diff options
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/vlc2/Makefile | 12 | ||||
-rw-r--r-- | multimedia/vlc2/PLIST | 6 | ||||
-rw-r--r-- | multimedia/vlc2/PLIST.Linux | 8 |
3 files changed, 21 insertions, 5 deletions
diff --git a/multimedia/vlc2/Makefile b/multimedia/vlc2/Makefile index c9d03d0b94a..a505ff5f99b 100644 --- a/multimedia/vlc2/Makefile +++ b/multimedia/vlc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/02/16 11:23:44 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2013/03/18 09:18:16 sbd Exp $ # DISTNAME= vlc-${VLC_VERSION} @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-kde-solid=${PREFIX}/share/kde/apps/solid/actions PTHREAD_OPTS+= require USE_LANGUAGES= c99 c++ -PLIST_VARS+= x86simd altivec v4l2 +PLIST_VARS+= x86simd altivec v4l2 oss .include "../../mk/bsd.prefs.mk" .include "options.mk" @@ -54,6 +54,11 @@ PLIST.altivec= yes CONFIGURE_ARGS+= --enable-altivec .endif +# Linux uses alsa +.if "${OPSYS}" != "Linux" +PLIST.oss= yes +.endif + # Enable when cleanly builds .if exists(/usr/include/linux/videodev2.h) # || exists(/usr/include/sys/videoio.h) CONFIGURE_ARGS+= --enable-v4l2 @@ -146,6 +151,9 @@ BUILDLINK_API_DEPENDS.x264-devel+= x264-devel>=20100201 .include "../../net/libupnp/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.if "${OPSYS}" == "Linux" +. include "../../audio/alsa-lib/buildlink3.mk" +.endif .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/vlc2/PLIST b/multimedia/vlc2/PLIST index 32ac78f1960..fad84a54161 100644 --- a/multimedia/vlc2/PLIST +++ b/multimedia/vlc2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2013/01/20 15:31:42 drochner Exp $ +@comment $NetBSD: PLIST,v 1.7 2013/03/18 09:18:16 sbd Exp $ bin/cvlc ${PLIST.x11}bin/qvlc bin/rvlc @@ -105,7 +105,7 @@ ${PLIST.gnome}lib/vlc/plugins/access/libaccess_gnomevfs_plugin.la lib/vlc/plugins/access/libaccess_http_plugin.la lib/vlc/plugins/access/libaccess_imem_plugin.la lib/vlc/plugins/access/libaccess_mms_plugin.la -lib/vlc/plugins/access/libaccess_oss_plugin.la +${PLIST.oss}lib/vlc/plugins/access/libaccess_oss_plugin.la lib/vlc/plugins/access/libaccess_rar_plugin.la lib/vlc/plugins/access/libaccess_shm_plugin.la lib/vlc/plugins/access/libaccess_tcp_plugin.la @@ -155,7 +155,7 @@ lib/vlc/plugins/audio_mixer/libfloat32_mixer_plugin.la lib/vlc/plugins/audio_output/libadummy_plugin.la lib/vlc/plugins/audio_output/libamem_plugin.la lib/vlc/plugins/audio_output/libaout_file_plugin.la -lib/vlc/plugins/audio_output/liboss_plugin.la +${PLIST.oss}lib/vlc/plugins/audio_output/liboss_plugin.la ${PLIST.pulseaudio}lib/vlc/plugins/audio_output/libpulse_plugin.la lib/vlc/plugins/codec/liba52_plugin.la lib/vlc/plugins/codec/libadpcm_plugin.la diff --git a/multimedia/vlc2/PLIST.Linux b/multimedia/vlc2/PLIST.Linux new file mode 100644 index 00000000000..682fb98575b --- /dev/null +++ b/multimedia/vlc2/PLIST.Linux @@ -0,0 +1,8 @@ +@comment $NetBSD: PLIST.Linux,v 1.1 2013/03/18 09:18:16 sbd Exp $ +lib/vlc/plugins/access/libaccess_alsa_plugin.la +lib/vlc/plugins/access/libdtv_plugin.la +lib/vlc/plugins/access/liblinsys_hdsdi_plugin.la +${PLIST.v4l2}lib/vlc/plugins/access/libv4l2_plugin.la +lib/vlc/plugins/audio_output/libalsa_plugin.la +lib/vlc/plugins/video_filter/libatmo_plugin.la +lib/vlc/plugins/video_output/libfb_plugin.la |