CVS commit: pkgsrc/graphics/gegl

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/gegl
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 9 Apr 2021 05:12:58 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Apr  9 05:12:58 UTC 2021

Modified Files:
        pkgsrc/graphics/gegl: Makefile PLIST buildlink3.mk options.mk

Log Message:
gegl: PLIST fix


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/graphics/gegl/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/gegl/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/graphics/gegl/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/gegl/options.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/gegl/Makefile
diff -u pkgsrc/graphics/gegl/Makefile:1.91 pkgsrc/graphics/gegl/Makefile:1.92
--- pkgsrc/graphics/gegl/Makefile:1.91  Sat Apr  3 05:30:51 2021
+++ pkgsrc/graphics/gegl/Makefile       Fri Apr  9 05:12:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2021/04/03 05:30:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.92 2021/04/09 05:12:58 adam Exp $
 
 DISTNAME=      gegl-0.4.30
 CATEGORIES=    graphics
@@ -15,21 +15,16 @@ MESON_ARGS+=        -Dlibv4l=disabled
 MESON_ARGS+=   -Dlibv4l2=disabled
 
 USE_LANGUAGES= c c++
-USE_TOOLS+=    pkg-config xgettext
-USE_TOOLS+=    bash
+USE_TOOLS+=    bash pkg-config xgettext
 
 PKGCONFIG_OVERRIDE+=   gegl.pc.in
 
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+=           Darwin not_Darwin
 .if ${OPSYS} == "Darwin"
-PLIST.Darwin=          yes
 PLIST_SUBST+=          SOEXT="dylib"
 .else
-PLIST.not_Darwin=      yes
 PLIST_SUBST+=          SOEXT="so"
 .endif
 
@@ -46,7 +41,6 @@ pre-build:
 .include "../../devel/SDL2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.babl+=   babl>=0.1.72
 .include "../../graphics/babl/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
@@ -56,4 +50,5 @@ BUILDLINK_API_DEPENDS.babl+=  babl>=0.1.7
 .include "../../lang/python/tool.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gegl/PLIST
diff -u pkgsrc/graphics/gegl/PLIST:1.31 pkgsrc/graphics/gegl/PLIST:1.32
--- pkgsrc/graphics/gegl/PLIST:1.31     Sat Apr  3 05:30:51 2021
+++ pkgsrc/graphics/gegl/PLIST  Fri Apr  9 05:12:58 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2021/04/03 05:30:51 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.32 2021/04/09 05:12:58 adam Exp $
 bin/gegl
 bin/gegl-imgcmp
 include/gegl-0.4/gegl-apply.h
@@ -85,41 +85,42 @@ include/gegl-0.4/sc/sc-context.h
 include/gegl-0.4/sc/sc-outline.h
 include/gegl-0.4/sc/sc-sample.h
 lib/gegl-0.4/dropshadow2.json
-lib/gegl-0.4/exr-load.so
-lib/gegl-0.4/exr-save.so
-lib/gegl-0.4/gegl-common-cxx.so
-lib/gegl-0.4/gegl-common-gpl3.so
-lib/gegl-0.4/gegl-common.so
-lib/gegl-0.4/gegl-core.so
-lib/gegl-0.4/gegl-generated.so
-lib/gegl-0.4/gif-load.so
+lib/gegl-0.4/exr-load.${SOEXT}
+lib/gegl-0.4/exr-save.${SOEXT}
+lib/gegl-0.4/gegl-common-cxx.${SOEXT}
+lib/gegl-0.4/gegl-common-gpl3.${SOEXT}
+lib/gegl-0.4/gegl-common.${SOEXT}
+lib/gegl-0.4/gegl-core.${SOEXT}
+lib/gegl-0.4/gegl-generated.${SOEXT}
+lib/gegl-0.4/gif-load.${SOEXT}
 lib/gegl-0.4/grey2.json
