Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1712950900260540"
MIME-Version: 1.0
Date: Fri, 12 Apr 2024 19:41:40 +0000
From: "Taylor R Campbell" <riastradh@netbsd.org>
Subject: CVS commit: pkgsrc/graphics/gdk-pixbuf2
To: pkgsrc-changes@NetBSD.org
Reply-To: riastradh@netbsd.org
Message-Id: <20240412194140.20934FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1712950900260540
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	riastradh
Date:		Fri Apr 12 19:41:40 UTC 2024

Modified Files:
	pkgsrc/graphics/gdk-pixbuf2: Makefile PLIST
Added Files:
	pkgsrc/graphics/gdk-pixbuf2: options.mk

Log Message:
graphics/gdk-pixbuf2: Make this cross-compile.

1. Break introspection out into an option, default off for cross
   builds, default on for native builds (so no change to native
   builds).

2. Don't play LD_LIBRARY_PATH games at build time in cross builds; it
   won't do anything useful.

3. For some reason the thumbnailer is disabled upstream in cross
   builds, which seems sketchy, but maybe it's not that important.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/gdk-pixbuf2/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/gdk-pixbuf2/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/gdk-pixbuf2/options.mk

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


--_----------=_1712950900260540
Content-Disposition: inline
Content-Length: 4985
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/gdk-pixbuf2/Makefile
diff -u pkgsrc/graphics/gdk-pixbuf2/Makefile:1.62 pkgsrc/graphics/gdk-pixbuf2/Makefile:1.63
--- pkgsrc/graphics/gdk-pixbuf2/Makefile:1.62	Sat Oct 21 17:10:27 2023
+++ pkgsrc/graphics/gdk-pixbuf2/Makefile	Fri Apr 12 19:41:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2023/10/21 17:10:27 gdt Exp $
+# $NetBSD: Makefile,v 1.63 2024/04/12 19:41:39 riastradh Exp $
 
 DISTNAME=	gdk-pixbuf-2.42.10
 PKGNAME=	${DISTNAME:S/pixbuf/pixbuf2/}
@@ -18,9 +18,6 @@ TOOL_DEPENDS+=	${PYPKGPREFIX}-docutils-[
 CONFLICTS+=	gtk2+<2.22
 
 USE_TOOLS+=	pkg-config xgettext
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
-# For Darwin
-MAKE_ENV+=	DYLD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
 
 SUBST_CLASSES+=		rst2man
 SUBST_MESSAGE.rst2man=	Fixing rst2man name used by pkgsrc due to versioning.
@@ -45,6 +42,24 @@ MESON_ARGS+=			-D installed_tests=false
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 PKGCONFIG_OVERRIDE=		output/meson-private/gdk-pixbuf-2.0.pc
 
+PLIST_VARS+=		native
+
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+
+TOOL_DEPENDS+=				glib2-tools>=0:../../devel/glib2-tools
+MESON_CROSS_BINARIES+=			glib-genmarshal glib-mkenums
+MESON_CROSS_BINARY.glib-genmarshal+=	${TOOLBASE:Q}/bin/glib-genmarshal
+MESON_CROSS_BINARY.glib-mkenums+=	${TOOLBASE:Q}/bin/glib-mkenums
+
+.else
+
+PLIST.native=	yes
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
+# For Darwin
+MAKE_ENV+=	DYLD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
+
+.endif
+
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 PYTHON_FOR_BUILD_ONLY=		tool
 
@@ -53,13 +68,13 @@ PYTHON_FOR_BUILD_ONLY=		tool
 _BUILDING_GTK2= yes
 .include "loaders.mk"
 
+.include "options.mk"
+
 .include "../../devel/meson/build.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/py-gi-docgen/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection:= build
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/gdk-pixbuf2/PLIST
diff -u pkgsrc/graphics/gdk-pixbuf2/PLIST:1.24 pkgsrc/graphics/gdk-pixbuf2/PLIST:1.25
--- pkgsrc/graphics/gdk-pixbuf2/PLIST:1.24	Sun Nov 13 09:59:02 2022
+++ pkgsrc/graphics/gdk-pixbuf2/PLIST	Fri Apr 12 19:41:39 2024
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.24 2022/11/13 09:59:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2024/04/12 19:41:39 riastradh Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-pixdata
 bin/gdk-pixbuf-query-loaders
-bin/gdk-pixbuf-thumbnailer
+${PLIST.native}bin/gdk-pixbuf-thumbnailer
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-autocleanups.h
 include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h
@@ -27,16 +27,16 @@ lib/gdk-pixbuf-2.0/2.10.0/loaders/libpix
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
 lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
-lib/girepository-1.0/GdkPixbuf-2.0.typelib
-lib/girepository-1.0/GdkPixdata-2.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GdkPixbuf-2.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GdkPixdata-2.0.typelib
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
 lib/libgdk_pixbuf-2.0.so.0.4200.10
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 man/man1/gdk-pixbuf-csource.1
 man/man1/gdk-pixbuf-query-loaders.1
-share/gir-1.0/GdkPixbuf-2.0.gir
-share/gir-1.0/GdkPixdata-2.0.gir
+${PLIST.introspection}share/gir-1.0/GdkPixbuf-2.0.gir
+${PLIST.introspection}share/gir-1.0/GdkPixdata-2.0.gir
 share/locale/ab/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
@@ -144,4 +144,4 @@ share/locale/yi/LC_MESSAGES/gdk-pixbuf.m
 share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/zh_HK/LC_MESSAGES/gdk-pixbuf.mo
 share/locale/zh_TW/LC_MESSAGES/gdk-pixbuf.mo
-share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer
+${PLIST.native}share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer

Added files:

Index: pkgsrc/graphics/gdk-pixbuf2/options.mk
diff -u /dev/null pkgsrc/graphics/gdk-pixbuf2/options.mk:1.1
--- /dev/null	Fri Apr 12 19:41:40 2024
+++ pkgsrc/graphics/gdk-pixbuf2/options.mk	Fri Apr 12 19:41:39 2024
@@ -0,0 +1,18 @@
+#	$NetBSD: options.mk,v 1.1 2024/04/12 19:41:39 riastradh Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gdk-pixbuf2
+PKG_SUPPORTED_OPTIONS=	introspection
+PKG_SUGGESTED_OPTIONS=	${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		introspection
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=	yes
+MESON_ARGS+=		-Dintrospection=enabled
+BUILDLINK_DEPMETHOD.gobject-introspection:= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.else
+MESON_ARGS+=		-Dintrospection=disabled
+.endif


--_----------=_1712950900260540--