 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.102 2023/11/09 16:48:03 nia Exp $
+# $NetBSD: Makefile,v 1.103 2024/01/22 13:09:26 ryoon Exp $
-DISTNAME=	libvpx-1.13.1
+DISTNAME=	libvpx-1.14.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GITHUB:=webmproject/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 MAINTAINER=	ryoon@NetBSD.org
 HOMEPAGE=	https://chromium.googlesource.com/webm/libvpx
 COMMENT=	On2 VP8/VP9 video codec library from Google
 LICENSE=	modified-bsd
 USE_LANGUAGES=		c c++
 USE_CXX_FEATURES+=	c++11
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake bash:build perl:build

 @@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.7 2021/04/14 07:02:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2024/01/22 13:09:26 ryoon Exp $
 bin/vpxdec
 bin/vpxenc
 include/vpx/vp8.h
 include/vpx/vp8cx.h
 include/vpx/vp8dx.h
 include/vpx/vpx_codec.h
 include/vpx/vpx_decoder.h
 include/vpx/vpx_encoder.h
 include/vpx/vpx_ext_ratectrl.h
 include/vpx/vpx_frame_buffer.h
 include/vpx/vpx_image.h
 include/vpx/vpx_integer.h
 include/vpx/vpx_tpl.h
 lib/libvpx.la
 lib/pkgconfig/vpx.pc

 @@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2023/07/18 18:34:31 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2024/01/22 13:09:26 ryoon Exp $
 BUILDLINK_TREE+=	libvpx
 .if !defined(LIBVPX_BUILDLINK3_MK)
 LIBVPX_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.6.0
+BUILDLINK_API_DEPENDS.libvpx+=	libvpx>=1.14.0
-BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.11.0nb1
+BUILDLINK_ABI_DEPENDS.libvpx+=	libvpx>=1.14.0
 BUILDLINK_PKGSRCDIR.libvpx?=	../../multimedia/libvpx
 USE_CXX_FEATURES+=	c++11
 .include "../../mk/pthread.buildlink3.mk"
 .endif # LIBVPX_BUILDLINK3_MK
 BUILDLINK_TREE+=	-libvpx

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.49 2023/10/01 08:20:19 wiz Exp $
+$NetBSD: distinfo,v 1.50 2024/01/22 13:09:26 ryoon Exp $
-BLAKE2s (libvpx-1.13.1.tar.gz) = 43dd93abcb6ca410aab9393ae5dd408ac2736aeba0f54f681acdc8e416769e79
+BLAKE2s (libvpx-1.14.0.tar.gz) = 3a33d153ec455c2cb72951ca89ef04fdb1caf9d72f2f5e61bf3652950f61d51b
-SHA512 (libvpx-1.13.1.tar.gz) = 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897
+SHA512 (libvpx-1.14.0.tar.gz) = 724150c5cafa934e0a8dd9aebbab8afd25aa4f584734e0de37837ec2e8bdcbd9390acd7f883665be7ecdc27af93afda737a4dea7e3bd7531abffcc5bb7c2c7d2
-Size (libvpx-1.13.1.tar.gz) = 5515662 bytes
+Size (libvpx-1.14.0.tar.gz) = 5606471 bytes
-SHA1 (patch-build_make_Makefile) = 908b1abc8c5eed56e920f442f8f1f80c49838a6f
+SHA1 (patch-build_make_Makefile) = f36e7addd3e26536e80f806e1bf759a9a72b4ce8
-SHA1 (patch-build_make_configure.sh) = 018bb2333f1de509a81ae4c7b390076043f18118
+SHA1 (patch-build_make_configure.sh) = ef4247ed3712ed81654f465f813160685dc09e8b
 SHA1 (patch-configure) = aeb5bfd9d58b06b4f2fdbdb8c73b03339de313e7
 SHA1 (patch-examples.mk) = 17410f43ff9952d616be3211ca697f37c107610a
 SHA1 (patch-libs.mk) = 9ddc9cb6c09c9eefce59072c2a657bc5b7e1d295

 @@ -1,130 +1,130 @@
-$NetBSD: patch-build_make_Makefile,v 1.2 2020/01/28 19:20:09 adam Exp $
+$NetBSD: patch-build_make_Makefile,v 1.3 2024/01/22 13:09:26 ryoon Exp $
---- build/make/Makefile.orig	2017-01-12 20:27:27.000000000 +0000
+--- build/make/Makefile.orig	2024-01-09 21:12:22.000000000 +0000
 +++ build/make/Makefile
