CVS commit: pkgsrc/multimedia/libaom

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Oct 23 17:30:21 UTC 2018

Modified Files:
        pkgsrc/multimedia/libaom: distinfo
        pkgsrc/multimedia/libaom/patches:
            patch-build_cmake_aom__configure.cmake
Added Files:
        pkgsrc/multimedia/libaom/patches: patch-build_cmake_exports.cmake

Log Message:
libaom: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/libaom/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/libaom/distinfo
diff -u pkgsrc/multimedia/libaom/distinfo:1.2 pkgsrc/multimedia/libaom/distinfo:1.3
--- pkgsrc/multimedia/libaom/distinfo:1.2       Mon Oct  1 03:25:46 2018
+++ pkgsrc/multimedia/libaom/distinfo   Tue Oct 23 17:30:21 2018
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2018/10/01 03:25:46 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2018/10/23 17:30:21 jperkin 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-build_cmake_aom__configure.cmake) = 618aa2bf047e89fbcf665ff65535d818327bb413
+SHA1 (patch-build_cmake_aom__configure.cmake) = e0dbccb5dd1b6137ff29f915a221fbae1c56b49b
 SHA1 (patch-build_cmake_aom__optimization.cmake) = 56eda2e9e40cd20ce955ca311ded4a11f2ae3d1c
+SHA1 (patch-build_cmake_exports.cmake) = b64a36404b96a8ede42ac7419c28d2075c910395

Index: pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
diff -u pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake:1.1 pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake:1.2
--- pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake:1.1 Sun Sep 30 18:58:16 2018
+++ pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake     Tue Oct 23 17:30:21 2018
@@ -1,10 +1,24 @@
-$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.1 2018/09/30 18:58:16 maya Exp $
+$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.2 2018/10/23 17:30:21 jperkin Exp $
 
 Don't disable fortify just because it's a release build.
+Set CPU correctly on SunOS.
 
---- build/cmake/aom_configure.cmake.orig       2018-09-28 20:57:38.000000000 +0000
+--- build/cmake/aom_configure.cmake.orig       2018-10-01 03:20:05.000000000 +0000
 +++ build/cmake/aom_configure.cmake
-@@ -290,9 +290,6 @@ else()
+@@ -65,7 +65,11 @@ if(NOT AOM_TARGET_CPU)
+     endif()
+   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR
+          "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")
+-    set(AOM_TARGET_CPU "x86")
++    if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
++      set(AOM_TARGET_CPU "x86")
++    elseif(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
++      set(AOM_TARGET_CPU "x86_64")
++    endif()
+   elseif("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^arm" OR
+          "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^mips")
+     set(AOM_TARGET_CPU "${CMAKE_SYSTEM_PROCESSOR}")
+@@ -290,9 +294,6 @@ else()
      add_compiler_flag_if_supported("-Werror")
    endif()
  

Added files:

Index: pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake
diff -u /dev/null pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake:1.1
--- /dev/null   Tue Oct 23 17:30:21 2018
+++ pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake    Tue Oct 23 17:30:21 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_cmake_exports.cmake,v 1.1 2018/10/23 17:30:21 jperkin Exp $
+
+Don't use --version-script on SunOS.
+
+--- build/cmake/exports.cmake.orig     2018-10-01 03:20:05.000000000 +0000
++++ build/cmake/exports.cmake
+@@ -55,7 +55,7 @@ function(setup_exports_target)
+ 
+     # TODO(tomfinegan): Sort out the import lib situation and flags for MSVC.
+ 
+-  else()
++  elseif(NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+     set_property(TARGET aom APPEND_STRING
+                  PROPERTY LINK_FLAGS "-Wl,--version-script,${aom_sym_file}")
+   endif()