diff options
-rw-r--r-- | graphics/gmplayer/distinfo | 8 | ||||
-rw-r--r-- | graphics/mencoder/distinfo | 8 | ||||
-rw-r--r-- | graphics/mplayer-share/Makefile.common | 17 | ||||
-rw-r--r-- | graphics/mplayer-share/Makefile.depends | 4 | ||||
-rw-r--r-- | graphics/mplayer-share/distinfo | 10 | ||||
-rw-r--r-- | graphics/mplayer-share/patches/patch-ad | 14 | ||||
-rw-r--r-- | graphics/mplayer/distinfo | 8 |
7 files changed, 31 insertions, 38 deletions
diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo index 4e2359e0e9f..f03ce24c4e7 100644 --- a/graphics/gmplayer/distinfo +++ b/graphics/gmplayer/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.21 2002/11/01 10:19:16 jlam Exp $ +$NetBSD: distinfo,v 1.22 2002/11/13 15:25:35 wiz Exp $ -SHA1 (mplayer/MPlayer-0.90pre9.tar.bz2) = e9c022e6531c7d75847130ef6ed5b4342db271ab -Size (mplayer/MPlayer-0.90pre9.tar.bz2) = 2758568 bytes +SHA1 (mplayer/MPlayer-0.90pre10.tar.bz2) = 4b53eef9c2b2ad461ae6648dc76651b21a2079e7 +Size (mplayer/MPlayer-0.90pre10.tar.bz2) = 2855776 bytes SHA1 (mplayer/default.tar.bz2) = 804d181e96c81e3794260dc8976786f3a535a3cf Size (mplayer/default.tar.bz2) = 167735 bytes SHA1 (mplayer/MidnightLove.tar.bz2) = 449a9b82633b7e5dd7e801d701540c4811ac6e58 @@ -44,4 +44,4 @@ SHA1 (mplayer/hwswskin.tar.bz2) = 00ecb41cf8b295fbd50422e2d7d1b7874b0fed12 Size (mplayer/hwswskin.tar.bz2) = 20278 bytes SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d -SHA1 (patch-ad) = 8204b57097d6f0b4eb08e49bca3c1bbbb464c21e +SHA1 (patch-ad) = 2ed6583fb2b7825d6207722815da514bbbe83a12 diff --git a/graphics/mencoder/distinfo b/graphics/mencoder/distinfo index 6b2c19da772..bfcacb4df3c 100644 --- a/graphics/mencoder/distinfo +++ b/graphics/mencoder/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2002/11/05 21:11:58 wiz Exp $ +$NetBSD: distinfo,v 1.13 2002/11/13 15:25:35 wiz Exp $ -SHA1 (mplayer/MPlayer-0.90pre9.tar.bz2) = e9c022e6531c7d75847130ef6ed5b4342db271ab -Size (mplayer/MPlayer-0.90pre9.tar.bz2) = 2758568 bytes +SHA1 (mplayer/MPlayer-0.90pre10.tar.bz2) = 4b53eef9c2b2ad461ae6648dc76651b21a2079e7 +Size (mplayer/MPlayer-0.90pre10.tar.bz2) = 2855776 bytes SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d -SHA1 (patch-ad) = 8204b57097d6f0b4eb08e49bca3c1bbbb464c21e +SHA1 (patch-ad) = 2ed6583fb2b7825d6207722815da514bbbe83a12 diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common index 7d631c956f7..e364a1dfbf3 100644 --- a/graphics/mplayer-share/Makefile.common +++ b/graphics/mplayer-share/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.15 2002/11/01 10:19:17 jlam Exp $ +# $NetBSD: Makefile.common,v 1.16 2002/11/13 15:25:34 wiz Exp $ -MPLAYER_DIST_VERSION= 0.90pre9 +MPLAYER_DIST_VERSION= 0.90pre10 #PKGREVISION= 1 # There is no need to change anything below here. @@ -23,11 +23,7 @@ HOMEPAGE?= http://www.mplayerhq.hu/ PATCHDIR= ${.CURDIR}/../../graphics/mplayer-share/patches ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc SunOS-*-* -RESTRICTED?= "unsure of the license" -# see http://www.mplayerhq.hu/DOCS/users_against_developers.html#binary -NO_BIN_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -# no source on the ftp server because of the css source code in it +# no source on the ftp server because of the css source code in it NO_SRC_ON_FTP= ${RESTRICTED} USE_BUILDLINK2= YES @@ -41,6 +37,7 @@ CONFIGURE_ARGS+= --with-extraincdir="${LOCALBASE}/include" CONFIGURE_ARGS+= --with-extralibdir="${LOCALBASE}/lib" #CONFIGURE_ARGS+= --enable-dvdread CONFIGURE_ARGS+= --disable-mpdvdkit +CONFIGURE_ARGS+= --enable-runtime-cpudetection CONFIGURE_ARGS+= --enable-faad CONFIGURE_ARGS+= --disable-arts @@ -51,12 +48,6 @@ CONFIGURE_ENV+= TMPDIR=${WRKDIR} .include "../../mk/bsd.prefs.mk" -.if defined(USE_OSS) -CONFIGURE_ARGS+= --enable-ossaudio -.else -CONFIGURE_ARGS+= --disable-ossaudio -.endif - .if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+= --with-win32libdir="${LOCALBASE}/lib/win32" .if ${MPLAYER_USE_REALMEDIA} == "YES" diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends index 3036bceecb7..0200ed9b14f 100644 --- a/graphics/mplayer-share/Makefile.depends +++ b/graphics/mplayer-share/Makefile.depends @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.depends,v 1.7 2002/11/01 10:19:17 jlam Exp $ +# $NetBSD: Makefile.depends,v 1.8 2002/11/13 15:25:34 wiz Exp $ DEPENDS+= mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share @@ -16,7 +16,9 @@ DEPENDS+= realplayer>=8:../../audio/realplayer USE_X11= # defined .include "../../audio/mad/buildlink2.mk" +.include "../../audio/libvorbis/buildlink2.mk" .include "../../audio/faad2/buildlink2.mk" +.include "../../converters/libiconv/buildlink2.mk" .include "../../devel/SDL/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo index 30808bbfd8e..b72986885e0 100644 --- a/graphics/mplayer-share/distinfo +++ b/graphics/mplayer-share/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.12 2002/11/01 10:19:17 jlam Exp $ +$NetBSD: distinfo,v 1.13 2002/11/13 15:25:34 wiz Exp $ -SHA1 (mplayer/MPlayer-0.90pre9.tar.bz2) = e9c022e6531c7d75847130ef6ed5b4342db271ab -Size (mplayer/MPlayer-0.90pre9.tar.bz2) = 2758568 bytes +SHA1 (mplayer/MPlayer-0.90pre10.tar.bz2) = 4b53eef9c2b2ad461ae6648dc76651b21a2079e7 +Size (mplayer/MPlayer-0.90pre10.tar.bz2) = 2855776 bytes SHA1 (mplayer/mp-arial-iso-8859-1.zip) = 535809c2745d5dfa79d1243cbe225ee030e626ac Size (mplayer/mp-arial-iso-8859-1.zip) = 272659 bytes SHA1 (mplayer/mp-arial-iso-8859-2.zip) = a1ef7ea4f4349cd4451052351f7c300597a1b5d3 Size (mplayer/mp-arial-iso-8859-2.zip) = 255907 bytes SHA1 (mplayer/koi8r-font.tar.bz2) = d8f44c101aaae32b5674c16da3549f5e520c077e Size (mplayer/koi8r-font.tar.bz2) = 68817 bytes -SHA1 (patch-aa) = e941800773428dae213c13384b0fb7cfc19befda +SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d -SHA1 (patch-ad) = 8204b57097d6f0b4eb08e49bca3c1bbbb464c21e +SHA1 (patch-ad) = 2ed6583fb2b7825d6207722815da514bbbe83a12 diff --git a/graphics/mplayer-share/patches/patch-ad b/graphics/mplayer-share/patches/patch-ad index 7098908c2b4..f531565c254 100644 --- a/graphics/mplayer-share/patches/patch-ad +++ b/graphics/mplayer-share/patches/patch-ad @@ -1,10 +1,10 @@ -$NetBSD: patch-ad,v 1.2 2002/10/18 06:44:34 skrll Exp $ +$NetBSD: patch-ad,v 1.3 2002/11/13 15:25:35 wiz Exp $ ---- cpudetect.c.orig Mon May 20 02:00:51 2002 +--- cpudetect.c.orig Thu Nov 7 00:54:21 2002 +++ cpudetect.c -@@ -13,6 +13,11 @@ CpuCaps gCpuCaps; - +@@ -14,6 +14,11 @@ CpuCaps gCpuCaps; #include <stdio.h> + #include <string.h> +#ifdef __NetBSD__ +#include <sys/param.h> @@ -14,7 +14,7 @@ $NetBSD: patch-ad,v 1.2 2002/10/18 06:44:34 skrll Exp $ #ifdef __FreeBSD__ #include <sys/types.h> #include <sys/sysctl.h> -@@ -146,7 +151,7 @@ void GetCpuCaps( CpuCaps *caps) +@@ -147,7 +152,7 @@ void GetCpuCaps( CpuCaps *caps) #endif /* FIXME: Does SSE2 need more OS support, too? */ @@ -23,7 +23,7 @@ $NetBSD: patch-ad,v 1.2 2002/10/18 06:44:34 skrll Exp $ if (caps->hasSSE) check_os_katmai_support(); if (!caps->hasSSE) -@@ -236,6 +241,15 @@ char *GetCpuFriendlyName(unsigned int re +@@ -237,6 +242,15 @@ char *GetCpuFriendlyName(unsigned int re #undef CPUID_STEPPING @@ -39,7 +39,7 @@ $NetBSD: patch-ad,v 1.2 2002/10/18 06:44:34 skrll Exp $ #if defined(__linux__) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC) static void sigill_handler_sse( int signal, struct sigcontext sc ) { -@@ -292,6 +306,36 @@ static void check_os_katmai_support( voi +@@ -293,6 +307,36 @@ static void check_os_katmai_support( voi if (ret || !has_sse) gCpuCaps.hasSSE=0; diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo index 242d4d7edfe..20330069846 100644 --- a/graphics/mplayer/distinfo +++ b/graphics/mplayer/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.24 2002/11/01 10:19:17 jlam Exp $ +$NetBSD: distinfo,v 1.25 2002/11/13 15:25:33 wiz Exp $ -SHA1 (mplayer/MPlayer-0.90pre9.tar.bz2) = e9c022e6531c7d75847130ef6ed5b4342db271ab -Size (mplayer/MPlayer-0.90pre9.tar.bz2) = 2758568 bytes +SHA1 (mplayer/MPlayer-0.90pre10.tar.bz2) = 4b53eef9c2b2ad461ae6648dc76651b21a2079e7 +Size (mplayer/MPlayer-0.90pre10.tar.bz2) = 2855776 bytes SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d -SHA1 (patch-ad) = 8204b57097d6f0b4eb08e49bca3c1bbbb464c21e +SHA1 (patch-ad) = 2ed6583fb2b7825d6207722815da514bbbe83a12 |