CVS commit: pkgsrc/multimedia/x264-devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/x264-devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 16 Jun 2017 05:39:23 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jun 16 05:39:23 UTC 2017

Modified Files:
        pkgsrc/multimedia/x264-devel: Makefile buildlink3.mk distinfo
        pkgsrc/multimedia/x264-devel/patches: patch-configure
Added Files:
        pkgsrc/multimedia/x264-devel/patches: patch-Makefile
            patch-encoder_analyse.c
Removed Files:
        pkgsrc/multimedia/x264-devel/patches: patch-ab patch-ba

Log Message:
Changes 20170615:
* x86: Avoid self-relative expressions on macho64
* configure: Don't try to detect clang by $CC
* checkasm: Use the right variable in a loop condition
* x86: Fix linking with 8-bit depth shared libx264
* x86: Only enable AVX-512 in 8-bit mode
* x86: AVX-512 cabac_block_residual
* x86: AVX-512 pixel_sad_x3 and pixel_sad_x4
* x86: AVX-512 pixel_sad
* x86: AVX-512 decimate_score
* x86: AVX-512 pixel_var2_8x8 and 8x16
* Rework pixel_var2
* x86: AVX-512 pixel_var_8x8, 8x16, and 16x16
* x86: AVX-512 pixel_sa8d_8x8
* x86: AVX-512 pixel_satd
* x86: AVX-512 deblock_strength
* x86: AVX-512 plane_copy_deinterleave_v210
* x86: AVX-512 memzero_aligned
* x86: AVX and AVX-512 memcpy_aligned
* x86: AVX-512 dequant_8x8_flat16
* x86: AVX-512 dequant_8x8
* x86: AVX-512 dequant_4x4
* x86: AVX-512 mbtree_propagate_cost
* x86: AVX-512 coeff_last
* x86: AVX-512 zigzag_interleave_8x8_cavlc
* x86: AVX-512 zigzag_scan_8x8_field
* x86: AVX-512 zigzag_scan_4x4_field
* x86: AVX-512 zigzag_scan_8x8_frame
* x86: AVX-512 zigzag_scan_4x4_frame
* checkasm: x86: More accurate ymm/zmm measurements
* x86: AVX-512 support
* x86: Change assembler from yasm to nasm
* x86: Add some additional cpuflag relations
* x86: Faster SSE2 pixel_sad_16x16 and 16x8
* msvs/icl: Improve target host detection
* ppc: Optimize add8x8_idct_dc


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/multimedia/x264-devel/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/x264-devel/buildlink3.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/multimedia/x264-devel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/x264-devel/patches/patch-Makefile \
    pkgsrc/multimedia/x264-devel/patches/patch-encoder_analyse.c
cvs rdiff -u -r1.24 -r0 pkgsrc/multimedia/x264-devel/patches/patch-ab
cvs rdiff -u -r1.5 -r0 pkgsrc/multimedia/x264-devel/patches/patch-ba
cvs rdiff -u -r1.1 -r1.2 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.61 pkgsrc/multimedia/x264-devel/Makefile:1.62
--- pkgsrc/multimedia/x264-devel/Makefile:1.61  Mon Jan 23 15:28:27 2017
+++ pkgsrc/multimedia/x264-devel/Makefile       Fri Jun 16 05:39:23 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2017/01/23 15:28:27 adam Exp $
+# $NetBSD: Makefile,v 1.62 2017/06/16 05:39:23 adam Exp $
 
-SNAPSHOT_DATE= 20170122
+SNAPSHOT_DATE= 20170615
 
 DISTNAME=      x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=       x264-devel-${SNAPSHOT_DATE}
@@ -34,14 +34,14 @@ GNU_ARCH.i386=              i486
 CFLAGS+=               -march=i486
 .    endif
 .  else
-BUILD_DEPENDS+=                yasm>=0.4.0:../../devel/yasm
+BUILD_DEPENDS+=                nasm>=2.13.0:../../devel/nasm
 .  endif
 .elif ${MACHINE_ARCH} == "x86_64"
 .  if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \
        (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*)))
 CONFIGURE_ARGS+=       --disable-asm
 .  else
-BUILD_DEPENDS+=                yasm>=0.4.0:../../devel/yasm
+BUILD_DEPENDS+=                nasm>=2.13.0:../../devel/nasm
 .  endif
 .endif
 

Index: pkgsrc/multimedia/x264-devel/buildlink3.mk
diff -u pkgsrc/multimedia/x264-devel/buildlink3.mk:1.12 pkgsrc/multimedia/x264-devel/buildlink3.mk:1.13
--- pkgsrc/multimedia/x264-devel/buildlink3.mk:1.12     Thu Apr 10 05:39:14 2014
+++ pkgsrc/multimedia/x264-devel/buildlink3.mk  Fri Jun 16 05:39:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2014/04/10 05:39:14 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2017/06/16 05:39:23 adam Exp $
 
 BUILDLINK_TREE+=       x264-devel
 
@@ -22,7 +22,7 @@ X264_DEVEL_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.x264-devel?=     x264-devel>=20140303 # X264 BUILD 142
 BUILDLINK_PKGSRCDIR.x264-devel?=       ../../multimedia/x264-devel
 pkgbase:= x264-devel
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.x264-devel:Mthreads)
 .  include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/multimedia/x264-devel/distinfo
diff -u pkgsrc/multimedia/x264-devel/distinfo:1.45 pkgsrc/multimedia/x264-devel/distinfo:1.46
--- pkgsrc/multimedia/x264-devel/distinfo:1.45  Mon Jan 23 15:28:27 2017
+++ pkgsrc/multimedia/x264-devel/distinfo       Fri Jun 16 05:39:23 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.45 2017/01/23 15:28:27 adam Exp $
+$NetBSD: distinfo,v 1.46 2017/06/16 05:39:23 adam Exp $
 
-SHA1 (x264-snapshot-20170122-2245.tar.bz2) = eb4ea581ad05ad9bebb4113cbef555a267fd78d3
-RMD160 (x264-snapshot-20170122-2245.tar.bz2) = dd1e74ff0819acd735b07b17052d5e47c85f5aa7
-SHA512 (x264-snapshot-20170122-2245.tar.bz2) = 3d5035db41aca0636e68d8ca6e5fd31c4f837845aa04138c6529786f1e5d8dfdad842afc399823addb2f52d6372f5a1f423a9910896540bb57ae8db87198879b
-Size (x264-snapshot-20170122-2245.tar.bz2) = 733657 bytes
-SHA1 (patch-ab) = f4be6477f75b3f7a411729997712bcaf028f88b2
-SHA1 (patch-ba) = b16486f28ba5c34449e015906957062186e657af
-SHA1 (patch-configure) = 7bec098f853266d4156e59047128114a2d00ea4d
+SHA1 (x264-snapshot-20170615-2245.tar.bz2) = b2988d6b54208f8ce35993463750a1b6a191480c
+RMD160 (x264-snapshot-20170615-2245.tar.bz2) = eeac6a746658b36a96ddd32efff8c0bf4fded600
+SHA512 (x264-snapshot-20170615-2245.tar.bz2) = 54b2066747cdad0804ab27e730fe1218589b979567af1c930280f83eea5aed140f09b847c48ec1bd928ab106a6eec5fb8f8c3c40fb7c9e33df513594e7bc4e23
+Size (x264-snapshot-20170615-2245.tar.bz2) = 746854 bytes
+SHA1 (patch-Makefile) = 8637cc22e142081ad309b462fb30c654d3688cce
+SHA1 (patch-configure) = 0a69da50452159e0b12fb7ac294d1f15cd42bdca
+SHA1 (patch-encoder_analyse.c) = 1ef090172fd8a48d4e031525ac82433865d549e2

Index: pkgsrc/multimedia/x264-devel/patches/patch-configure
diff -u pkgsrc/multimedia/x264-devel/patches/patch-configure:1.1 pkgsrc/multimedia/x264-devel/patches/patch-configure:1.2
--- pkgsrc/multimedia/x264-devel/patches/patch-configure:1.1    Mon Oct 24 10:36:12 2016
+++ pkgsrc/multimedia/x264-devel/patches/patch-configure        Fri Jun 16 05:39:23 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2016/10/24 10:36:12 maya Exp $
+$NetBSD: patch-configure,v 1.2 2017/06/16 05:39:23 adam Exp $
 
 Add support for DragonFly.
 Use 'amd64' as a synonym for 'x86_64'.
@@ -7,9 +7,9 @@ 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.orig     2017-06-15 20:45:03.000000000 +0000
 +++ configure
