CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:34:31 UTC 2023

Modified Files:
        pkgsrc/multimedia/assimp: Makefile
        pkgsrc/multimedia/atomicparsley: Makefile
        pkgsrc/multimedia/gerbera: Makefile
        pkgsrc/multimedia/libvpx: Makefile buildlink3.mk
        pkgsrc/multimedia/mkvtoolnix: Makefile
        pkgsrc/multimedia/mpv: Makefile
        pkgsrc/multimedia/olive-editor: Makefile
        pkgsrc/multimedia/subtitleeditor: Makefile

Log Message:
multimedia: Adapt packages to USE_(CC|CXX)_FEATURES where possible


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/assimp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/atomicparsley/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/gerbera/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/multimedia/libvpx/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/libvpx/buildlink3.mk
cvs rdiff -u -r1.220 -r1.221 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.155 -r1.156 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/multimedia/olive-editor/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/multimedia/subtitleeditor/Makefile

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

Modified files:

Index: pkgsrc/multimedia/assimp/Makefile
diff -u pkgsrc/multimedia/assimp/Makefile:1.9 pkgsrc/multimedia/assimp/Makefile:1.10
--- pkgsrc/multimedia/assimp/Makefile:1.9       Wed Jul 12 19:35:40 2023
+++ pkgsrc/multimedia/assimp/Makefile   Tue Jul 18 18:34:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/07/12 19:35:40 nia Exp $
+# $NetBSD: Makefile,v 1.10 2023/07/18 18:34:30 nia Exp $
 
 DISTNAME=      assimp-5.2.5
 CATEGORIES=    multimedia
@@ -14,8 +14,7 @@ USE_CMAKE=    yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-# 'Target "assimp" requires the language dialect "CXX17"'
-GCC_REQD+=     7
+USE_CXX_FEATURES+=     c++17
 
 PKGCONFIG_OVERRIDE=    assimp.pc.in
 

Index: pkgsrc/multimedia/atomicparsley/Makefile
diff -u pkgsrc/multimedia/atomicparsley/Makefile:1.2 pkgsrc/multimedia/atomicparsley/Makefile:1.3
--- pkgsrc/multimedia/atomicparsley/Makefile:1.2        Wed Jul 12 19:45:18 2023
+++ pkgsrc/multimedia/atomicparsley/Makefile    Tue Jul 18 18:34:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/07/12 19:45:18 nia Exp $
+# $NetBSD: Makefile,v 1.3 2023/07/18 18:34:30 nia Exp $
 
 GITHUB_PROJECT=        atomicparsley
 GITHUB_TAG=    refs/tags/20221229.172126.d813aa6
@@ -17,7 +17,7 @@ WRKSRC=               ${WRKDIR}/atomicparsley-2022122
 USE_LANGUAGES= c c++
 
 # Uses nullptr in the code.
-GCC_REQD+=     4.8
+USE_CXX_FEATURES+=     c++11
 
 INSTALLATION_DIRS=     share/doc/atomicparsley
 

Index: pkgsrc/multimedia/gerbera/Makefile
diff -u pkgsrc/multimedia/gerbera/Makefile:1.17 pkgsrc/multimedia/gerbera/Makefile:1.18
--- pkgsrc/multimedia/gerbera/Makefile:1.17     Tue May 16 21:20:53 2023
+++ pkgsrc/multimedia/gerbera/Makefile  Tue Jul 18 18:34:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/05/16 21:20:53 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2023/07/18 18:34:30 nia Exp $
 
 DISTNAME=      gerbera-1.12.1
 PKGREVISION=   4
@@ -14,7 +14,7 @@ LICENSE=      gnu-gpl-v2
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-GCC_REQD+=     8
+USE_CXX_FEATURES+=     filesystem
 
 RCD_SCRIPTS=   gerbera
 

Index: pkgsrc/multimedia/libvpx/Makefile
diff -u pkgsrc/multimedia/libvpx/Makefile:1.97 pkgsrc/multimedia/libvpx/Makefile:1.98
--- pkgsrc/multimedia/libvpx/Makefile:1.97      Tue Jun  6 12:42:01 2023
+++ pkgsrc/multimedia/libvpx/Makefile   Tue Jul 18 18:34:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2023/06/06 12:42:01 riastradh Exp $
+# $NetBSD: Makefile,v 1.98 2023/07/18 18:34:31 nia Exp $
 
 DISTNAME=      libvpx-1.13.0
 CATEGORIES=    multimedia
@@ -11,6 +11,7 @@ COMMENT=      On2 VP8/VP9 video codec library
 LICENSE=       modified-bsd
 
 USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     c++11
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake bash:build perl:build
 HAS_CONFIGURE=         yes
@@ -21,9 +22,6 @@ 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" || \

