Tue Jun 28 10:40:39 2022 UTC ()
cogl: Remove introspection option. Darwin !x11 case appears broken,
anyone want to investigate?

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


(nia)
diff -r1.31 -r1.32 pkgsrc/graphics/cogl/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/cogl/PLIST
diff -r1.5 -r1.6 pkgsrc/graphics/cogl/options.mk
cvs diff -r1.31 -r1.32 pkgsrc/graphics/cogl/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cogl/Makefile 2021/12/08 16:02:08 1.31
+++ pkgsrc/graphics/cogl/Makefile 2022/06/28 10:40:39 1.32
@@ -1,50 +1,53 @@ @@ -1,50 +1,53 @@
1# $NetBSD: Makefile,v 1.31 2021/12/08 16:02:08 adam Exp $ 1# $NetBSD: Makefile,v 1.32 2022/06/28 10:40:39 nia Exp $
2 2
3DISTNAME= cogl-1.22.0 3DISTNAME= cogl-1.22.0
4PKGREVISION= 12 4PKGREVISION= 12
5CATEGORIES= graphics gnome 5CATEGORIES= graphics gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cogl/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/cogl/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://cogl3d.org/ 10HOMEPAGE= https://cogl3d.org/
11COMMENT= Modern 3D graphics API 11COMMENT= Modern 3D graphics API
12LICENSE= mit AND sgi-free-software-b-v2.0 AND modified-bsd 12LICENSE= mit AND sgi-free-software-b-v2.0 AND modified-bsd
13# if --standalone 13# if --standalone
14# LICENSE += AND gnu-lgpl-v2.1 14# LICENSE += AND gnu-lgpl-v2.1
15 15
16CONFLICTS+= clutter<1.8 16CONFLICTS+= clutter<1.8
17 17
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= gmake gsed pkg-config msgfmt 20USE_TOOLS+= gmake gsed pkg-config msgfmt
21USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
22 22
23# Disable -Werror. 23# Disable -Werror.
24# code is not clean enough for modern compilers 24# code is not clean enough for modern compilers
25CONFIGURE_ARGS+= --enable-maintainer-flags=no 25CONFIGURE_ARGS+= --enable-maintainer-flags=no
 26CONFIGURE_ARGS+= --enable-introspection=yes
26 27
27PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in 28PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in
28PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-1.0.pc.in 29PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-1.0.pc.in
29PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-2.0-experimental.pc.in 30PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango-2.0-experimental.pc.in
30PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in 31PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in
31PKGCONFIG_OVERRIDE+= cogl/cogl-1.0.pc.in 32PKGCONFIG_OVERRIDE+= cogl/cogl-1.0.pc.in
32PKGCONFIG_OVERRIDE+= cogl/cogl-2.0-experimental.pc.in 33PKGCONFIG_OVERRIDE+= cogl/cogl-2.0-experimental.pc.in
33 34
34PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango2.pc.in 35PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango2.pc.in
35PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in 36PKGCONFIG_OVERRIDE+= cogl-pango/cogl-pango.pc.in
36PKGCONFIG_OVERRIDE+= cogl/cogl2.pc.in 37PKGCONFIG_OVERRIDE+= cogl/cogl2.pc.in
37PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in 38PKGCONFIG_OVERRIDE+= cogl-gles2/cogl-gles2-experimental.pc.in
38PKGCONFIG_OVERRIDE+= cogl-gst/cogl-gst.pc.in 39PKGCONFIG_OVERRIDE+= cogl-gst/cogl-gst.pc.in
39PKGCONFIG_OVERRIDE+= cogl-path/cogl-path.pc.in 40PKGCONFIG_OVERRIDE+= cogl-path/cogl-path.pc.in
40 41
41.include "options.mk" 42.include "options.mk"
42 43BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5
 44BUILDLINK_DEPMETHOD.gobject-introspection+= build
 45.include "../../devel/gobject-introspection/buildlink3.mk"
