graphics/gdk-pixbuf-extra: add default-disabled loaders

With the new port, remove OTHERS from graphics/gdk-pixbuf2, and add
corresponding helper to USES=gnome. Ports using the affected loaders
should declare USE_GNOME=gdkpixbufextra.

PR: 285185
This commit is contained in:
Charlie Li 2025-03-11 17:38:21 -04:00
parent e87d8134a3
commit e129c081e3
No known key found for this signature in database
GPG key ID: 678F936058415CCA
10 changed files with 79 additions and 15 deletions

View file

@ -63,7 +63,7 @@ _USE_GNOME_ALL= intlhack intltool introspection \
# GNOME 2 components # GNOME 2 components
_USE_GNOME_ALL+= atk cairo \ _USE_GNOME_ALL+= atk cairo \
gdkpixbuf gdkpixbuf2xlib gconf2 glib20 \ gdkpixbuf gdkpixbuf2xlib gdkpixbufextra gconf2 glib20 \
gtk-update-icon-cache gtk20 \ gtk-update-icon-cache gtk20 \
gtksharp20 gtksourceview2 gvfs libartlgpl2 \ gtksharp20 gtksourceview2 gvfs libartlgpl2 \
libglade2 libgnomecanvas \ libglade2 libgnomecanvas \
@ -177,6 +177,10 @@ gdkpixbuf_USE_GNOME_IMPL=glib20
gdkpixbuf2xlib_LIB_DEPENDS= libgdk_pixbuf_xlib-2.0.so:graphics/gdk-pixbuf2-xlib gdkpixbuf2xlib_LIB_DEPENDS= libgdk_pixbuf_xlib-2.0.so:graphics/gdk-pixbuf2-xlib
gdkpixbuf2xlib_USE_GNOME_IMPL= glib20 gdkpixbuf gdkpixbuf2xlib_USE_GNOME_IMPL= glib20 gdkpixbuf
gdkpixbufextra_BUILD_DEPENDS= gdk-pixbuf-extra>=0.1.0:graphics/gdk-pixbuf-extra
gdkpixbufextra_RUN_DEPENDS= gdk-pixbuf-extra>=0.1.0:graphics/gdk-pixbuf-extra
gdkpixbufextra_USE_GNOME_IMPL= glib20 gdkpixbuf
gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache gtk-update-icon-cache_RUN_DEPENDS= gtk-update-icon-cache:graphics/gtk-update-icon-cache
gtk20_LIB_DEPENDS= libgtk-x11-2.0.so:x11-toolkits/gtk20 gtk20_LIB_DEPENDS= libgtk-x11-2.0.so:x11-toolkits/gtk20

View file

@ -5,6 +5,18 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades. you update your ports collection, before attempting any port upgrades.
20250316:
AFFECTS: users of graphics/gdk-pixbuf2
AUTHOR: vishwin@FreeBSD.org
Loaders for ANI, BMP, ICNS, ICO, PNM, QTIF, TGA, XBM and XPM have
been moved to a separate graphics/gdk-pixbuf-extra port. Install
the aforementioned port if artefacts in those formats no longer
load or otherwise cause errors, and report them so that
USE_GNOME=gdkpixbufextra can be declared. Most should only need
USE_GNOME=gdkpixbufextra:run, but for those also needing these
loaders for build, leave out the :run.
20250315: 20250315:
AFFECTS: users of sysutils/snmp_exporter AFFECTS: users of sysutils/snmp_exporter
AUTHOR: lexi@hemlock.eden.le-fay.org AUTHOR: lexi@hemlock.eden.le-fay.org

View file

@ -232,6 +232,7 @@
SUBDIR += gdal SUBDIR += gdal
SUBDIR += gdal-grass SUBDIR += gdal-grass
SUBDIR += gdchart SUBDIR += gdchart
SUBDIR += gdk-pixbuf-extra
SUBDIR += gdk-pixbuf2 SUBDIR += gdk-pixbuf2
SUBDIR += gdk-pixbuf2-xlib SUBDIR += gdk-pixbuf2-xlib
SUBDIR += gdtclft SUBDIR += gdtclft

View file

