Skip to content

Commit 8bae95f

Browse files
committed
gdk-pixbuf2*: update to 2.38.1
2.38.1 (stable) === - Fix OOM in JPEG2000 loader [Ivan A. Melnikov, NetBSD#107] - Fix thumbnailing of animated GIFs [Debarshi Ray, NetBSD#99] - Multiple improvements to the GIF loader [Robert Ancell, !24, !28, !30, NetBSD#22, NetBSD#69 - Fix build on Windows/MSYS2 [Christoph Reiter, !29] - Fix soname versioning on macOS [Christoph Reiter, !23] - Cross-compilation fixes for Android [Matthew Waters, NetBSD#64] - Fix building modules on macOS [Ignacio Casal Quinteiro, !18 and !19] - Fix introspection generation [Iain Lane, NetBSD#92] - Fix error handling in PNG loader [Debarshi Ray, !16] - Improve reproducibility of the build [Chris Lamb, !15] - Speed up saving PNG files [Brion Vibber, NetBSD#90] - Add variables in the pkg-config files for binary utilities [Emmanuele Bassi, NetBSD#88] - Build fixes [Emmanuele Bassi, NetBSD#88] 2.38.0 (stable) === - Documentation fixes 2.37.92 (release candidate) === - Ensure that GdkPixbuf's storage is safely handled [Federico Mena Quintero] - Add test case for buffer overflow in pixdata loader [Bastien Nocera, NetBSD#57] 2.37.0 (development) === - Rework relocation support for loaders cache on Windows [Christoph Reiter, #776081] - Properly install test data [Emmanuele Bassi, Jeremy Bicha, #795527, #795210] - Plug a memory leak when using GBytes [Vitaly Kirsanov, #787626] - Fix introspection annotations [Iñaki García Etxebarria, #789935] - Fix documentation building with X11 disabled [Quentin Glidic, #794872] - Drop Autotools build and move to Meson [Emmanuele Bassi] - Fix OOB error when dithering [Bert Pauline, #748211] - Drop the MMX assembly optimizations for pixops [Emmanuele Bassi] - Improve compatibility for the post-install script [Brendan L, #795705] - Expose the dimensions of the original image from GdkPixbufLoader [Debarshi Ray, #778517] - Improve thumbnailer implementation [Debarshi Ray, #778517] - Make X11 a dependency if the `x11` build option is enabled [Emmanuele Bassi, NetBSD#77] - Generate separate introspection data for GdkPixdata API [Emmanuele Bassi, NetBSD#72] - Deprecate GDK_INTERP_HYPER [Emmanuele Bassi, NetBSD#3] - Avoid a deprecation warning with recent libjasper [Emmanuele Bassi, NetBSD#73] - Fix build on macOS [Emmanuele Bassi, !5] - Fix build with Visual Studio [Chun-wei Fan, !8] - Fix cross-compilation of Windows build on Linux [Benjamin Gilbert, !10]
1 parent 1ced5df commit 8bae95f

9 files changed

Lines changed: 68 additions & 158 deletions

File tree

graphics/gdk-pixbuf2-xlib/Makefile

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.20 2017/08/08 16:52:11 adam Exp $
1+
# $NetBSD: Makefile,v 1.21 2019/07/21 10:11:13 wiz Exp $
22

33
DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION}
44
PKGNAME= gdk-pixbuf2-xlib-${PIXBUF2_VERSION}
@@ -7,33 +7,46 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${MSITE_VERSION}/}
77
EXTRACT_SUFX= .tar.xz
88

99
MAINTAINER= pkgsrc-users@NetBSD.org
10-
HOMEPAGE= https://www.gnome.org/
11-
COMMENT= Image loaders for gtk2
10+
HOMEPAGE= https://developer.gnome.org/gdk-pixbuf
11+
COMMENT= Image loaders for gtk2 (X11 support)
1212
LICENSE= gnu-gpl-v2
1313

1414
PATCHDIR= ${.CURDIR}/../../graphics/gdk-pixbuf2/patches
1515
DISTINFO_FILE= ${.CURDIR}/../../graphics/gdk-pixbuf2/distinfo
16-
BUILD_DIRS= contrib/gdk-pixbuf-xlib
17-
INSTALL_DIRS= contrib/gdk-pixbuf-xlib
1816

1917
CONFLICTS+= gtk2+<2.22
2018

2119
.include "../../graphics/gdk-pixbuf2/Makefile.version"
2220

23-
USE_LIBTOOL= yes
24-
USE_PKGLOCALEDIR= yes
25-
USE_TOOLS+= pkg-config
26-
GNU_CONFIGURE= yes
27-
CONFIGURE_ARGS+= --without-libjpeg
28-
CONFIGURE_ARGS+= --without-libpng
29-
CONFIGURE_ARGS+= --without-libtiff
30-
CONFIGURE_ARGS+= --with-x11
31-
PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
32-
PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
21+
USE_TOOLS+= gmake pkg-config
22+
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
3323