43.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
44BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.0 47BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.0
45.include "../../devel/glib2/buildlink3.mk" 48.include "../../devel/glib2/buildlink3.mk"
46BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 49BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0
47.include "../../devel/pango/buildlink3.mk" 50.include "../../devel/pango/buildlink3.mk"
48BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.0 51BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.0
49.include "../../graphics/cairo/buildlink3.mk" 52.include "../../graphics/cairo/buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/graphics/cogl/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/cogl/PLIST 2015/10/29 22:55:01 1.4
+++ pkgsrc/graphics/cogl/PLIST 2022/06/28 10:40:39 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.4 2015/10/29 22:55:01 prlw1 Exp $ 1@comment $NetBSD: PLIST,v 1.5 2022/06/28 10:40:39 nia Exp $
2include/cogl/cogl-pango/cogl-pango.h 2include/cogl/cogl-pango/cogl-pango.h
3include/cogl/cogl-path/cogl-path-enum-types.h 3include/cogl/cogl-path/cogl-path-enum-types.h
4include/cogl/cogl-path/cogl-path-types.h 4include/cogl/cogl-path/cogl-path-types.h
5include/cogl/cogl-path/cogl-path.h 5include/cogl/cogl-path/cogl-path.h
6include/cogl/cogl-path/cogl1-path-functions.h 6include/cogl/cogl-path/cogl1-path-functions.h
7include/cogl/cogl-path/cogl2-path-functions.h 7include/cogl/cogl-path/cogl2-path-functions.h
8include/cogl/cogl/cogl-atlas-texture.h 8include/cogl/cogl/cogl-atlas-texture.h
9include/cogl/cogl/cogl-attribute-buffer.h 9include/cogl/cogl/cogl-attribute-buffer.h
10include/cogl/cogl/cogl-attribute.h 10include/cogl/cogl/cogl-attribute.h
11include/cogl/cogl/cogl-auto-texture.h 11include/cogl/cogl/cogl-auto-texture.h
12include/cogl/cogl/cogl-bitmap.h 12include/cogl/cogl/cogl-bitmap.h
13include/cogl/cogl/cogl-buffer.h 13include/cogl/cogl/cogl-buffer.h
14include/cogl/cogl/cogl-clip-state.h 14include/cogl/cogl/cogl-clip-state.h
@@ -83,45 +83,45 @@ include/cogl/cogl/deprecated/cogl-clutte @@ -83,45 +83,45 @@ include/cogl/cogl/deprecated/cogl-clutte
83include/cogl/cogl/deprecated/cogl-clutter.h 83include/cogl/cogl/deprecated/cogl-clutter.h
84include/cogl/cogl/deprecated/cogl-fixed.h 84include/cogl/cogl/deprecated/cogl-fixed.h
85include/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h 85include/cogl/cogl/deprecated/cogl-framebuffer-deprecated.h
86include/cogl/cogl/deprecated/cogl-material-compat.h 86include/cogl/cogl/deprecated/cogl-material-compat.h
87include/cogl/cogl/deprecated/cogl-shader.h 87include/cogl/cogl/deprecated/cogl-shader.h
88include/cogl/cogl/deprecated/cogl-texture-deprecated.h 88include/cogl/cogl/deprecated/cogl-texture-deprecated.h
89include/cogl/cogl/deprecated/cogl-type-casts.h 89include/cogl/cogl/deprecated/cogl-type-casts.h
90include/cogl/cogl/deprecated/cogl-vertex-buffer.h 90include/cogl/cogl/deprecated/cogl-vertex-buffer.h
91include/cogl/cogl/gl-prototypes/cogl-core-functions.h 91include/cogl/cogl/gl-prototypes/cogl-core-functions.h
92include/cogl/cogl/gl-prototypes/cogl-gles2-functions.h 92include/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
93include/cogl/cogl/gl-prototypes/cogl-glsl-functions.h 93include/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
94include/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h 94include/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h
95include/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h 95include/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h
96${PLIST.introspection}lib/girepository-1.0/Cogl-1.0.typelib 96lib/girepository-1.0/Cogl-1.0.typelib
97${PLIST.introspection}lib/girepository-1.0/Cogl-2.0.typelib 97lib/girepository-1.0/Cogl-2.0.typelib
98${PLIST.introspection}lib/girepository-1.0/CoglPango-1.0.typelib 98lib/girepository-1.0/CoglPango-1.0.typelib
99${PLIST.introspection}lib/girepository-1.0/CoglPango-2.0.typelib 99lib/girepository-1.0/CoglPango-2.0.typelib
100lib/libcogl-pango.la 100lib/libcogl-pango.la
101lib/libcogl-path.la 101lib/libcogl-path.la
102lib/libcogl.la 102lib/libcogl.la
103lib/pkgconfig/cogl-1.0.pc 103lib/pkgconfig/cogl-1.0.pc
104lib/pkgconfig/cogl-2.0-experimental.pc 104lib/pkgconfig/cogl-2.0-experimental.pc
105lib/pkgconfig/cogl-gl-1.0.pc 105lib/pkgconfig/cogl-gl-1.0.pc
106lib/pkgconfig/cogl-pango-1.0.pc 106lib/pkgconfig/cogl-pango-1.0.pc
107lib/pkgconfig/cogl-pango-2.0-experimental.pc 107lib/pkgconfig/cogl-pango-2.0-experimental.pc
108lib/pkgconfig/cogl-path-1.0.pc 108lib/pkgconfig/cogl-path-1.0.pc
109lib/pkgconfig/cogl-path-2.0-experimental.pc 109lib/pkgconfig/cogl-path-2.0-experimental.pc
110share/cogl/examples-data/crate.jpg 110share/cogl/examples-data/crate.jpg
111${PLIST.introspection}share/gir-1.0/Cogl-1.0.gir 111share/gir-1.0/Cogl-1.0.gir
112${PLIST.introspection}share/gir-1.0/Cogl-2.0.gir 112share/gir-1.0/Cogl-2.0.gir
113${PLIST.introspection}share/gir-1.0/CoglPango-1.0.gir 113share/gir-1.0/CoglPango-1.0.gir
114${PLIST.introspection}share/gir-1.0/CoglPango-2.0.gir 114share/gir-1.0/CoglPango-2.0.gir
115share/locale/an/LC_MESSAGES/cogl.mo 115share/locale/an/LC_MESSAGES/cogl.mo
116share/locale/ar/LC_MESSAGES/cogl.mo 116share/locale/ar/LC_MESSAGES/cogl.mo
117share/locale/as/LC_MESSAGES/cogl.mo 117share/locale/as/LC_MESSAGES/cogl.mo
118share/locale/ast/LC_MESSAGES/cogl.mo 118share/locale/ast/LC_MESSAGES/cogl.mo
119share/locale/be/LC_MESSAGES/cogl.mo 119share/locale/be/LC_MESSAGES/cogl.mo
120share/locale/bg/LC_MESSAGES/cogl.mo 120share/locale/bg/LC_MESSAGES/cogl.mo
121share/locale/bs/LC_MESSAGES/cogl.mo 121share/locale/bs/LC_MESSAGES/cogl.mo
122share/locale/ca/LC_MESSAGES/cogl.mo 122share/locale/ca/LC_MESSAGES/cogl.mo
123share/locale/ca@valencia/LC_MESSAGES/cogl.mo 123share/locale/ca@valencia/LC_MESSAGES/cogl.mo
124share/locale/cs/LC_MESSAGES/cogl.mo 124share/locale/cs/LC_MESSAGES/cogl.mo
125share/locale/da/LC_MESSAGES/cogl.mo 125share/locale/da/LC_MESSAGES/cogl.mo
126share/locale/de/LC_MESSAGES/cogl.mo 126share/locale/de/LC_MESSAGES/cogl.mo
127share/locale/el/LC_MESSAGES/cogl.mo 127share/locale/el/LC_MESSAGES/cogl.mo
cvs diff -r1.5 -r1.6 pkgsrc/graphics/cogl/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cogl/options.mk 2021/04/16 06:49:24 1.5
+++ pkgsrc/graphics/cogl/options.mk 2022/06/28 10:40:39 1.6
@@ -1,36 +1,23 @@ @@ -1,36 +1,23 @@
1# $NetBSD: options.mk,v 1.5 2021/04/16 06:49:24 nia Exp $ 1# $NetBSD: options.mk,v 1.6 2022/06/28 10:40:39 nia Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.cogl 4PKG_OPTIONS_VAR= PKG_OPTIONS.cogl
5PKG_SUPPORTED_OPTIONS= introspection x11 5PKG_SUPPORTED_OPTIONS= x11
6PKG_SUGGESTED_OPTIONS= introspection x11 6PKG_SUGGESTED_OPTIONS= x11
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= introspection x11 
11 
12.if !empty(PKG_OPTIONS:Mintrospection) 
13PLIST.introspection= yes 
14BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 
15BUILDLINK_DEPMETHOD.gobject-introspection+= build 
16.include "../../devel/gobject-introspection/buildlink3.mk" 
17CONFIGURE_ARGS+= --enable-introspection=yes 
18.else 
19CONFIGURE_ARGS+= --enable-introspection=no 
20.endif 
21 
22.if !empty(PKG_OPTIONS:Mx11) 10.if !empty(PKG_OPTIONS:Mx11)
23PLIST.x11= yes 
24CONFIGURE_ARGS+= --with-x 11CONFIGURE_ARGS+= --with-x
25CONFIGURE_ARGS+= --enable-gdk-pixbuf 12CONFIGURE_ARGS+= --enable-gdk-pixbuf
26CONFIGURE_ARGS+= --with-gl-libname=libGL 13CONFIGURE_ARGS+= --with-gl-libname=libGL
27.include "../../graphics/MesaLib/buildlink3.mk" 14.include "../../graphics/MesaLib/buildlink3.mk"
28.include "../../x11/libX11/buildlink3.mk" 15.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 16.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/libXdamage/buildlink3.mk" 17.include "../../x11/libXdamage/buildlink3.mk"
31.include "../../x11/libXfixes/buildlink3.mk" 18.include "../../x11/libXfixes/buildlink3.mk"
32BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.4 19BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.4
33.include "../../x11/libXcomposite/buildlink3.mk" 20.include "../../x11/libXcomposite/buildlink3.mk"
34BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.2 21BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.2
35.include "../../x11/libXrandr/buildlink3.mk" 22.include "../../x11/libXrandr/buildlink3.mk"
36.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 23.include "../../graphics/gdk-pixbuf2/buildlink3.mk"