update to 0.4.1

changes:
-build system fixes
-acceleration on amd64 and ppc
-bugfixes

4 files changed, 11 insertions, 114 deletions

diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 706c4115654..f99b7dc4819 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/06/19 13:21:14 adam Exp $
+# $NetBSD: Makefile,v 1.17 2006/10/17 16:18:14 drochner Exp $
 
-DISTNAME=	mpeg2dec-0.4.0b
-PKGNAME=	libmpeg2-0.4.0b
-PKGREVISION=	5
+DISTNAME=	mpeg2dec-0.4.1
+PKGNAME=	libmpeg2-0.4.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 
@@ -12,9 +11,6 @@ COMMENT=	Library for decoding mpeg-2 and mpeg-1 video streams
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-# remove on next update, only needed for 0.4.0b
-WRKSRC=		${WRKDIR}/mpeg2dec-0.4.0
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config
 USE_LIBTOOL=	yes
@@ -26,12 +22,6 @@ CONFIGURE_ARGS+=	--enable-shared
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-CONFIGURE_ENV+=		LIBMPEG2_CFLAGS=-prefer-non-pic
-.  endif
-.endif
-
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ENV+=		ac_cv_header_altivec_h=no
 .endif
diff --git a/multimedia/libmpeg2/distinfo b/multimedia/libmpeg2/distinfo
index 1ec442c66af..66dc4150922 100644
--- a/multimedia/libmpeg2/distinfo
+++ b/multimedia/libmpeg2/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2006/06/19 13:21:14 adam Exp $
+$NetBSD: distinfo,v 1.10 2006/10/17 16:18:14 drochner 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) = 6cada1b298fb4a93307c1bfe384c93b1b5fddd81
+SHA1 (mpeg2dec-0.4.1.tar.gz) = 80be8b16dff4caa4253470d1a3b563fdc0177fcb
+RMD160 (mpeg2dec-0.4.1.tar.gz) = 5377ae45abdd37fabcea6d3d0a9d74e493b84483
+Size (mpeg2dec-0.4.1.tar.gz) = 494539 bytes
+SHA1 (patch-aa) = b9dbc7b0f852851c8fecf1eae07cf762c2eec735
diff --git a/multimedia/libmpeg2/patches/patch-aa b/multimedia/libmpeg2/patches/patch-aa
index bbb89d8e05f..e49884783de 100644
--- a/multimedia/libmpeg2/patches/patch-aa
+++ b/multimedia/libmpeg2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/08/20 11:44:09 grant Exp $
+$NetBSD: patch-aa,v 1.5 2006/10/17 16:18:14 drochner Exp $
 
---- configure.orig	2003-12-23 23:07:34.000000000 +1100
+--- configure.orig	2006-02-15 17:34:16.000000000 +0100
 +++ configure
-@@ -3851,7 +3851,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -3886,7 +3886,7 @@ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
  
      TRY_CFLAGS=`echo "$OPT_CFLAGS $CFLAGS"|sed "s/-O[0-9]*//g"`
  
@@ -11,48 +11,3 @@ $NetBSD: patch-aa,v 1.4 2005/08/20 11:44:09 grant Exp $
      echo "$as_me:$LINENO: checking if $CC supports $TRY_CFLAGS flags" >&5
  echo $ECHO_N "checking if $CC supports $TRY_CFLAGS flags... $ECHO_C" >&6
      SAVE_CFLAGS="$CFLAGS"
-@@ -24534,25 +24534,25 @@ done
- 
- 
- 
--echo "$as_me:$LINENO: checking if libtool supports -prefer-non-pic flag" >&5
--echo $ECHO_N "checking if libtool supports -prefer-non-pic flag... $ECHO_C" >&6
--    mkdir ac_test_libtool; cd ac_test_libtool; ac_cv_libtool_non_pic=no
--    echo "int g (int i); int f (int i) {return g (i);}" >f.c
--    echo "int (* hook) (int) = 0; int g (int i) {if (hook) i = hook (i); return i + 1;}" >g.c
--    ../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
--		-c f.c >/dev/null 2>&1 && \
--	../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
--		-c g.c >/dev/null 2>&1 && \
--	../libtool --mode=link $CC $CFLAGS -prefer-non-pic -o libfoo.la \
--		-rpath / f.lo g.lo >/dev/null 2>&1 &&
--	ac_cv_libtool_non_pic=yes
--    cd ..; rm -fr ac_test_libtool; echo "$as_me:$LINENO: result: $ac_cv_libtool_non_pic" >&5
--echo "${ECHO_T}$ac_cv_libtool_non_pic" >&6
--    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
--	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"
--    else
--	:
--    fi
-+#echo "$as_me:$LINENO: checking if libtool supports -prefer-non-pic flag" >&5
-+#echo $ECHO_N "checking if libtool supports -prefer-non-pic flag... $ECHO_C" >&6
-+#    mkdir ac_test_libtool; cd ac_test_libtool; ac_cv_libtool_non_pic=no
-+#    echo "int g (int i); int f (int i) {return g (i);}" >f.c
-+#    echo "int (* hook) (int) = 0; int g (int i) {if (hook) i = hook (i); return i + 1;}" >g.c
-+#    ../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
-+#		-c f.c >/dev/null 2>&1 && \
-+#	../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
-+#		-c g.c >/dev/null 2>&1 && \
-+#	../libtool --mode=link $CC $CFLAGS -prefer-non-pic -o libfoo.la \
-+#		-rpath / f.lo g.lo >/dev/null 2>&1 &&
-+#	ac_cv_libtool_non_pic=yes
-+#    cd ..; rm -fr ac_test_libtool; echo "$as_me:$LINENO: result: $ac_cv_libtool_non_pic" >&5
-+#echo "${ECHO_T}$ac_cv_libtool_non_pic" >&6
-+#    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
-+#	LIBMPEG2_CFLAGS="$LIBMPEG2_CFLAGS -prefer-non-pic"
-+#    else
-+#	:
-+#    fi
- 
- # Check whether --enable-accel-detect or --disable-accel-detect was given.
- if test "${enable_accel_detect+set}" = set; then
diff --git a/multimedia/libmpeg2/patches/patch-ab b/multimedia/libmpeg2/patches/patch-ab
deleted file mode 100644
index 97d7e9407ac..00000000000
--- a/multimedia/libmpeg2/patches/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/06/19 13:21:14 adam Exp $
-
---- 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;
- 
--#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 @@ static inline uint32_t arch_accel (void)
- 	       "=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 @@ static inline uint32_t arch_accel (void)
- 	     : "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 @@ static inline uint32_t arch_accel (void)
- 
-     if (eax == ebx)		/* no cpuid */
- 	return 0;
-+#endif
- 
-     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);
-