mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00
Code Issues Releases Activity

Properly patch jbig2dec for png > 1.5 instead of exposing png internals

Browse Source
This commit is contained in:
Baptiste Daroussin 2014-12-23 22:40:21 +00:00
parent 72aeb95356
commit 0193f43f06
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=375360
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/jbig2dec/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= jbig2dec
PORTVERSION= 0.11
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics devel
MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@ -25,9 +25,8 @@ TESTS_DESC= Download and use test-images for post-build testing
EXTRACT_AFTER_ARGS+= --exclude sha1.h --exclude 'getopt*'
PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
PNG_CONFIGURE_ON= --with-libpng=${LOCALBASE}
PNG_CFLAGS= -I${LOCALBASE}/include/libpng15
.include <bsd.port.options.mk>

10
graphics/jbig2dec/files/patch-jbig2_image_png.c
View File

@ -1,10 +0,0 @@
--- jbig2_image_png.c.orig 2009-07-16 06:44:49.000000000 +0200
+++ jbig2_image_png.c 2012-04-24 21:54:55.000000000 +0200
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <png.h>
+#include <pngpriv.h>
#include "jbig2.h"
#include "jbig2_priv.h"

20
graphics/jbig2dec/files/patch-libpng15 Normal file
View File

@ -0,0 +1,20 @@
--- jbig2_image_png.c
+++ jbig2_image_png.c
@@ -33,7 +33,7 @@
{
png_size_t check;
- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
+ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));
if (check != length) {
png_error(png_ptr, "Write Error");
}
@@ -43,7 +43,7 @@
jbig2_png_flush(png_structp png_ptr)
{
png_FILE_p io_ptr;
- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);
if (io_ptr != NULL)
fflush(io_ptr);
}