-@@ -147,7 +147,7 @@ $(BUILD_PFX)%.c.d: %.c
+@@ -173,7 +173,7 @@ $(BUILD_PFX)%.c.d: %.c
  $(BUILD_PFX)%.c.o: %.c
  	$(if $(quiet),@echo "    [CC] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile $(CC) $(INTERNAL_CFLAGS) $(CFLAGS) -c -o $@ $<
  $(BUILD_PFX)%.cc.d: %.cc
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -157,7 +157,7 @@ $(BUILD_PFX)%.cc.d: %.cc
+@@ -183,7 +183,7 @@ $(BUILD_PFX)%.cc.d: %.cc
  $(BUILD_PFX)%.cc.o: %.cc
  	$(if $(quiet),@echo "    [CXX] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile $(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
  $(BUILD_PFX)%.cpp.d: %.cpp
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -167,7 +167,7 @@ $(BUILD_PFX)%.cpp.d: %.cpp
+@@ -193,7 +193,7 @@ $(BUILD_PFX)%.cpp.d: %.cpp
  $(BUILD_PFX)%.cpp.o: %.cpp
  	$(if $(quiet),@echo "    [CXX] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile $(CXX) $(INTERNAL_CFLAGS) $(CXXFLAGS) -c -o $@ $<
  $(BUILD_PFX)%.asm.d: %.asm
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -178,7 +178,8 @@ $(BUILD_PFX)%.asm.d: %.asm
+@@ -204,7 +204,8 @@ $(BUILD_PFX)%.asm.d: %.asm
  $(BUILD_PFX)%.asm.o: %.asm
  	$(if $(quiet),@echo "    [AS] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
 +		$(AS) $(ASFLAGS) -o $@ $<
  $(BUILD_PFX)%.S.d: %.S
  	$(if $(quiet),@echo "    [DEP] $@")
-@@ -189,7 +190,8 @@ $(BUILD_PFX)%.S.d: %.S
+@@ -215,7 +216,8 @@ $(BUILD_PFX)%.S.d: %.S
  $(BUILD_PFX)%.S.o: %.S
  	$(if $(quiet),@echo "    [AS] $@")
  	$(qexec)$(if $(CONFIG_DEPENDENCY_TRACKING),,mkdir -p $(dir $@))
 -	$(qexec)$(AS) $(ASFLAGS) -o $@ $<
 +	$(qexec)${LIBTOOL} --mode=compile --tag=CC sh strip_fPIC.sh \
 +		$(AS) $(ASFLAGS) -o $@ $<
  .PRECIOUS: %.c.S
  %.c.S: CFLAGS += -DINLINE_ASM
-@@ -254,13 +256,15 @@ define linker_template
+@@ -280,13 +282,15 @@ define linker_template
  $(1): $(filter-out -%,$(2))
  $(1):
  	$(if $(quiet),@echo    "    [LD] $$@")
 -	$(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
 +	$(qexec)${LIBTOOL} --mode=link $(CXX) $(LDFLAGS) -o $$@ \
 +		$$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
  endef
  define linkerxx_template
  $(1): $(filter-out -%,$(2))
  $(1):
  	$(if $(quiet),@echo    "    [LD] $$@")
 -	$(qexec)$$(CXX) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
 +	$(qexec)${LIBTOOL} --mode=link ${CXX} $(LDFLAGS) -o $$@ \
 +		$$(filter-out -lvpx,$(2)) libvpx.la $$(extralibs)
  endef
  # make-3.80 has a bug with expanding large input strings to the eval function,
  # which was triggered in some cases by the following component of
-@@ -273,8 +277,12 @@ endef
+@@ -299,8 +303,12 @@ endef
  define install_map_template
  $(DIST_DIR)/$(1): $(2)
  	$(if $(quiet),@echo "    [INSTALL] $$@")
 -	$(qexec)mkdir -p $$(dir $$@)
 -	$(qexec)cp -p $$< $$@
 +	$(qexec)${BSD_INSTALL_DATA} -d -m 755 $$(dir $$@)
 +	$$(if $$(filter %.a,$$<), \
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c $$(patsubst %.a,%.la,$$<) $$(dir $$@), \
 +	$$(if $$(filter %.h %.pc,$$<), \
 +	${BSD_INSTALL_DATA} -c -m 644 $$< $$(dir $$@), \
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} -c -s $$< $$(dir $$@)))
  endef
  define archive_template
-@@ -283,7 +291,9 @@ define archive_template
+@@ -309,7 +317,9 @@ define archive_template
  # for creating them.
  $(1):
  	$(if $(quiet),@echo "    [AR] $$@")
 -	$(qexec)$$(AR) $$(ARFLAGS) $$@ $$^
 +	$(qexec)${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -Wl,-Bsymbolic -o $$(patsubst %.a,%.la,$$@) \
 +		$$(patsubst %.o,%.lo,$$?) -rpath $(PREFIX)/lib $$(extralibs) \
 +		-version-info $(VERSION_MAJOR):$(VERSION_MINOR)
  endef
- define so_template
+ # Don't use -Wl,-z,defs with Clang's sanitizers.
-@@ -377,9 +387,9 @@ clean::
+@@ -417,9 +427,9 @@ clean::
  	rm -f .bins .install-bins $(BINS)
  LIBS=$(call enabled,LIBS)
 -.libs: $(LIBS)
 +dot.libs: $(LIBS)
  	@touch $@
 -$(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
 +$(foreach lib,$(filter %.a,$(LIBS)),$(eval $(call archive_template,$(lib))))
  $(foreach lib,$(filter %so.$(SO_VERSION_MAJOR).$(SO_VERSION_MINOR).$(SO_VERSION_PATCH),$(LIBS)),$(eval $(call so_template,$(lib))))
  $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dylib,$(LIBS)),$(eval $(call dl_template,$(lib))))
  $(foreach lib,$(filter %$(SO_VERSION_MAJOR).dll,$(LIBS)),$(eval $(call dll_template,$(lib))))
-@@ -388,11 +398,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_
+@@ -428,11 +438,11 @@ INSTALL-LIBS=$(call cond_enabled,CONFIG_
  ifeq ($(MAKECMDGOALS),dist)
  INSTALL-LIBS+=$(call cond_enabled,CONFIG_INSTALL_LIBS,DIST-LIBS)
  endif
 -.install-libs: .libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
 +.install-libs: dot.libs $(addprefix $(DIST_DIR)/,$(INSTALL-LIBS))
  	@touch $@
  clean::
 -	rm -f .libs .install-libs $(LIBS)
 +	rm -f dot.libs .install-libs $(LIBS)
  ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
  PROJECTS=$(call enabled,PROJECTS)
-@@ -442,7 +452,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
+@@ -482,7 +492,7 @@ ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
      BUILD_TARGETS += .projects
      INSTALL_TARGETS += .install-projects
  endif
 -BUILD_TARGETS += .docs .libs .bins
 +BUILD_TARGETS += .docs dot.libs .bins
  INSTALL_TARGETS += .install-docs .install-srcs .install-libs .install-bins
  all: $(BUILD_TARGETS)
  install:: $(INSTALL_TARGETS)

 @@ -1,66 +1,66 @@
-$NetBSD: patch-build_make_configure.sh,v 1.3 2022/07/15 11:04:33 adam Exp $
+$NetBSD: patch-build_make_configure.sh,v 1.4 2024/01/22 13:09:26 ryoon Exp $
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
 All sparc cpus can not do unaligned access.
 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	2022-06-28 19:00:48.000000000 +0000
+--- build/make/configure.sh.orig	2024-01-09 21:12:22.000000000 +0000
 +++ build/make/configure.sh
-@@ -751,7 +751,7 @@ process_common_toolchain() {
+@@ -752,7 +752,7 @@ process_common_toolchain() {
        aarch64*)
          tgt_isa=arm64
          ;;
 -      armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf)
 +      armv7*-hardfloat* | armv7*-gnueabihf | arm-*-gnueabihf | armv7*-netbsd*-*hf)
          tgt_isa=armv7
          float_abi=hard
          ;;
-@@ -783,6 +783,9 @@ process_common_toolchain() {
+@@ -784,6 +784,9 @@ process_common_toolchain() {
        loongarch64*)
          tgt_isa=loongarch64
          ;;
 +      *powerpc*)
 +	tgt_isa=powerpc
 +	;;
      esac
      # detect tgt_os
-@@ -805,7 +808,7 @@ process_common_toolchain() {
+@@ -806,7 +809,7 @@ process_common_toolchain() {
          [ -z "$tgt_isa" ] && tgt_isa=x86
          tgt_os=win32
          ;;
 -      *linux*|*bsd*)
 +      *linux*|*bsd*|*qnx6*)
          tgt_os=linux
          ;;
        *solaris2.10)
-@@ -856,6 +859,9 @@ process_common_toolchain() {
+@@ -861,6 +864,9 @@ process_common_toolchain() {
        soft_enable lasx
        enable_feature loongarch
        ;;
 +    sparc*)
 +      disable_feature fast_unaligned
 +      ;;
    esac
-   # PIC is probably what we want when building shared libs
+   # Position independent code (PIC) is probably what we want when building
-@@ -1506,7 +1512,7 @@ EOF
+@@ -1533,7 +1539,7 @@ EOF
    check_cc <<EOF
  unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
  EOF
 -    [ -f "${TMP_O}" ] && od -A n -t x1 "${TMP_O}" | tr -d '\n' |
 +    [ -f "${TMP_O}" ] && od -t x1 "${TMP_O}" | tr -d '\n' |
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
      # Try to find which inline keywords are supported
-@@ -1523,7 +1529,7 @@ EOF
+@@ -1550,7 +1556,7 @@ EOF
          # bionic includes basic pthread functionality, obviating -lpthread.
          ;;
        *)
 -        check_header pthread.h && check_lib -lpthread <<EOF && add_extralibs -lpthread || disable_feature pthread_h
 +        check_header pthread.h && check_lib ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} <<EOF && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} || disable_feature pthread_h
  #include <pthread.h>
  #include <stddef.h>
  int main(void) { return pthread_create(NULL, NULL, NULL, NULL); }