[pkgsrc/trunk]: pkgsrc/multimedia/libmpeg2 Updated libmpeg2 to 0.4.0bnb4: App...

[wulf <wulf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b0c83143190
branches:  trunk
changeset: 511755:5b0c83143190
user:      wulf <wulf%pkgsrc.org@localhost>
date:      Fri Apr 21 07:15:38 2006 +0000

description:
Updated libmpeg2 to 0.4.0bnb4: Applied patch supplied by njoly%pasteur.fr@localhost
fixing x86_64 assembler code issues as identified in PR #33136.

diffstat:

 multimedia/libmpeg2/Makefile         |   6 ++--
 multimedia/libmpeg2/distinfo         |   3 +-
 multimedia/libmpeg2/patches/patch-ab |  38 ++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diffs (73 lines):

diff -r 795977521690 -r 5b0c83143190 multimedia/libmpeg2/Makefile
--- a/multimedia/libmpeg2/Makefile      Fri Apr 21 02:14:39 2006 +0000
+++ b/multimedia/libmpeg2/Makefile      Fri Apr 21 07:15:38 2006 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:16 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/04/21 07:15:38 wulf Exp $
 
 DISTNAME=      mpeg2dec-0.4.0b
 PKGNAME=       libmpeg2-0.4.0b
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    multimedia
 MASTER_SITES=  http://libmpeg2.sourceforge.net/files/
 
-MAINTAINER=    wulf%NetBSD.org@localhost
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://libmpeg2.sourceforge.net/
 COMMENT=       Library for decoding mpeg-2 and mpeg-1 video streams
 
diff -r 795977521690 -r 5b0c83143190 multimedia/libmpeg2/distinfo
--- a/multimedia/libmpeg2/distinfo      Fri Apr 21 02:14:39 2006 +0000
+++ b/multimedia/libmpeg2/distinfo      Fri Apr 21 07:15:38 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/08/20 11:44:09 grant Exp $
+$NetBSD: distinfo,v 1.8 2006/04/21 07:15:38 wulf 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
diff -r 795977521690 -r 5b0c83143190 multimedia/libmpeg2/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libmpeg2/patches/patch-ab      Fri Apr 21 07:15:38 2006 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-ab,v 1.1 2006/04/21 07:15:38 wulf 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 @@
+     int AMD;
+     uint32_t caps;
+ 
+-#if !defined(PIC) && !defined(__PIC__)
++#if defined(__x86_64__) || (!defined(PIC) && !defined(__PIC__))
+ #define cpuid(op,eax,ebx,ecx,edx)     \
+     __asm__ ("cpuid"                  \
+            : "=a" (eax),              \
+@@ -46,7 +46,7 @@
+              "=d" (edx)               \
+            : "a" (op)                 \
+            : "cc")
+-#else /* PIC version : save ebx */
++#else /* PIC version : save ebx (not needed on x86_64) */
+ #define cpuid(op,eax,ebx,ecx,edx)     \
+     __asm__ ("push %%ebx\n\t"         \
+            "cpuid\n\t"                \
+@@ -60,6 +60,7 @@
+            : "cc")
+ #endif
+ 
++#ifndef __x86_64__ /* x86_64 supports the cpuid op */
+     __asm__ ("pushf\n\t"
+            "pushf\n\t"
+            "pop %0\n\t"
+@@ -77,6 +78,7 @@
+ 
+     if (eax == ebx)           /* no cpuid */
+       return 0;
++#endif
+ 
+     cpuid (0x00000000, eax, ebx, ecx, edx);
+     if (!eax)                 /* vendor string only */