Index: pkgsrc/multimedia/libvpx/buildlink3.mk
diff -u pkgsrc/multimedia/libvpx/buildlink3.mk:1.8 pkgsrc/multimedia/libvpx/buildlink3.mk:1.9
--- pkgsrc/multimedia/libvpx/buildlink3.mk:1.8  Tue Jun 28 11:34:56 2022
+++ pkgsrc/multimedia/libvpx/buildlink3.mk      Tue Jul 18 18:34:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2022/06/28 11:34:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2023/07/18 18:34:31 nia Exp $
 
 BUILDLINK_TREE+=       libvpx
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libvpx+=  libvpx>=1
 BUILDLINK_ABI_DEPENDS.libvpx+= libvpx>=1.11.0nb1
 BUILDLINK_PKGSRCDIR.libvpx?=   ../../multimedia/libvpx
 
-GCC_REQD+=     4.8
+USE_CXX_FEATURES+=     c++11
 
 .include "../../mk/pthread.buildlink3.mk"
 .endif # LIBVPX_BUILDLINK3_MK

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.220 pkgsrc/multimedia/mkvtoolnix/Makefile:1.221
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.220 Tue Jul  4 09:21:55 2023
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Tue Jul 18 18:34:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.220 2023/07/04 09:21:55 adam Exp $
+# $NetBSD: Makefile,v 1.221 2023/07/18 18:34:31 nia Exp $
 
 DISTNAME=      mkvtoolnix-78.0
 CATEGORIES=    multimedia
@@ -17,9 +17,9 @@ TOOL_DEPENDS+=        ${RUBY_BASE}>=${RUBY_VERS
 #  * file system library (C++17)
 # If you are using the GNU C compiler collection (gcc), you need
 # at least v8; for clang v7 and newer should work.'
-GCC_REQD+=     8
+USE_CXX_FEATURES+=     filesystem
 
-USE_LANGUAGES=         c c++17
+USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake msgfmt pkg-config
 GNU_CONFIGURE=         yes

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.155 pkgsrc/multimedia/mpv/Makefile:1.156
--- pkgsrc/multimedia/mpv/Makefile:1.155        Thu Jul 13 13:45:43 2023
+++ pkgsrc/multimedia/mpv/Makefile      Tue Jul 18 18:34:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2023/07/13 13:45:43 nia Exp $
+# $NetBSD: Makefile,v 1.156 2023/07/18 18:34:31 nia Exp $
 
 DISTNAME=      mpv-0.35.1
 PKGREVISION=   4
@@ -14,6 +14,9 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2.1
 # needs sem_timedwait(3)
 NOT_FOR_PLATFORM=      NetBSD-[1-6].*-*
 
+# Requires support for c11 atomics.
+USE_CC_FEATURES+=      c11
+
 TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
 # ${WRKSRC}/bootstrap.py mentions needed version
 TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf

Index: pkgsrc/multimedia/olive-editor/Makefile
diff -u pkgsrc/multimedia/olive-editor/Makefile:1.29 pkgsrc/multimedia/olive-editor/Makefile:1.30
--- pkgsrc/multimedia/olive-editor/Makefile:1.29        Mon May 22 21:00:40 2023
+++ pkgsrc/multimedia/olive-editor/Makefile     Tue Jul 18 18:34:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2023/05/22 21:00:40 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2023/07/18 18:34:31 nia Exp $
 
 DISTNAME=      olive-editor-0.1.2
 PKGREVISION=   9
@@ -18,8 +18,7 @@ USE_CMAKE=    yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-# C++11
-GCC_REQD+=     4.7
+USE_CXX_FEATURES+=     c++11
 
 CMAKE_ARGS+=   -DFFMPEG_INCLUDE_ROOT=${BUILDLINK_DIR}/include/ffmpeg4
 CMAKE_ARGS+=   -DFFMPEG_LIB_ROOT=${BUILDLINK_DIR}/lib/ffmpeg4

Index: pkgsrc/multimedia/subtitleeditor/Makefile
diff -u pkgsrc/multimedia/subtitleeditor/Makefile:1.64 pkgsrc/multimedia/subtitleeditor/Makefile:1.65
--- pkgsrc/multimedia/subtitleeditor/Makefile:1.64      Wed Apr 19 08:11:00 2023
+++ pkgsrc/multimedia/subtitleeditor/Makefile   Tue Jul 18 18:34:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2023/04/19 08:11:00 adam Exp $
+# $NetBSD: Makefile,v 1.65 2023/07/18 18:34:31 nia Exp $
 
 DISTNAME=      subtitleeditor-0.54.0
 PKGREVISION=   18
@@ -18,8 +18,7 @@ USE_TOOLS+=   pkg-config perl gmake
 USE_TOOLS+=    intltool msgfmt msgmerge xgettext
 USE_LANGUAGES= c c++14
 
-# C++14
-GCC_REQD+=     5
+USE_CXX_FEATURES+=     c++14
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"