CVS commit: pkgsrc/multimedia/libvpx

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jul 15 11:04:33 UTC 2022

Modified Files:
        pkgsrc/multimedia/libvpx: Makefile distinfo
        pkgsrc/multimedia/libvpx/patches: patch-build_make_configure.sh
            patch-configure patch-libs.mk

Log Message:
libvpx: updated to 1.12.0

v1.12.0 "Torrent Duck"
  This release adds optimizations for Loongarch, adds support for vp8 in the
  real-time rate control library, upgrades GoogleTest to v1.11.0, updates
  libwebm to libwebm-1.0.0.28-20-g206d268, and includes numerous bug fixes.

  - Upgrading:
    This release is ABI compatible with the previous release.

    vp8 support in the real-time rate control library.
    New codec control VP8E_SET_RTC_EXTERNAL_RATECTRL is added.

    Configure support for darwin21 is added.

    GoogleTest is upgraded to v1.11.0.

    libwebm is updated to libwebm-1.0.0.28-20-g206d268.

    Allow SimpleEncode environment to take target level as input to match
    the level conformance in vp9.

  - Enhancement:
    Numerous improvements on checking memory allocations.
    Optimizations for Loongarch.
    Code clean-up.

  - Bug fixes:
    Fix to a crash related to {vp8/vp9}_set_roi_map.
    Fix to compiling failure with -Wformat-nonliteral.
    Fix to integer overflow with vp9 with high resolution content.
    Fix to AddNoiseTest failure with ARMv7.
    Fix to libvpx Null-dereference READ in vp8.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/multimedia/libvpx/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/multimedia/libvpx/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/multimedia/libvpx/patches/patch-build_make_configure.sh
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/libvpx/patches/patch-configure
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/libvpx/patches/patch-libs.mk

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

Modified files:

Index: pkgsrc/multimedia/libvpx/Makefile
diff -u pkgsrc/multimedia/libvpx/Makefile:1.94 pkgsrc/multimedia/libvpx/Makefile:1.95
--- pkgsrc/multimedia/libvpx/Makefile:1.94      Tue Jun 28 11:34:56 2022
+++ pkgsrc/multimedia/libvpx/Makefile   Fri Jul 15 11:04:33 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.94 2022/06/28 11:34:56 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2022/07/15 11:04:33 adam Exp $
 
-DISTNAME=      libvpx-1.11.0
-PKGREVISION=   1
+DISTNAME=      libvpx-1.12.0
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=webmproject/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/multimedia/libvpx/distinfo
diff -u pkgsrc/multimedia/libvpx/distinfo:1.45 pkgsrc/multimedia/libvpx/distinfo:1.46
--- pkgsrc/multimedia/libvpx/distinfo:1.45      Mon Nov  1 20:06:46 2021
+++ pkgsrc/multimedia/libvpx/distinfo   Fri Jul 15 11:04:33 2022
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.45 2021/11/01 20:06:46 wiz Exp $
+$NetBSD: distinfo,v 1.46 2022/07/15 11:04:33 adam Exp $
 
-BLAKE2s (libvpx-1.11.0.tar.gz) = ada5a68c472be5f3c528e2565834b54d93e10220dcd5d15c7f24296087f1391d
-SHA512 (libvpx-1.11.0.tar.gz) = 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5
-Size (libvpx-1.11.0.tar.gz) = 5347256 bytes
+BLAKE2s (libvpx-1.12.0.tar.gz) = 019b0ed78ffbc9c29de956e59548025c372bf0c4373c9006c325417150f2563d
+SHA512 (libvpx-1.12.0.tar.gz) = dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
+Size (libvpx-1.12.0.tar.gz) = 5465627 bytes
 SHA1 (patch-build_make_Makefile) = 908b1abc8c5eed56e920f442f8f1f80c49838a6f
-SHA1 (patch-build_make_configure.sh) = ec0235cc29830b7e2619885dda2abdadbe5f2417
+SHA1 (patch-build_make_configure.sh) = 018bb2333f1de509a81ae4c7b390076043f18118
 SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6
-SHA1 (patch-configure) = 738871dc9ffa44a809e594849915a875a97ac40b
+SHA1 (patch-configure) = aeb5bfd9d58b06b4f2fdbdb8c73b03339de313e7
 SHA1 (patch-examples.mk) = 17410f43ff9952d616be3211ca697f37c107610a
