Changes 20140303:

Bug fixes.
Enabled OpenCL for Darwin.
Fix building with Clang.

5 files changed, 49 insertions, 35 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index b54bcf7627f..2487bcae729 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2013/10/17 07:09:08 adam Exp $
+# $NetBSD: Makefile,v 1.47 2014/03/04 13:59:11 adam Exp $
 
-SNAPSHOT_DATE=	20131015
+SNAPSHOT_DATE=	20140303
 
 DISTNAME=	x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=	x264-devel-${SNAPSHOT_DATE}
@@ -55,7 +55,11 @@ HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${BASH}
 CONFIGURE_ARGS+=	--enable-pic	# uses libtool's -prefer-pic
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
+.if ${OPSYS} == "Darwin"
+USE_TOOLS+=		perl
+.else
 CONFIGURE_ARGS+=	--disable-opencl
+.endif
 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 fdd37bb2244..b855e25586f 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.31 2013/10/17 07:09:08 adam Exp $
+$NetBSD: distinfo,v 1.32 2014/03/04 13:59:11 adam Exp $
 
-SHA1 (x264-snapshot-20131015-2245.tar.bz2) = bd115a57762b553269c115c644c8fbbe92fca3bc
-RMD160 (x264-snapshot-20131015-2245.tar.bz2) = 929cd5140b381d07f5022540cd285a8dd3b47ad2
-Size (x264-snapshot-20131015-2245.tar.bz2) = 629232 bytes
-SHA1 (patch-aa) = bf070b45b4868abdb08c4b9849937c970e6b1311
-SHA1 (patch-ab) = 5a7e8fc1a25fe3146bea66f835b6fa17bf4c16f9
-SHA1 (patch-ac) = 42aaa1f91cd87923442d23ff222e1b37ed43948b
-SHA1 (patch-ak) = bb73c847d6f7be5cee2eee1d77060b5633e5dfc2
+SHA1 (x264-snapshot-20140303-2245.tar.bz2) = c308b92ab11f8dcd8c655005f0d10d8a40e35154
+RMD160 (x264-snapshot-20140303-2245.tar.bz2) = fcbd2c0df27a6b26641e212094ecd93811cbead2
+Size (x264-snapshot-20140303-2245.tar.bz2) = 624932 bytes
+SHA1 (patch-aa) = 8a8dd038925ea82b82ec9ada8293cccf3af2db87
+SHA1 (patch-ab) = ab27d32793b70a021850d774ef23724e97730dbf
+SHA1 (patch-ac) = e81a4c74cca30a0d3191817ada915fc956362509
 SHA1 (patch-ba) = a8f12131e23953704361fb499b568f8f233c6be6
diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa
index b3ba34eaae5..3bd1739daa5 100644
--- a/multimedia/x264-devel/patches/patch-aa
+++ b/multimedia/x264-devel/patches/patch-aa
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.16 2012/11/28 16:29:53 adam Exp $
+$NetBSD: patch-aa,v 1.17 2014/03/04 13:59:11 adam Exp $
 
---- configure.orig	2012-11-27 21:45:03.000000000 +0000
+Clang does not support -falign-loops option.
+
+--- configure.orig	2014-03-03 21:45:04.000000000 +0000
 +++ configure
-@@ -466,6 +466,10 @@ case $host_os in
+@@ -467,7 +467,7 @@ case $host_os in
+         ;;
+     darwin*)
+         SYS="MACOSX"
+-        CFLAGS="$CFLAGS -falign-loops=16"
++        CFLAGS="$CFLAGS"
+         libm="-lm"
+         if [ "$pic" = "no" ]; then
+             cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"
+@@ -477,6 +477,10 @@ case $host_os in
          SYS="FREEBSD"
          libm="-lm"
          ;;
@@ -13,7 +24,7 @@ $NetBSD: patch-aa,v 1.16 2012/11/28 16:29:53 adam Exp $
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -567,7 +571,7 @@ case $host_cpu in
+@@ -599,7 +603,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf"
          fi
          ;;
@@ -22,7 +33,7 @@ $NetBSD: patch-aa,v 1.16 2012/11/28 16:29:53 adam Exp $
          ARCH="X86_64"
          AS="yasm"
          [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-@@ -587,13 +591,14 @@ case $host_cpu in
+@@ -620,13 +624,14 @@ case $host_cpu in
          fi
          ;;
      powerpc|powerpc64)
@@ -38,7 +49,7 @@ $NetBSD: patch-aa,v 1.16 2012/11/28 16:29:53 adam Exp $
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -739,7 +744,7 @@ fi
+@@ -777,7 +782,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 +58,7 @@ $NetBSD: patch-aa,v 1.16 2012/11/28 16:29:53 adam Exp $
  if [ "$thread" = "auto" ]; then
      thread="no"
      case $SYS in
