CVS commit: pkgsrc/multimedia/libvpx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct 25 12:43:45 UTC 2020

Modified Files:
        pkgsrc/multimedia/libvpx: Makefile buildlink3.mk

Log Message:
libvpx: Set compiler requirements properly.

Needs at least gcc 4.8, does not need c++11 in USE_LANGUAGES because it
sets -std=c++11 itself.


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/multimedia/libvpx/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/libvpx/buildlink3.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.84 pkgsrc/multimedia/libvpx/Makefile:1.85
--- pkgsrc/multimedia/libvpx/Makefile:1.84      Tue Sep 29 13:03:13 2020
+++ pkgsrc/multimedia/libvpx/Makefile   Sun Oct 25 12:43:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2020/09/29 13:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.85 2020/10/25 12:43:45 nia Exp $
 
 DISTNAME=      libvpx-1.9.0
 PKGREVISION=   1
@@ -12,7 +12,7 @@ HOMEPAGE=     https://chromium.googlesource.
 COMMENT=       On2 VP8 library from Google
 LICENSE=       modified-bsd
 
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake bash:build perl:build
 HAS_CONFIGURE=         yes
@@ -23,16 +23,13 @@ CONFIGURE_ARGS+=    --enable-runtime-cpu-de
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --disable-unit-tests
 
+# Uses -std=c++11
+GCC_REQD+=             4.8
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-# PR pkg/48508: GCC 4.4 or later is required to compile ssse3 code on NetBSD & Solaris.
-# Because building pkgsrc with gcc < 4.4 doesn't really work in the
-# first place, for simplicitly, just set GCC_REQD unconditionally
-# rather than trying to limit by OS.
-GCC_REQD+=     4.4
-
-BUILD_DEPENDS+=                yasm-[0-9]*:../../devel/yasm
+TOOL_DEPENDS+=         yasm-[0-9]*:../../devel/yasm
 .endif
 
 REPLACE_BASH=          configure

Index: pkgsrc/multimedia/libvpx/buildlink3.mk
diff -u pkgsrc/multimedia/libvpx/buildlink3.mk:1.6 pkgsrc/multimedia/libvpx/buildlink3.mk:1.7
--- pkgsrc/multimedia/libvpx/buildlink3.mk:1.6  Mon Jan 16 23:45:10 2017
+++ pkgsrc/multimedia/libvpx/buildlink3.mk      Sun Oct 25 12:43:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2017/01/16 23:45:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2020/10/25 12:43:45 nia Exp $
 
 BUILDLINK_TREE+=       libvpx
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.libvpx+=  libvpx>=1
 BUILDLINK_ABI_DEPENDS.libvpx+= libvpx>=1.6.1
 BUILDLINK_PKGSRCDIR.libvpx?=   ../../multimedia/libvpx
 
+GCC_REQD+=     4.8
+
 .include "../../mk/pthread.buildlink3.mk"
 .endif # LIBVPX_BUILDLINK3_MK