diff options
| author | salo <salo@pkgsrc.org> | 2004-07-20 22:04:44 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2004-07-20 22:04:44 +0000 |
| commit | 03fc6a69a68d618d737470295a9cd86b72ebcaaf (patch) | |
| tree | f11c6ae6035bdd4d0ea63a4f37910e630ea07bea /multimedia/mplayer-share | |
| parent | 6dfa389b8fc194d6502051224731290ac3c49bba (diff) | |
| download | pkgsrc-03fc6a69a68d618d737470295a9cd86b72ebcaaf.tar.gz | |
Remove external Matroska support from mplayer packages.
The new internal demuxer is the only one supported now, works better
and support for the external one will be removed in next releases.
Diffstat (limited to 'multimedia/mplayer-share')
| -rw-r--r-- | multimedia/mplayer-share/Makefile.common | 5 | ||||
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-aa | 16 |
3 files changed, 5 insertions, 20 deletions
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common index 9c7ccf49d04..7caa590e94c 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2004/07/17 19:06:36 wiz Exp $ +# $NetBSD: Makefile.common,v 1.16 2004/07/20 22:04:44 salo Exp $ # MPLAYER_DIST_VERSION= 1.0pre5 @@ -81,7 +81,6 @@ CONFIGURE_ARGS+= --disable-mlib # MPLAYER_DISABLE_DRIVERS is explained. MPLAYER_DRIVERS= arts audio/arts arts \ esd audio/esound esd \ - matroska multimedia/libmatroska external-matroska \ nas audio/nas nas \ sdl devel/SDL sdl @@ -91,7 +90,7 @@ MPLAYER_DISABLE_DRIVERS+= arts .endif .if defined(PKGNAME) && !empty(PKGNAME:M*encoder*) -MPLAYER_DISABLE_DRIVERS=arts esd matroska nas sdl +MPLAYER_DISABLE_DRIVERS=arts esd nas sdl .else BUILD_DEFS+= MPLAYER_DISABLE_DRIVERS .endif diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 52505ee292a..2b51f93ba71 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/07/17 19:06:36 wiz Exp $ +$NetBSD: distinfo,v 1.11 2004/07/20 22:04:44 salo Exp $ SHA1 (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = cf64892871b8673e452b5d390be25144d85fe307 Size (mplayer-1.0rc5/MPlayer-1.0pre5.tar.bz2) = 5072836 bytes @@ -8,5 +8,5 @@ SHA1 (mplayer-1.0rc5/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f9 Size (mplayer-1.0rc5/font-arial-iso-8859-2.tar.bz2) = 222208 bytes SHA1 (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 Size (mplayer-1.0rc5/font-arial-cp1250.tar.bz2) = 249705 bytes -SHA1 (patch-aa) = 1dfc5284ec0f67d8adfe860010a39d273b3fa74c +SHA1 (patch-aa) = 9a90cadba608c518e998024f8dbde39cbfab70da SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index 7c17c616b14..398e9015c75 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2004/07/17 19:06:36 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2004/07/20 22:04:44 salo Exp $ --- configure.orig 2004-07-15 00:04:42.000000000 +0200 +++ configure @@ -50,17 +50,3 @@ $NetBSD: patch-aa,v 1.7 2004/07/17 19:06:36 wiz Exp $ ;; --with-dxr2incdir=*) _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` -@@ -4865,11 +4894,11 @@ if test "$_matroska_external" != no ; th - - int main(void) { return 0; } - EOF -- cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes -+ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska_external=yes - if test "$_matroska_external" = no ; then - _saved_inc_extra=$_inc_extra - _inc_extra="$_inc_extra -I/usr/local/include" -- cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes -+ cc_check -lmatroska -lebml -lm -lstdc++ && _matroska_external=yes - if test "$_matroska_external" = no ; then - _inc_extra=$_saved_inc_extra - fi |