pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics



Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:19:24 UTC 2023

Modified Files:
        pkgsrc/graphics/ImageMagick: Makefile
        pkgsrc/graphics/ImageMagick6: Makefile
        pkgsrc/graphics/MesaLib: Makefile
        pkgsrc/graphics/blender-lts: Makefile
        pkgsrc/graphics/exiv2: Makefile
        pkgsrc/graphics/gpick: Makefile
        pkgsrc/graphics/graphite2: Makefile
        pkgsrc/graphics/inkscape: Makefile
        pkgsrc/graphics/mygui: Makefile
        pkgsrc/graphics/opencolorio: Makefile
        pkgsrc/graphics/openexr: Makefile buildlink3.mk
        pkgsrc/graphics/pfstools: Makefile
        pkgsrc/graphics/sane-backends: Makefile
        pkgsrc/graphics/tesseract: Makefile
        pkgsrc/graphics/zxing-cpp: Makefile buildlink3.mk

Log Message:
graphics: Adapt packages to USE_(CC|CXX)_FEATURES


To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 pkgsrc/graphics/ImageMagick/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/graphics/ImageMagick6/Makefile
cvs rdiff -u -r1.207 -r1.208 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/blender-lts/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/graphics/exiv2/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/gpick/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/graphite2/Makefile
cvs rdiff -u -r1.267 -r1.268 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/mygui/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/opencolorio/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/openexr/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/openexr/buildlink3.mk
cvs rdiff -u -r1.96 -r1.97 pkgsrc/graphics/pfstools/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/graphics/sane-backends/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/graphics/tesseract/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/zxing-cpp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/zxing-cpp/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/graphics/ImageMagick/Makefile
diff -u pkgsrc/graphics/ImageMagick/Makefile:1.324 pkgsrc/graphics/ImageMagick/Makefile:1.325
--- pkgsrc/graphics/ImageMagick/Makefile:1.324  Tue Jun  6 10:58:29 2023
+++ pkgsrc/graphics/ImageMagick/Makefile        Tue Jul 18 18:19:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.324 2023/06/06 10:58:29 wiz Exp $
+# $NetBSD: Makefile,v 1.325 2023/07/18 18:19:22 nia Exp $
 
 .include "Makefile.common"
 
@@ -27,15 +27,11 @@ PKGCONFIG_OVERRIDE+=        MagickCore/MagickCo
 PKGCONFIG_OVERRIDE+=   MagickCore/ImageMagick.pc.in
 PKGCONFIG_OVERRIDE+=   Magick++/lib/Magick++.pc.in
 
-GCC_REQD+=             2.95.3
-
 TEST_TARGET=           check
 
-.include "options.mk"
+USE_CC_FEATURES+=      c99
 
-.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64}
-GCC_REQD+=             3.0
-.endif
+.include "options.mk"
 
 # Avoid compiler bug on "mipsel" (cobalt?)
 .if ${MACHINE_ARCH} == "mipsel"

Index: pkgsrc/graphics/ImageMagick6/Makefile
diff -u pkgsrc/graphics/ImageMagick6/Makefile:1.55 pkgsrc/graphics/ImageMagick6/Makefile:1.56
--- pkgsrc/graphics/ImageMagick6/Makefile:1.55  Tue Jun  6 08:02:09 2023
+++ pkgsrc/graphics/ImageMagick6/Makefile       Tue Jul 18 18:19:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2023/06/06 08:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2023/07/18 18:19:22 nia Exp $
 
 PKGREVISION= 22
 .include "Makefile.common"
@@ -51,16 +51,12 @@ SUBST_NOOP_OK.pkgcfg=       yes
 # modified, and they don't need to since their names don't appear in any
 # "Requires:" line.
 
-GCC_REQD+=             2.95.3
+USE_CC_FEATURES+=      c99
 
 TEST_TARGET=           check
 
 .include "options.mk"
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
-GCC_REQD+=             3.0
-.endif
-
 # Avoid compiler bug on "mipsel" (cobalt?)
 .if ${MACHINE_ARCH} == "mipsel"
 CFLAGS+=               -O

Index: pkgsrc/graphics/MesaLib/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.207 pkgsrc/graphics/MesaLib/Makefile:1.208
--- pkgsrc/graphics/MesaLib/Makefile:1.207      Fri Jul 14 06:27:52 2023
+++ pkgsrc/graphics/MesaLib/Makefile    Tue Jul 18 18:19:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2023/07/14 06:27:52 pho Exp $
+# $NetBSD: Makefile,v 1.208 2023/07/18 18:19:22 nia Exp $
 
 DISTNAME=      mesa-21.3.9
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -13,10 +13,9 @@ COMMENT=     Open source OpenGL implementati
 LICENSE=       mit
 
 USE_TOOLS+=    bison flex pkg-config xgettext
