Try harder to disable AltiVec support under Mac OS X PPC (because it cannot

be used in a shared library). Applications linked against "libx264" can now
actually be started without crashing immediately because the symbol
"_x264_deblock_h_luma_altivec" couldn't be found.

Bump package revision because of this fix.

4 files changed, 26 insertions, 15 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index abc9699adad..95437edf496 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2008/03/31 16:16:00 tron Exp $
-#
+# $NetBSD: Makefile,v 1.12 2008/04/09 18:33:37 tron Exp $
 
 SNAPSHOT_DATE=		20071218
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 898fbb86550..2d32c56dc74 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2008/03/31 16:16:00 tron Exp $
+$NetBSD: distinfo,v 1.10 2008/04/09 18:33:37 tron Exp $
 
 SHA1 (x264-snapshot-20071218-2245.tar.bz2) = b5bc182070e17a8470618bae776488514b67a96a
 RMD160 (x264-snapshot-20071218-2245.tar.bz2) = 753ab79398bf5bb92b41656ef48ab57dcc63f347
 Size (x264-snapshot-20071218-2245.tar.bz2) = 537622 bytes
-SHA1 (patch-aa) = cce1ef8b7a332e9f9a4c18a8a4246b9382dc4bca
-SHA1 (patch-ab) = 9609529aaa2b2bb2aa1d50cdb2339ee49293dec0
+SHA1 (patch-aa) = 78152d98fd8df5719dfc556286dec466c53299ba
+SHA1 (patch-ab) = 0233ca220383d5699327c92664d7eb7ead786e20
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index 0becface825..4161dcfe73a 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2008/01/07 13:33:28 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2008/04/09 18:33:37 tron Exp $
 
---- configure.orig	2007-12-18 22:45:04.000000000 +0100
-+++ configure
-@@ -193,6 +193,10 @@ case $host_os in
+--- configure.orig	2007-12-18 21:45:04.000000000 +0000
++++ configure	2008-04-09 19:10:28.000000000 +0100
+@@ -193,6 +193,10 @@
      SYS="FREEBSD"
      LDFLAGS="$LDFLAGS -lm"
      ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.4 2008/01/07 13:33:28 joerg Exp $
    kfreebsd*-gnu)
      SYS="FREEBSD"
      CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
-@@ -245,14 +249,12 @@ case $host_cpu in
+@@ -245,14 +249,12 @@
        ASFLAGS="$ASFLAGS -f macho -DPREFIX"
      elif [ "$SYS" = CYGWIN -o "$SYS" = MINGW ]; then
        ASFLAGS="$ASFLAGS -f win32 -DPREFIX"
@@ -29,3 +29,17 @@ $NetBSD: patch-aa,v 1.4 2008/01/07 13:33:28 joerg Exp $
      ARCH="X86_64"
      AS="yasm"
      if [ "$SYS" = MACOSX ];then
+@@ -264,11 +266,11 @@
+     fi
+     ;;
+   powerpc|powerpc64)
+-    ARCH="PPC"
+     if [ $SYS = MACOSX ]
+     then
+-      ALTIVECFLAGS="$ALTIVECFLAGS -faltivec -fastf -mcpu=G4"
++      ARCH="POWERPC"
+     else
++      ARCH="PPC"
+       ALTIVECFLAGS="$ALTIVECFLAGS -maltivec -mabi=altivec"
+     fi
+     ;;
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index 3b6ab1ca44a..28dfc0c72dd 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2008/03/31 16:16:00 tron Exp $
+$NetBSD: patch-ab,v 1.7 2008/04/09 18:33:37 tron Exp $
 
 --- Makefile.orig	2007-12-18 21:45:04.000000000 +0000
 +++ Makefile	2008-03-31 17:09:28.000000000 +0100
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2008/03/31 16:16:00 tron Exp $
  ASFLAGS += -Icommon/i386/
  endif
  endif
-@@ -40,31 +40,33 @@
+@@ -40,31 +40,31 @@
            common/amd64/mc-a2.asm common/amd64/predict-a.asm \
            common/amd64/pixel-sse2.asm common/amd64/quant-a.asm \
            common/amd64/deblock-a.asm
@@ -23,14 +23,12 @@ $NetBSD: patch-ab,v 1.6 2008/03/31 16:16:00 tron Exp $
  
  # AltiVec optims
  ifeq ($(ARCH),PPC)
-+ifneq ($(SYS),MACOSX)
  ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
                common/ppc/quant.c common/ppc/deblock.c \
                common/ppc/predict.c
  SRCS += $(ALTIVECSRC)
 -$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
 +$(ALTIVECSRC:%.c=%.lo): CFLAGS += $(ALTIVECFLAGS)
-+endif
  endif
  
  # VIS optims