@ -0,0 +1,22 @@
PORTNAME= gdk-pixbuf-extra
DISTVERSION= 0.1.0
CATEGORIES= graphics
DIST_SUBDIR= gnome
MAINTAINER= desktop@FreeBSD.org
COMMENT= gdk-pixbuf extra loaders for niche and seldom-used image formats
WWW= https://gitlab.gnome.org/ebassi/gdk-pixbuf-extra
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe gnome meson pkgconfig
CPE_VENDOR= gnome
USE_GNOME= gdkpixbuf glib20
USE_GITLAB= yes
GL_SITE= https://gitlab.gnome.org/
GL_ACCOUNT= ebassi
GL_TAGNAME= ef0277942b83c5c4c4c726bf0076d02e087a131c
.include <bsd.port.mk>

View file

@ -0,0 +1,3 @@
TIMESTAMP = 1741719269
SHA256 (gnome/ebassi-gdk-pixbuf-extra-ef0277942b83c5c4c4c726bf0076d02e087a131c_GL0.tar.gz) = 228f81e3f27ee567c139cc1030bd4c322731c25d14de6306d0fc26dd32d06e09
SIZE (gnome/ebassi-gdk-pixbuf-extra-ef0277942b83c5c4c4c726bf0076d02e087a131c_GL0.tar.gz) = 71146

View file

@ -0,0 +1,12 @@
This project includes GdkPixbuf loaders for niche and seldom used image
formats:
- ANI
- BMP
- ICO
- ICNS
- PNM
- QTIF
- TGA
- XBM
- XPM

View file

@ -0,0 +1,10 @@
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.so
lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so
share/thumbnailers/gdk-pixbuf-extra.thumbnailer

View file

@ -1,5 +1,6 @@
PORTNAME= gdk-pixbuf PORTNAME= gdk-pixbuf
PORTVERSION= 2.42.12 PORTVERSION= 2.42.12
PORTREVISION= 1
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= GNOME MASTER_SITES= GNOME
PKGNAMESUFFIX= 2 PKGNAMESUFFIX= 2
@ -28,11 +29,9 @@ LIBVERSION= 0.4200.12
PLIST_SUB+= LIBVERSION=${LIBVERSION} PLIST_SUB+= LIBVERSION=${LIBVERSION}
OPTIONS_SUB= yes OPTIONS_SUB= yes
OPTIONS_DEFINE= DOCS GIF JPEG MANPAGES OTHERS PNG TIFF OPTIONS_DEFINE= DOCS GIF JPEG MANPAGES PNG TIFF
OPTIONS_DEFAULT=GIF JPEG MANPAGES PNG TIFF OPTIONS_DEFAULT=GIF JPEG MANPAGES PNG TIFF
OTHERS_DESC= Enable weakly-maintained loaders
DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR}
DOCS_MESON_TRUE= gtk_doc DOCS_MESON_TRUE= gtk_doc
@ -46,8 +45,6 @@ MANPAGES_BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \
MANPAGES_USE= gnome=libxslt:build MANPAGES_USE= gnome=libxslt:build
MANPAGES_MESON_TRUE= man MANPAGES_MESON_TRUE= man
OTHERS_MESON_ENABLED= others
PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_MESON_ENABLED= png PNG_MESON_ENABLED= png

View file

@ -0,0 +1,12 @@
[
{
type: upgrade
minimum_version: "2.42.11"
message: <<EOM
Loaders for ANI, BMP, ICNS, ICO, PNM, QTIF, TGA, XBM and XPM have
been moved to a separate graphics/gdk-pixbuf-extra port. Install
the aforementioned port if artefacts in those formats no longer
load or otherwise cause errors.
EOM
}
]

View file

@ -15,19 +15,10 @@ include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ani.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-bmp.so
%%GIF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so %%GIF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-gif.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-icns.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-ico.so
%%JPEG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so %%JPEG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jpeg.so
%%PNG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so %%PNG%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-png.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-pnm.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-qtif.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tga.so
%%TIFF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.so %%TIFF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-tiff.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xbm.so
%%OTHERS%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-xpm.so
lib/girepository-1.0/GdkPixbuf-2.0.typelib lib/girepository-1.0/GdkPixbuf-2.0.typelib
lib/girepository-1.0/GdkPixdata-2.0.typelib lib/girepository-1.0/GdkPixdata-2.0.typelib
lib/libgdk_pixbuf-2.0.so lib/libgdk_pixbuf-2.0.so