Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1598790810296030"
MIME-Version: 1.0
Date: Sun, 30 Aug 2020 12:33:30 +0000
From: "Jonathan Schleifer" <js@netbsd.org>
Subject: CVS commit: pkgsrc/multimedia/libvpx
To: pkgsrc-changes@NetBSD.org
Reply-To: js@netbsd.org
Message-Id: <20200830123330.0AC0DFB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1598790810296030
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	js
Date:		Sun Aug 30 12:33:29 UTC 2020

Modified Files:
	pkgsrc/multimedia/libvpx: distinfo
	pkgsrc/multimedia/libvpx/patches: patch-libs.mk

Log Message:
Fix building multimedia/libvpx on Darwin

This should also fix other platforms that don't like empty .a files.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/multimedia/libvpx/distinfo
cvs rdiff -u -r1.4 -r1.5 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.


--_----------=_1598790810296030
Content-Disposition: inline
Content-Length: 2379
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/libvpx/distinfo
diff -u pkgsrc/multimedia/libvpx/distinfo:1.40 pkgsrc/multimedia/libvpx/distinfo:1.41
--- pkgsrc/multimedia/libvpx/distinfo:1.40	Mon Aug 24 08:35:07 2020
+++ pkgsrc/multimedia/libvpx/distinfo	Sun Aug 30 12:33:29 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2020/08/24 08:35:07 wiz Exp $
+$NetBSD: distinfo,v 1.41 2020/08/30 12:33:29 js Exp $
 
 SHA1 (libvpx-1.9.0.tar.gz) = 2ab8203ad8922bdf3256e4a197d1348fa8db9a62
 RMD160 (libvpx-1.9.0.tar.gz) = 6189b855a38cd5f2e34a5120d5a48cc945b623b1
@@ -9,4 +9,4 @@ SHA1 (patch-build_make_configure.sh) = 6
 SHA1 (patch-build_make_gen_asm_deps.sh) = c55bd4d0e12176b73ba62c3c4741b58de77923e6
 SHA1 (patch-configure) = 738871dc9ffa44a809e594849915a875a97ac40b
 SHA1 (patch-examples.mk) = 17410f43ff9952d616be3211ca697f37c107610a
-SHA1 (patch-libs.mk) = 5da8377ca81db70f34c833ce0049060d05ef107c
+SHA1 (patch-libs.mk) = cdbd8b590746f3b366f25ba9b2a8636ff790d930

Index: pkgsrc/multimedia/libvpx/patches/patch-libs.mk
diff -u pkgsrc/multimedia/libvpx/patches/patch-libs.mk:1.4 pkgsrc/multimedia/libvpx/patches/patch-libs.mk:1.5
--- pkgsrc/multimedia/libvpx/patches/patch-libs.mk:1.4	Mon Aug 24 08:35:07 2020
+++ pkgsrc/multimedia/libvpx/patches/patch-libs.mk	Sun Aug 30 12:33:29 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-libs.mk,v 1.4 2020/08/24 08:35:07 wiz Exp $
+$NetBSD: patch-libs.mk,v 1.5 2020/08/30 12:33:29 js Exp $
 
 Do not install debug library.
 
@@ -23,3 +23,23 @@ Do not install debug library.
  
  SO_VERSION_MAJOR := 6
  SO_VERSION_MINOR := 3
+@@ -384,15 +383,15 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
+   RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
+   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)
+ endif
+ 
+ ifeq ($(CONFIG_VP9_ENCODER)$(CONFIG_RATE_CTRL),yesyes)
+   SIMPLE_ENCODE_OBJS=$(call objs,$(SIMPLE_ENCODE_SRCS))
+   OBJS-yes += $(SIMPLE_ENCODE_OBJS)
+-  LIBS-yes += $(BUILD_PFX)libsimple_encode.a $(BUILD_PFX)libsimple_encode_g.a
+-  $(BUILD_PFX)libsimple_encode_g.a: $(SIMPLE_ENCODE_OBJS)
++  LIBS-yes += $(BUILD_PFX)libsimple_encode.a
++  $(BUILD_PFX)libsimple_encode.a: $(SIMPLE_ENCODE_OBJS)
+ endif
+ 
+ endif # ifeq ($(CONFIG_EXTERNAL_BUILD),yes)


--_----------=_1598790810296030--