From d279eb7f52ca84807612d547e322048cac793a44 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 4 Oct 2022 11:30:19 +0000
Subject: [PATCH] update to libvpx-1.12.0, from Brad (maintainer)

---
 multimedia/libvpx/Makefile                          |  5 ++---
 multimedia/libvpx/distinfo                          |  4 ++--
 multimedia/libvpx/patches/patch-build_make_Makefile |  4 ++--
 multimedia/libvpx/patches/patch-configure           | 10 +++++-----
 multimedia/libvpx/patches/patch-libs_mk             |  4 ++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 87238c46a6a..9b559f7fcbd 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -2,12 +2,11 @@ COMMENT=	Google VP8/VP9 video codec
 
 GH_ACCOUNT=	webmproject
 GH_PROJECT=	libvpx
-GH_TAGNAME=	v1.11.0
-REVISION=	1
+GH_TAGNAME=	v1.12.0
 EPOCH=		0
 CATEGORIES=	multimedia
 
-SHARED_LIBS=	vpx	14.0
+SHARED_LIBS=	vpx	15.0
 
 HOMEPAGE=	https://www.webmproject.org/
 
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index acea4520d4d..d56b2efa0af 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvpx-1.11.0.tar.gz) = ll5RyRrZhR4jN668wPUXRAxjfFBvOgOUgGLj1eoSmoM=
-SIZE (libvpx-1.11.0.tar.gz) = 5347256
+SHA256 (libvpx-1.12.0.tar.gz) = 8azBXQ/Qy0MfS/bqwy1eky5A6hGG/njgdCVNbQA5V7s=
+SIZE (libvpx-1.12.0.tar.gz) = 5465627
diff --git a/multimedia/libvpx/patches/patch-build_make_Makefile b/multimedia/libvpx/patches/patch-build_make_Makefile
index ae59b194317..6288e27992f 100644
--- a/multimedia/libvpx/patches/patch-build_make_Makefile
+++ b/multimedia/libvpx/patches/patch-build_make_Makefile
@@ -1,7 +1,7 @@
 Index: build/make/Makefile
 --- build/make/Makefile.orig
 +++ build/make/Makefile
-@@ -306,8 +306,7 @@ define so_template
+@@ -312,8 +312,7 @@ define so_template
  # This needs further abstraction for dealing with non-GNU linkers.
  $(1):
  	$(if $(quiet),@echo "    [LD] $$@")
@@ -11,7 +11,7 @@ Index: build/make/Makefile
              -Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
              $$(filter %.o,$$^) $$(extralibs)
  endef
-@@ -392,7 +391,7 @@ LIBS=$(call enabled,LIBS)
+@@ -398,7 +397,7 @@ LIBS=$(call enabled,LIBS)
  .libs: $(LIBS)
  	@touch $@
  $(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
diff --git a/multimedia/libvpx/patches/patch-configure b/multimedia/libvpx/patches/patch-configure
index 94be9d51d50..665179d72ba 100644
--- a/multimedia/libvpx/patches/patch-configure
+++ b/multimedia/libvpx/patches/patch-configure
@@ -1,8 +1,8 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -115,7 +115,9 @@ all_platforms="${all_platforms} armv7s-darwin-gcc"
- all_platforms="${all_platforms} armv8-linux-gcc"
+@@ -118,7 +118,9 @@ 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} mips64-linux-gcc"
 +all_platforms="${all_platforms} ppc-linux-gcc"
@@ -11,7 +11,7 @@ Index: configure
  all_platforms="${all_platforms} sparc-solaris-gcc"
  all_platforms="${all_platforms} x86-android-gcc"
  all_platforms="${all_platforms} x86-darwin8-gcc"
-@@ -171,7 +173,7 @@ for t in ${all_targets}; do
+@@ -177,7 +179,7 @@ for t in ${all_targets}; do
      [ -f "${source_path}/${t}.mk" ] && enable_feature ${t}
  done
  
@@ -20,7 +20,7 @@ Index: configure
    die "diff missing: Try installing diffutils via your package manager."
  fi
  
-@@ -186,19 +188,6 @@ if [ "`cd \"${source_path}\" && pwd`" != "`pwd`" ]; th
+@@ -192,19 +194,6 @@ if [ "`cd \"${source_path}\" && pwd`" != "`pwd`" ]; th
    fi
  fi
  
@@ -40,7 +40,7 @@ Index: configure
  # disable codecs when their source directory does not exist
  [ -d "${source_path}/vp8" ] || disable_codec vp8
  [ -d "${source_path}/vp9" ] || disable_codec vp9
-@@ -533,7 +522,7 @@ process_detect() {
+@@ -542,7 +531,7 @@ process_detect() {
          # here rather than at option parse time because the target auto-detect
          # magic happens after the command line has been parsed.
          case "${tgt_os}" in
diff --git a/multimedia/libvpx/patches/patch-libs_mk b/multimedia/libvpx/patches/patch-libs_mk
index 298a9853422..39e36017218 100644
--- a/multimedia/libvpx/patches/patch-libs_mk
+++ b/multimedia/libvpx/patches/patch-libs_mk
@@ -1,7 +1,7 @@
 Index: libs.mk
 --- libs.mk.orig
 +++ libs.mk
-@@ -322,22 +322,17 @@ EXPORT_FILE             := libvpx.def
+@@ -335,22 +335,17 @@ EXPORT_FILE             := libvpx.def
  LIBVPX_SO_SYMLINKS      :=
  LIBVPX_SO_IMPLIB        := libvpx_dll.a
  else
@@ -25,7 +25,7 @@ Index: libs.mk
  $(BUILD_PFX)$(LIBVPX_SO): EXPORTS_FILE = $(EXPORT_FILE)
  
  libvpx.def: $(call enabled,CODEC_EXPORTS)
-@@ -360,15 +355,7 @@ $(1): $(2)
+@@ -373,15 +368,7 @@ $(1): $(2)
  	$(qexec)ln -sf $(2) $$@
  endef