SF.net SVN: gar:[23618] csw/mgar/pkg/openjpeg/trunk

[lblume at users.sourceforge.net]

Revision: 23618
          http://sourceforge.net/p/gar/code/23618
Author:   lblume
Date:     2014-05-15 13:02:28 +0000 (Thu, 15 May 2014)
Log Message:
-----------
openjpeg/trunk: Bump to 2.1.0; add patch for big endian issue

Modified Paths:
--------------
    csw/mgar/pkg/openjpeg/trunk/Makefile
    csw/mgar/pkg/openjpeg/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch

Modified: csw/mgar/pkg/openjpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/Makefile	2014-05-14 22:22:53 UTC (rev 23617)
+++ csw/mgar/pkg/openjpeg/trunk/Makefile	2014-05-15 13:02:28 UTC (rev 23618)
@@ -1,5 +1,5 @@
 NAME = openjpeg
-VERSION = 2.0.0
+VERSION = 2.1.0
 GARTYPE = v2
 
 DESCRIPTION = Open-source JPEG 2000 codec written in C
@@ -8,41 +8,39 @@
 endef
 
 VENDOR_URL   = http://code.google.com/p/openjpeg/
-MASTER_SITES = $(GOOGLE_MIRROR)
+MASTER_SITES = $(SF_MIRROR)
+SF_PROJECT   = openjpeg.mirror
 DISTFILES    = $(DISTNAME).tar.gz
 LICENSE      = LICENSE
 
-# .pc file needed at least for ImageMagick
-# http://code.google.com/p/openjpeg/source/detail?spec=svn2250&r=2250#
-PATCHFILES += 0001-add-pc-file.patch
-
 GARCOMPILER = GCC4
 
-PACKAGES += CSWlibopenjp2-6
-CATALOGNAME_CSWlibopenjp2-6 = libopenjp2_6
-PKGFILES_CSWlibopenjp2-6 += $(call baseisadirs,$(libdir),libopenjp2\.so\.2\.0\.0)
-PKGFILES_CSWlibopenjp2-6 += $(call baseisadirs,$(libdir),libopenjp2\.so\.6)
-SPKG_DESC_CSWlibopenjp2-6 += $(DESCRIPTION), libopenjp2.so.6
-RUNTIME_DEP_PKGS_CSWlibopenjp2-6 += CSWlibgcc-s1
+PATCHFILES += 0002-big-endian-uint16_t.patch
 
+PACKAGES += CSWlibopenjp2-7
+CATALOGNAME_CSWlibopenjp2-7 = libopenjp2_7
+PKGFILES_CSWlibopenjp2-7 += $(call baseisadirs,$(libdir),libopenjp2\.so\.2\.1\.0)
+PKGFILES_CSWlibopenjp2-7 += $(call baseisadirs,$(libdir),libopenjp2\.so\.7(\.\d+)*)
+SPKG_DESC_CSWlibopenjp2-7 += $(DESCRIPTION), libopenjp2.so.7
+RUNTIME_DEP_PKGS_CSWlibopenjp2-7 += CSWlibgcc-s1
+# For some reason the so.7 links to the so.2.1.0
+CHECKPKG_OVERRIDES_CSWlibopenjp2-7 += soname-not-part-of-filename|soname=libopenjp2.so.7|filename=libopenjp2.so.2.1.0
+
 PACKAGES += CSWopenjpeg-dev
 CATALOGNAME_CSWopenjpeg-dev = openjpeg_dev
 SPKG_DESC_CSWopenjpeg-dev += $(DESCRIPTION), development files
 PKGFILES_CSWopenjpeg-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWopenjpeg-dev += CSWlibopenjp2-6
+RUNTIME_DEP_PKGS_CSWopenjpeg-dev += CSWlibopenjp2-7
 
 PACKAGES += CSWopenjpeg
 CATALOGNAME_CSWopenjpeg = openjpeg
 SPKG_DESC_CSWopenjpeg += $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibopenjp2-6
+RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibopenjp2-7
 RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibtiff5
 RUNTIME_DEP_PKGS_CSWopenjpeg += CSWliblcms2-2
 RUNTIME_DEP_PKGS_CSWopenjpeg += CSWlibpng15-15
 # PKGFILES is catchall
 
-# For some reason the so.6 links to the so.2.0.0
-CHECKPKG_OVERRIDES_CSWlibopenjp2-6 += soname-not-part-of-filename|soname=libopenjp2.so.6|filename=libopenjp2.so.2.0.0
-
 CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
 CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
 CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"

Modified: csw/mgar/pkg/openjpeg/trunk/checksums
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/checksums	2014-05-14 22:22:53 UTC (rev 23617)
+++ csw/mgar/pkg/openjpeg/trunk/checksums	2014-05-15 13:02:28 UTC (rev 23618)
@@ -1 +1 @@
-d9be274bddc0f47f268e484bdcaaa6c5  openjpeg-2.0.0.tar.gz
+f6419fcc233df84f9a81eb36633c6db6  openjpeg-2.1.0.tar.gz

Added: csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch	                        (rev 0)
+++ csw/mgar/pkg/openjpeg/trunk/files/0002-big-endian-uint16_t.patch	2014-05-15 13:02:28 UTC (rev 23618)
@@ -0,0 +1,14 @@
+index 1b2d361..89a885a 100644
+--- a/src/bin/jp2/convert.c
++++ b/src/bin/jp2/convert.c
+@@ -191,8 +191,8 @@ static int tga_readheader(FILE *fp, unsigned int *bits_per_pixel,
+ 
+ static INLINE int16_t swap16(int16_t x)
+ {
+-    return((((u_int16_t)x & 0x00ffU) <<  8) |
+-           (((u_int16_t)x & 0xff00U) >>  8));
++    return((((uint16_t)x & 0x00ffU) <<  8) |
++           (((uint16_t)x & 0xff00U) >>  8));
+ }
+ 
+ #endif

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