CVS commit: pkgsrc/graphics/cogl

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 28 10:40:39 UTC 2022

Modified Files:
        pkgsrc/graphics/cogl: Makefile PLIST options.mk

Log Message:
cogl: Remove introspection option. Darwin !x11 case appears broken,
anyone want to investigate?

https://marc.info/?l=pkgsrc-users&m=165444158600671&w=2


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/cogl/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/cogl/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/cogl/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/cogl/Makefile
diff -u pkgsrc/graphics/cogl/Makefile:1.31 pkgsrc/graphics/cogl/Makefile:1.32
--- pkgsrc/graphics/cogl/Makefile:1.31  Wed Dec  8 16:02:08 2021
+++ pkgsrc/graphics/cogl/Makefile       Tue Jun 28 10:40:39 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/12/08 16:02:08 adam Exp $
+# $NetBSD: Makefile,v 1.32 2022/06/28 10:40:39 nia Exp $
 
 DISTNAME=      cogl-1.22.0
 PKGREVISION=   12
@@ -23,6 +23,7 @@ USE_PKGLOCALEDIR=     yes
 # Disable -Werror.
 # code is not clean enough for modern compilers
 CONFIGURE_ARGS+=       --enable-maintainer-flags=no
+CONFIGURE_ARGS+=       --enable-introspection=yes
 
 PKGCONFIG_OVERRIDE+=   cogl-gles2/cogl-gles2-experimental.pc.in
 PKGCONFIG_OVERRIDE+=   cogl-pango/cogl-pango-1.0.pc.in
@@ -39,7 +40,9 @@ PKGCONFIG_OVERRIDE+=  cogl-gst/cogl-gst.p
 PKGCONFIG_OVERRIDE+=   cogl-path/cogl-path.pc.in
 
 .include "options.mk"
-
+BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.32.0
 .include "../../devel/glib2/buildlink3.mk"

Index: pkgsrc/graphics/cogl/PLIST
diff -u pkgsrc/graphics/cogl/PLIST:1.4 pkgsrc/graphics/cogl/PLIST:1.5
--- pkgsrc/graphics/cogl/PLIST:1.4      Thu Oct 29 22:55:01 2015
+++ pkgsrc/graphics/cogl/PLIST  Tue Jun 28 10:40:39 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/10/29 22:55:01 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/06/28 10:40:39 nia Exp $
 include/cogl/cogl-pango/cogl-pango.h
 include/cogl/cogl-path/cogl-path-enum-types.h
 include/cogl/cogl-path/cogl-path-types.h
@@ -93,10 +93,10 @@ include/cogl/cogl/gl-prototypes/cogl-gle
 include/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
 include/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
 include/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
-${PLIST.introspection}lib/girepository-1.0/Cogl-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/Cogl-2.0.typelib
-${PLIST.introspection}lib/girepository-1.0/CoglPango-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/CoglPango-2.0.typelib
+lib/girepository-1.0/Cogl-1.0.typelib
+lib/girepository-1.0/Cogl-2.0.typelib
+lib/girepository-1.0/CoglPango-1.0.typelib
+lib/girepository-1.0/CoglPango-2.0.typelib
 lib/libcogl-pango.la
 lib/libcogl-path.la
 lib/libcogl.la
@@ -108,10 +108,10 @@ lib/pkgconfig/cogl-pango-2.0-experimenta
 lib/pkgconfig/cogl-path-1.0.pc
 lib/pkgconfig/cogl-path-2.0-experimental.pc
 share/cogl/examples-data/crate.jpg
-${PLIST.introspection}share/gir-1.0/Cogl-1.0.gir
-${PLIST.introspection}share/gir-1.0/Cogl-2.0.gir
-${PLIST.introspection}share/gir-1.0/CoglPango-1.0.gir
-${PLIST.introspection}share/gir-1.0/CoglPango-2.0.gir
+share/gir-1.0/Cogl-1.0.gir
+share/gir-1.0/Cogl-2.0.gir
+share/gir-1.0/CoglPango-1.0.gir
+share/gir-1.0/CoglPango-2.0.gir
 share/locale/an/LC_MESSAGES/cogl.mo
 share/locale/ar/LC_MESSAGES/cogl.mo
 share/locale/as/LC_MESSAGES/cogl.mo

Index: pkgsrc/graphics/cogl/options.mk
diff -u pkgsrc/graphics/cogl/options.mk:1.5 pkgsrc/graphics/cogl/options.mk:1.6
--- pkgsrc/graphics/cogl/options.mk:1.5 Fri Apr 16 06:49:24 2021
+++ pkgsrc/graphics/cogl/options.mk     Tue Jun 28 10:40:39 2022
@@ -1,26 +1,13 @@
-# $NetBSD: options.mk,v 1.5 2021/04/16 06:49:24 nia Exp $
+# $NetBSD: options.mk,v 1.6 2022/06/28 10:40:39 nia Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cogl
-PKG_SUPPORTED_OPTIONS= introspection x11
-PKG_SUGGESTED_OPTIONS= introspection x11
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   introspection x11
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-PLIST.introspection=           yes
-BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
-BUILDLINK_DEPMETHOD.gobject-introspection+=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-introspection=yes
-.else
-CONFIGURE_ARGS+=       --enable-introspection=no
-.endif
-
 .if !empty(PKG_OPTIONS:Mx11)
-PLIST.x11=             yes
 CONFIGURE_ARGS+=       --with-x
 CONFIGURE_ARGS+=       --enable-gdk-pixbuf
 CONFIGURE_ARGS+=       --with-gl-libname=libGL