CVS commit: pkgsrc/multimedia/x264-devel

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Oct 24 10:36:12 UTC 2016

Modified Files:
        pkgsrc/multimedia/x264-devel: Makefile distinfo
Added Files:
        pkgsrc/multimedia/x264-devel/patches: patch-configure
Removed Files:
        pkgsrc/multimedia/x264-devel/patches: patch-aa

Log Message:
x264-devel: update to 20161023

Approximate changelog:

Remove misaligned SSE support; could cause problems if exception masks
were messed with by libraries and is obsoleted by AVX.
Fix AVX2 detection if "limit CPUID" is enabled in the BIOS.
Fix cases where intra refresh could predict from disallowed pixels.
x86inc: support "x64"-marked Windows 64-bit machines.
Improvements:
Support cygwin 64-bit.
x86: faster SAD_X3/SAD_X4
Transparent hugepage support and optimization on Linux.
AVC-Intra encoding support.
Windows Unicode (UTF-16) support.
Fix compilation with OpenCL on OS X.
Fix a crash in the case of an OpenCL error during encoding with OpenCL.
Fix building in compilers without inline asm support.
Fix crash in high bit depth builds compiled with unaligned stack.
Fix potential misalignment crash in AVX2 denoise_dct.
Fix some builds with PIC.
Fix possible crash when writing very large filler NALUs.
Improvements:
Add --stitchable option for segmented encoding.
Add new color primaries, transfer characteristics, and matrix
coefficient options from the latest H.264 spec.
x86: optimizations to AVX2 iDCT and AVX deblock
Tweak i16x16 delta-quant-avoidance code to fix a rare flickering issue
with deblocking in static areas of the frame.
Fix an invalid memcpy in sliced-threads that sometimes used src==dst;
this probably didn't break anything, but valgrind complains and it's
technically wrong.
Fix a stack alignment bug in checkasm and use 64-bit cycle counters to
avoid overflows that could occur in some tests.
x86inc: Remove .rodata kludges; they're no longer necessary and could
cause other problems.
Improvements:
x86: add Jaguar CPU detection.
x86inc: utilize the shadow space on win64 to avoid stack pointer
manipulation in some functions.
x86: 32-byte align the stack if possible, avoiding explicit alignment
routines in ALIGNED_ARRAY for AVX2-aligned arrays.
x86: Various optimizations and a bunch of new AVX2 functions,
especially for high bit depth.
OpenCL refactoring: autoload the OpenCL library, clean up the code,
and increment X264_BUILD.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/multimedia/x264-devel/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/multimedia/x264-devel/distinfo
cvs rdiff -u -r1.23 -r0 pkgsrc/multimedia/x264-devel/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/x264-devel/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x264-devel/Makefile
diff -u pkgsrc/multimedia/x264-devel/Makefile:1.59 pkgsrc/multimedia/x264-devel/Makefile:1.60
--- pkgsrc/multimedia/x264-devel/Makefile:1.59  Sun Oct  2 20:34:48 2016
+++ pkgsrc/multimedia/x264-devel/Makefile       Mon Oct 24 10:36:12 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2016/10/02 20:34:48 maya Exp $
+# $NetBSD: Makefile,v 1.60 2016/10/24 10:36:12 maya Exp $
 
-SNAPSHOT_DATE= 20160307
+SNAPSHOT_DATE= 20161023
 
 DISTNAME=      x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=       x264-devel-${SNAPSHOT_DATE}

Index: pkgsrc/multimedia/x264-devel/distinfo
diff -u pkgsrc/multimedia/x264-devel/distinfo:1.43 pkgsrc/multimedia/x264-devel/distinfo:1.44
--- pkgsrc/multimedia/x264-devel/distinfo:1.43  Sun Oct  2 20:34:48 2016
+++ pkgsrc/multimedia/x264-devel/distinfo       Mon Oct 24 10:36:12 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2016/10/02 20:34:48 maya Exp $
+$NetBSD: distinfo,v 1.44 2016/10/24 10:36:12 maya Exp $
 
-SHA1 (x264-snapshot-20160307-2245.tar.bz2) = 495868fbd6e99de94ee7c6823853b3fa9b3bfb7e
-RMD160 (x264-snapshot-20160307-2245.tar.bz2) = 84a911b0b9925f9663ddcc27589f42c5b464f122
-SHA512 (x264-snapshot-20160307-2245.tar.bz2) = f080241aad9d83388e061bb23f177944cb0d0645b7385756a85d1fbcee77242b762de7c113b6ad7d43d565ef8100ff6ceaa1f1ed20c0ecdecfe44712a2512b08
-Size (x264-snapshot-20160307-2245.tar.bz2) = 727234 bytes
-SHA1 (patch-aa) = 7e9080f9268c2e5838e7fa94e3c261822fccfe82
+SHA1 (x264-snapshot-20161023-2245.tar.bz2) = 76346384cd4480b6b7ebd30af017b031b672869a
+RMD160 (x264-snapshot-20161023-2245.tar.bz2) = 52a4a734ca892523c0e696372301d01aabd7d59b
+SHA512 (x264-snapshot-20161023-2245.tar.bz2) = 80a4247a548afe517b1da47434e704be4ed7f999f41a85c299c57f090128ffa8ada42114aaaac5ac668bd1b6b3cdf592c79dcaf8d56ff8cb2d174a60c34bdb7f
+Size (x264-snapshot-20161023-2245.tar.bz2) = 733615 bytes
 SHA1 (patch-ab) = f4be6477f75b3f7a411729997712bcaf028f88b2
 SHA1 (patch-ba) = b16486f28ba5c34449e015906957062186e657af
