Add "rpi" build option to enable Raspberry Pi OpenMAX IL decoding and

video output plugins. While here, fix plist for -x11 builds.

3 files changed, 27 insertions, 6 deletions

diff --git a/multimedia/vlc21/Makefile b/multimedia/vlc21/Makefile
index 2632d66912d..21419d7ada6 100644
--- a/multimedia/vlc21/Makefile
+++ b/multimedia/vlc21/Makefile
@@ -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_SED.fnt=		-e "s,${ORIGFNT},${DEFAULT_FONT},"
 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 --git a/multimedia/vlc21/PLIST b/multimedia/vlc21/PLIST
index af6a0d93835..89ddb67e36b 100644
--- a/multimedia/vlc21/PLIST
+++ b/multimedia/vlc21/PLIST
@@ -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/liblibass_plugin.la
 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/libtheora_plugin.la
 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/libtransform_plugin.la
 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 --git a/multimedia/vlc21/options.mk b/multimedia/vlc21/options.mk
index 0cf938329ce..b2041534fdb 100644
--- a/multimedia/vlc21/options.mk
+++ b/multimedia/vlc21/options.mk
@@ -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+=		gnome dts rtsp
 #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 @@ PLIST.lirc=	yes
 .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