CVS commit: pkgsrc/multimedia/libaom

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/libaom
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sat, 9 Oct 2021 14:47:24 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Oct  9 14:47:24 UTC 2021

Modified Files:
        pkgsrc/multimedia/libaom: Makefile PLIST distinfo
        pkgsrc/multimedia/libaom/patches:
            patch-build_cmake_aom__configure.cmake
            patch-build_cmake_exports.cmake patch-build_cmake_version.cmake
Removed Files:
        pkgsrc/multimedia/libaom/patches: patch-aom_exports__com
            patch-build_cmake_aom__optimization.cmake

Log Message:
libaom: update to 3.1.3

This includes various bug fixes and improvements to the encoder.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/libaom/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/libaom/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/libaom/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/multimedia/libaom/patches/patch-aom_exports__com \
    pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__optimization.cmake
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake \
    pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.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/Makefile
diff -u pkgsrc/multimedia/libaom/Makefile:1.14 pkgsrc/multimedia/libaom/Makefile:1.15
--- pkgsrc/multimedia/libaom/Makefile:1.14      Mon Jun 28 11:52:41 2021
+++ pkgsrc/multimedia/libaom/Makefile   Sat Oct  9 14:47:24 2021
@@ -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 @@ CMAKE_ARGS+=  -DENABLE_NASM:BOOL=ON
 TOOL_DEPENDS+= nasm>=2.13:../../devel/nasm
 .endif
 
+PKGCONFIG_OVERRIDE_STAGE=      pre-install
+PKGCONFIG_OVERRIDE+=           build/aom.pc
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/libaom/PLIST
diff -u pkgsrc/multimedia/libaom/PLIST:1.1 pkgsrc/multimedia/libaom/PLIST:1.2
--- pkgsrc/multimedia/libaom/PLIST:1.1  Sun Sep 30 18:58:16 2018
+++ pkgsrc/multimedia/libaom/PLIST      Sat Oct  9 14:47:24 2021
@@ -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_image.h
 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

Index: pkgsrc/multimedia/libaom/distinfo
diff -u pkgsrc/multimedia/libaom/distinfo:1.7 pkgsrc/multimedia/libaom/distinfo:1.8
--- pkgsrc/multimedia/libaom/distinfo:1.7       Thu Oct  7 14:32:09 2021
+++ pkgsrc/multimedia/libaom/distinfo   Sat Oct  9 14:47:24 2021
@@ -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

Index: pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake
diff -u pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake:1.3 pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake:1.4
--- pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake:1.3 Sun Nov 11 18:03:17 2018
+++ pkgsrc/multimedia/libaom/patches/patch-build_cmake_aom__configure.cmake     Sat Oct  9 14:47:24 2021
@@ -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")

Index: pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake
diff -u pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake:1.1 pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake:1.2
--- pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake:1.1        Tue Oct 23 17:30:21 2018
+++ pkgsrc/multimedia/libaom/patches/patch-build_cmake_exports.cmake    Sat Oct  9 14:47:24 2021
@@ -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()
Index: pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake
diff -u pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake:1.1 pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake:1.2
--- pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake:1.1        Wed Nov  7 13:08:29 2018
+++ pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake    Sat Oct  9 14:47:24 2021
@@ -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: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index