CVS commit: pkgsrc/multimedia/x264-devel

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jul 14 13:19:42 UTC 2021

Modified Files:
        pkgsrc/multimedia/x264-devel: distinfo
        pkgsrc/multimedia/x264-devel/patches: patch-configure
Added Files:
        pkgsrc/multimedia/x264-devel/patches: patch-config.guess
            patch-config.sub

Log Message:
Apply upstream eb95c29 to fix macOS M1 build.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/multimedia/x264-devel/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/x264-devel/patches/patch-config.guess \
    pkgsrc/multimedia/x264-devel/patches/patch-config.sub
cvs rdiff -u -r1.4 -r1.5 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/distinfo
diff -u pkgsrc/multimedia/x264-devel/distinfo:1.53 pkgsrc/multimedia/x264-devel/distinfo:1.54
--- pkgsrc/multimedia/x264-devel/distinfo:1.53  Wed Mar  4 15:53:24 2020
+++ pkgsrc/multimedia/x264-devel/distinfo       Wed Jul 14 13:19:41 2021
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.53 2020/03/04 15:53:24 wiz Exp $
+$NetBSD: distinfo,v 1.54 2021/07/14 13:19:41 schmonz Exp $
 
 SHA1 (x264-snapshot-20191217-2245.tar.bz2) = f2c36c5a2e81eb0456af4e1f06b827d98ccc6c18
 RMD160 (x264-snapshot-20191217-2245.tar.bz2) = 8565a3af522b47430cfc1527968e8ae851fc05c4
 SHA512 (x264-snapshot-20191217-2245.tar.bz2) = 89061f66fa86dfb868759e5b1dabbb6d1cd9d1240b1bf16afc789f1aa080b3940df5766ddb25e0f0faf0bc8b2603bc35b932848426eeaa4b603199066368f5f0
 Size (x264-snapshot-20191217-2245.tar.bz2) = 774081 bytes
 SHA1 (patch-common_cpu.c) = ef15bae000163e9c10d2e414e841486dd2920b80
-SHA1 (patch-configure) = 101800ee97242ab4f42da8fc6f83b8a6209a1993
+SHA1 (patch-config.guess) = 0ea57f57cdc5c2b98c9fa1a865274b08a8136b07
+SHA1 (patch-config.sub) = bb6303f5200128fb65a7f9ae90653a2dc6876877
+SHA1 (patch-configure) = a55a26beef54352ae8d4b30bddcd9afe664cb8e4
 SHA1 (patch-encoder_analyse.c) = 2057583899e029a4c2173c511293e6a35cf80f78

Index: pkgsrc/multimedia/x264-devel/patches/patch-configure
diff -u pkgsrc/multimedia/x264-devel/patches/patch-configure:1.4 pkgsrc/multimedia/x264-devel/patches/patch-configure:1.5
--- pkgsrc/multimedia/x264-devel/patches/patch-configure:1.4    Wed Mar 13 17:40:26 2019
+++ pkgsrc/multimedia/x264-devel/patches/patch-configure        Wed Jul 14 13:19:42 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.4 2019/03/13 17:40:26 adam Exp $
+$NetBSD: patch-configure,v 1.5 2021/07/14 13:19:42 schmonz Exp $
 
 Add support for DragonFly.
 Use 'amd64' as a synonym for 'x86_64'.
@@ -6,8 +6,9 @@ Avoid endian test failure for -flto.
 Do not force compiler optimisations.
 If we fail an assembly test, continue as if --disable-asm
 was passed.
+Apply upstream eb95c29 to fix macOS M1 build.
 
---- configure.orig     2019-03-12 21:45:03.000000000 +0000
+--- configure.orig     2021-07-14 13:16:59.000000000 +0000
 +++ configure
 @@ -630,6 +630,10 @@ case $host_os in
          SYS="FREEBSD"
@@ -46,6 +47,44 @@ was passed.
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
+@@ -788,6 +793,18 @@ case $host_cpu in
+         AS="${AS-${CC}}"
+         AS_EXT=".c"
+         ;;
++    aarch64|arm64*)
++        ARCH="AARCH64"
++        stack_alignment=16
++        if [ "$SYS" = MACOSX ] ; then
++            AS="${AS-${CC}}"
++            ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
++        elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
++            AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
++        else
++            AS="${AS-${CC}}"
++        fi
++        ;;
+     arm*)
+         ARCH="ARM"
+         if [ "$SYS" = MACOSX ] ; then
+@@ -806,18 +823,6 @@ case $host_cpu in
+             AS="${AS-${CC}}"
+         fi
+         ;;
+-    aarch64)
+-        ARCH="AARCH64"
+-        stack_alignment=16
+-        if [ "$SYS" = MACOSX ] ; then
+-            AS="${AS-${CC}}"
+-            ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
+-        elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
+-            AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
+-        else
+-            AS="${AS-${CC}}"
+-        fi
+-        ;;
+     s390|s390x)
+         ARCH="S390"
+         ;;
 @@ -944,8 +949,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
          ASFLAGS="$ASFLAGS -c"
      else

Added files:

Index: pkgsrc/multimedia/x264-devel/patches/patch-config.guess
diff -u /dev/null pkgsrc/multimedia/x264-devel/patches/patch-config.guess:1.1
--- /dev/null   Wed Jul 14 13:19:42 2021
+++ pkgsrc/multimedia/x264-devel/patches/patch-config.guess     Wed Jul 14 13:19:42 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.guess,v 1.1 2021/07/14 13:19:42 schmonz Exp $
+
+Apply upstream eb95c29 to fix macOS M1 build.
+
+--- config.guess.orig  2019-12-17 21:45:04.000000000 +0000
++++ config.guess
+@@ -1238,6 +1238,9 @@ EOF
+     *:Rhapsody:*:*)
+       echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+       exit ;;
++    arm64:Darwin:*:*)
++      echo arm64-apple-darwin${UNAME_RELEASE}
++      exit ;;
+     *:Darwin:*:*)
+       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+       case $UNAME_PROCESSOR in
Index: pkgsrc/multimedia/x264-devel/patches/patch-config.sub
diff -u /dev/null pkgsrc/multimedia/x264-devel/patches/patch-config.sub:1.1
--- /dev/null   Wed Jul 14 13:19:42 2021
+++ pkgsrc/multimedia/x264-devel/patches/patch-config.sub       Wed Jul 14 13:19:42 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-config.sub,v 1.1 2021/07/14 13:19:42 schmonz Exp $
+
+Apply upstream eb95c29 to fix macOS M1 build.
+
+--- config.sub.orig    2019-12-17 21:45:04.000000000 +0000
++++ config.sub
+@@ -255,7 +255,7 @@ case $basic_machine in
+       # Some are omitted here because they have special meanings below.
+       1750a | 580 \
+       | a29k \
+-      | aarch64 | aarch64_be \
++      | aarch64 | aarch64_be | arm64 \
+       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+       | am33_2.0 \
+@@ -369,7 +369,7 @@ case $basic_machine in
+       # Recognize the basic CPU types with company name.
+       580-* \
+       | a29k-* \
+-      | aarch64-* | aarch64_be-* \
++      | aarch64-* | aarch64_be-* | arm64*-* \
+       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \