[csw-devel] SF.net SVN: gar:[21216] csw/mgar/pkg/jbig2dec/trunk

[dmichelsen at users.sourceforge.net]

Revision: 21216
          http://gar.svn.sourceforge.net/gar/?rev=21216&view=rev
Author:   dmichelsen
Date:     2013-05-28 09:48:55 +0000 (Tue, 28 May 2013)
Log Message:
-----------
jbig2dec/trunk: Add patch

Modified Paths:
--------------
    csw/mgar/pkg/jbig2dec/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch

Modified: csw/mgar/pkg/jbig2dec/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jbig2dec/trunk/Makefile	2013-05-28 08:30:00 UTC (rev 21215)
+++ csw/mgar/pkg/jbig2dec/trunk/Makefile	2013-05-28 09:48:55 UTC (rev 21216)
@@ -1,6 +1,7 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
+
 NAME = jbig2dec
 VERSION = 0.11
 GARTYPE = v2
@@ -11,6 +12,7 @@
 DISTFILES  = $(DISTNAME).tar.xz
 
 PATCHFILES += 0001-Fix-test-in-testsuite.patch
+PATCHFILES += 0001-Use-accessor-function.patch
 
 VENDOR_URL = http://jbig2dec.sourceforge.net
 
@@ -22,6 +24,7 @@
 PACKAGES += CSWlibjbig2dec0
 SPKG_DESC_CSWlibjbig2dec0 = Library for decoding JBIG2 bi-level images, libjbig2dec.so.0
 PKGFILES_CSWlibjbig2dec0 += $(call pkgfiles_lib,libjbig2dec.so.0)
+RUNTIME_DEP_PKGS_CSWjbig2dec += CSWlibpng15-15
 
 PACKAGES += CSWlibjbig2dec-dev
 SPKG_DESC_CSWlibjbig2dec-dev = Development files for libjbig2dec.so.0
@@ -31,10 +34,10 @@
 BUILD64 = 1
 ISAEXEC = 1
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
 
-# We need /opt/csw/bin/python for the testsuite
-TEST_ENV_PATH = $(bindir):$(PATH)
+# Detection of PNG support is broken due to test for removed legacy function, hardcode for now
+CONFIGURE_ARGS += ac_cv_lib_png_png_check_sig=yes
 
 include gar/category.mk
 

Added: csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch
===================================================================
--- csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch	                        (rev 0)
+++ csw/mgar/pkg/jbig2dec/trunk/files/0001-Use-accessor-function.patch	2013-05-28 09:48:55 UTC (rev 21216)
@@ -0,0 +1,34 @@
+From 98117d1651483893071cc3a87c9e52a41847110c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 28 May 2013 11:41:12 +0200
+Subject: [PATCH] Use accessor function
+
+---
+ jbig2_image_png.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/jbig2_image_png.c b/jbig2_image_png.c
+index 342c0c3..13c0b67 100644
+--- a/jbig2_image_png.c
++++ b/jbig2_image_png.c
+@@ -33,7 +33,7 @@ jbig2_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+     png_size_t check;
+ 
+-    check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
++    check = fwrite(data, 1, length, png_get_io_ptr(png_ptr));
+     if (check != length) {
+       png_error(png_ptr, "Write Error");
+     }
+@@ -43,7 +43,7 @@ static void
+ 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);
+ }
+-- 
+1.8.1.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.