[pkgsrc/trunk]: pkgsrc/multimedia/libaom libaom: update to 3.1.3

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/multimedia/libaom libaom: update to 3.1.3
From: nia <nia%pkgsrc.org@localhost>
Date: Sat, 09 Oct 2021 15:43:11 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f0afe37215c3
branches:  trunk
changeset: 459570:f0afe37215c3
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Oct 09 14:47:24 2021 +0000

description:
libaom: update to 3.1.3

This includes various bug fixes and improvements to the encoder.

diffstat:

 multimedia/libaom/Makefile                                          |  14 +-
 multimedia/libaom/PLIST                                             |   6 +-
 multimedia/libaom/distinfo                                          |  16 +-
 multimedia/libaom/patches/patch-aom_exports__com                    |  39 -------
 multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake    |  37 +++---
 multimedia/libaom/patches/patch-build_cmake_aom__optimization.cmake |  51 ----------
 multimedia/libaom/patches/patch-build_cmake_exports.cmake           |  10 +-
 multimedia/libaom/patches/patch-build_cmake_version.cmake           |  37 +++++-
 8 files changed, 71 insertions(+), 139 deletions(-)

diffs (297 lines):

diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/Makefile
--- a/multimedia/libaom/Makefile        Sat Oct 09 13:26:38 2021 +0000
+++ b/multimedia/libaom/Makefile        Sat Oct 09 14:47:24 2021 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2021/06/28 11:52:41 nia Exp $
+# $NetBSD: Makefile,v 1.15 2021/10/09 14:47:24 nia Exp $
 
-PKGNAME=       libaom-1.0.0
-PKGREVISION=   4
-DISTNAME=      aom-d14c5bb4f336ef1842046089849dee4a301fbbf0
+PKGNAME=       libaom-3.1.3
+DISTNAME=      ce9a40ce01ade9d6fea1721c82645804a2f39b00
 CATEGORIES=    multimedia
-#MASTER_SITES= -https://aomedia.googlesource.com/aom/+archive/d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz
-MASTER_SITES=  ${MASTER_SITE_LOCAL}
+MASTER_SITES=  https://aomedia.googlesource.com/aom/+archive/
+DIST_SUBDIR=   libaom
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://aomedia.googlesource.com/aom/+archive/
@@ -66,4 +65,7 @@
 TOOL_DEPENDS+= nasm>=2.13:../../devel/nasm
 .endif
 
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           build/aom.pc
+
 .include "../../mk/bsd.pkg.mk"
diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/PLIST
--- a/multimedia/libaom/PLIST   Sat Oct 09 13:26:38 2021 +0000
+++ b/multimedia/libaom/PLIST   Sat Oct 09 14:47:24 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/09/30 18:58:16 maya Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/10/09 14:47:24 nia Exp $
 bin/aomdec
 bin/aomenc
 include/aom/aom.h
@@ -10,6 +10,8 @@
 include/aom/aom_integer.h
 include/aom/aomcx.h
 include/aom/aomdx.h
+lib/libaom.a
 lib/libaom.so
-lib/libaom.so.0
+lib/libaom.so.3
+lib/libaom.so.${PKGVERSION}
 lib/pkgconfig/aom.pc
diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/distinfo
--- a/multimedia/libaom/distinfo        Sat Oct 09 13:26:38 2021 +0000
+++ b/multimedia/libaom/distinfo        Sat Oct 09 14:47:24 2021 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/10/07 14:32:09 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/10/09 14:47:24 nia Exp $
 
