update to 20110707

a newer snapshot is needed for newer versions of ffmpeg

7 files changed, 62 insertions, 119 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index da9f984c644..1b47e84e812 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2011/01/19 20:40:06 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2011/07/18 21:00:11 drochner Exp $
 
-SNAPSHOT_DATE=		20110101
+SNAPSHOT_DATE=		20110707
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
-PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=		.tar.bz2
@@ -56,6 +55,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 MAKE_ENV+=		SH=${SH:Q}
 
 BUILD_TARGET=		default
+INSTALL_TARGET=		install-lib-static
 BUILDLINK_TRANSFORM+=	rm:-O4	# XXX does this mean anything to any compiler?
 REPLACE_SH=		strip_fopt.sh version.sh
 
diff --git a/multimedia/x264-devel/PLIST b/multimedia/x264-devel/PLIST
index 1234b22a2e6..90c401f601b 100644
--- a/multimedia/x264-devel/PLIST
+++ b/multimedia/x264-devel/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/01/17 16:46:42 drochner Exp $
-bin/x264
+@comment $NetBSD: PLIST,v 1.4 2011/07/18 21:00:11 drochner Exp $
 include/x264.h
 include/x264_config.h
 lib/libx264.la
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 15b192531d0..777c57729e5 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.22 2011/01/17 16:46:42 drochner Exp $
+$NetBSD: distinfo,v 1.23 2011/07/18 21:00:11 drochner Exp $
 
-SHA1 (x264-snapshot-20110101-2245.tar.bz2) = 8798a3d20cb6c80f40f21aee44d4e85d842435bd
-RMD160 (x264-snapshot-20110101-2245.tar.bz2) = 642d69d6265d6486ceee014d56ca91d07c5c2bb0
-Size (x264-snapshot-20110101-2245.tar.bz2) = 477314 bytes
-SHA1 (patch-aa) = eb4d91e897197586215f9915d2f83008d0613bc7
-SHA1 (patch-ab) = 3cd899d5306c2b3024c9117e801f39a1b62f920b
+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 (patch-ac) = a1bd65058559ec1704e2b64dade9f5a84066e67a
 SHA1 (patch-ak) = 3c8d6650147ad6a0043d705464267a5d947da488
 SHA1 (patch-am) = c34f02fae14236d95ba027aa8942e463f80c878d
-SHA1 (patch-an) = ac9522d86b9ce7d2689f21cff3c504f2f300c08a
-SHA1 (patch-ba) = eef8e69f33420dc8ec2c7aeec24debb80caa7090
+SHA1 (patch-ba) = 074eaf75ac7b3e8019950360283e1c65dc8a8109
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index df962b5108a..ea07d71d606 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2011/01/17 16:46:42 drochner Exp $
+$NetBSD: patch-aa,v 1.12 2011/07/18 21:00:11 drochner Exp $
 
---- configure.orig	2011-01-02 06:45:05.000000000 +0900
-+++ configure	2011-01-09 21:33:08.000000000 +0900
-@@ -306,6 +306,10 @@
+--- configure.orig	2011-07-07 20:45:05.000000000 +0000
++++ configure
+@@ -403,6 +403,10 @@ case $host_os in
          SYS="FREEBSD"
          LDFLAGS="$LDFLAGS -lm"
          ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.11 2011/01/17 16:46:42 drochner Exp $
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -369,7 +373,7 @@
+@@ -487,7 +491,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf"
          fi
          ;;
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.11 2011/01/17 16:46:42 drochner Exp $
          ARCH="X86_64"
          AS="yasm"
          if [ "$SYS" = MACOSX ]; then
-@@ -386,13 +390,14 @@
+@@ -505,13 +509,14 @@ case $host_cpu in
          fi
          ;;
      powerpc|powerpc64)
@@ -38,17 +38,17 @@ $NetBSD: patch-aa,v 1.11 2011/01/17 16:46:42 drochner Exp $
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -522,7 +527,7 @@
+@@ -648,7 +653,7 @@ fi
  # pthread-win32 is lgpl, prevent its use if --disable-gpl is specified and targeting windows
