From 1c1bace9fb74a16fda031d7a8cf1a37363b4016e Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 30 May 2005 12:43:30 +0000 Subject: regen with updated line numbers --- multimedia/mplayer-share/patches/patch-aa | 12 ++++++------ multimedia/mplayer-share/patches/patch-ab | 6 +++--- multimedia/mplayer-share/patches/patch-ac | 6 +++--- multimedia/mplayer-share/patches/patch-ae | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index 373092059bf..3792da5f5c1 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2005/01/05 15:39:15 drochner Exp $ +$NetBSD: patch-aa,v 1.10 2005/05/30 12:43:30 wiz Exp $ ---- configure.orig 2004-12-23 16:36:00.000000000 +0100 +--- configure.orig 2005-04-13 13:46:35.000000000 +0200 +++ configure -@@ -398,7 +398,7 @@ for ac_option do +@@ -408,7 +408,7 @@ for ac_option do _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-extralibdir=*) @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 15:39:15 drochner Exp $ ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes -@@ -586,7 +586,7 @@ if test "$_skip_cc_check" != yes ; then +@@ -596,7 +596,7 @@ if test "$_skip_cc_check" != yes ; then echocheck "$_cc version" cc_vendor=gnu cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1` @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 15:39:15 drochner Exp $ if test "$?" -gt 0; then cc_version="not found" fi -@@ -733,7 +733,7 @@ case "$host_arch" in +@@ -743,7 +743,7 @@ case "$host_arch" in pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1` pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.9 2005/01/05 15:39:15 drochner Exp $ pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` -@@ -1762,7 +1762,8 @@ for ac_option do +@@ -1797,7 +1797,8 @@ for ac_option do _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-x11libdir=*) diff --git a/multimedia/mplayer-share/patches/patch-ab b/multimedia/mplayer-share/patches/patch-ab index 36695af3cb0..59cc28f6df7 100644 --- a/multimedia/mplayer-share/patches/patch-ab +++ b/multimedia/mplayer-share/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2004/07/24 01:19:35 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2005/05/30 12:43:30 wiz Exp $ ---- loader/win32.c.orig 2004-07-01 00:00:53.000000000 +0200 +--- loader/win32.c.orig 2005-04-15 22:17:12.000000000 +0200 +++ loader/win32.c -@@ -444,8 +444,10 @@ static int my_release(void* memory) +@@ -451,8 +451,10 @@ static int my_release(void* memory) if (last_alloc) pthread_mutex_unlock(&memmut); diff --git a/multimedia/mplayer-share/patches/patch-ac b/multimedia/mplayer-share/patches/patch-ac index bb939647285..ed64a9ddbae 100644 --- a/multimedia/mplayer-share/patches/patch-ac +++ b/multimedia/mplayer-share/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2004/11/06 00:47:34 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2005/05/30 12:43:30 wiz Exp $ ---- libfaad2/common.h.orig 2004-06-23 15:50:49.000000000 +0200 +--- libfaad2/common.h.orig 2005-02-19 03:19:21.000000000 +0100 +++ libfaad2/common.h -@@ -337,7 +337,7 @@ char *strchr(), *strrchr(); +@@ -344,7 +344,7 @@ char *strchr(), *strrchr(); #elif (defined(__i386__) && defined(__GNUC__)) && !defined(__MINGW32__) #define HAS_LRINTF // from http://www.stereopsis.com/FPU.html diff --git a/multimedia/mplayer-share/patches/patch-ae b/multimedia/mplayer-share/patches/patch-ae index 2a3c88af479..45001887af5 100644 --- a/multimedia/mplayer-share/patches/patch-ae +++ b/multimedia/mplayer-share/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.3 2005/01/06 14:40:45 drochner Exp $ +$NetBSD: patch-ae,v 1.4 2005/05/30 12:43:30 wiz Exp $ ---- cpudetect.c.orig 2005-01-06 13:37:02.000000000 +0100 +--- cpudetect.c.orig 2005-01-12 22:56:25.000000000 +0100 +++ cpudetect.c -@@ -330,6 +330,10 @@ static void check_os_katmai_support( voi +@@ -334,6 +334,10 @@ static void check_os_katmai_support( voi #elif defined(__NetBSD__) || defined (__OpenBSD__) #if __NetBSD_Version__ >= 105250000 || (defined __OpenBSD__) @@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.3 2005/01/06 14:40:45 drochner Exp $ int has_sse, has_sse2, ret, mib[2]; size_t varlen; -@@ -358,6 +362,7 @@ static void check_os_katmai_support( voi +@@ -362,6 +366,7 @@ static void check_os_katmai_support( voi gCpuCaps.hasSSE2=1; mp_msg(MSGT_CPUDETECT,MSGL_V, "yes!\n" ); } -- cgit v1.2.3