Update to 20130703 snapshot: speedups, opencl support (disabled in pkgsrc).

3 files changed, 25 insertions, 24 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 6d10603847b..7c23d3f54d8 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2013/05/10 05:39:20 riastradh Exp $
+# $NetBSD: Makefile,v 1.42 2013/07/04 16:43:55 wiz Exp $
 
-SNAPSHOT_DATE=	20130115
+SNAPSHOT_DATE=	20130703
 
 DISTNAME=	x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=	x264-devel-${SNAPSHOT_DATE}
@@ -50,6 +50,7 @@ HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${BASH}
 CONFIGURE_ARGS+=	--enable-pic	# uses libtool's -prefer-pic
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--disable-opencl
 MAKE_ENV+=		SH=${SH:Q}
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 4196272ef42..567f2a17b8b 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.29 2013/01/16 20:55:30 adam Exp $
+$NetBSD: distinfo,v 1.30 2013/07/04 16:43:55 wiz Exp $
 
-SHA1 (x264-snapshot-20130115-2245.tar.bz2) = 6e418f56200b12e4c4a99738a7db4ef4e35d3040
-RMD160 (x264-snapshot-20130115-2245.tar.bz2) = 048551b58268d837957fe323517b0dc05f6588b9
-Size (x264-snapshot-20130115-2245.tar.bz2) = 558202 bytes
+SHA1 (x264-snapshot-20130703-2245.tar.bz2) = 3c343f0957451e98cb695877e82fd4eae024e74c
+RMD160 (x264-snapshot-20130703-2245.tar.bz2) = 7066bc12c454c615879af09a7ab5b801093d514f
+Size (x264-snapshot-20130703-2245.tar.bz2) = 624809 bytes
 SHA1 (patch-aa) = bf070b45b4868abdb08c4b9849937c970e6b1311
-SHA1 (patch-ab) = 796b817a9ad056fea3ccb87c051701653c78f913
+SHA1 (patch-ab) = 5a7e8fc1a25fe3146bea66f835b6fa17bf4c16f9
 SHA1 (patch-ac) = 42aaa1f91cd87923442d23ff222e1b37ed43948b
 SHA1 (patch-ak) = bb73c847d6f7be5cee2eee1d77060b5633e5dfc2
 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index 34ed941c913..3522590fceb 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $
+$NetBSD: patch-ab,v 1.18 2013/07/04 16:43:55 wiz Exp $
 
---- Makefile.orig	2012-11-07 21:45:03.000000000 +0000
+--- Makefile.orig	2013-07-03 20:45:03.000000000 +0000
 +++ Makefile
-@@ -99,9 +99,9 @@ endif
+@@ -101,9 +101,9 @@ endif
  ifdef ARCH_X86
  ASFLAGS += -I$(SRCPATH)/common/x86/
  SRCS   += common/x86/mc-c.c common/x86/predict-c.c
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $
  endif
  endif
  
-@@ -121,7 +121,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/
+@@ -123,7 +123,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.17 2012/11/08 20:28:09 adam Exp $
  endif
  endif
  
-@@ -129,7 +129,7 @@ endif
+@@ -131,7 +131,7 @@ endif
  ifeq ($(ARCH),UltraSPARC)
  ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),)
  ASMSRC += common/sparc/pixel.asm
@@ -32,8 +32,8 @@ $NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $
  endif
  endif
  
-@@ -145,20 +145,23 @@ OBJSO  += $(if $(RC), x264res.dll.o)
- endif
+@@ -154,20 +154,23 @@ GENERATED += common/oclobj.h
+ SRCS += common/opencl.c encoder/slicetype-cl.c
  endif
  
 -OBJS   += $(SRCS:%.c=%.o)
@@ -52,29 +52,29 @@ $NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $
 +lib-static: libx264.la
  lib-shared: $(SONAME)
  
--$(LIBX264): .depend $(OBJS) $(OBJASM)
+-$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
 -	rm -f $(LIBX264)
 -	$(AR)$@ $(OBJS) $(OBJASM)
 -	$(if $(RANLIB), $(RANLIB) $@)
-+libx264.la: .depend $(OBJS) $(OBJASM)
++libx264.la: $(GENERATED) .depend $(OBJS) $(OBJASM)
 +	${LIBTOOL} --mode=link \
 +	${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
 +	$(OBJS) $(OBJASM) ${LDFLAGS}
  
- $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
+ $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
  	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-@@ -169,17 +172,17 @@ x264: x264$(EXE)
+@@ -178,17 +181,17 @@ x264: x264$(EXE)
  checkasm: checkasm$(EXE)
  endif
  
--x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264)
+-x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
 -	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
-+x264$(EXE): .depend $(OBJCLI) libx264.la
++x264$(EXE): $(GENERATED) .depend $(OBJCLI) libx264.la
 +	${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS)
  
--checkasm$(EXE): .depend $(OBJCHK) $(LIBX264)
+-checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
 -	$(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
-+checkasm$(EXE): .depend $(OBJCHK) libx264.la
++checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la
 +	${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
  
  $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend
@@ -88,7 +88,7 @@ $NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -238,8 +241,7 @@ distclean: clean
+@@ -247,8 +250,7 @@ distclean: clean
  	rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
  
  install-cli: cli
@@ -98,7 +98,7 @@ $NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $
  
  install-lib-dev:
  	install -d $(DESTDIR)$(includedir)
-@@ -250,8 +252,7 @@ install-lib-dev:
+@@ -259,8 +261,7 @@ install-lib-dev:
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
  install-lib-static: lib-static install-lib-dev