move a52 support out of the !no_dvd case since some non-dvd stuff uses

it, it's also a dependency of a dependency so we'll have it around
anyway

bump PKGNAME
This commit is contained in:
jolan 2005-06-23 00:54:40 +00:00
parent 72d0b4d01d
commit 8d2bbfc6c9
3 changed files with 12 additions and 11 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2005/02/20 03:28:27 naddy Exp $
# $OpenBSD: Makefile,v 1.20 2005/06/23 00:54:40 jolan Exp $
SHARED_ONLY= Yes
COMMENT= "videolan client; multimedia player"
V= 0.8.1
DISTNAME= vlc-${V}
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
@ -36,7 +36,8 @@ LIB_DEPENDS= SDL.3.0::devel/sdl \
mpeg2.0.0::graphics/libmpeg2 \
avcodec.5.0,avformat.5.0,postproc.5.0::graphics/ffmpeg \
fribidi.0.0::devel/fribidi \
faad.0.0::audio/faad
faad.0.0::audio/faad \
a52.0.0::audio/liba52
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.59
@ -64,7 +65,8 @@ CONFIGURE_ARGS+=--disable-altivec \
--disable-pvr \
--disable-fb \
--disable-qnx \
--disable-slp
--disable-slp \
--enable-a52
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
@ -83,11 +85,10 @@ CFLAGS+=-mhard-quad-float
.endif
.if ${FLAVOR:L:Mno_dvd}
CONFIGURE_ARGS+=--disable-a52 --disable-dvdread --disable-dvdnav
CONFIGURE_ARGS+=--disable-dvdread --disable-dvdnav
.else
CONFIGURE_ARGS+=--enable-a52 --enable-dvdread --enable-dvdnav
LIB_DEPENDS+= a52.0.0::audio/liba52 \
dvdnav.3.0::multimedia/libdvdnav \
CONFIGURE_ARGS+=--enable-dvdread --enable-dvdnav
LIB_DEPENDS+= dvdnav.3.0::multimedia/libdvdnav \
dvdread.3.0::devel/libdvdread
.endif

View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PFRAG.no-no_dvd,v 1.2 2004/12/16 07:40:20 jolan Exp $
@comment $OpenBSD: PFRAG.no-no_dvd,v 1.3 2005/06/23 00:54:40 jolan Exp $
lib/vlc/access/libdvdnav_plugin.so
lib/vlc/access/libdvdread_plugin.so
lib/vlc/audio_filter/liba52tofloat32_plugin.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2005/02/20 03:28:27 naddy Exp $
@comment $OpenBSD: PLIST,v 1.13 2005/06/23 00:54:40 jolan Exp $
%%SHARED%%
%%i386%%
bin/vlc
@ -28,6 +28,7 @@ lib/vlc/access_output/libaccess_output_file_plugin.so
lib/vlc/access_output/libaccess_output_http_plugin.so
lib/vlc/access_output/libaccess_output_udp_plugin.so
lib/vlc/audio_filter/
lib/vlc/audio_filter/liba52tofloat32_plugin.so
lib/vlc/audio_filter/liba52tospdif_plugin.so
lib/vlc/audio_filter/libbandlimited_resampler_plugin.so
lib/vlc/audio_filter/libdtstospdif_plugin.so