[pkgsrc/trunk]: pkgsrc/multimedia/libaom libaom: Fix the build for NetBSD/*arm*

[leot <leot%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/27e23b78f8a3
branches:  trunk
changeset: 325194:27e23b78f8a3
user:      leot <leot%pkgsrc.org@localhost>
date:      Sun Nov 11 18:03:17 2018 +0000

description:
libaom: Fix the build for NetBSD/*arm*

diffstat:

 multimedia/libaom/Makefile                                       |   9 ++++-
 multimedia/libaom/distinfo                                       |   4 +-
 multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake |  19 +++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diffs (74 lines):

diff -r c81ac2273c39 -r 27e23b78f8a3 multimedia/libaom/Makefile
--- a/multimedia/libaom/Makefile        Sun Nov 11 16:20:42 2018 +0000
+++ b/multimedia/libaom/Makefile        Sun Nov 11 18:03:17 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/11/07 13:08:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2018/11/11 18:03:17 leot Exp $
 
 PKGNAME=       libaom-1.0.0
 PKGREVISION=   1
@@ -35,6 +35,13 @@
 CMAKE_ARGS+=   -DENABLE_TOOLS:BOOL=OFF
 CMAKE_ARGS+=   -DENABLE_WERROR:BOOL=OFF
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) \
+  || !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64)
+CMAKE_ARGS+=   -DCONFIG_RUNTIME_CPU_DETECT=0
+.endif
+
 BUILD_DEPENDS+=        nasm>=2.13:../../devel/nasm
 
 .include "../../mk/bsd.pkg.mk"
diff -r c81ac2273c39 -r 27e23b78f8a3 multimedia/libaom/distinfo
--- a/multimedia/libaom/distinfo        Sun Nov 11 16:20:42 2018 +0000
+++ b/multimedia/libaom/distinfo        Sun Nov 11 18:03:17 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2018/11/07 13:08:29 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2018/11/11 18:03:17 leot Exp $
 
 SHA1 (aom-d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz) = deaf4f5420055cba0385a4e7dd91720211b7b97d
 RMD160 (aom-d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz) = 3f01d1408b715acb54537ba933bac4e03bc4f157
 SHA512 (aom-d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz) = 40e98a50fb470266229a43296d7217edadefd51a5e2faa64094f0dd23523c3f6877586880175731bca1056b26f5f393b95ae214e5c673bad63839859003b615c
 Size (aom-d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz) = 2775350 bytes
 SHA1 (patch-aom_exports__com) = 23e24008c0e0ea08f0998d1553f880f64bcb4d3c
-SHA1 (patch-build_cmake_aom__configure.cmake) = e0dbccb5dd1b6137ff29f915a221fbae1c56b49b
+SHA1 (patch-build_cmake_aom__configure.cmake) = a35123870aa5b37fdf9ed4fed24a354d66098714
 SHA1 (patch-build_cmake_aom__optimization.cmake) = 56eda2e9e40cd20ce955ca311ded4a11f2ae3d1c
 SHA1 (patch-build_cmake_exports.cmake) = b64a36404b96a8ede42ac7419c28d2075c910395
 SHA1 (patch-build_cmake_version.cmake) = 37bf922fbf2a1aa412d2a47c054f42cff38ad4c3
diff -r c81ac2273c39 -r 27e23b78f8a3 multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
--- a/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake  Sun Nov 11 16:20:42 2018 +0000
+++ b/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake  Sun Nov 11 18:03:17 2018 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.2 2018/10/23 17:30:21 jperkin Exp $
+$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.3 2018/11/11 18:03:17 leot Exp $
 
-Don't disable fortify just because it's a release build.
-Set CPU correctly on SunOS.
+- Don't disable fortify just because it's a release build.
+- Set CPU correctly on SunOS.
+- Add support for NetBSD/*arm*
 
 --- build/cmake/aom_configure.cmake.orig       2018-10-01 03:20:05.000000000 +0000
 +++ build/cmake/aom_configure.cmake
@@ -18,7 +19,17 @@
    elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm" OR
           "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^mips")
      set(AOM_TARGET_CPU "${CMAKE_SYSTEM_PROCESSOR}")
-@@ -290,9 +294,6 @@ else()
+@@ -151,7 +155,8 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm"
+   if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
+     set(AS_EXECUTABLE as)
+     set(AOM_AS_FLAGS -arch ${AOM_TARGET_CPU} -isysroot ${CMAKE_OSX_SYSROOT})
+-  elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
++  elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux" OR
++         "${AOM_TARGET_SYSTEM}" STREQUAL "NetBSD")
+     if(NOT AS_EXECUTABLE)
+       set(AS_EXECUTABLE as)
+     endif()
+@@ -290,9 +295,6 @@ else()
      add_compiler_flag_if_supported("-Werror")
    endif()