diff options
Diffstat (limited to 'multimedia/xine-lib/patches')
| -rw-r--r-- | multimedia/xine-lib/patches/patch-af | 26 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-am | 12 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-au | 20 |
3 files changed, 16 insertions, 42 deletions
diff --git a/multimedia/xine-lib/patches/patch-af b/multimedia/xine-lib/patches/patch-af deleted file mode 100644 index 94d9780ea5d..00000000000 --- a/multimedia/xine-lib/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - ---- src/xine-utils/ppcasm_string.S.orig 2003-10-24 09:52:09.000000000 +1000 -+++ src/xine-utils/ppcasm_string.S 2003-10-24 09:52:39.000000000 +1000 -@@ -18,6 +18,7 @@ - - #warning Be forewarned - using PowerPC assembly - -+#ifdef __linux__ - #define __KERNEL__ - #define __ASSEMBLY__ - -@@ -26,6 +27,13 @@ - #include <asm/processor.h> - #include <asm/cache.h> - #include <asm/errno.h> -+#endif -+ -+#ifdef __NetBSD__ -+#define _STANDALONE -+ -+#include <machine/asm.h> -+#endif - - #define COPY_16_BYTES \ - lwz r7,4(r4); \ diff --git a/multimedia/xine-lib/patches/patch-am b/multimedia/xine-lib/patches/patch-am index 48ec5af72ae..047e45d22e0 100644 --- a/multimedia/xine-lib/patches/patch-am +++ b/multimedia/xine-lib/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ +$NetBSD: patch-am,v 1.2 2004/05/12 16:37:07 drochner Exp $ ---- src/libw32dll/wine/ldt_keeper.c.orig 2003-07-13 19:29:04.000000000 +0000 -+++ src/libw32dll/wine/ldt_keeper.c 2003-10-02 12:28:23.000000000 +0000 -@@ -147,18 +147,9 @@ +--- src/libw32dll/wine/ldt_keeper.c.orig 2004-05-12 18:33:31.000000000 +0200 ++++ src/libw32dll/wine/ldt_keeper.c 2004-05-12 18:41:51.000000000 +0200 +@@ -152,18 +152,9 @@ void Check_FS_Segment(void) { @@ -10,11 +10,11 @@ $NetBSD: patch-am,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ - __asm__ __volatile__( - "movw %%fs,%%ax; mov %%eax,%0" : "=r" (fs) :: "%eax" + __asm__ __volatile__( -+ "movl %0,%%eax; movw %%ax, %%fs" : : "i" (TEB_SEL) : "%eax" ++ "movl %0,%%eax; movw %%ax, %%fs" : : "r" (teb_sel) : "%eax" ); - fs = fs & 0xffff; - -- if( fs != TEB_SEL ) { +- if( fs != teb_sel ) { - printf("ldt_keeper: FS segment is not set or has being lost!\n"); - printf(" Please report this error to xine-devel@sourceforge.net\n"); - printf(" Aborting....\n"); diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au index d2d6fce2a11..2f5889c901c 100644 --- a/multimedia/xine-lib/patches/patch-au +++ b/multimedia/xine-lib/patches/patch-au @@ -1,12 +1,12 @@ -$NetBSD: patch-au,v 1.1 2004/03/28 20:14:22 mycroft Exp $ +$NetBSD: patch-au,v 1.2 2004/05/12 16:37:07 drochner Exp $ ---- src/xine-engine/xine.c.orig 2004-03-16 21:40:16.000000000 +0000 -+++ src/xine-engine/xine.c 2004-03-28 03:36:37.000000000 +0000 -@@ -1321,6 +1321,7 @@ - pthread_mutex_init(&this->port_ticket->lock, NULL); - pthread_mutex_init(&this->port_ticket->revoke_lock, NULL); - pthread_cond_init(&this->port_ticket->issued, NULL); -+ pthread_cond_init(&this->port_ticket->revoked, NULL); - - return this; +--- src/xine-engine/xine.c.orig 2004-04-27 18:56:39.000000000 +0200 ++++ src/xine-engine/xine.c 2004-05-11 22:20:16.000000000 +0200 +@@ -238,6 +238,7 @@ + pthread_mutex_init(&port_ticket->lock, NULL); + pthread_mutex_init(&port_ticket->revoke_lock, NULL); + pthread_cond_init(&port_ticket->issued, NULL); ++ pthread_cond_init(&port_ticket->revoked, NULL); + + return port_ticket; } |