From 44a5577f79e631209e188744de6b1a7380f34c31 Mon Sep 17 00:00:00 2001
From: dogcow <dogcow@pkgsrc.org>
Date: Thu, 15 Jun 2006 20:16:41 +0000
Subject: fix compilation with gcc4; patch from cvs libdv

---
 multimedia/libdv/distinfo         |  3 +-
 multimedia/libdv/patches/patch-ae | 82 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/libdv/patches/patch-ae

(limited to 'multimedia/libdv')

diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo
index 3d5f57eaf2d..70618837aae 100644
--- a/multimedia/libdv/distinfo
+++ b/multimedia/libdv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/06/05 09:53:07 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2006/06/15 20:16:41 dogcow Exp $
 
 SHA1 (libdv-0.104.tar.gz) = 521a079193f4ae8f9995091b0590c87fde130650
 RMD160 (libdv-0.104.tar.gz) = a91708ecb75533caf2b9038ca68064c7707dcfdf
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 6910450f2c93ac4989e8c132368d208ddd65cf0d
 SHA1 (patch-ab) = f204ba8b80f48a5965397beb2239b44b45ca8920
 SHA1 (patch-ac) = a8d1fd55c9bf3ee59f34613e285314def3add60b
 SHA1 (patch-ad) = 7b65a66a54c49e5bb7e902ba0cfc67f882b344f0
+SHA1 (patch-ae) = c4bd957fa444f7142b53c623129cacfcb4d3d227
diff --git a/multimedia/libdv/patches/patch-ae b/multimedia/libdv/patches/patch-ae
new file mode 100644
index 00000000000..9ffebcacdb8
--- /dev/null
+++ b/multimedia/libdv/patches/patch-ae
@@ -0,0 +1,82 @@
+$NetBSD: patch-ae,v 1.1 2006/06/15 20:16:41 dogcow Exp $
+--- libdv/mmx.h.orig	2001-10-27 20:23:57.000000000 -0700
++++ libdv/mmx.h	2006-06-15 13:11:12.000000000 -0700
+@@ -272,15 +272,15 @@ mmx_ok(void)
+ 		fprintf(stderr, #op "_m2r(" #mem "=0x%08x%08x, ", \
+ 			mmx_trace.d[1], mmx_trace.d[0]); \
+ 		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+-				      : "=X" (mmx_trace) \
++				      : "=m" (mmx_trace) \
+ 				      : /* nothing */ ); \
+ 		fprintf(stderr, #reg "=0x%08x%08x) => ", \
+ 			mmx_trace.d[1], mmx_trace.d[0]); \
+ 		__asm__ __volatile__ (#op " %0, %%" #reg \
+ 				      : /* nothing */ \
+-				      : "X" (mem)); \
++				      : "m" (mem)); \
+ 		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+-				      : "=X" (mmx_trace) \
++				      : "=m" (mmx_trace) \
+ 				      : /* nothing */ ); \
+ 		fprintf(stderr, #reg "=0x%08x%08x\n", \
+ 			mmx_trace.d[1], mmx_trace.d[0]); \
+@@ -290,7 +290,7 @@ mmx_ok(void)
+ 	{ \
+ 		mmx_t mmx_trace; \
+ 		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+-				      : "=X" (mmx_trace) \
++				      : "=m" (mmx_trace) \
+ 				      : /* nothing */ ); \
+ 		fprintf(stderr, #op "_r2m(" #reg "=0x%08x%08x, ", \
+ 			mmx_trace.d[1], mmx_trace.d[0]); \
+@@ -298,7 +298,7 @@ mmx_ok(void)
+ 		fprintf(stderr, #mem "=0x%08x%08x) => ", \
+ 			mmx_trace.d[1], mmx_trace.d[0]); \
+ 		__asm__ __volatile__ (#op " %%" #reg ", %0" \
+-				      : "=X" (mem) \
++				      : "=m" (mem) \
+ 				      : /* nothing */ ); \
+ 		mmx_trace = (mem); \
+ 		fprintf(stderr, #mem "=0x%08x%08x\n", \
+@@ -338,8 +338,8 @@ mmx_ok(void)
+ 		__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+ 				      #op " %1, %%mm0\n\t" \
+ 				      "movq %%mm0, %0" \
+-				      : "=X" (memd) \
+-				      : "X" (mems)); \
++				      : "=m" (memd) \
++				      : "m" (mems)); \
+ 		mmx_trace = (memd); \
+ 		fprintf(stderr, #memd "=0x%08x%08x\n", \
+ 			mmx_trace.d[1], mmx_trace.d[0]); \
+@@ -353,16 +353,16 @@ mmx_ok(void)
+ #define	mmx_i2r(op, imm, reg) \
+ 	__asm__ __volatile__ (#op " %0, %%" #reg \
+ 			      : /* nothing */ \
+-			      : "X" (imm) )
++			      : "i" (imm) )
+ 
+ #define	mmx_m2r(op, mem, reg) \
+ 	__asm__ __volatile__ (#op " %0, %%" #reg \
+ 			      : /* nothing */ \
+-			      : "X" (mem))
++			      : "m" (mem))
+ 
+ #define	mmx_r2m(op, reg, mem) \
+ 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
+-			      : "=X" (mem) \
++			      : "=m" (mem) \
+ 			      : /* nothing */ )
+ 
+ #define	mmx_r2r(op, regs, regd) \
+@@ -372,8 +372,8 @@ mmx_ok(void)
+ 	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+ 			      #op " %1, %%mm0\n\t" \
+ 			      "movq %%mm0, %0" \
+-			      : "=X" (memd) \
+-			      : "X" (mems))
++			      : "=m" (memd) \
++			      : "m" (mems))
+ 
+ #endif
+ 
-- 
cgit v1.2.3