-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) = a35123870aa5b37fdf9ed4fed24a354d66098714
-SHA1 (patch-build_cmake_aom__optimization.cmake) = 56eda2e9e40cd20ce955ca311ded4a11f2ae3d1c
-SHA1 (patch-build_cmake_exports.cmake) = b64a36404b96a8ede42ac7419c28d2075c910395
-SHA1 (patch-build_cmake_version.cmake) = 37bf922fbf2a1aa412d2a47c054f42cff38ad4c3
+RMD160 (libaom/ce9a40ce01ade9d6fea1721c82645804a2f39b00.tar.gz) = 84b6410ea7e93c839575473e4a855d5f08735eec
+SHA512 (libaom/ce9a40ce01ade9d6fea1721c82645804a2f39b00.tar.gz) = c7d053390825068bccd5031915e0f790c1c1000bdf9f6c7c41dbeff65cc44d6f16ca64a05bb9e359849728fc98f74f0a24929ef08f290d1b04fa40efc0d4a5ae
+Size (libaom/ce9a40ce01ade9d6fea1721c82645804a2f39b00.tar.gz) = 4606141 bytes
+SHA1 (patch-build_cmake_aom__configure.cmake) = 87a8b65cee873f7deff18cd74c140cd7e8c95924
+SHA1 (patch-build_cmake_exports.cmake) = be181c5718a5fac75f31bd8e74f214fc8b610ad9
+SHA1 (patch-build_cmake_version.cmake) = 1e6b4a1373c0d54cafdc8ad5c153881e41758bd6
diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/patches/patch-aom_exports__com
--- a/multimedia/libaom/patches/patch-aom_exports__com  Sat Oct 09 13:26:38 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-aom_exports__com,v 1.1 2018/10/30 17:30:16 adam Exp $
-
-Add missing exports.
-
---- aom/exports_com.orig       2018-10-01 03:20:04.000000000 +0000
-+++ aom/exports_com
-@@ -9,15 +9,30 @@ text aom_codec_iface_name
- text aom_codec_version
- text aom_codec_version_extra_str
- text aom_codec_version_str
-+text aom_film_grain_table_append
-+text aom_film_grain_table_free
-+text aom_film_grain_table_write
-+text aom_flat_block_finder_init
-+text aom_flat_block_finder_run
- text aom_img_alloc
-+text aom_img_alloc_with_border
- text aom_img_flip
- text aom_img_free
--text aom_img_plane_width
- text aom_img_plane_height
-+text aom_img_plane_width
- text aom_img_set_rect
- text aom_img_wrap
--text aom_img_alloc_with_border
-+text aom_malloc
-+text aom_noise_model_get_grain_parameters
-+text aom_noise_model_init
-+text aom_noise_model_save_latest
-+text aom_noise_model_update
-+text aom_obu_type_to_string
-+text aom_read_obu_header
- text aom_uleb_decode
- text aom_uleb_encode
- text aom_uleb_encode_fixed_size
- text aom_uleb_size_in_bytes
-+text aom_wb_write_literal
-+text av1_add_film_grain
-+text av1_resize_frame420
diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
--- a/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake  Sat Oct 09 13:26:38 2021 +0000
+++ b/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake  Sat Oct 09 14:47:24 2021 +0000
@@ -1,39 +1,36 @@
-$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.3 2018/11/11 18:03:17 leot Exp $
+$NetBSD: patch-build_cmake_aom__configure.cmake,v 1.4 2021/10/09 14:47:24 nia Exp $
 
 - 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.orig       2021-10-09 07:54:04.000000000 +0000
 +++ build/cmake/aom_configure.cmake
-@@ -65,7 +65,11 @@ if(NOT AOM_TARGET_CPU)
+@@ -66,12 +66,16 @@ if(NOT AOM_TARGET_CPU)
+                     "      CMAKE_GENERATOR=${CMAKE_GENERATOR}\n")
      endif()
-   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i386" OR
-          "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")
+   elseif(cpu_lowercase STREQUAL "i386" OR cpu_lowercase STREQUAL "x86")
 -    set(AOM_TARGET_CPU "x86")
+-  elseif(cpu_lowercase MATCHES "^arm" OR cpu_lowercase MATCHES "^mips")
 +    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}")
