[pkgsrc/trunk]: pkgsrc/multimedia/vlc21 Add "rpi" build option to enable Rasp...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe06d5b9b78d
branches:  trunk
changeset: 649886:fe06d5b9b78d
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Apr 12 10:43:25 2015 +0000

description:
Add "rpi" build option to enable Raspberry Pi OpenMAX IL decoding and
video output plugins. While here, fix plist for -x11 builds.

diffstat:

 multimedia/vlc21/Makefile   |   8 +++++++-
 multimedia/vlc21/PLIST      |  10 ++++++----
 multimedia/vlc21/options.mk |  15 ++++++++++++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diffs (93 lines):

diff -r d612021224d7 -r fe06d5b9b78d multimedia/vlc21/Makefile
--- a/multimedia/vlc21/Makefile Sun Apr 12 10:43:12 2015 +0000
+++ b/multimedia/vlc21/Makefile Sun Apr 12 10:43:25 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/02/21 23:35:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2015/04/12 10:43:25 jmcneill Exp $
 
 DISTNAME=              vlc-${VLC_VERSION}
 PKGREVISION=           4
@@ -104,6 +104,12 @@
 SUBST_FILES.fnt=       modules/text_renderer/freetype.c
 SUBST_MESSAGE.fnt=     Fixing hardcoded paths.
 
+SUBST_CLASSES+=                vc
+SUBST_STAGE.vc=                pre-configure
+SUBST_SED.vc=          -e "s,/opt/vc,${LOCALBASE},g"
+SUBST_FILES.vc+=       modules/codec/omxil/omxil_core.c
+SUBST_MESSAGE.vc=      Fixing hardcoded videocore library paths. 
+
 # VLC embeds the build environment info to help debuging.
 CHECK_WRKREF_SKIP=     lib/libvlccore.a \
                        lib/libvlccore.so*
diff -r d612021224d7 -r fe06d5b9b78d multimedia/vlc21/PLIST
--- a/multimedia/vlc21/PLIST    Sun Apr 12 10:43:12 2015 +0000
+++ b/multimedia/vlc21/PLIST    Sun Apr 12 10:43:25 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/12/13 11:15:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/04/12 10:43:25 jmcneill Exp $
 bin/cvlc
 ${PLIST.x11}bin/qvlc
 bin/rvlc
@@ -183,6 +183,8 @@
 lib/vlc/plugins/codec/liblibmpeg2_plugin.la
 lib/vlc/plugins/codec/liblpcm_plugin.la
 lib/vlc/plugins/codec/libmpeg_audio_plugin.la
+${PLIST.rpi}lib/vlc/plugins/codec/libomxil_plugin.la
+${PLIST.rpi}lib/vlc/plugins/codec/libomxil_vout_plugin.la
 lib/vlc/plugins/codec/libopus_plugin.la
 lib/vlc/plugins/codec/libpng_plugin.la
 lib/vlc/plugins/codec/librawvideo_plugin.la
@@ -200,7 +202,7 @@
 lib/vlc/plugins/codec/libuleaddvaudio_plugin.la
 lib/vlc/plugins/codec/libvorbis_plugin.la
 lib/vlc/plugins/codec/libx264_plugin.la
-lib/vlc/plugins/codec/libxwd_plugin.la
+${PLIST.x11}lib/vlc/plugins/codec/libxwd_plugin.la
 lib/vlc/plugins/control/libdummy_plugin.la
 lib/vlc/plugins/control/libgestures_plugin.la
 ${PLIST.x11}lib/vlc/plugins/control/libglobalhotkeys_plugin.la
@@ -377,8 +379,8 @@
 lib/vlc/plugins/video_filter/libwall_plugin.la
 lib/vlc/plugins/video_filter/libwave_plugin.la
 lib/vlc/plugins/video_filter/libyuvp_plugin.la
-lib/vlc/plugins/video_output/libgl_plugin.la
-lib/vlc/plugins/video_output/libglx_plugin.la
+${PLIST.x11}lib/vlc/plugins/video_output/libgl_plugin.la
+${PLIST.x11}lib/vlc/plugins/video_output/libglx_plugin.la
 lib/vlc/plugins/video_output/libvdummy_plugin.la
 lib/vlc/plugins/video_output/libvmem_plugin.la
 ${PLIST.sdl}lib/vlc/plugins/video_output/libvout_sdl_plugin.la
diff -r d612021224d7 -r fe06d5b9b78d multimedia/vlc21/options.mk
--- a/multimedia/vlc21/options.mk       Sun Apr 12 10:43:12 2015 +0000
+++ b/multimedia/vlc21/options.mk       Sun Apr 12 10:43:25 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/12/13 11:15:45 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2015/04/12 10:43:25 jmcneill Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=         debug faad skins sdl pulseaudio x11
@@ -7,6 +7,11 @@
 #PKG_SUPPORTED_OPTIONS+=       dbus
 PKG_SUGGESTED_OPTIONS=         faad x11 rtsp
 
+.if !empty(MACHINE_ARCH:M*earm*)
+PKG_SUPPORTED_OPTIONS+=                rpi
+PKG_SUGGESTED_OPTIONS+=                rpi
+.endif
+
 ### Add VAAPI if it is available
 .include "../../multimedia/libva/available.mk"
 PLIST_VARS+=           vaapi
@@ -177,3 +182,11 @@
 .else
 CONFIGURE_ARGS+=       --disable-lirc
 .endif
+
+## Raspberry Pi support
+.if !empty(PKG_OPTIONS:Mrpi)
+CONFIGURE_ARGS+=       --enable-rpi-omxil
+.include "../../misc/raspberrypi-userland/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-rpi-omxil
+.endif