-@@ -922,10 +927,11 @@ fi
+@@ -986,10 +991,11 @@ fi
  cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
  
  if [ "$pic" = "yes" ] ; then
diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab
index 3522590fceb..42de058c0d3 100644
--- a/multimedia/x264-devel/patches/patch-ab
+++ b/multimedia/x264-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.18 2013/07/04 16:43:55 wiz Exp $
+$NetBSD: patch-ab,v 1.19 2014/03/04 13:59:11 adam Exp $
 
---- Makefile.orig	2013-07-03 20:45:03.000000000 +0000
+--- Makefile.orig	2014-03-03 21:45:04.000000000 +0000
 +++ Makefile
-@@ -101,9 +101,9 @@ endif
+@@ -100,9 +100,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.18 2013/07/04 16:43:55 wiz Exp $
  endif
  endif
  
-@@ -123,7 +123,7 @@ ASMSRC += common/arm/cpu-a.S common/arm/
+@@ -122,7 +122,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.18 2013/07/04 16:43:55 wiz Exp $
  endif
  endif
  
-@@ -131,7 +131,7 @@ endif
+@@ -130,7 +130,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.18 2013/07/04 16:43:55 wiz Exp $
  endif
  endif
  
-@@ -154,20 +154,23 @@ GENERATED += common/oclobj.h
+@@ -153,20 +153,23 @@ GENERATED += common/oclobj.h
  SRCS += common/opencl.c encoder/slicetype-cl.c
  endif
  
@@ -63,7 +63,7 @@ $NetBSD: patch-ab,v 1.18 2013/07/04 16:43:55 wiz Exp $
  
  $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
  	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-@@ -178,17 +181,17 @@ x264: x264$(EXE)
+@@ -177,17 +180,17 @@ x264: x264$(EXE)
  checkasm: checkasm$(EXE)
  endif
  
@@ -88,21 +88,21 @@ $NetBSD: patch-ab,v 1.18 2013/07/04 16:43:55 wiz Exp $
  
  %.o: %.S
  	$(AS) $(ASFLAGS) -o $@ $<
-@@ -247,8 +250,7 @@ distclean: clean
+@@ -246,8 +249,7 @@ distclean: clean
  	rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
  
  install-cli: cli
--	install -d $(DESTDIR)$(bindir)
--	install x264$(EXE) $(DESTDIR)$(bindir)
+-	$(INSTALL) -d $(DESTDIR)$(bindir)
+-	$(INSTALL) x264$(EXE) $(DESTDIR)$(bindir)
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264
  
  install-lib-dev:
- 	install -d $(DESTDIR)$(includedir)
-@@ -259,8 +261,7 @@ install-lib-dev:
- 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)
+@@ -258,8 +260,7 @@ install-lib-dev:
+ 	$(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  
  install-lib-static: lib-static install-lib-dev
--	install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
+-	$(INSTALL) -m 644 $(LIBX264) $(DESTDIR)$(libdir)
 -	$(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
  
diff --git a/multimedia/x264-devel/patches/patch-ac b/multimedia/x264-devel/patches/patch-ac
index ee4660f65ca..df18ec15f10 100644
--- a/multimedia/x264-devel/patches/patch-ac
+++ b/multimedia/x264-devel/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.9 2012/11/28 16:29:53 adam Exp $
+$NetBSD: patch-ac,v 1.10 2014/03/04 13:59:11 adam Exp $
 
---- common/cpu.c.orig	2012-11-07 21:45:03.000000000 +0000
+--- common/cpu.c.orig	2014-03-03 21:45:04.000000000 +0000
 +++ common/cpu.c
 @@ -39,7 +39,7 @@
  #include <sys/types.h>
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.9 2012/11/28 16:29:53 adam Exp $
  #include <sys/param.h>
  #include <sys/sysctl.h>
  #include <machine/cpu.h>
-@@ -293,13 +293,13 @@ uint32_t x264_cpu_detect( void )
+@@ -313,13 +313,13 @@ uint32_t x264_cpu_detect( void )
  
  #elif ARCH_PPC
  
@@ -27,7 +27,7 @@ $NetBSD: patch-ac,v 1.9 2012/11/28 16:29:53 adam Exp $
      int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
  #else
      int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
-@@ -427,7 +427,7 @@ int x264_cpu_num_processors( void )
+@@ -447,7 +447,7 @@ int x264_cpu_num_processors( void )
  #elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD
      int ncpu;
      size_t length = sizeof( ncpu );