-USE_LANGUAGES= c99 c++14
+USE_LANGUAGES= c c++03
 
-# ERROR: C++ Compiler does not support -std=c++14
-GCC_REQD+=     5
+USE_CXX_FEATURES+=     c++14
 
 USE_FEATURES+= strnlen
 

Index: pkgsrc/graphics/blender-lts/Makefile
diff -u pkgsrc/graphics/blender-lts/Makefile:1.30 pkgsrc/graphics/blender-lts/Makefile:1.31
--- pkgsrc/graphics/blender-lts/Makefile:1.30   Tue Jun  6 08:02:09 2023
+++ pkgsrc/graphics/blender-lts/Makefile        Tue Jul 18 18:19:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/06/06 08:02:09 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2023/07/18 18:19:22 nia Exp $
 
 DISTNAME=      blender-2.83.5
 PKGREVISION=   26
@@ -12,10 +12,9 @@ COMMENT=     Fully integrated 3D graphics cr
 LICENSE=       gnu-gpl-v2
 
 USE_CMAKE=     yes
-USE_LANGUAGES= c gnu++11
+USE_LANGUAGES= c c++03
 
-# C++11
-GCC_REQD+=     4.7
+USE_CXX_FEATURES+=     c++11
 
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ..

Index: pkgsrc/graphics/exiv2/Makefile
diff -u pkgsrc/graphics/exiv2/Makefile:1.58 pkgsrc/graphics/exiv2/Makefile:1.59
--- pkgsrc/graphics/exiv2/Makefile:1.58 Fri Jul  7 12:25:39 2023
+++ pkgsrc/graphics/exiv2/Makefile      Tue Jul 18 18:19:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2023/07/07 12:25:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.59 2023/07/18 18:19:22 nia Exp $
 
 DISTNAME=      exiv2-0.28.0-Source
 PKGNAME=       ${DISTNAME:S/-Source//}
@@ -15,7 +15,8 @@ CHECK_PORTABILITY_SKIP+=      contrib/coverit
 
 USE_TOOLS+=    msgfmt
 USE_LANGUAGES= c c++
-GCC_REQD+=     8 # std::filesystem
+
+USE_CXX_FEATURES+=     filesystem
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/graphics/gpick/Makefile
diff -u pkgsrc/graphics/gpick/Makefile:1.39 pkgsrc/graphics/gpick/Makefile:1.40
--- pkgsrc/graphics/gpick/Makefile:1.39 Sun Apr 23 14:26:20 2023
+++ pkgsrc/graphics/gpick/Makefile      Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2023/04/23 14:26:20 adam Exp $
+# $NetBSD: Makefile,v 1.40 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      gpick-0.2.6
 PKGREVISION=   6
@@ -14,7 +14,7 @@ LICENSE=      modified-bsd
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config msgfmt msgmerge xgettext
 
-GCC_REQD+=     5 # C++14
+USE_CXX_FEATURES+=     c++14
 
 TOOL_DEPENDS+= ragel-[0-9]*:../../devel/ragel
 

Index: pkgsrc/graphics/graphite2/Makefile
diff -u pkgsrc/graphics/graphite2/Makefile:1.17 pkgsrc/graphics/graphite2/Makefile:1.18
--- pkgsrc/graphics/graphite2/Makefile:1.17     Tue Jun  6 12:41:32 2023
+++ pkgsrc/graphics/graphite2/Makefile  Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/06/06 12:41:32 riastradh Exp $
+# $NetBSD: Makefile,v 1.18 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      graphite2-1.3.14
 PKGREVISION=   1
@@ -11,11 +11,10 @@ HOMEPAGE=   http://graphite.sil.org/
 COMMENT=       Cross-platform rendering for complex writing systems
 LICENSE=       gnu-lgpl-v2
 
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 
-# C++11
-GCC_REQD+=     4.8
+USE_CXX_FEATURES+=     c++11
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.267 pkgsrc/graphics/inkscape/Makefile:1.268
--- pkgsrc/graphics/inkscape/Makefile:1.267     Sat Jul  1 08:37:35 2023
+++ pkgsrc/graphics/inkscape/Makefile   Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.267 2023/07/01 08:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.268 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      inkscape-1.2.2
 PKGREVISION=   3
@@ -23,13 +23,11 @@ DEPENDS+=           ${PYPKGPREFIX}-scour-[0-9]*:.
 
 WRKSRC=                ${WRKDIR}/inkscape-1.2.2_2022-12-01_b0a8486541
 
-# std::optional
-GCC_REQD+=             7
-
 # This should be resolved in CMakeLists.txt.
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/inkscape
 
-USE_LANGUAGES=         c c++17
+USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     c++17
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            msgfmt msgmerge perl pkg-config

Index: pkgsrc/graphics/mygui/Makefile
diff -u pkgsrc/graphics/mygui/Makefile:1.10 pkgsrc/graphics/mygui/Makefile:1.11
--- pkgsrc/graphics/mygui/Makefile:1.10 Sat May  6 19:08:51 2023
+++ pkgsrc/graphics/mygui/Makefile      Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/05/06 19:08:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      mygui-3.2.3.20190707
 PKGREVISION=   9
@@ -13,11 +13,10 @@ COMMENT=    Cross-platform library for crea
 LICENSE=       mit
 
 USE_CMAKE=     yes
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
-# C++11
-GCC_REQD+=     4.8
+USE_CXX_FEATURES+=     c++11
 
 CMAKE_ARGS+=   -DMYGUI_RENDERSYSTEM=7 # OpenGL 3.*
 CMAKE_ARGS+=   -DMYGUI_SAMPLES_INPUT=4 # SDL2

Index: pkgsrc/graphics/opencolorio/Makefile
diff -u pkgsrc/graphics/opencolorio/Makefile:1.7 pkgsrc/graphics/opencolorio/Makefile:1.8
--- pkgsrc/graphics/opencolorio/Makefile:1.7    Sun Oct 20 09:51:02 2019
+++ pkgsrc/graphics/opencolorio/Makefile        Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/10/20 09:51:02 nia Exp $
+# $NetBSD: Makefile,v 1.8 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      OpenColorIO-1.1.1
 PKGREVISION=   1
@@ -15,8 +15,7 @@ USE_CMAKE=    yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++11
 
-# C++11
-GCC_REQD+=     4.8
+USE_CXX_FEATURES+=     c++11
 
 CMAKE_ARGS+=   -DUSE_EXTERNAL_TINYXML:BOOL=ON
 CMAKE_ARGS+=   -DUSE_EXTERNAL_YAML:BOOL=ON

Index: pkgsrc/graphics/openexr/Makefile
diff -u pkgsrc/graphics/openexr/Makefile:1.54 pkgsrc/graphics/openexr/Makefile:1.55
--- pkgsrc/graphics/openexr/Makefile:1.54       Wed Jul  5 22:39:15 2023
+++ pkgsrc/graphics/openexr/Makefile    Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2023/07/05 22:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      openexr-3.1.9
 CATEGORIES=    graphics
@@ -11,10 +11,9 @@ HOMEPAGE=    https://www.openexr.com/
 COMMENT=       High dynamic-range (HDR) image file format library and tools
 LICENSE=       modified-bsd
 
-USE_LANGUAGES= c c++14
+USE_LANGUAGES= c c++
 
-# C++14
-GCC_REQD+=     6
+USE_CXX_FEATURES+=     c++14
 
 PKGCONFIG_OVERRIDE=    cmake/OpenEXR.pc.in
 

Index: pkgsrc/graphics/openexr/buildlink3.mk
diff -u pkgsrc/graphics/openexr/buildlink3.mk:1.21 pkgsrc/graphics/openexr/buildlink3.mk:1.22
--- pkgsrc/graphics/openexr/buildlink3.mk:1.21  Tue Jun  6 08:02:12 2023
+++ pkgsrc/graphics/openexr/buildlink3.mk       Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2023/06/06 08:02:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2023/07/18 18:19:23 nia Exp $
 
 BUILDLINK_TREE+=       openexr
 
@@ -11,8 +11,7 @@ BUILDLINK_PKGSRCDIR.openexr?= ../../grap
 
 PTHREAD_OPTS+= require
 
-# C++14
-GCC_REQD+=     6
+USE_CXX_FEATURES+=             c++14
 
 .include "../../math/imath/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/graphics/pfstools/Makefile
diff -u pkgsrc/graphics/pfstools/Makefile:1.96 pkgsrc/graphics/pfstools/Makefile:1.97
--- pkgsrc/graphics/pfstools/Makefile:1.96      Mon Jul 10 07:42:45 2023
+++ pkgsrc/graphics/pfstools/Makefile   Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2023/07/10 07:42:45 nia Exp $
+# $NetBSD: Makefile,v 1.97 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      pfstools-2.1.0
 PKGREVISION=   37
@@ -23,9 +23,7 @@ CMAKE_ARGS+=          -DPKGMANDIR=${PKGMANDIR}
 CMAKE_ARGS+=           -DWITH_MATLAB=OFF
 CMAKE_ARGS+=           -DWITH_OpenCV=OFF
 CXXFLAGS+=             -std=c++14  # OpenEXR
-
-# C++14
-GCC_REQD+=             5
+USE_CXX_FEATURES+=     c++14
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure

Index: pkgsrc/graphics/sane-backends/Makefile
diff -u pkgsrc/graphics/sane-backends/Makefile:1.85 pkgsrc/graphics/sane-backends/Makefile:1.86
--- pkgsrc/graphics/sane-backends/Makefile:1.85 Wed Apr 19 08:10:26 2023
+++ pkgsrc/graphics/sane-backends/Makefile      Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2023/04/19 08:10:26 adam Exp $
+# $NetBSD: Makefile,v 1.86 2023/07/18 18:19:23 nia Exp $
 
 PKGREVISION=   7
 .include "Makefile.common"
@@ -13,11 +13,10 @@ USE_PKGLOCALEDIR=   YES
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-# c++11 is needed for genesys backend
-USE_LANGUAGES=         c c++11
+USE_LANGUAGES=         c c++
 
-# C++11
-GCC_REQD+=             4.8
+# c++11 is needed for genesys backend
+USE_CXX_FEATURES+=     c++11
 
 CONFIGURE_ARGS+=       --enable-pthread
 CONFIGURE_ARGS+=       --with-gphoto2=no

Index: pkgsrc/graphics/tesseract/Makefile
diff -u pkgsrc/graphics/tesseract/Makefile:1.69 pkgsrc/graphics/tesseract/Makefile:1.70
--- pkgsrc/graphics/tesseract/Makefile:1.69     Mon Jul 17 19:33:04 2023
+++ pkgsrc/graphics/tesseract/Makefile  Tue Jul 18 18:19:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2023/07/17 19:33:04 adam Exp $
+# $NetBSD: Makefile,v 1.70 2023/07/18 18:19:23 nia Exp $
 
 DISTNAME=      tesseract-5.3.2
 CATEGORIES=    graphics
@@ -14,11 +14,10 @@ LANGVER=    4.1.0
 DISTFILES+=    tessdata-${LANGVER}${EXTRACT_SUFX}
 SITES.tessdata-${LANGVER}.tar.gz=      -${MASTER_SITES:Q}tessdata_best/archive/${LANGVER}.tar.gz
 
-GCC_REQD+=     8 # std::filesystem
-
 TOOL_DEPENDS+=         asciidoc-[0-9]*:../../textproc/asciidoc
 
 USE_LANGUAGES=         c c++
+USE_CXX_FEATURES+=     filesystem
 USE_LIBTOOL=           yes
 USE_TOOLS+=            autoconf automake bash gmake pax pkg-config
 GNU_CONFIGURE=         yes

Index: pkgsrc/graphics/zxing-cpp/Makefile
diff -u pkgsrc/graphics/zxing-cpp/Makefile:1.10 pkgsrc/graphics/zxing-cpp/Makefile:1.11
--- pkgsrc/graphics/zxing-cpp/Makefile:1.10     Mon Jul 10 07:51:27 2023
+++ pkgsrc/graphics/zxing-cpp/Makefile  Tue Jul 18 18:19:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/07/10 07:51:27 nia Exp $
+# $NetBSD: Makefile,v 1.11 2023/07/18 18:19:24 nia Exp $
 
 DISTNAME=      zxing-cpp-2.0.0
 CATEGORIES=    graphics
@@ -12,13 +12,12 @@ LICENSE=    apache-2.0
 
 USE_LANGUAGES= c c++
 
-# C++17
-GCC_REQD+=     7
-
 CMAKE_ARGS+=   -DBUILD_EXAMPLES=OFF
 # Blackbox tests target pulls fmtlib with git command.
 CMAKE_ARGS+=   -DBUILD_BLACKBOX_TESTS=OFF
 
+USE_CXX_FEATURES+=     c++17
+
 PKGCONFIG_OVERRIDE+=   zxing.pc.in
 
 # Install private header file to fix build failure of misc/libreoffice-7.3.4.2.

Index: pkgsrc/graphics/zxing-cpp/buildlink3.mk
diff -u pkgsrc/graphics/zxing-cpp/buildlink3.mk:1.3 pkgsrc/graphics/zxing-cpp/buildlink3.mk:1.4
--- pkgsrc/graphics/zxing-cpp/buildlink3.mk:1.3 Mon Jul 10 07:51:27 2023
+++ pkgsrc/graphics/zxing-cpp/buildlink3.mk     Tue Jul 18 18:19:24 2023
@@ -1,14 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.3 2023/07/10 07:51:27 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/07/18 18:19:24 nia Exp $
 
 BUILDLINK_TREE+=       zxing-cpp
 
 .if !defined(ZXING_CPP_BUILDLINK3_MK)
 
-# C++17
-GCC_REQD+=     7
-
 ZXING_CPP_BUILDLINK3_MK:=
 
+USE_CXX_FEATURES+=                     c++17
+
 BUILDLINK_API_DEPENDS.zxing-cpp+=      zxing-cpp>=1.2.0
 BUILDLINK_ABI_DEPENDS.zxing-cpp+=      zxing-cpp>=2.0.0
 BUILDLINK_PKGSRCDIR.zxing-cpp?=                ../../graphics/zxing-cpp



Home | Main Index | Thread Index | Old Index