[pkgsrc/trunk]: pkgsrc Remove external Matroska support from mplayer packages.

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8721caf1885f
branches:  trunk
changeset: 478281:8721caf1885f
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Jul 20 22:04:44 2004 +0000

description:
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:

 mk/bsd.pkg.defaults.mk                    |   4 ++--
 multimedia/gmplayer/Makefile              |   3 ++-
 multimedia/gmplayer/distinfo              |   4 ++--
 multimedia/mplayer-share/Makefile.common  |   5 ++---
 multimedia/mplayer-share/distinfo         |   4 ++--
 multimedia/mplayer-share/patches/patch-aa |  16 +---------------
 multimedia/mplayer/Makefile               |   3 ++-
 7 files changed, 13 insertions(+), 26 deletions(-)

diffs (132 lines):

diff -r 3e8d83cbb2b1 -r 8721caf1885f mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk    Tue Jul 20 22:04:15 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk    Tue Jul 20 22:04:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.261 2004/07/19 23:54:32 schmonz Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.262 2004/07/20 22:04:44 salo Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1510,7 +1510,7 @@
 MPLAYER_DISABLE_DRIVERS?=
 # Whitespace separated list of output drivers that are not wanted in
 # mplayer/gmplayer's binary.
-# Possible: arts esd matroska nas sdl
+# Possible: arts esd nas sdl
 # Default: empty
 
 MPLAYER_ENABLE_RUNTIME_CPU_DETECTION?= YES
diff -r 3e8d83cbb2b1 -r 8721caf1885f multimedia/gmplayer/Makefile
--- a/multimedia/gmplayer/Makefile      Tue Jul 20 22:04:15 2004 +0000
+++ b/multimedia/gmplayer/Makefile      Tue Jul 20 22:04:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/07/17 19:06:36 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/07/20 22:04:44 salo Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,6 +9,7 @@
 #
 
 PKGNAME=       gmplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION=   1
 
 SKIN_SITES=    http://www.mplayerhq.hu/MPlayer/Skin/           \
                ftp://ftp.mplayerhq.hu/MPlayer/Skin/            \
diff -r 3e8d83cbb2b1 -r 8721caf1885f multimedia/gmplayer/distinfo
--- a/multimedia/gmplayer/distinfo      Tue Jul 20 22:04:15 2004 +0000
+++ b/multimedia/gmplayer/distinfo      Tue Jul 20 22:04:44 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/07/17 19:06:36 wiz Exp $
+$NetBSD: distinfo,v 1.12 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
@@ -42,5 +42,5 @@
 Size (mplayer-1.0rc5/xanim-1.6.tar.bz2) = 94567 bytes
 SHA1 (mplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = b882ec3e0aceeffb22c425cfd7322bf0f7aaf269
 Size (mplayer-1.0rc5/xine-lcd-1.2.tar.bz2) = 172340 bytes
-SHA1 (patch-aa) = 1dfc5284ec0f67d8adfe860010a39d273b3fa74c
+SHA1 (patch-aa) = 9a90cadba608c518e998024f8dbde39cbfab70da
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
diff -r 3e8d83cbb2b1 -r 8721caf1885f multimedia/mplayer-share/Makefile.common
--- a/multimedia/mplayer-share/Makefile.common  Tue Jul 20 22:04:15 2004 +0000
+++ b/multimedia/mplayer-share/Makefile.common  Tue Jul 20 22:04:44 2004 +0000
@@ -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 @@
 # 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 @@
 .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 -r 3e8d83cbb2b1 -r 8721caf1885f multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Tue Jul 20 22:04:15 2004 +0000
+++ b/multimedia/mplayer-share/distinfo Tue Jul 20 22:04:44 2004 +0000
@@ -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 @@
 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 -r 3e8d83cbb2b1 -r 8721caf1885f multimedia/mplayer-share/patches/patch-aa
--- a/multimedia/mplayer-share/patches/patch-aa Tue Jul 20 22:04:15 2004 +0000
+++ b/multimedia/mplayer-share/patches/patch-aa Tue Jul 20 22:04:44 2004 +0000
@@ -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 @@
      ;;
    --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
diff -r 3e8d83cbb2b1 -r 8721caf1885f multimedia/mplayer/Makefile
--- a/multimedia/mplayer/Makefile       Tue Jul 20 22:04:15 2004 +0000
+++ b/multimedia/mplayer/Makefile       Tue Jul 20 22:04:44 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/07/17 19:06:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/20 22:04:44 salo Exp $
 
 PKGNAME=       mplayer-${MPLAYER_PKG_VERSION}
+PKGREVISION=   1
 
 COMMENT=       Software-only MPEG-1/2/4 video decoder