-lib/gegl-0.4/jpg-load.so
-lib/gegl-0.4/jpg-save.so
-lib/gegl-0.4/lcms-from-profile.so
-lib/gegl-0.4/npd.so
-lib/gegl-0.4/npy-save.so
-lib/gegl-0.4/path.so
-lib/gegl-0.4/pixbuf-load.so
-lib/gegl-0.4/pixbuf-save.so
-lib/gegl-0.4/png-load.so
-lib/gegl-0.4/png-save.so
-lib/gegl-0.4/ppm-load.so
-lib/gegl-0.4/ppm-save.so
-lib/gegl-0.4/rgbe-load.so
-lib/gegl-0.4/rgbe-save.so
-lib/gegl-0.4/sdl2-display.so
-lib/gegl-0.4/seamless-clone-compose.so
-lib/gegl-0.4/seamless-clone.so
-lib/gegl-0.4/svg-load.so
-lib/gegl-0.4/text.so
-lib/gegl-0.4/tiff-load.so
-lib/gegl-0.4/tiff-save.so
-lib/gegl-0.4/transformops.so
-lib/gegl-0.4/vector-fill.so
-lib/gegl-0.4/vector-stroke.so
-lib/gegl-0.4/webp-load.so
-lib/gegl-0.4/webp-save.so
+${PLIST.jasper}lib/gegl-0.4/jp2-load.${SOEXT}
+lib/gegl-0.4/jpg-load.${SOEXT}
+lib/gegl-0.4/jpg-save.${SOEXT}
+lib/gegl-0.4/lcms-from-profile.${SOEXT}
+lib/gegl-0.4/npd.${SOEXT}
+lib/gegl-0.4/npy-save.${SOEXT}
+lib/gegl-0.4/path.${SOEXT}
+lib/gegl-0.4/pixbuf-load.${SOEXT}
+lib/gegl-0.4/pixbuf-save.${SOEXT}
+lib/gegl-0.4/png-load.${SOEXT}
+lib/gegl-0.4/png-save.${SOEXT}
+lib/gegl-0.4/ppm-load.${SOEXT}
+lib/gegl-0.4/ppm-save.${SOEXT}
+lib/gegl-0.4/rgbe-load.${SOEXT}
+lib/gegl-0.4/rgbe-save.${SOEXT}
+lib/gegl-0.4/sdl2-display.${SOEXT}
+lib/gegl-0.4/seamless-clone-compose.${SOEXT}
+lib/gegl-0.4/seamless-clone.${SOEXT}
+${PLIST.svg}lib/gegl-0.4/svg-load.${SOEXT}
+lib/gegl-0.4/text.${SOEXT}
+lib/gegl-0.4/tiff-load.${SOEXT}
+lib/gegl-0.4/tiff-save.${SOEXT}
+lib/gegl-0.4/transformops.${SOEXT}
+lib/gegl-0.4/vector-fill.${SOEXT}
+lib/gegl-0.4/vector-stroke.${SOEXT}
+lib/gegl-0.4/webp-load.${SOEXT}
+lib/gegl-0.4/webp-save.${SOEXT}
 lib/libgegl-0.4.so
 lib/libgegl-0.4.so.0
 lib/libgegl-0.4.so.0.429.1

Index: pkgsrc/graphics/gegl/buildlink3.mk
diff -u pkgsrc/graphics/gegl/buildlink3.mk:1.45 pkgsrc/graphics/gegl/buildlink3.mk:1.46
--- pkgsrc/graphics/gegl/buildlink3.mk:1.45     Thu Nov  5 09:06:54 2020
+++ pkgsrc/graphics/gegl/buildlink3.mk  Fri Apr  9 05:12:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2020/11/05 09:06:54 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2021/04/09 05:12:58 adam Exp $
 
 BUILDLINK_TREE+=       gegl
 
@@ -6,16 +6,9 @@ BUILDLINK_TREE+=       gegl
 GEGL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gegl+=   gegl>=0.3.0
-BUILDLINK_ABI_DEPENDS.gegl?=   gegl>=0.4.26nb1
+BUILDLINK_ABI_DEPENDS.gegl+=   gegl>=0.4.26nb1
 BUILDLINK_PKGSRCDIR.gegl?=     ../../graphics/gegl
 
-pkgbase := gegl
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.gegl:Msvg)
-.include "../../graphics/librsvg/buildlink3.mk"
-.endif
-
 .include "../../graphics/babl/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .endif # GEGL_BUILDLINK3_MK

Index: pkgsrc/graphics/gegl/options.mk
diff -u pkgsrc/graphics/gegl/options.mk:1.3 pkgsrc/graphics/gegl/options.mk:1.4
--- pkgsrc/graphics/gegl/options.mk:1.3 Sat Nov  2 14:05:46 2019
+++ pkgsrc/graphics/gegl/options.mk     Fri Apr  9 05:12:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/02 14:05:46 nia Exp $
+# $NetBSD: options.mk,v 1.4 2021/04/09 05:12:58 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gegl
 PKG_SUPPORTED_OPTIONS= svg jasper
@@ -6,7 +6,8 @@ PKG_SUGGESTED_OPTIONS=  svg
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   svg
+PLIST_VARS+=   jasper svg
+
 .if !empty(PKG_OPTIONS:Msvg)
 .include "../../graphics/librsvg/buildlink3.mk"
 PLIST.svg=     yes
@@ -14,7 +15,6 @@ PLIST.svg=    yes
 MESON_ARGS+=   -Dlibrsvg=disabled
 .endif
 
-PLIST_VARS+=   jasper
 .if !empty(PKG_OPTIONS:Mjasper)
 .include "../../graphics/jasper/buildlink3.mk"
 PLIST.jasper=  yes

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/nss
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/nss
Indexes:

Home | Main Index | Thread Index | Old Index