- [ "$SYS" = "MINGW" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32"
+ [ "$SYS" = "WINDOWS" -a "$gpl" = "no" -a "$thread" = "auto" ] && thread="win32"
  
 -libpthread=""
 +libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
  if [ "$thread" = "auto" ]; then
      thread="no"
      case $SYS in
-@@ -712,7 +717,8 @@
- fi
+@@ -835,7 +840,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
 -    CFLAGS="$CFLAGS -fPIC"
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index 79a8af7cdad..09a909c9829 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.13 2011/01/17 16:46:42 drochner Exp $
+$NetBSD: patch-ab,v 1.14 2011/07/18 21:00:11 drochner Exp $
 
---- Makefile.orig	2011-01-01 21:45:05.000000000 +0000
+--- Makefile.orig	2011-07-07 20:45:05.000000000 +0000
 +++ Makefile
 @@ -86,9 +86,9 @@ endif
  ifdef ARCH_X86
@@ -43,70 +43,55 @@ $NetBSD: patch-ab,v 1.13 2011/01/17 16:46:42 drochner Exp $
  OBJSO = $(SRCSO:%.c=%.o)
  DEP  = depend
  
-@@ -139,22 +139,26 @@ DEP  = depend
+@@ -139,26 +139,30 @@ DEP  = depend
  
- default: $(DEP) x264$(EXE)
+ default: $(DEP)
  
--libx264.a: .depend $(OBJS) $(OBJASM)
--	$(AR) rc libx264.a $(OBJS) $(OBJASM)
--	$(RANLIB) libx264.a
 +%.lo: %.c
 +	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
 +
+ cli: x264$(EXE)
+-lib-static: $(LIBX264)
++lib-static: libx264.la
+ lib-shared: $(SONAME)
+ 
+-$(LIBX264): .depend $(OBJS) $(OBJASM)
+-	$(AR)$@ $(OBJS) $(OBJASM)
+-	$(if $(RANLIB), $(RANLIB) $@)
 +libx264.la: .depend $(OBJS) $(OBJASM)
 +	${LIBTOOL} --mode=link \
 +	${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
 +	$(OBJS) $(OBJASM) ${LDFLAGS}
  
  $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
- 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+ 	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
  
--x264$(EXE): $(OBJCLI) libx264.a
--	$(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
-+x264$(EXE): $(OBJCLI) libx264.la
-+	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
+-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.a
--	$(CC) -o $@ $+ $(LDFLAGS)
-+checkasm: tools/checkasm.lo libx264.la
-+	${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
+-checkasm: tools/checkasm.o $(LIBX264)
+-	$(LD)$@ $+ $(LDFLAGS)
++checkasm: tools/checkasm.o libx264.la
++	${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
  
 -%.o: %.asm
 -	$(AS) $(ASFLAGS) -o $@ $<
--	-@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
+-	-@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
 +%.lo: %.asm
 +	${LIBTOOL} --mode=compile --tag=CC \
 +		./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -212,24 +216,17 @@ distclean: clean
- 	rm -f config.mak x264_config.h config.h config.log x264.pc
- 	rm -rf test/
+@@ -224,8 +228,7 @@ install-lib-dev:
+ 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
--install: x264$(EXE) $(SONAME)
--	install -d $(DESTDIR)$(bindir)
--	install -d $(DESTDIR)$(includedir)
--	install -d $(DESTDIR)$(libdir)
--	install -d $(DESTDIR)$(libdir)/pkgconfig
-+install: x264$(EXE) libx264.la
-+	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
-+	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
- 	install -m 644 x264.h $(DESTDIR)$(includedir)
- 	install -m 644 x264_config.h $(DESTDIR)$(includedir)
--	install -m 644 libx264.a $(DESTDIR)$(libdir)
+ install-lib-static: lib-static install-lib-dev
+-	install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
+-	$(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
- 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
--	install x264$(EXE) $(DESTDIR)$(bindir)
--	$(RANLIB) $(DESTDIR)$(libdir)/libx264.a
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264$(EXE) $(DESTDIR)$(bindir)
- ifeq ($(SYS),MINGW)
- 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
--else
--	$(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
--	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
- endif
--	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
  
- uninstall:
- 	rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(includedir)/x264_config.h $(DESTDIR)$(libdir)/libx264.a
+ install-lib-shared: lib-shared install-lib-dev
+ ifeq ($(SYS),WINDOWS)
diff --git a/multimedia/x264-devel/patches/patch-an b/multimedia/x264-devel/patches/patch-an
deleted file mode 100644
index be320c654e7..00000000000
--- a/multimedia/x264-devel/patches/patch-an
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-an,v 1.2 2011/01/17 16:46:42 drochner Exp $
-
---- common/x86/predict-c.c.orig	2011-01-02 06:45:05.000000000 +0900
-+++ common/x86/predict-c.c	2011-01-09 21:38:53.000000000 +0900
-@@ -155,7 +155,7 @@
- #endif
- PREDICT_16x16_P( sse2   )
- 
--#ifdef __GNUC__
-+#if 0
- static void x264_predict_16x16_p_ssse3( uint8_t *src )
- {
-     int a, b, c, i00;
-@@ -215,7 +215,7 @@
- #endif
- PREDICT_8x8_P( sse2   )
- 
--#ifdef __GNUC__
-+#if 0
- static void x264_predict_8x8c_p_ssse3( uint8_t *src )
- {
-     int a, b, c, i00;
-@@ -418,7 +418,7 @@
-     if( !(cpu&X264_CPU_SSSE3) )
-         return;
-     pf[I_PRED_16x16_H]       = x264_predict_16x16_h_ssse3;
--#ifdef __GNUC__
-+#if 0
-     pf[I_PRED_16x16_P]       = x264_predict_16x16_p_ssse3;
- #endif
- #endif // HIGH_BIT_DEPTH
-@@ -447,7 +447,7 @@
-     if( !(cpu&X264_CPU_SSSE3) )
-         return;
-     pf[I_PRED_CHROMA_H]       = x264_predict_8x8c_h_ssse3;
--#ifdef __GNUC__
-+#if 0
-     pf[I_PRED_CHROMA_P]       = x264_predict_8x8c_p_ssse3;
- #endif
- #endif // !HIGH_BIT_DEPTH
diff --git a/multimedia/x264-devel/patches/patch-ba b/multimedia/x264-devel/patches/patch-ba
index 48474eee43e..74badda221d 100644
--- a/multimedia/x264-devel/patches/patch-ba
+++ b/multimedia/x264-devel/patches/patch-ba
@@ -1,13 +1,13 @@
-$NetBSD: patch-ba,v 1.2 2011/01/17 16:46:42 drochner Exp $
+$NetBSD: patch-ba,v 1.3 2011/07/18 21:00:12 drochner Exp $
 
---- encoder/analyse.c~	2011-01-09 17:35:15.000000000 +0900
-+++ encoder/analyse.c	2011-01-09 17:46:47.000000000 +0900
-@@ -252,7 +252,7 @@
-     for( int i = 0; i <= 2*4*2048; i++ )
-     {
-         h->cost_mv[lambda][-i] =
--        h->cost_mv[lambda][i]  = lambda * (log2f(i+1)*2 + 0.718f + !!i) + .5f;
-+        h->cost_mv[lambda][i]  = lambda * (logf(i+1)*2.88539f + 0.718f + !!i) + .5f;
-     }
-     x264_pthread_mutex_lock( &cost_ref_mutex );
-     for( int i = 0; i < 3; i++ )
+--- encoder/analyse.c.orig	2011-07-07 20:45:05.000000000 +0000
++++ encoder/analyse.c
+@@ -283,7 +283,7 @@ float *x264_analyse_prepare_costs( x264_
+         return NULL;
+     logs[0] = 0.718f;
+     for( int i = 1; i <= 2*4*2048; i++ )
+-        logs[i] = log2f(i+1)*2 + 1.718f;
++        logs[i] = logf(i+1)*2.88539f + 1.718f;
+     return logs;
+ }
+