Tue Dec 28 17:35:52 2021 UTC ()
libaom: un-break the build: correct a patch so it applies


(gutteridge)
diff -r1.14 -r1.15 pkgsrc/multimedia/libaom/distinfo
diff -r1.1 -r1.2 pkgsrc/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/libaom/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libaom/distinfo 2021/12/27 10:45:59 1.14
+++ pkgsrc/multimedia/libaom/distinfo 2021/12/28 17:35:52 1.15
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.14 2021/12/27 10:45:59 he Exp $ 1$NetBSD: distinfo,v 1.15 2021/12/28 17:35:52 gutteridge Exp $
2 2
3BLAKE2s (libaom-3.2.0.tar.gz) = 0324096a1c955c6db4fa194397280810c36398b51b05833633d621268a88a68c 3BLAKE2s (libaom-3.2.0.tar.gz) = 0324096a1c955c6db4fa194397280810c36398b51b05833633d621268a88a68c
4SHA512 (libaom-3.2.0.tar.gz) = 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19 4SHA512 (libaom-3.2.0.tar.gz) = 649bebde85c1a42b0c1c3d2d3b7110b999e3ee1c8e76595259e4e75a8b0f3918e23ff7c7e2c313da4d579882f55bf29765bb882570280adc81f3bc1e82f1ee19
5Size (libaom-3.2.0.tar.gz) = 4717955 bytes 5Size (libaom-3.2.0.tar.gz) = 4717955 bytes
6SHA1 (patch-aom__ports_ppc__cpudetect.c) = 3ee7048d8ab543605f5c14fe7d872c63fde1028e 6SHA1 (patch-aom__ports_ppc__cpudetect.c) = 57bf7974b0be44939a7e9ab59d93a4cf49844411
7SHA1 (patch-build_cmake_aom__configure.cmake) = 87a8b65cee873f7deff18cd74c140cd7e8c95924 7SHA1 (patch-build_cmake_aom__configure.cmake) = 87a8b65cee873f7deff18cd74c140cd7e8c95924
8SHA1 (patch-build_cmake_exports.cmake) = be181c5718a5fac75f31bd8e74f214fc8b610ad9 8SHA1 (patch-build_cmake_exports.cmake) = be181c5718a5fac75f31bd8e74f214fc8b610ad9
9SHA1 (patch-build_cmake_version.cmake) = 1e6b4a1373c0d54cafdc8ad5c153881e41758bd6 9SHA1 (patch-build_cmake_version.cmake) = 1e6b4a1373c0d54cafdc8ad5c153881e41758bd6
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c (expand / switch to unified diff)

--- pkgsrc/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c 2021/12/27 10:45:59 1.1
+++ pkgsrc/multimedia/libaom/patches/patch-aom__ports_ppc__cpudetect.c 2021/12/28 17:35:52 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-aom__ports_ppc__cpudetect.c,v 1.1 2021/12/27 10:45:59 he Exp $ 1$NetBSD: patch-aom__ports_ppc__cpudetect.c,v 1.2 2021/12/28 17:35:52 gutteridge Exp $
2 2
3Make this at least build on NetBSD. 3Make this at least build on NetBSD.
4So far no dynamic CPU feature detection on NetBSD. 4So far no dynamic CPU feature detection on NetBSD.
5 5
6--- work/aom_ports/ppc_cpudetect.c.orig 2021-10-14 18:05:43.000000000 +0000 6--- aom_ports/ppc_cpudetect.c.orig 2021-10-14 18:05:43.000000000 +0000
7+++ work/aom_ports/ppc_cpudetect.c 7+++ aom_ports/ppc_cpudetect.c
8@@ -12,14 +12,16 @@ 8@@ -12,14 +12,16 @@
9 #include <fcntl.h> 9 #include <fcntl.h>
10 #include <unistd.h> 10 #include <unistd.h>
11 #include <stdint.h> 11 #include <stdint.h>
12+#if !defined(__NetBSD__) 12+#if !defined(__NetBSD__)
13 #include <asm/cputable.h> 13 #include <asm/cputable.h>
14 #include <linux/auxvec.h> 14 #include <linux/auxvec.h>
15+#endif 15+#endif
16  16
17 #include "config/aom_config.h" 17 #include "config/aom_config.h"
18  18
19 #include "aom_ports/ppc.h" 19 #include "aom_ports/ppc.h"
20  20