CVS commit: pkgsrc/multimedia/x264-devel

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Oct  2 20:34:48 UTC 2016

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

Log Message:
x264-devel: if we don't pass the assembly test, e.g. if we don't
pass optimizing flags (like default netbsd setup), just act as if
we passed --disable-asm, as opposed to passing it for netbsd/arm.

- now other operating systems that don't optimize won't fail here.
- if someone does pass optimization, he benefits from it
- I don't have to define another case in the Makefile for MIPS


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/multimedia/x264-devel/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/multimedia/x264-devel/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/multimedia/x264-devel/patches/patch-aa

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.58 pkgsrc/multimedia/x264-devel/Makefile:1.59
--- pkgsrc/multimedia/x264-devel/Makefile:1.58  Sat Jul  9 06:38:40 2016
+++ pkgsrc/multimedia/x264-devel/Makefile       Sun Oct  2 20:34:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2016/07/09 06:38:40 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2016/10/02 20:34:48 maya Exp $
 
 SNAPSHOT_DATE= 20160307
 
@@ -44,9 +44,6 @@ CONFIGURE_ARGS+=      --disable-asm
 .  else
 BUILD_DEPENDS+=                yasm>=0.4.0:../../devel/yasm
 .  endif
-.elif ${MACHINE_ARCH} == "arm" && ${OPSYS} == "NetBSD"
-# pre-ARMv6 is default on NetBSD/arm
-CONFIGURE_ARGS+=       --disable-asm
 .endif
 
 USE_TOOLS+=            bash gmake

Index: pkgsrc/multimedia/x264-devel/distinfo
diff -u pkgsrc/multimedia/x264-devel/distinfo:1.42 pkgsrc/multimedia/x264-devel/distinfo:1.43
--- pkgsrc/multimedia/x264-devel/distinfo:1.42  Sun Aug 28 06:42:27 2016
+++ pkgsrc/multimedia/x264-devel/distinfo       Sun Oct  2 20:34:48 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2016/08/28 06:42:27 richard Exp $
+$NetBSD: distinfo,v 1.43 2016/10/02 20:34:48 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) = c947b8d057d653169cf62c7983e0f36780d466b4
+SHA1 (patch-aa) = 7e9080f9268c2e5838e7fa94e3c261822fccfe82
 SHA1 (patch-ab) = f4be6477f75b3f7a411729997712bcaf028f88b2
 SHA1 (patch-ba) = b16486f28ba5c34449e015906957062186e657af

Index: pkgsrc/multimedia/x264-devel/patches/patch-aa
diff -u pkgsrc/multimedia/x264-devel/patches/patch-aa:1.22 pkgsrc/multimedia/x264-devel/patches/patch-aa:1.23
--- pkgsrc/multimedia/x264-devel/patches/patch-aa:1.22  Sun Jan 24 14:34:11 2016
+++ pkgsrc/multimedia/x264-devel/patches/patch-aa       Sun Oct  2 20:34:48 2016
@@ -1,10 +1,13 @@
-$NetBSD: patch-aa,v 1.22 2016/01/24 14:34:11 ryoon Exp $
+$NetBSD: patch-aa,v 1.23 2016/10/02 20:34:48 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-01-23 21:45:04.000000000 +0000
 +++ configure
 @@ -578,6 +578,10 @@ case $host_os in
@@ -44,6 +47,39 @@ Do not force compiler optimisations.
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
+@@ -844,8 +849,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
+ 
+@@ -854,8 +859,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
+ 
+@@ -873,8 +878,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
+ 
 @@ -891,7 +896,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
  CPU_ENDIAN="little-endian"
  if [ $compiler = GNU ]; then