From 1585c86ae110bb8ff65ba8ff38c3a6b3c14683ac Mon Sep 17 00:00:00 2001 From: sborrill Date: Mon, 25 Feb 2008 16:38:00 +0000 Subject: Restore conditional PLIST items lost during the upgrade to 0.8.6d. Remove option for flac as vlc's configure script forces it to be enabled all the time (contrary to the docs!). Add some buildlink dependencies. Bump PKGREVISION --- multimedia/vlc/Makefile | 6 ++++-- multimedia/vlc/PLIST | 12 ++++++++---- multimedia/vlc/buildlink3.mk | 7 +++---- multimedia/vlc/options.mk | 15 +++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'multimedia') diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 73bb69ecb7f..acb3d0d551a 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.47 2008/02/20 13:11:00 xtraeme Exp $ +# $NetBSD: Makefile,v 1.48 2008/02/25 16:38:00 sborrill Exp $ # DISTNAME= vlc-${VLC_VER} CATEGORIES= multimedia MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/ EXTRACT_SUFX= .tar.bz2 +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.videolan.org/ @@ -41,7 +42,6 @@ CONFIGURE_ARGS+= --disable-mpc CONFIGURE_ARGS+= --disable-dts CONFIGURE_ARGS+= --enable-cddax CONFIGURE_ARGS+= --enable-dvdread -CONFIGURE_ARGS+= --enable-faad CONFIGURE_ARGS+= --enable-flac INSTALLATION_DIRS+= ${PREFIX}/share/vlc/http/dialogs \ @@ -107,6 +107,8 @@ CONFIGURE_ARGS+= x_libraries=${PREFIX}/lib .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST index 0fcacebf020..bad736bf761 100644 --- a/multimedia/vlc/PLIST +++ b/multimedia/vlc/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.9 2008/02/20 13:11:00 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/02/25 16:38:00 sborrill Exp $ +${COND_SKINS}bin/svlc bin/vlc bin/vlc-config -bin/wxvlc +${COND_WXWIDGETS}bin/wxvlc include/vlc/aout.h include/vlc/decoder.h include/vlc/input.h @@ -21,10 +22,12 @@ lib/vlc/access/libaccess_http_plugin.so lib/vlc/access/libaccess_mms_plugin.so lib/vlc/access/libaccess_tcp_plugin.so lib/vlc/access/libaccess_udp_plugin.so +${COND_CDDA}lib/vlc/access/libcddax_plugin.so lib/vlc/access/libcddax_plugin.so lib/vlc/access/libdvdnav_plugin.so lib/vlc/access/libdvdread_plugin.so lib/vlc/access/libscreen_plugin.so +${COND_VCD}lib/vlc/access/libvcd_plugin.so lib/vlc/access_filter/libaccess_filter_dump_plugin.so lib/vlc/access_filter/libaccess_filter_record_plugin.so lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so @@ -74,7 +77,7 @@ lib/vlc/codec/libcmml_plugin.so lib/vlc/codec/libcvdsub_plugin.so lib/vlc/codec/libdts_plugin.so lib/vlc/codec/libdvbsub_plugin.so -lib/vlc/codec/libfaad_plugin.so +${COND_FAAD}lib/vlc/codec/libfaad_plugin.so lib/vlc/codec/libfake_plugin.so lib/vlc/codec/libflacdec_plugin.so lib/vlc/codec/liblibmpeg2_plugin.so @@ -131,7 +134,8 @@ lib/vlc/demux/libvobsub_plugin.so lib/vlc/demux/libvoc_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/demux/libxa_plugin.so -lib/vlc/gui/libwxwidgets_plugin.so +${COND_SKINS}lib/vlc/gui/libskins2_plugin.so +${COND_WXWIDGETS}lib/vlc/gui/libwxwidgets_plugin.so lib/vlc/libffmpeg.a lib/vlc/libi420_rgb_mmx.a lib/vlc/libi420_ymga_mmx.a diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk index b795cb84921..5764b2eeb5e 100644 --- a/multimedia/vlc/buildlink3.mk +++ b/multimedia/vlc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/02/23 00:14:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2008/02/25 16:38:00 sborrill Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ VLC_BUILDLINK3_MK:= ${VLC_BUILDLINK3_MK}+ @@ -23,10 +23,7 @@ pkgbase:= vlc .include "../../audio/faad2/buildlink3.mk" .endif -.if !empty(PKG_BUILD_OPTIONS.vlc:Mflac) .include "../../audio/flac/buildlink3.mk" -.endif - .include "../../audio/lame/buildlink3.mk" .include "../../audio/liba52/buildlink3.mk" .include "../../audio/libcddb/buildlink3.mk" @@ -36,6 +33,8 @@ pkgbase:= vlc .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk index 69c989b2ca0..d14b93d6532 100644 --- a/multimedia/vlc/options.mk +++ b/multimedia/vlc/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2008/02/22 15:37:28 sborrill Exp $ +# $NetBSD: options.mk,v 1.4 2008/02/25 16:38:00 sborrill Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vlc -PKG_SUPPORTED_OPTIONS= skins wxwidgets faad flac -PKG_SUGGESTED_OPTIONS= wxwidgets faad flac +PKG_SUPPORTED_OPTIONS= skins wxwidgets faad +PKG_SUGGESTED_OPTIONS= wxwidgets faad .include "../../mk/bsd.options.mk" @@ -25,14 +25,9 @@ PLIST_SUBST+= COND_WXWIDGETS="@comment " .if !empty(PKG_OPTIONS:Mfaad) CONFIGURE_ARGS+= --enable-faad +PLIST_SUBST+= COND_FAAD= .include "../../audio/faad2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-faad -.endif - -.if !empty(PKG_OPTIONS:Mflac) -CONFIGURE_ARGS+= --enable-flac -.include "../../audio/flac/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-flac +PLIST_SUBST+= COND_FAAD="@comment " .endif -- cgit v1.2.3