Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30528
Modified Files:
jbig2dec.info
Added Files:
jbig2dec.patch
Log Message:
Patch from Jack Howarth to build with libpng15.
Index: jbig2dec.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/jbig2dec.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jbig2dec.info 23 Jul 2011 22:44:55 -0000 1.1
+++ jbig2dec.info 26 May 2013 02:24:20 -0000 1.2
@@ -1,6 +1,6 @@
Package: jbig2dec
Version: 0.11
-Revision: 2
+Revision: 3
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Description: Decoder for JBIG2 image compression format
@@ -18,34 +18,26 @@
License: GPL
Homepage: http://jbig2dec.sourceforge.net/
-# Doesn't build with libpng15.
-Depends: lib%N-shlibs (= %v-%r), libpng14-shlibs, libgettext8-shlibs
-BuildDepends: libpng14, fink (>= 0.24.12), libgettext8-dev, libiconv-dev
+Depends: lib%N-shlibs (= %v-%r), libpng15-shlibs, libgettext8-shlibs
+BuildDepends: libpng15, fink (>= 0.24.12), libgettext8-dev, libiconv-dev
Source: http://ghostscript.com/~giles/jbig2/jbig2dec/%n-%v.tar.gz
Source-MD5: 1f61e144852c86563fee6e5ddced63f1
+PatchFile: %n.patch
+PatchFile-MD5: 23633770dabad57a8370a664676349f5
-# Patch for libpng14 compatibility from Tomoaki Okayama
-PatchScript: sed -i.bak 's|png_check_sig|png_create_write_struct|g' configure
+PatchScript: <<
+%{default_script}
+sed -i.bak 's|png_check_sig|png_create_write_struct|g' configure
+sed -i.bak 's|not result|0|g' test_jbig2dec.py
+<<
ConfigureParams: --disable-dependency-tracking --disable-static
--with-libpng=%p
SetCFLAGS: -Os
-SetLDFLAGS: -lintl
-
-CompileScript: <<
- #!/bin/bash -ev
- # This bit enables stripping unused libs on 10.5 and later.
- let version=`uname -r | cut -f 1 -d .`
- if [ $version -ge 9 ]; then
- export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
- fi
-
- %{default_script}
-<<
+SetLDFLAGS: -lintl -Wl,-dead_strip_dylibs
-#test_jbig2dec.py seems to have been broken upstream.
-#InfoTest: TestScript: make check || exit 2
+InfoTest: TestScript: make check || exit 2
InstallScript: <<
make install DESTDIR=%d
@@ -56,7 +48,7 @@
SplitOff: <<
Package: lib%N-shlibs
- Depends: libpng14-shlibs
+ Depends: libpng15-shlibs
Files: lib/*.*.dylib
Shlibs: <<
--- NEW FILE: jbig2dec.patch ---
--- jbig2dec-0.11/jbig2_image_png.c.orig 2013-05-24 13:58:56.000000000
-0400
+++ jbig2dec-0.11/jbig2_image_png.c 2013-05-24 14:03:17.000000000 -0400
@@ -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);
}
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