+SHA1 (patch-configure) = 7bec098f853266d4156e59047128114a2d00ea4d

Added files:

Index: pkgsrc/multimedia/x264-devel/patches/patch-configure
diff -u /dev/null pkgsrc/multimedia/x264-devel/patches/patch-configure:1.1
--- /dev/null   Mon Oct 24 10:36:12 2016
+++ pkgsrc/multimedia/x264-devel/patches/patch-configure        Mon Oct 24 10:36:12 2016
@@ -0,0 +1,129 @@
+$NetBSD: patch-configure,v 1.1 2016/10/24 10:36:12 maya Exp $
+
+Add support for DragonFly.
+Use 'amd64' as a synonym for 'x86_64'.
+Avoid endian test failure for -flto.
+Do not force compiler optimisations.
+If we fail an assembly test, continue as if --disable-asm
+was passed.
+
+--- configure.orig     2016-10-23 20:45:03.000000000 +0000
++++ configure
+@@ -597,6 +597,10 @@ case $host_os in
+         SYS="FREEBSD"
+         libm="-lm"
+         ;;
++    dragonfly*)
++        SYS="DRAGONFLY"
++        LDFLAGS="$LDFLAGS -lm"
++        ;;
+     kfreebsd*-gnu)
+         SYS="FREEBSD"
+         define HAVE_MALLOC_H
+@@ -697,7 +701,7 @@ case $host_cpu in
+             ASFLAGS="$ASFLAGS -f elf32"
+         fi
+         ;;
+-    x86_64)
++    x86_64|amd64)
+         ARCH="X86_64"
+         AS="${AS-yasm}"
+         AS_EXT=".asm"
+@@ -726,14 +730,15 @@ case $host_cpu in
+         fi
+         ;;
+     powerpc*)
+-        ARCH="PPC"
+         if [ $asm = auto ] ; then
+             define HAVE_ALTIVEC
+             AS="${AS-${CC}}"
+             AS_EXT=".c"
+             if [ $SYS = MACOSX ] ; then
++                ARCH="POWERPC"
+                 CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
+             else
++                ARCH="PPC"
+                 CFLAGS="$CFLAGS -maltivec -mabi=altivec"
+                 define HAVE_ALTIVEC_H
+             fi
+@@ -883,8 +888,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+         ASFLAGS="$ASFLAGS -c"
+     else
+         echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
+-        echo "If you really want to run on such a CPU, configure with --disable-asm."
+-        exit 1
++      echo "Disabling asm"
++      asm="no"
+     fi
+ fi
+ 
+@@ -893,8 +898,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ; 
+         ASFLAGS="$ASFLAGS -c"
+     else
+         echo "no NEON support, try adding -mfpu=neon to CFLAGS"
+-        echo "If you really want to run on such a CPU, configure with --disable-asm."
+-        exit 1
++      echo "Disabling asm"
++      asm="no"
+     fi
+ fi
+ 
+@@ -912,8 +917,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
+         define HAVE_MSA
+     else
+         echo "You specified a pre-MSA CPU in your CFLAGS."
+-        echo "If you really want to run on such a CPU, configure with --disable-asm."
+-        exit 1
++      echo "Disabling asm"
++      asm="no"
+     fi
+ fi
+ 
+@@ -930,7 +935,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
+ CPU_ENDIAN="little-endian"
+ if [ $compiler = GNU ]; then
+     echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
+-    $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
++    $CC $CPPFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"
+     if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
+         define WORDS_BIGENDIAN
+         CPU_ENDIAN="big-endian"
+@@ -952,7 +957,7 @@ fi
+ 
+ # autodetect options that weren't forced nor disabled
+ 
+-libpthread=""
++libpthread="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
+ if [ "$SYS" = "WINDOWS" -a "$thread" = "posix" ] ; then
+     if [ "$gpl" = "no" ] ; then
+         echo "Warning: pthread-win32 is LGPL and is therefore not supported with --disable-gpl"
+@@ -1173,10 +1178,10 @@ fi
+ cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
+ 
+ if [ "$pic" = "yes" ] ; then
+-    [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC"
++    PICFLAG="-prefer-pic"
+     ASFLAGS="$ASFLAGS -DPIC"
+     # resolve textrels in the x86 asm
+-    cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
++    cc_check stdio.h "-Wl,-Bsymbolic" && LDFLAGS="$LDFLAGS -Wl,-Bsymbolic"
+     [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
+ fi
+ 
+@@ -1192,7 +1197,6 @@ if [ "$debug" = "yes" ]; then
+     CFLAGS="-O1 -g $CFLAGS"
+     RCFLAGS="$RCFLAGS -DDEBUG"
+ else
+-    CFLAGS="-O3 -ffast-math $CFLAGS"
+     if [ "$lto" = "auto" ] && [ $compiler = GNU ] && cc_check "" "-flto" ; then
+         lto="yes"
+         CFLAGS="$CFLAGS -flto"
+@@ -1327,7 +1331,7 @@ else # gcc/icc
+     DEPMM="$DEPMM -g0"
+     AR="$AR rc "
+     LD="$CC -o "
+-    LIBX264=libx264.a
++    LIBX264=libx264.la
+     [ -n "$RC" ] && RCFLAGS="$RCFLAGS -I. -o "
+ fi
+ [ $compiler != GNU ] && CFLAGS="$(cc_cflags $CFLAGS)"