-@@ -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()
++  elseif(cpu_lowercase MATCHES "^(arm|earm)" OR cpu_lowercase MATCHES "^mips")
+     set(AOM_TARGET_CPU "${cpu_lowercase}")
+   elseif(cpu_lowercase MATCHES "aarch64")
+     set(AOM_TARGET_CPU "arm64")
+-  elseif(cpu_lowercase MATCHES "^ppc")
++  elseif(cpu_lowercase MATCHES "^(ppc|powerpc)")
+     set(AOM_TARGET_CPU "ppc")
+   else()
+     message(WARNING "The architecture ${CMAKE_SYSTEM_PROCESSOR} is not "
+@@ -321,9 +325,6 @@ else()
      add_compiler_flag_if_supported("-Werror")
    endif()
  
--  if("${CMAKE_BUILD_TYPE}" MATCHES "Rel")
+-  if(build_type_lowercase MATCHES "rel")
 -    add_compiler_flag_if_supported("-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0")
 -  endif()
    add_compiler_flag_if_supported("-D_LARGEFILE_SOURCE")
diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/patches/patch-build_cmake_aom__optimization.cmake
--- a/multimedia/libaom/patches/patch-build_cmake_aom__optimization.cmake       Sat Oct 09 13:26:38 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-$NetBSD: patch-build_cmake_aom__optimization.cmake,v 1.1 2018/09/30 18:58:16 maya Exp $
-
-Assume everyone besides Darwin/Windows uses ELF.
-
---- build/cmake/aom_optimization.cmake.orig    2018-09-28 20:57:38.000000000 +0000
-+++ build/cmake/aom_optimization.cmake
-@@ -83,24 +83,20 @@ function(get_asm_obj_format out_format)
-   if("${AOM_TARGET_CPU}" STREQUAL "x86_64")
-     if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
-       set(objformat "macho64")
--    elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
--      set(objformat "elf64")
-     elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}"
-            STREQUAL "Windows")
-       set(objformat "win64")
-     else()
--      message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}")
-+      set(objformat "elf64")
-     endif()
-   elseif("${AOM_TARGET_CPU}" STREQUAL "x86")
-     if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
-       set(objformat "macho32")
--    elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
--      set(objformat "elf32")
-     elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}"
-            STREQUAL "Windows")
-       set(objformat "win32")
-     else()
--      message(FATAL_ERROR "Unknown obj format: ${AOM_TARGET_SYSTEM}")
-+      set(objformat "elf32")
-     endif()
-   else()
-     message(FATAL_ERROR
-@@ -171,7 +167,7 @@ function(test_nasm)
-         message(FATAL_ERROR
-                   "Unsupported nasm: macho32 object format not supported.")
-       endif()
--    elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
-+    else()
-       if(NOT "${nasm_helptext}" MATCHES "elf32")
-         message(FATAL_ERROR
-                   "Unsupported nasm: elf32 object format not supported.")
-@@ -183,7 +179,7 @@ function(test_nasm)
-         message(FATAL_ERROR
-                   "Unsupported nasm: macho64 object format not supported.")
-       endif()
--    elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
-+    else()
-       if(NOT "${nasm_helptext}" MATCHES "elf64")
-         message(FATAL_ERROR
-                   "Unsupported nasm: elf64 object format not supported.")
diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/patches/patch-build_cmake_exports.cmake
--- a/multimedia/libaom/patches/patch-build_cmake_exports.cmake Sat Oct 09 13:26:38 2021 +0000
+++ b/multimedia/libaom/patches/patch-build_cmake_exports.cmake Sat Oct 09 14:47:24 2021 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-build_cmake_exports.cmake,v 1.1 2018/10/23 17:30:21 jperkin Exp $
+$NetBSD: patch-build_cmake_exports.cmake,v 1.2 2021/10/09 14:47:24 nia 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.orig     2021-10-09 07:54:04.000000000 +0000
 +++ build/cmake/exports.cmake
-@@ -55,7 +55,7 @@ function(setup_exports_target)
+@@ -66,7 +66,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
+     set_property(TARGET aom
+                  APPEND_STRING
                   PROPERTY LINK_FLAGS "-Wl,--version-script,${aom_sym_file}")
-   endif()
diff -r 57c76d71cea9 -r f0afe37215c3 multimedia/libaom/patches/patch-build_cmake_version.cmake
--- a/multimedia/libaom/patches/patch-build_cmake_version.cmake Sat Oct 09 13:26:38 2021 +0000
+++ b/multimedia/libaom/patches/patch-build_cmake_version.cmake Sat Oct 09 14:47:24 2021 +0000
@@ -1,13 +1,36 @@
-$NetBSD: patch-build_cmake_version.cmake,v 1.1 2018/11/07 13:08:29 ryoon Exp $
+$NetBSD: patch-build_cmake_version.cmake,v 1.2 2021/10/09 14:47:24 nia Exp $
 
---- build/cmake/version.cmake.orig     2018-10-01 03:20:05.000000000 +0000
+Write the correct version number in the aom.pc file.
+
+--- build/cmake/version.cmake.orig     2021-10-09 07:54:04.000000000 +0000
 +++ build/cmake/version.cmake
-@@ -36,7 +36,7 @@ if(EXISTS "${GIT_EXECUTABLE}")
- endif()
+@@ -23,28 +23,8 @@ include("${AOM_ROOT}/build/cmake/util.cm
+ 
+ # Generate the version string for this run.
+ unset(aom_version)
+-if(EXISTS "${GIT_EXECUTABLE}")
+-  execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${AOM_ROOT}/.git describe
+-                  OUTPUT_VARIABLE aom_version
+-                  ERROR_QUIET
+-                  RESULT_VARIABLE version_check_result)
  
- if("${aom_version}" STREQUAL "")
+-  if(${version_check_result} EQUAL 0)
+-    string(STRIP "${aom_version}" aom_version)
+-
+-    # Remove the leading 'v' from the version string.
+-    string(FIND "${aom_version}" "v" v_pos)
+-    if(${v_pos} EQUAL 0)
+-      string(SUBSTRING "${aom_version}" 1 -1 aom_version)
+-    endif()
+-  else()
+-    set(aom_version "")
+-  endif()
+-endif()
+-
+-if("${aom_version}" STREQUAL "")
 -  set(aom_version "${AOM_ROOT}/CHANGELOG")
-+  set(aom_version "@PKGVERSION_NOREV@")
- endif()
+-endif()
++set(aom_version "@PKGVERSION_NOREV@")
  
  unset(last_aom_version)
+ set(version_file "${AOM_CONFIG_DIR}/config/aom_version.h")
Prev by Date: [pkgsrc/pkgsrc-2021Q3]: pkgsrc/www Pullup ticket #6508 - requested by nia
Next by Date: [pkgsrc/trunk]: pkgsrc Recursive revbump for multimedia/libaom
Previous by Thread: [pkgsrc/pkgsrc-2021Q3]: pkgsrc/www Pullup ticket #6508 - requested by nia
Next by Thread: [pkgsrc/trunk]: pkgsrc Recursive revbump for multimedia/libaom
Indexes:
Home | Main Index | Thread Index | Old Index