-SHA1 (patch-libs.mk) = 2eff62fd8080eeb9315793cc0dc93cbb485cc33d
+SHA1 (patch-libs.mk) = 9ddc9cb6c09c9eefce59072c2a657bc5b7e1d295

Index: pkgsrc/multimedia/libvpx/patches/patch-build_make_configure.sh
diff -u pkgsrc/multimedia/libvpx/patches/patch-build_make_configure.sh:1.2 pkgsrc/multimedia/libvpx/patches/patch-build_make_configure.sh:1.3
--- pkgsrc/multimedia/libvpx/patches/patch-build_make_configure.sh:1.2  Wed Apr 14 07:02:49 2021
+++ pkgsrc/multimedia/libvpx/patches/patch-build_make_configure.sh      Fri Jul 15 11:04:33 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-build_make_configure.sh,v 1.2 2021/04/14 07:02:49 adam Exp $
+$NetBSD: patch-build_make_configure.sh,v 1.3 2022/07/15 11:04:33 adam Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
@@ -6,9 +6,9 @@ All sparc cpus can not do unaligned acce
 Detect NetBSD ARMv7 hardfloat toolchain.
 Recognize powerpc as a target ISA, so we don't end up with generic-gnu
 
---- build/make/configure.sh.orig       2019-02-04 17:02:33.000000000 +0000
+--- build/make/configure.sh.orig       2022-06-28 19:00:48.000000000 +0000
 +++ build/make/configure.sh
-@@ -740,7 +740,7 @@ process_common_toolchain() {
+@@ -751,7 +751,7 @@ process_common_toolchain() {
        aarch64*)
          tgt_isa=arm64
          ;;
@@ -17,9 +17,9 @@ Recognize powerpc as a target ISA, so we
          tgt_isa=armv7
          float_abi=hard
          ;;
-@@ -766,6 +766,9 @@ process_common_toolchain() {
-       *mips32el*)
-         tgt_isa=mips32
+@@ -783,6 +783,9 @@ process_common_toolchain() {
+       loongarch64*)
+         tgt_isa=loongarch64
          ;;
 +      *powerpc*)
 +      tgt_isa=powerpc
@@ -27,7 +27,7 @@ Recognize powerpc as a target ISA, so we
      esac
  
      # detect tgt_os
-@@ -812,7 +815,7 @@ process_common_toolchain() {
+@@ -805,7 +808,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32
          ;;
@@ -36,9 +36,9 @@ Recognize powerpc as a target ISA, so we
          tgt_os=linux
          ;;
        *solaris2.10)
-@@ -858,6 +861,9 @@ process_common_toolchain() {
-     ppc*)
-       enable_feature ppc
+@@ -856,6 +859,9 @@ process_common_toolchain() {
+       soft_enable lasx
+       enable_feature loongarch
        ;;
 +    sparc*)
 +      disable_feature fast_unaligned
@@ -46,7 +46,7 @@ Recognize powerpc as a target ISA, so we
    esac
  
    # PIC is probably what we want when building shared libs
-@@ -1530,7 +1536,7 @@ EOF
+@@ -1506,7 +1512,7 @@ EOF
    check_cc <<EOF
  unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
@@ -55,7 +55,7 @@ Recognize powerpc as a target ISA, so we
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
      # Try to find which inline keywords are supported
-@@ -1547,7 +1553,7 @@ EOF
+@@ -1523,7 +1529,7 @@ EOF
          # bionic includes basic pthread functionality, obviating -lpthread.
          ;;
        *)

Index: pkgsrc/multimedia/libvpx/patches/patch-configure
diff -u pkgsrc/multimedia/libvpx/patches/patch-configure:1.8 pkgsrc/multimedia/libvpx/patches/patch-configure:1.9
--- pkgsrc/multimedia/libvpx/patches/patch-configure:1.8        Tue Feb 12 20:47:14 2019
+++ pkgsrc/multimedia/libvpx/patches/patch-configure    Fri Jul 15 11:04:33 2022
@@ -1,21 +1,21 @@
-$NetBSD: patch-configure,v 1.8 2019/02/12 20:47:14 adam Exp $
+$NetBSD: patch-configure,v 1.9 2022/07/15 11:04:33 adam Exp $
 
 Recognize sparc and powerpc linux (or BSD...) platforms.
 Don't do doxygen.
 Remove bogus diff check.
 
---- configure.orig     2019-02-04 17:02:33.000000000 +0000
+--- configure.orig     2022-06-28 19:00:48.000000000 +0000
 +++ configure
