"Drop the use of faad / liba52 / libdca / libmad and libmpeg2 for decoding

AAC / AC3 / DTS / MPEG Audio and MPEG/MPEG2 in favour of FFmpeg's libavcodec
decoders which nowdays are just as good and in some cases like AC3 / DTS
are better."  From Brad (maintainer). ok dcoppa@
This commit is contained in:
sthen 2011-04-03 21:41:38 +00:00
parent a4367ae483
commit 0e20780610
2 changed files with 20 additions and 37 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.118 2011/03/26 10:05:24 sthen Exp $
# $OpenBSD: Makefile,v 1.119 2011/04/03 21:41:38 sthen Exp $
SHARED_ONLY= Yes
@ -7,7 +7,7 @@ COMMENT-main= VideoLAN client; multimedia player
V= 1.0.6
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
REVISION-main= 18
REVISION-main= 19
REVISION-jack= 3
REVISION-web= 5
CATEGORIES= x11
@ -27,15 +27,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= devel/gettext x11/qt4
MODULES= devel/gettext \
x11/qt4
LIB_DEPENDS+= x11/dbus
LIB_DEPENDS-main=${LIB_DEPENDS} \
audio/faad \
audio/flac \
audio/liba52 \
audio/libcddb \
audio/libdca \
audio/libmad \
audio/libmpcdec \
audio/libvorbis \
audio/speex \
@ -46,7 +43,6 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
devel/sdl-image \
graphics/ffmpeg>=20080620p10 \
graphics/libdvbpsi \
graphics/libmpeg2 \
graphics/png \
multimedia/libdvdnav \
multimedia/libmatroska \
@ -61,27 +57,28 @@ RUN_DEPENDS= devel/desktop-file-utils
WANTLIB-main= FLAC GL GLU ICE lib/qt4/QtGui SM SDL SDL_image X11 Xau \
Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama \
Xrandr Xrender Xv Xxf86vm a52 atk-1.0 avcodec avformat \
avutil bz2 c cairo cddb dbus-1 dbus-glib-1 dca dvbpsi \
dvdnav dvdread ebml expat faac faad fontconfig freetype \
fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 gsm gthread-2.0 gtk-x11-2.0 \
jpeg m mad matroska mp3lame mpcdec mpeg2 notify orc-0.4 \
ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
png postproc proxy pthread-stubs pthread stdc++>=46.0 \
schroedinger-1.0>=2.0 sndio speex swscale tag tiff theora \
usbhid vorbis vorbisenc x264 xcb-keysyms xcb-render \
drm xcb-shm xcb xml2 z ${WANTLIB}
Xrandr Xrender Xv Xxf86vm atk-1.0 avcodec avformat avutil \
bz2 c cairo cddb dbus-1 dbus-glib-1 drm dvbpsi dvdnav \
dvdread ebml expat faac fontconfig freetype fribidi \
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gsm gthread-2.0 gtk-x11-2.0 jpeg m matroska \
mp3lame mpcdec notify orc-0.4 ogg pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 png postproc proxy pthread-stubs \
pthread stdc++>=46.0 schroedinger-1.0>=2.0 sndio speex \
swscale tag tiff theora usbhid vorbis vorbisenc x264 \
xcb-keysyms xcb-render xcb-shm xcb xml2 z ${WANTLIB}
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.65
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autotools
CONFIGURE_ARGS+=--disable-alsa \
CONFIGURE_ARGS+=--disable-a52 \
--disable-alsa \
--disable-altivec \
--disable-bonjour \
--disable-cmml \
--disable-dca \
--disable-fluidsynth \
--disable-dvb \
--disable-fluidsynth \
@ -90,10 +87,12 @@ CONFIGURE_ARGS+=--disable-alsa \
--disable-hal \
--disable-kate \
--disable-libgcrypt \
--disable-libmpeg2 \
--disable-libtar \
--disable-libv4l2 \
--disable-live555 \
--disable-lua \
--disable-mad \
--disable-mod \
--disable-mtp \
--disable-oss \
@ -106,7 +105,6 @@ CONFIGURE_ARGS+=--disable-alsa \
--disable-upnp \
--disable-zvbi \
--enable-dvdread \
--enable-faad \
--enable-flac \
--enable-real \
--enable-realrtsp \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.11 2010/09/17 12:15:20 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.12 2011/04/03 21:41:38 sthen Exp $
@pkgpath x11/vlc
%%amd64%%
%%i386%%
@ -149,9 +149,6 @@ lib/vlc/access_output/libaccess_output_http_plugin.so
lib/vlc/access_output/libaccess_output_udp_plugin.la
lib/vlc/access_output/libaccess_output_udp_plugin.so
lib/vlc/audio_filter/
@comment lib/vlc/audio_filter/liba52tofloat32_plugin.a
lib/vlc/audio_filter/liba52tofloat32_plugin.la
lib/vlc/audio_filter/liba52tofloat32_plugin.so
@comment lib/vlc/audio_filter/liba52tospdif_plugin.a
lib/vlc/audio_filter/liba52tospdif_plugin.la
lib/vlc/audio_filter/liba52tospdif_plugin.so
@ -170,9 +167,6 @@ lib/vlc/audio_filter/libconverter_float_plugin.so
@comment lib/vlc/audio_filter/libdolby_surround_decoder_plugin.a
lib/vlc/audio_filter/libdolby_surround_decoder_plugin.la
lib/vlc/audio_filter/libdolby_surround_decoder_plugin.so
@comment lib/vlc/audio_filter/libdtstofloat32_plugin.a
lib/vlc/audio_filter/libdtstofloat32_plugin.la
lib/vlc/audio_filter/libdtstofloat32_plugin.so
@comment lib/vlc/audio_filter/libdtstospdif_plugin.a
lib/vlc/audio_filter/libdtstospdif_plugin.la
lib/vlc/audio_filter/libdtstospdif_plugin.so
@ -188,9 +182,6 @@ lib/vlc/audio_filter/liblinear_resampler_plugin.so
@comment lib/vlc/audio_filter/libmono_plugin.a
lib/vlc/audio_filter/libmono_plugin.la
lib/vlc/audio_filter/libmono_plugin.so
@comment lib/vlc/audio_filter/libmpgatofixed32_plugin.a
lib/vlc/audio_filter/libmpgatofixed32_plugin.la
lib/vlc/audio_filter/libmpgatofixed32_plugin.so
@comment lib/vlc/audio_filter/libnormvol_plugin.a
lib/vlc/audio_filter/libnormvol_plugin.la
lib/vlc/audio_filter/libnormvol_plugin.so
@ -263,9 +254,6 @@ lib/vlc/codec/libdts_plugin.so
@comment lib/vlc/codec/libdvbsub_plugin.a
lib/vlc/codec/libdvbsub_plugin.la
lib/vlc/codec/libdvbsub_plugin.so
@comment lib/vlc/codec/libfaad_plugin.a
lib/vlc/codec/libfaad_plugin.la
lib/vlc/codec/libfaad_plugin.so
@comment lib/vlc/codec/libfake_plugin.a
lib/vlc/codec/libfake_plugin.la
lib/vlc/codec/libfake_plugin.so
@ -275,9 +263,6 @@ lib/vlc/codec/libflac_plugin.so
@comment lib/vlc/codec/libinvmem_plugin.a
lib/vlc/codec/libinvmem_plugin.la
lib/vlc/codec/libinvmem_plugin.so
@comment lib/vlc/codec/liblibmpeg2_plugin.a
lib/vlc/codec/liblibmpeg2_plugin.la
lib/vlc/codec/liblibmpeg2_plugin.so
@comment lib/vlc/codec/liblpcm_plugin.a
lib/vlc/codec/liblpcm_plugin.la
lib/vlc/codec/liblpcm_plugin.so