-@@ -597,6 +597,10 @@ case $host_os in
+@@ -612,6 +612,10 @@ case $host_os in
          SYS="FREEBSD"
          libm="-lm"
          ;;
@@ -20,16 +20,16 @@ was passed.
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -697,7 +701,7 @@ case $host_cpu in
+@@ -712,7 +716,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
 -    x86_64)
 +    x86_64|amd64)
          ARCH="X86_64"
-         AS="${AS-yasm}"
+         AS="${AS-nasm}"
          AS_EXT=".asm"
-@@ -726,14 +730,15 @@ case $host_cpu in
+@@ -741,14 +745,15 @@ case $host_cpu in
          fi
          ;;
      powerpc*)
@@ -46,7 +46,7 @@ was passed.
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -883,8 +888,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+@@ -915,8 +920,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."
@@ -57,7 +57,7 @@ was passed.
      fi
  fi
  
-@@ -893,8 +898,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ; 
+@@ -925,8 +930,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ; 
          ASFLAGS="$ASFLAGS -c"
      else
          echo "no NEON support, try adding -mfpu=neon to CFLAGS"
@@ -68,7 +68,7 @@ was passed.
      fi
  fi
  
-@@ -912,8 +917,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
+@@ -944,8 +949,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
          define HAVE_MSA
      else
          echo "You specified a pre-MSA CPU in your CFLAGS."
@@ -79,7 +79,7 @@ was passed.
      fi
  fi
  
-@@ -930,7 +935,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
+@@ -962,7 +967,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
@@ -88,7 +88,7 @@ was passed.
      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
+@@ -984,7 +989,7 @@ fi
  
  # autodetect options that weren't forced nor disabled
  
@@ -97,7 +97,7 @@ was passed.
  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
+@@ -1205,10 +1210,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
@@ -110,7 +110,7 @@ was passed.
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
-@@ -1192,7 +1197,6 @@ if [ "$debug" = "yes" ]; then
+@@ -1224,7 +1229,6 @@ if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
      RCFLAGS="$RCFLAGS -DDEBUG"
  else
@@ -118,7 +118,7 @@ was passed.
      if [ "$lto" = "auto" ] && [ $compiler = GNU ] && cc_check "" "-flto" ; then
          lto="yes"
          CFLAGS="$CFLAGS -flto"
-@@ -1327,7 +1331,7 @@ else # gcc/icc
+@@ -1359,7 +1363,7 @@ else # gcc/icc
      DEPMM="$DEPMM -g0"
      AR="$AR rc "
      LD="$CC -o "

Added files:

Index: pkgsrc/multimedia/x264-devel/patches/patch-Makefile
diff -u /dev/null pkgsrc/multimedia/x264-devel/patches/patch-Makefile:1.1
--- /dev/null   Fri Jun 16 05:39:23 2017
+++ pkgsrc/multimedia/x264-devel/patches/patch-Makefile Fri Jun 16 05:39:23 2017
@@ -0,0 +1,134 @@
+$NetBSD: patch-Makefile,v 1.1 2017/06/16 05:39:23 adam Exp $
+
+Add rule for .lo:.S needed by aarch64
+
+--- Makefile.orig      2017-06-15 20:45:03.000000000 +0000
++++ Makefile
+@@ -34,7 +34,7 @@ OBJS =
+ OBJSO =
+ OBJCLI =
+ 
+-OBJCHK = tools/checkasm.o
++OBJCHK = tools/checkasm.lo
+ 
+ OBJEXAMPLE = example.o
+ 
+@@ -99,9 +99,9 @@ endif
+ 
+ ifdef ARCH_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
+-OBJCHK += tools/checkasm-a.o
++OBJCHK += tools/checkasm-a.lo
+ endif
+ endif
+ 
+@@ -121,8 +121,8 @@ 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 common/arm/bitstream-a.S
+ SRCS   += common/arm/mc-c.c common/arm/predict-c.c
+-OBJASM  = $(ASMSRC:%.S=%.o)
+-OBJCHK += tools/checkasm-arm.o
++OBJASM  = $(ASMSRC:%.S=%.lo)
++OBJCHK += tools/checkasm-arm.lo
+ endif
+ endif
+ 
+@@ -140,8 +140,8 @@ ASMSRC += common/aarch64/bitstream-a.S \
+ SRCS   += common/aarch64/asm-offsets.c \
+           common/aarch64/mc-c.c        \
+           common/aarch64/predict-c.c
+-OBJASM  = $(ASMSRC:%.S=%.o)
+-OBJCHK += tools/checkasm-aarch64.o
++OBJASM  = $(ASMSRC:%.S=%.lo)
++OBJCHK += tools/checkasm-aarch64.lo
+ endif
+ endif
+ 
+@@ -173,20 +173,23 @@ GENERATED += common/oclobj.h
+ SRCS += common/opencl.c encoder/slicetype-cl.c
+ endif
+ 
+-OBJS   += $(SRCS:%.c=%.o)
+-OBJCLI += $(SRCCLI:%.c=%.o)
++OBJS   += $(SRCS:%.c=%.lo)
++OBJCLI += $(SRCCLI:%.c=%.lo)
+ OBJSO  += $(SRCSO:%.c=%.o)
+ 
+ .PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags
+ 
++%.lo: %.c
++      ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAG} -o $@ $<
++
+ cli: x264$(EXE)
+-lib-static: $(LIBX264)
++lib-static: libx264.la
+ lib-shared: $(SONAME)
+ 
+-$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
+-      rm -f $(LIBX264)
+-      $(AR)$@ $(OBJS) $(OBJASM)
+-      $(if $(RANLIB), $(RANLIB) $@)
++libx264.la: $(GENERATED) .depend $(OBJS) $(OBJASM)
++      ${LIBTOOL} --mode=link \
++      ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
++      $(OBJS) $(OBJASM) ${LDFLAGS}
+ 
+ $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
+       $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
+@@ -198,24 +201,22 @@ checkasm: checkasm$(EXE)
+ example: example$(EXE)
+ endif
+ 
+-x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
+-      $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
++x264$(EXE): $(GENERATED) .depend $(OBJCLI) libx264.la
++      ${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS)
+ 
+-checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
+-      $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
++checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la
++      ${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
+ 
+ example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264)
+       $(LD)$@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS)
+ 
+ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK) $(OBJEXAMPLE): .depend
+ 
+-%.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm
+-      $(AS) $(ASFLAGS) -o $@ $<
+-      -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
+-
+-%.o: %.S
+-      $(AS) $(ASFLAGS) -o $@ $<
+-      -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
++%.lo: %.asm common/x86/x86inc.asm common/x86/x86util.asm
++      ${LIBTOOL} --mode=compile --tag=CC ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
++
++%.lo: %.S
++      ${LIBTOOL} --mode=compile --tag=CC $(AS) $(ASFLAGS) -o $@ $<
+ 
+ %.dll.o: %.rc x264.h
+       $(RC) $(RCFLAGS)$@ -DDLL $<
+@@ -282,8 +283,7 @@ distclean: clean
+       rm -rf conftest*
+ 
+ install-cli: cli
+-      $(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)
+@@ -294,8 +294,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)
+-      $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
+ 
+ install-lib-shared: lib-shared install-lib-dev
+ ifneq ($(IMPLIBNAME),)
Index: pkgsrc/multimedia/x264-devel/patches/patch-encoder_analyse.c
diff -u /dev/null pkgsrc/multimedia/x264-devel/patches/patch-encoder_analyse.c:1.1
--- /dev/null   Fri Jun 16 05:39:23 2017
+++ pkgsrc/multimedia/x264-devel/patches/patch-encoder_analyse.c        Fri Jun 16 05:39:23 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-encoder_analyse.c,v 1.1 2017/06/16 05:39:23 adam Exp $
+
+Use logf() instead of log2f.
+
+--- encoder/analyse.c.orig     2017-06-15 20:45:03.000000000 +0000
++++ encoder/analyse.c
+@@ -306,7 +306,7 @@ int x264_analyse_init_costs( x264_t *h )
+ 
+     logs[0] = 0.718f;
+     for( int i = 1; i <= 2*4*2048; i++ )
+-        logs[i] = log2f( i+1 ) * 2.0f + 1.718f;
++        logs[i] = logf(i+1)*2.88539f + 1.718f;
+ 
+     for( int qp = X264_MIN( h->param.rc.i_qp_min, QP_MAX_SPEC ); qp <= h->param.rc.i_qp_max; qp++ )
+         if( init_costs( h, logs, qp ) )

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index