diff options
| author | adam <adam@pkgsrc.org> | 2006-06-19 13:21:14 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2006-06-19 13:21:14 +0000 |
| commit | 00c73b070e16624212300a2cd42152a671a7820c (patch) | |
| tree | 480d1e9b45f653d8d3cf99bf63f374ca345799d3 | |
| parent | 8a1f98faa2705dddfd48f0825e16072aa1465f3d (diff) | |
| download | pkgsrc-00c73b070e16624212300a2cd42152a671a7820c.tar.gz | |
Fix buildling on Darwin/Mac OS X with GCC 4
| -rw-r--r-- | multimedia/libmpeg2/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/libmpeg2/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libmpeg2/patches/patch-ab | 23 |
3 files changed, 25 insertions, 12 deletions
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile index 9cfb3be6584..706c4115654 100644 --- a/multimedia/libmpeg2/Makefile +++ b/multimedia/libmpeg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/06/12 16:28:12 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2006/06/19 13:21:14 adam Exp $ DISTNAME= mpeg2dec-0.4.0b PKGNAME= libmpeg2-0.4.0b @@ -19,8 +19,8 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes -PKGCONFIG_OVERRIDE+= libmpeg2/convert/libmpeg2convert.pc.in -PKGCONFIG_OVERRIDE+= libmpeg2/libmpeg2.pc.in +PKGCONFIG_OVERRIDE+= libmpeg2/convert/libmpeg2convert.pc.in +PKGCONFIG_OVERRIDE+= libmpeg2/libmpeg2.pc.in CONFIGURE_ARGS+= --enable-shared @@ -32,5 +32,9 @@ CONFIGURE_ENV+= LIBMPEG2_CFLAGS=-prefer-non-pic . endif .endif +.if ${OPSYS} == "Darwin" +CONFIGURE_ENV+= ac_cv_header_altivec_h=no +.endif + .include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libmpeg2/distinfo b/multimedia/libmpeg2/distinfo index 7a8ce71786b..1ec442c66af 100644 --- a/multimedia/libmpeg2/distinfo +++ b/multimedia/libmpeg2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2006/04/21 07:15:38 wulf Exp $ +$NetBSD: distinfo,v 1.9 2006/06/19 13:21:14 adam Exp $ SHA1 (mpeg2dec-0.4.0b.tar.gz) = 7ad99a810802f216893022fa14fa078ac49d67d7 RMD160 (mpeg2dec-0.4.0b.tar.gz) = 44df6c21e88d2c3029ef418ea46e2d6796c90004 Size (mpeg2dec-0.4.0b.tar.gz) = 473846 bytes SHA1 (patch-aa) = d70e401272fe1f87a1a1866248caabe8fab77193 -SHA1 (patch-ab) = fd5ba1d72c40daa1162bf2c4f510521369abab46 +SHA1 (patch-ab) = 6cada1b298fb4a93307c1bfe384c93b1b5fddd81 diff --git a/multimedia/libmpeg2/patches/patch-ab b/multimedia/libmpeg2/patches/patch-ab index c0b7448eb5d..97d7e9407ac 100644 --- a/multimedia/libmpeg2/patches/patch-ab +++ b/multimedia/libmpeg2/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2006/04/21 07:15:38 wulf Exp $ +$NetBSD: patch-ab,v 1.2 2006/06/19 13:21:14 adam Exp $ ---- libmpeg2/cpu_accel.c.orig 2006-04-20 16:42:06.000000000 +0930 -+++ libmpeg2/cpu_accel.c 2006-04-20 17:04:24.000000000 +0930 -@@ -37,7 +37,7 @@ +--- libmpeg2/cpu_accel.c.orig 2003-10-06 04:31:52.000000000 +0200 ++++ libmpeg2/cpu_accel.c +@@ -37,7 +37,7 @@ static inline uint32_t arch_accel (void) int AMD; uint32_t caps; @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2006/04/21 07:15:38 wulf Exp $ #define cpuid(op,eax,ebx,ecx,edx) \ __asm__ ("cpuid" \ : "=a" (eax), \ -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ static inline uint32_t arch_accel (void) "=d" (edx) \ : "a" (op) \ : "cc") @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1 2006/04/21 07:15:38 wulf Exp $ #define cpuid(op,eax,ebx,ecx,edx) \ __asm__ ("push %%ebx\n\t" \ "cpuid\n\t" \ -@@ -60,6 +60,7 @@ +@@ -60,6 +60,7 @@ static inline uint32_t arch_accel (void) : "cc") #endif @@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.1 2006/04/21 07:15:38 wulf Exp $ __asm__ ("pushf\n\t" "pushf\n\t" "pop %0\n\t" -@@ -77,6 +78,7 @@ +@@ -77,6 +78,7 @@ static inline uint32_t arch_accel (void) if (eax == ebx) /* no cpuid */ return 0; @@ -36,3 +36,12 @@ $NetBSD: patch-ab,v 1.1 2006/04/21 07:15:38 wulf Exp $ cpuid (0x00000000, eax, ebx, ecx, edx); if (!eax) /* vendor string only */ +@@ -127,7 +129,7 @@ static RETSIGTYPE sigill_handler (int si + } + + #ifdef ARCH_PPC +-static inline uint32_t arch_accel (void) ++static uint32_t arch_accel (void) + { + static RETSIGTYPE (* oldsig) (int); + |