mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00
Code Issues Releases Activity

Properly support png 1.5

Browse Source
This commit is contained in:
Baptiste Daroussin 2014-12-25 11:24:40 +00:00
parent 358df94711
commit 589b203934
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=375535
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/metisse/Makefile
View File

@ -15,7 +15,7 @@ LICENSE= GPLv3
CONFLICTS= fvwm-1.* fvwm-2.*
LIB_DEPENDS= libNucleo.so:${PORTSDIR}/x11-toolkits/nucleo \
libpng15.so:${PORTSDIR}/graphics/png
libpng.so:${PORTSDIR}/graphics/png
RUN_DEPENDS= ${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
USES= gettext libtool pathfix pkgconfig python shebangfix tar:bzip2
@ -41,7 +41,7 @@ WANT_GNOME= yes
MAKE_ARGS= METISSE_DOC_DIR="${DOCSDIR}"
INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= MMX GLX ATSPI STROKE RPLAY FRIBIDI GLIB GTK2 GCONF \

10
x11/metisse/files/patch-fvwm-insitu-libs-PictureImageLoader.c
View File

@ -1,10 +0,0 @@
--- fvwm-insitu/libs/PictureImageLoader.c.orig 2008-12-09 13:52:20.000000000 +0100
+++ fvwm-insitu/libs/PictureImageLoader.c 2012-05-22 07:28:06.000000000 +0200
@@ -44,6 +44,7 @@
#include "Fgdk-pixbuf.h"
#include "FRenderInit.h"
#include "FImage.h"
+#include "pngpriv.h"
/* ---------------------------- local definitions -------------------------- */
#define FIMAGE_CMD_ARGS Display *dpy, Window win, char *path, \

31
x11/metisse/files/patch-fvwm-insitu_libs_PictureImageLoader.c Normal file
View File

@ -0,0 +1,31 @@
--- fvwm-insitu/libs/PictureImageLoader.c.orig 2008-12-09 12:52:20 UTC
+++ fvwm-insitu/libs/PictureImageLoader.c
@@ -145,7 +145,7 @@ Bool PImageLoadPng(FIMAGE_CMD_ARGS)
return False;
}
#if 0
- if (setjmp(Fpng_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(Fpng_ptr)))
{
Fpng_destroy_read_struct(&Fpng_ptr, &Finfo_ptr, NULL);
fclose(f);
@@ -165,16 +165,16 @@ Bool PImageLoadPng(FIMAGE_CMD_ARGS)
{
Fpng_set_expand(Fpng_ptr);
}
- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_RGB_ALPHA)
+ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_RGB_ALPHA)
{
hasa = 1;
}
- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY_ALPHA)
+ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY_ALPHA)
{
hasa = 1;
hasg = 1;
}
- if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY)
+ if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY)
{
hasg = 1;
}