update to the 20111207 snapshot

(this date is the beginning of a period of stability in the development
tree)
changelog is unknown

5 files changed, 36 insertions, 51 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 1b47e84e812..4d5c95f00d0 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2011/07/18 21:00:11 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2012/01/09 17:04:03 drochner Exp $
 
-SNAPSHOT_DATE=		20110707
+SNAPSHOT_DATE=		20111207
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 777c57729e5..c67a494688b 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.23 2011/07/18 21:00:11 drochner Exp $
+$NetBSD: distinfo,v 1.24 2012/01/09 17:04:03 drochner Exp $
 
-SHA1 (x264-snapshot-20110707-2245.tar.bz2) = 25e65840b10956106abb7a2bc1732a6b9b0882bb
-RMD160 (x264-snapshot-20110707-2245.tar.bz2) = 960373a1be7a8b84d9ae98ab531922fd27c6f9a0
-Size (x264-snapshot-20110707-2245.tar.bz2) = 506136 bytes
-SHA1 (patch-aa) = ab4e81cb3a4191b34e3dcecc8f6f25bc3832f498
-SHA1 (patch-ab) = 24b7d5c48a29885c7392cac2b4858777e8fa5de8
+SHA1 (x264-snapshot-20111207-2245.tar.bz2) = 33e0e44e636f8a7d2c2de4e7bac855d5db6a3b1e
+RMD160 (x264-snapshot-20111207-2245.tar.bz2) = bf429f9279029c3ad99cafe0551e1f5aedf5f92f
+Size (x264-snapshot-20111207-2245.tar.bz2) = 532952 bytes
+SHA1 (patch-aa) = eaac52b0dc6fa3f40d9b4f0b8ec53ec2e7b70f29
+SHA1 (patch-ab) = 2ea835a62f3ac8bebefef056f69c51b11ceb6099
 SHA1 (patch-ac) = a1bd65058559ec1704e2b64dade9f5a84066e67a
 SHA1 (patch-ak) = 3c8d6650147ad6a0043d705464267a5d947da488
-SHA1 (patch-am) = c34f02fae14236d95ba027aa8942e463f80c878d
 SHA1 (patch-ba) = 074eaf75ac7b3e8019950360283e1c65dc8a8109
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index ea07d71d606..2de7a60a8f6 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2011/07/18 21:00:11 drochner Exp $
+$NetBSD: patch-aa,v 1.13 2012/01/09 17:04:03 drochner Exp $
 
---- configure.orig	2011-07-07 20:45:05.000000000 +0000
+--- configure.orig	2011-12-07 21:45:03.000000000 +0000
 +++ configure
-@@ -403,6 +403,10 @@ case $host_os in
+@@ -428,6 +428,10 @@ case $host_os in
          SYS="FREEBSD"
          LDFLAGS="$LDFLAGS -lm"
          ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.12 2011/07/18 21:00:11 drochner Exp $
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -487,7 +491,7 @@ case $host_cpu in
+@@ -522,7 +526,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf"
          fi
          ;;
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.12 2011/07/18 21:00:11 drochner Exp $
          ARCH="X86_64"
          AS="yasm"
          if [ "$SYS" = MACOSX ]; then
-@@ -505,13 +509,14 @@ case $host_cpu in
+@@ -540,13 +544,14 @@ case $host_cpu in
          fi
          ;;
      powerpc|powerpc64)
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.12 2011/07/18 21:00:11 drochner Exp $
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -648,7 +653,7 @@ fi
+@@ -686,7 +691,7 @@ fi
  # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows
  [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32"
  
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.12 2011/07/18 21:00:11 drochner Exp $
  if [ "$thread" = "auto" ]; then
      thread="no"
      case $SYS in
-@@ -835,7 +840,8 @@ fi
+@@ -872,7 +877,8 @@ fi
  cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
  
  if [ "$pic" = "yes" ] ; then
@@ -56,4 +56,4 @@ $NetBSD: patch-aa,v 1.12 2011/07/18 21:00:11 drochner Exp $
 +    PICFLAG="-prefer-pic"
      ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
-     cc_check stdio.h -Wl,-Bsymbolic && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
+     cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index 09a909c9829..bcaaacf3ace 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,20 +1,20 @@
-$NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
+$NetBSD: patch-ab,v 1.15 2012/01/09 17:04:03 drochner Exp $
 
---- Makefile.orig	2011-07-07 20:45:05.000000000 +0000
+--- Makefile.orig	2011-12-07 21:45:03.000000000 +0000
 +++ Makefile
-@@ -86,9 +86,9 @@ endif
+@@ -88,9 +88,9 @@ endif
  ifdef ARCH_X86
  ASFLAGS += -Icommon/x86/
  SRCS   += common/x86/mc-c.c common/x86/predict-c.c
 -OBJASM  = $(ASMSRC:%.asm=%.o)
 +OBJASM  = $(ASMSRC:%.asm=%.lo)
  $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
--checkasm: tools/checkasm-a.o
-+checkasm: tools/checkasm-a.lo
+-OBJCHK += tools/checkasm-a.o
++OBJCHK += tools/checkasm-a.lo
  endif
  endif
  
-@@ -108,7 +108,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/
+@@ -110,7 +110,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/
            common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
            common/arm/predict-a.S
  SRCS   += common/arm/mc-c.c common/arm/predict-c.c
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
  endif
  endif
  
-@@ -116,7 +116,7 @@ endif
+@@ -118,7 +118,7 @@ endif
  ifeq ($(ARCH),UltraSPARC)
  ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),)
  ASMSRC += common/sparc/pixel.asm
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
  endif
  endif
  
-@@ -130,8 +130,8 @@ SRCSO += x264dll.c
+@@ -132,8 +132,8 @@ SRCSO += x264dll.c
  endif
  endif
  
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
  OBJSO = $(SRCSO:%.c=%.o)
  DEP  = depend
  
-@@ -139,26 +139,30 @@ DEP  = depend
+@@ -141,14 +141,17 @@ DEP  = depend
  
  default: $(DEP)
  
@@ -56,6 +56,7 @@ $NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
  lib-shared: $(SONAME)
  
 -$(LIBX264): .depend $(OBJS) $(OBJASM)
+-	rm -f $(LIBX264)
 -	$(AR)$@ $(OBJS) $(OBJASM)
 -	$(if $(RANLIB), $(RANLIB) $@)
 +libx264.la: .depend $(OBJS) $(OBJASM)
@@ -65,17 +66,22 @@ $NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
  
  $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
  	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+@@ -159,17 +162,17 @@ x264: x264$(EXE)
+ checkasm: checkasm$(EXE)
+ endif
  
 -x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264)
 -	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
 +x264$(EXE): .depend $(OBJCLI) libx264.la
 +	${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS)
  
--checkasm: tools/checkasm.o $(LIBX264)
--	$(LD)$@ $+ $(LDFLAGS)
-+checkasm: tools/checkasm.o libx264.la
+-checkasm$(EXE): .depend $(OBJCHK) $(LIBX264)
+-	$(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
++checkasm$(EXE): .depend $(OBJCHK) libx264.la
 +	${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
  
+ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend
+ 
 -%.o: %.asm
 -	$(AS) $(ASFLAGS) -o $@ $<
 -	-@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
@@ -85,7 +91,7 @@ $NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -224,8 +228,7 @@ install-lib-dev:
+@@ -234,8 +237,7 @@ install-lib-dev:
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
  install-lib-static: lib-static install-lib-dev
@@ -94,4 +100,4 @@ $NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
  
  install-lib-shared: lib-shared install-lib-dev
- ifeq ($(SYS),WINDOWS)
+ ifneq ($(IMPLIBNAME),)
diff --git a/multimedia/x264-devel/patches/patch-am b/multimedia/x264-devel/patches/patch-am
deleted file mode 100644
index ef0ba83043e..00000000000
--- a/multimedia/x264-devel/patches/patch-am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-am,v 1.2 2011/01/17 16:46:42 drochner Exp $
-
---- common/x86/mc-a.asm.orig	2010-11-02 06:45:07.000000000 +0900
-+++ common/x86/mc-a.asm	2011-01-09 21:09:29.000000000 +0900
-@@ -746,13 +746,13 @@
- AVG_CACHELINE_CHECK  8, 64, mmxext
- AVG_CACHELINE_CHECK 12, 64, mmxext
- %ifndef ARCH_X86_64
--AVG_CACHELINE_CHECK 16, 64, mmxext
--AVG_CACHELINE_CHECK 20, 64, mmxext
- AVG_CACHELINE_CHECK  8, 32, mmxext
- AVG_CACHELINE_CHECK 12, 32, mmxext
- AVG_CACHELINE_CHECK 16, 32, mmxext
- AVG_CACHELINE_CHECK 20, 32, mmxext
- %endif
-+AVG_CACHELINE_CHECK 16, 64, mmxext
-+AVG_CACHELINE_CHECK 20, 64, mmxext
- AVG_CACHELINE_CHECK 16, 64, sse2
- AVG_CACHELINE_CHECK 20, 64, sse2
-