pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/libopus don't fail the build just because we don...
details: https://anonhg.NetBSD.org/pkgsrc/rev/eb25991c1530
branches: trunk
changeset: 362389:eb25991c1530
user: maya <maya%pkgsrc.org@localhost>
date: Sat May 13 07:51:08 2017 +0000
description:
don't fail the build just because we don't know how to check for cpu
features on ARM. it doesn't seem to be a problem if /cpu/procinfo is
empty as in netbsd/arm nor if procfs is unmounted.
diffstat:
audio/libopus/distinfo | 3 +-
audio/libopus/patches/patch-celt_arm_armcpu.c | 33 +++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletions(-)
diffs (49 lines):
diff -r 297beee6d2f2 -r eb25991c1530 audio/libopus/distinfo
--- a/audio/libopus/distinfo Sat May 13 04:12:40 2017 +0000
+++ b/audio/libopus/distinfo Sat May 13 07:51:08 2017 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2017/01/22 13:04:55 wiz Exp $
+$NetBSD: distinfo,v 1.9 2017/05/13 07:51:08 maya Exp $
SHA1 (opus-1.1.4.tar.gz) = c7ecd67321c0e72c928ffc1013d725fc537e633f
RMD160 (opus-1.1.4.tar.gz) = a5cb4400e6e41be23d522cfffb04f14e1ac555f1
SHA512 (opus-1.1.4.tar.gz) = 57f14b9e8037eaa02a4d86535d3bbcceca249310fbc9ef1a452cc19dd442d4cf338d5db241d20605c236e22549df2c8266b7486c5f1666b80c532afd52cb3585
Size (opus-1.1.4.tar.gz) = 978830 bytes
+SHA1 (patch-celt_arm_armcpu.c) = 2698814d7f204c8ff82ac86b4b6d54f32ba0afb7
diff -r 297beee6d2f2 -r eb25991c1530 audio/libopus/patches/patch-celt_arm_armcpu.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libopus/patches/patch-celt_arm_armcpu.c Sat May 13 07:51:08 2017 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-celt_arm_armcpu.c,v 1.1 2017/05/13 07:51:08 maya Exp $
+
+Don't error on ARM if we're not on linux or MSVC.
+Currently the code attempts to open /proc/cpuinfo, and tests for
+failure - if that doesn't contain useful info or doesn't exist,
+it still behaves correctly.
+
+--- celt/arm/armcpu.c.orig 2017-01-16 20:50:20.000000000 +0000
++++ celt/arm/armcpu.c
+@@ -91,7 +91,7 @@ static OPUS_INLINE opus_uint32 opus_cpu_
+ return flags;
+ }
+
+-#elif defined(__linux__)
++#else
+ /* Linux based */
+ opus_uint32 opus_cpu_capabilities(void)
+ {
+@@ -146,11 +146,12 @@ opus_uint32 opus_cpu_capabilities(void)
+ }
+ return flags;
+ }
+-#else
++#endif
++#if !(defined(__linux__) || defined(_MSC_VER))
+ /* The feature registers which can tell us what the processor supports are
+ * accessible in priveleged modes only, so we can't have a general user-space
+ * detection method like on x86.*/
+-# error "Configured to use ARM asm but no CPU detection method available for " \
++# warning "Configured to use ARM asm but no CPU detection method available for " \
+ "your platform. Reconfigure with --disable-rtcd (or send patches)."
+ #endif
+
Home |
Main Index |
Thread Index |
Old Index