diff options
| -rw-r--r-- | mk/bsd.pkg.defaults.mk | 4 | ||||
| -rw-r--r-- | multimedia/gmplayer/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/gmplayer/distinfo | 4 | ||||
| -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 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 3 |
7 files changed, 13 insertions, 26 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 68a5996a093..5028ae20860 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -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 @@ MOZILLA_USE_XFT?= NO 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 --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile index a4b4bbb2ac9..c2878ab69e8 100644 --- a/multimedia/gmplayer/Makefile +++ b/multimedia/gmplayer/Makefile @@ -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 --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo index b16cf1be2fb..a69dcaf021e 100644 --- a/multimedia/gmplayer/distinfo +++ b/multimedia/gmplayer/distinfo @@ -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 @@ SHA1 (mplayer-1.0rc5/xanim-1.6.tar.bz2) = ea147768cba50e62646216217028a9dac8b8e6 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 --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 diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 87c1581c9f9..97b7acd2ce6 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 |