Skip to content

Commit

Permalink
gdk-pixbuf2*: update to 2.38.1
Browse files Browse the repository at this point in the history
2.38.1 (stable)
===
 - Fix OOM in JPEG2000 loader [Ivan A. Melnikov, #107]
 - Fix thumbnailing of animated GIFs [Debarshi Ray, #99]
 - Multiple improvements to the GIF loader [Robert Ancell, !24, !28, !30, #22, #69
 - Fix build on Windows/MSYS2 [Christoph Reiter, !29]
 - Fix soname versioning on macOS [Christoph Reiter, !23]
 - Cross-compilation fixes for Android [Matthew Waters, #64]
 - Fix building modules on macOS [Ignacio Casal Quinteiro, !18 and !19]
 - Fix introspection generation [Iain Lane, #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, #90]
 - Add variables in the pkg-config files for binary utilities [Emmanuele Bassi, #88]
 - Build fixes [Emmanuele Bassi, #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, #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, #77]
 - Generate separate introspection data for GdkPixdata API [Emmanuele Bassi, #72]
 - Deprecate GDK_INTERP_HYPER [Emmanuele Bassi, #3]
 - Avoid a deprecation warning with recent libjasper [Emmanuele Bassi, #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]
  • Loading branch information
0-wiz-0 committed Jul 21, 2019
1 parent 40f8bf5 commit 5c07abc
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 158 deletions.
45 changes: 29 additions & 16 deletions graphics/gdk-pixbuf2-xlib/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 2017/08/08 16:52:11 adam Exp $
# $NetBSD: Makefile,v 1.21 2019/07/21 10:11:13 wiz Exp $

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

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

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

CONFLICTS+= gtk2+<2.22

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

USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-libjpeg
CONFIGURE_ARGS+= --without-libpng
CONFIGURE_ARGS+= --without-libtiff
CONFIGURE_ARGS+= --with-x11
PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
USE_TOOLS+= gmake pkg-config
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf

MESON_ARGS+= -D installed_tests=false
MESON_ARGS+= -D x11=true
PKGCONFIG_OVERRIDE_STAGE=pre-install
PKGCONFIG_OVERRIDE= output/meson-private/gdk-pixbuf-xlib-2.0.pc

post-install:
${RM} -rf ${DESTDIR}${PREFIX}/*
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
${INSTALL_DATA} ${WRKSRC}/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h ${DESTDIR}${PREFIX}/include/gdk-pixbuf-2.0/gdk-pixbuf-xlib
${INSTALL_LIB} ${WRKSRC}/output/contrib/gdk-pixbuf-xlib/*.so* ${DESTDIR}${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdk-pixbuf-xlib-2.0.pc ${DESTDIR}${PREFIX}/lib/pkgconfig

.include "../../devel/py-meson/build.mk"
.include "../../databases/shared-mime-info/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../graphics/png/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 "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
6 changes: 4 additions & 2 deletions graphics/gdk-pixbuf2-xlib/PLIST
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/16 16:46:29 drochner Exp $
@comment $NetBSD: PLIST,v 1.2 2019/07/21 10:11:13 wiz Exp $
include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
include/gdk-pixbuf-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
lib/libgdk_pixbuf_xlib-2.0.la
lib/libgdk_pixbuf_xlib-2.0.so
lib/libgdk_pixbuf_xlib-2.0.so.0
lib/libgdk_pixbuf_xlib-2.0.so.0.3800.1
lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
22 changes: 9 additions & 13 deletions graphics/gdk-pixbuf2/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.35 2017/10/15 23:19:11 prlw1 Exp $
# $NetBSD: Makefile,v 1.36 2019/07/21 10:11:13 wiz Exp $

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

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

USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
PKGCONFIG_OVERRIDE+= gdk-pixbuf-2.0.pc.in
USE_TOOLS+= gmake pkg-config
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gdk-pixbuf

MESON_ARGS+= -D installed_tests=false
MESON_ARGS+= -D x11=false
PKGCONFIG_OVERRIDE_STAGE=pre-install
PKGCONFIG_OVERRIDE= output/meson-private/gdk-pixbuf-2.0.pc

_BUILDING_GTK2= yes
.include "loaders.mk"

# We remove the loader database during post-install since we create it
# anew in the +INSTALL script as part of the POST-INSTALL action.
#
post-install:
${RM} -f ${DESTDIR}${GDK_PIXBUF_LOADERS_DB}

.include "../../devel/py-meson/build.mk"
.include "../../databases/shared-mime-info/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.37.2
.include "../../devel/glib2/buildlink3.mk"
Expand Down
5 changes: 2 additions & 3 deletions graphics/gdk-pixbuf2/Makefile.version
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $NetBSD: Makefile.version,v 1.21 2018/04/16 12:22:40 wiz Exp $
# $NetBSD: Makefile.version,v 1.22 2019/07/21 10:11:13 wiz Exp $
#
# used by graphics/gdk-pixbuf2/Makefile
# used by graphics/gdk-pixbuf2-jasper/Makefile
# used by graphics/gdk-pixbuf2-xlib/Makefile

PIXBUF2_VERSION= 2.36.12
PIXBUF2_VERSION= 2.38.1
MSITE_VERSION= ${PIXBUF2_VERSION:R}
72 changes: 19 additions & 53 deletions graphics/gdk-pixbuf2/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.16 2017/05/14 12:55:16 spz Exp $
@comment $NetBSD: PLIST,v 1.17 2019/07/21 10:11:13 wiz Exp $
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-pixdata
bin/gdk-pixbuf-query-loaders
Expand All @@ -16,61 +16,27 @@ 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.h
include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
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/libgdk_pixbuf-2.0.la
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.3800.1
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/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html
share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html
share/gtk-doc/html/gdk-pixbuf/api-index-full.html
share/gtk-doc/html/gdk-pixbuf/composite.png
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Animations.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-Loading.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-saving.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Inline-data.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Scaling.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-The-GdkPixbuf-Structure.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Utilities.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-XlibRGB.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2
share/gtk-doc/html/gdk-pixbuf/home.png
share/gtk-doc/html/gdk-pixbuf/index.html
share/gtk-doc/html/gdk-pixbuf/left-insensitive.png
share/gtk-doc/html/gdk-pixbuf/left.png
share/gtk-doc/html/gdk-pixbuf/license.html
share/gtk-doc/html/gdk-pixbuf/right-insensitive.png
share/gtk-doc/html/gdk-pixbuf/right.png
share/gtk-doc/html/gdk-pixbuf/rn01.html
share/gtk-doc/html/gdk-pixbuf/rn02.html
share/gtk-doc/html/gdk-pixbuf/style.css
share/gtk-doc/html/gdk-pixbuf/up-insensitive.png
share/gtk-doc/html/gdk-pixbuf/up.png
share/gir-1.0/GdkPixdata-2.0.gir
share/locale/af/LC_MESSAGES/gdk-pixbuf.mo
share/locale/ang/LC_MESSAGES/gdk-pixbuf.mo
share/locale/ar/LC_MESSAGES/gdk-pixbuf.mo
Expand Down
13 changes: 5 additions & 8 deletions graphics/gdk-pixbuf2/distinfo
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
$NetBSD: distinfo,v 1.39 2018/04/16 12:22:40 wiz Exp $
$NetBSD: distinfo,v 1.40 2019/07/21 10:11:13 wiz Exp $

SHA1 (gdk-pixbuf-2.36.12.tar.xz) = 2a32bf71fd7c47b22abd9843bc3116e771772fbe
RMD160 (gdk-pixbuf-2.36.12.tar.xz) = 283963dfc2e04e7f51a3b195afb514379ecfda7b
SHA512 (gdk-pixbuf-2.36.12.tar.xz) = 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
Size (gdk-pixbuf-2.36.12.tar.xz) = 5675768 bytes
SHA1 (patch-configure) = 8078e64aae9b3897819635851c72d0ba6d377b18
SHA1 (patch-contrib_gdk-pixbuf-xlib_Makefile.in) = 636ab94c6bfde10c118b7833b4637a586781bfd5
SHA1 (patch-gdk-pixbuf_Makefile.in) = 9173c4dbc89e4a4d34359e52885121c19a8a7ba6
SHA1 (gdk-pixbuf-2.38.1.tar.xz) = 52a3ac673ec558e3eabb611256b74432b29945d7
RMD160 (gdk-pixbuf-2.38.1.tar.xz) = 4404509b3d51958afbba6bb2c3e8a10671622092
SHA512 (gdk-pixbuf-2.38.1.tar.xz) = e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
Size (gdk-pixbuf-2.38.1.tar.xz) = 5509328 bytes
SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda
14 changes: 0 additions & 14 deletions graphics/gdk-pixbuf2/patches/patch-configure

This file was deleted.

This file was deleted.

25 changes: 0 additions & 25 deletions graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_Makefile.in

This file was deleted.

0 comments on commit 5c07abc

Please sign in to comment.