-@@ -114,6 +114,8 @@ all_platforms="${all_platforms} armv7-wi
- all_platforms="${all_platforms} armv7s-darwin-gcc"
- all_platforms="${all_platforms} armv8-linux-gcc"
+@@ -117,6 +117,8 @@ all_platforms="${all_platforms} armv8-li
+ all_platforms="${all_platforms} loongarch32-linux-gcc"
+ all_platforms="${all_platforms} loongarch64-linux-gcc"
  all_platforms="${all_platforms} mips32-linux-gcc"
 +all_platforms="${all_platforms} powerpc-linux-gcc"
 +all_platforms="${all_platforms} sparc-linux-gcc"
  all_platforms="${all_platforms} mips64-linux-gcc"
  all_platforms="${all_platforms} ppc64le-linux-gcc"
  all_platforms="${all_platforms} sparc-solaris-gcc"
-@@ -166,9 +168,6 @@ for t in ${all_targets}; do
+@@ -177,9 +179,6 @@ for t in ${all_targets}; do
      [ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
  done
  
@@ -25,7 +25,7 @@ Remove bogus diff check.
  
  if ! perl --version >/dev/null; then
      die "Perl is required to build"
-@@ -181,19 +180,6 @@ if [ "`cd \"${source_path}\" && pwd`" !=
+@@ -192,19 +191,6 @@ if [ "`cd \"${source_path}\" && pwd`" !=
    fi
  fi
  

Index: pkgsrc/multimedia/libvpx/patches/patch-libs.mk
diff -u pkgsrc/multimedia/libvpx/patches/patch-libs.mk:1.6 pkgsrc/multimedia/libvpx/patches/patch-libs.mk:1.7
--- pkgsrc/multimedia/libvpx/patches/patch-libs.mk:1.6  Wed Apr 14 07:02:49 2021
+++ pkgsrc/multimedia/libvpx/patches/patch-libs.mk      Fri Jul 15 11:04:33 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-libs.mk,v 1.6 2021/04/14 07:02:49 adam Exp $
+$NetBSD: patch-libs.mk,v 1.7 2022/07/15 11:04:33 adam Exp $
 
 Do not install debug library.
 
---- libs.mk.orig       2021-03-18 19:59:46.000000000 +0000
+--- libs.mk.orig       2022-06-28 19:00:48.000000000 +0000
 +++ libs.mk
-@@ -174,7 +174,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea
+@@ -187,7 +187,6 @@ INSTALL-LIBS-$(CONFIG_SHARED) += $(forea
  endif
  else
  INSTALL-LIBS-$(CONFIG_STATIC) += $(LIBSUBDIR)/libvpx.a
@@ -12,7 +12,7 @@ Do not install debug library.
  endif
  
  ifeq ($(CONFIG_VP9_ENCODER)$(CONFIG_RATE_CTRL),yesyes)
-@@ -284,8 +283,8 @@ endif # ifeq ($(CONFIG_MSVS),yes)
+@@ -297,8 +296,8 @@ endif # ifeq ($(CONFIG_MSVS),yes)
  else # ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  LIBVPX_OBJS=$(call objs, $(filter-out $(ASM_INCLUDES), $(CODEC_SRCS)))
  OBJS-yes += $(LIBVPX_OBJS)
@@ -23,14 +23,14 @@ Do not install debug library.
  
  # Updating version info.
  # https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-@@ -402,15 +401,15 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
-   RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
+@@ -414,15 +413,15 @@ CLEAN-OBJS += vpx.pc
+ ifeq ($(CONFIG_ENCODERS),yes)
    RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
    OBJS-yes += $(RC_RTC_OBJS)
--  LIBS-yes += $(BUILD_PFX)libvp9rc.a $(BUILD_PFX)libvp9rc_g.a
--  $(BUILD_PFX)libvp9rc_g.a: $(RC_RTC_OBJS)
-+  LIBS-yes += $(BUILD_PFX)libvp9rc.a
-+  $(BUILD_PFX)libvp9rc.a: $(RC_RTC_OBJS)
+-  LIBS-yes += $(BUILD_PFX)libvpxrc.a $(BUILD_PFX)libvpxrc_g.a
+-  $(BUILD_PFX)libvpxrc_g.a: $(RC_RTC_OBJS)
++  LIBS-yes += $(BUILD_PFX)libvpxrc.a
++  $(BUILD_PFX)libvpxrc.a: $(RC_RTC_OBJS)
  endif
  
  ifeq ($(CONFIG_VP9_ENCODER)$(CONFIG_RATE_CTRL),yesyes)