24+
MESON_ARGS+= -D installed_tests=false
25+
MESON_ARGS+= -D x11=true
26+
PKGCONFIG_OVERRIDE_STAGE=pre-install
27+
PKGCONFIG_OVERRIDE= output/meson-private/gdk-pixbuf-xlib-2.0.pc
28+
29+
post-install:
30+
${RM} -rf ${DESTDIR}${PREFIX}/*
31+
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include
32+
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0
33+
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
34+
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib
35+
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
36+
${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
37+
${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
38+
${INSTALL_LIB} ${WRKSRC}/output/contrib/gdk-pixbuf-xlib/*.so* ${DESTDIR}${PREFIX}/lib
39+
${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdk-pixbuf-xlib-2.0.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
40+
41+
.include "../../devel/py-meson/build.mk"
3442
.include "../../databases/shared-mime-info/buildlink3.mk"
3543
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
36-
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
44+
.include "../../graphics/jpeg/buildlink3.mk"
45+
.include "../../graphics/tiff/buildlink3.mk"
46+
.include "../../graphics/png/buildlink3.mk"
47+
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
3748
.include "../../devel/glib2/buildlink3.mk"
49+
BUILDLINK_DEPMETHOD.gobject-introspection:= build
50+
.include "../../devel/gobject-introspection/buildlink3.mk"
3851
.include "../../x11/libX11/buildlink3.mk"
3952
.include "../../mk/bsd.pkg.mk"

graphics/gdk-pixbuf2-xlib/PLIST

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/16 16:46:29 drochner Exp $
1+
@comment $NetBSD: PLIST,v 1.2 2019/07/21 10:11:13 wiz Exp $
22
include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
33
include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
4-
lib/libgdk_pixbuf_xlib-2.0.la
4+
lib/libgdk_pixbuf_xlib-2.0.so
5+
lib/libgdk_pixbuf_xlib-2.0.so.0
6+
lib/libgdk_pixbuf_xlib-2.0.so.0.3800.1
57
lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc

graphics/gdk-pixbuf2/Makefile

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.35 2017/10/15 23:19:11 prlw1 Exp $
1+
# $NetBSD: Makefile,v 1.36 2019/07/21 10:11:13 wiz Exp $
22

33
DISTNAME= gdk-pixbuf-${PIXBUF2_VERSION}
44
PKGNAME= ${DISTNAME:S/pixbuf/pixbuf2/}
@@ -15,22 +15,18 @@ CONFLICTS+= gtk2+<2.22
1515

1616
.include "../../graphics/gdk-pixbuf2/Makefile.version"
1717

18-
USE_LIBTOOL= yes
19-
USE_PKGLOCALEDIR= yes
20-
USE_TOOLS+= gmake pkg-config
21-
GNU_CONFIGURE= yes
22-
PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
23-
PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
18+
USE_TOOLS+= gmake pkg-config
19+
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf
20+
21+
MESON_ARGS+= -D installed_tests=false
22+
MESON_ARGS+= -D x11=false
23+
PKGCONFIG_OVERRIDE_STAGE=pre-install
24+
PKGCONFIG_OVERRIDE= output/meson-private/gdk-pixbuf-2.0.pc
2425

2526
_BUILDING_GTK2= yes
2627
.include "loaders.mk"
2728

28-
# We remove the loader database during post-install since we create it
29-
# anew in the +INSTALL script as part of the POST-INSTALL action.
30-
#
31-
post-install:
32-
${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}
33-
29+
.include "../../devel/py-meson/build.mk"
3430
.include "../../databases/shared-mime-info/buildlink3.mk"
3531
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
3632
.include "../../devel/glib2/buildlink3.mk"
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# $NetBSD: Makefile.version,v 1.21 2018/04/16 12:22:40 wiz Exp $
1+
# $NetBSD: Makefile.version,v 1.22 2019/07/21 10:11:13 wiz Exp $
22
#
33
# used by graphics/gdk-pixbuf2/Makefile
4-
# used by graphics/gdk-pixbuf2-jasper/Makefile
54
# used by graphics/gdk-pixbuf2-xlib/Makefile
65

7-
PIXBUF2_VERSION= 2.36.12
6+
PIXBUF2_VERSION= 2.38.1
87
MSITE_VERSION= ${PIXBUF2_VERSION:R}

graphics/gdk-pixbuf2/PLIST

Lines changed: 19 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.16 2017/05/14 12:55:16 spz Exp $
1+
@comment $NetBSD: PLIST,v 1.17 2019/07/21 10:11:13 wiz Exp $
22
bin/gdk-pixbuf-csource
33
bin/gdk-pixbuf-pixdata
44
bin/gdk-pixbuf-query-loaders
@@ -16,61 +16,27 @@ include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
1616
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
1717
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf.h
1818
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h
19-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.la
20-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.la
21-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.la
22-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.la
23-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.la
24-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
25-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.la
26-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.la
27-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.la
28-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.la
29-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.la
30-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.la
31-
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.la
19+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
20+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
21+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
22+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
23+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
24+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
25+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
26+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
27+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
28+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
29+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
30+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
31+
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
3232
lib/girepository-1.0/GdkPixbuf-2.0.typelib
33-
lib/libgdk_pixbuf-2.0.la
33+
lib/girepository-1.0/GdkPixdata-2.0.typelib
34+
lib/libgdk_pixbuf-2.0.so
35+
lib/libgdk_pixbuf-2.0.so.0
36+
lib/libgdk_pixbuf-2.0.so.0.3800.1
3437
lib/pkgconfig/gdk-pixbuf-2.0.pc
35-
man/man1/gdk-pixbuf-csource.1
36-
man/man1/gdk-pixbuf-query-loaders.1
3738
share/gir-1.0/GdkPixbuf-2.0.gir
38-
share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
39-
share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html
40-
share/gtk-doc/html/gdk-pixbuf/api-index-full.html
41-
share/gtk-doc/html/gdk-pixbuf/composite.png
42-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Animations.html
43-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-Loading.html
44-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-saving.html
45-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html
46-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Inline-data.html
47-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
48-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html
49-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Scaling.html
50-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-The-GdkPixbuf-Structure.html
51-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Utilities.html
52-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
53-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html
54-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html
55-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-XlibRGB.html
56-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html
57-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html
58-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html
59-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html
60-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html
61-
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2
62-
share/gtk-doc/html/gdk-pixbuf/home.png
63-
share/gtk-doc/html/gdk-pixbuf/index.html
64-
share/gtk-doc/html/gdk-pixbuf/left-insensitive.png
65-
share/gtk-doc/html/gdk-pixbuf/left.png
66-
share/gtk-doc/html/gdk-pixbuf/license.html
67-
share/gtk-doc/html/gdk-pixbuf/right-insensitive.png
68-
share/gtk-doc/html/gdk-pixbuf/right.png
69-
share/gtk-doc/html/gdk-pixbuf/rn01.html
70-
share/gtk-doc/html/gdk-pixbuf/rn02.html
71-
share/gtk-doc/html/gdk-pixbuf/style.css
72-
share/gtk-doc/html/gdk-pixbuf/up-insensitive.png
73-
share/gtk-doc/html/gdk-pixbuf/up.png
39+
share/gir-1.0/GdkPixdata-2.0.gir
7440
share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
7541
share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
7642
share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo

graphics/gdk-pixbuf2/distinfo

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
$NetBSD: distinfo,v 1.39 2018/04/16 12:22:40 wiz Exp $
1+
$NetBSD: distinfo,v 1.40 2019/07/21 10:11:13 wiz Exp $
22

3-
SHA1 (gdk-pixbuf-2.36.12.tar.xz) = 2a32bf71fd7c47b22abd9843bc3116e771772fbe
4-
RMD160 (gdk-pixbuf-2.36.12.tar.xz) = 283963dfc2e04e7f51a3b195afb514379ecfda7b
5-
SHA512 (gdk-pixbuf-2.36.12.tar.xz) = 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
6-
Size (gdk-pixbuf-2.36.12.tar.xz) = 5675768 bytes
7-
SHA1 (patch-configure) = 8078e64aae9b3897819635851c72d0ba6d377b18
8-
SHA1 (patch-contrib_gdk-pixbuf-xlib_Makefile.in) = 636ab94c6bfde10c118b7833b4637a586781bfd5
9-
SHA1 (patch-gdk-pixbuf_Makefile.in) = 9173c4dbc89e4a4d34359e52885121c19a8a7ba6
3+
SHA1 (gdk-pixbuf-2.38.1.tar.xz) = 52a3ac673ec558e3eabb611256b74432b29945d7
4+
RMD160 (gdk-pixbuf-2.38.1.tar.xz) = 4404509b3d51958afbba6bb2c3e8a10671622092
5+
SHA512 (gdk-pixbuf-2.38.1.tar.xz) = e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
6+
Size (gdk-pixbuf-2.38.1.tar.xz) = 5509328 bytes
107
SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda

graphics/gdk-pixbuf2/patches/patch-configure

Lines changed: 0 additions & 14 deletions
This file was deleted.

graphics/gdk-pixbuf2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile.in

Lines changed: 0 additions & 24 deletions
This file was deleted.

graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)