openjpeg 1.4-1 màj port

8 files changed, 168 insertions, 93 deletions

diff --git a/openjpeg/.footprint.i686 b/openjpeg/.footprint.i686
index fa03c1b41..5bb5d6ef5 100644
--- a/openjpeg/.footprint.i686
+++ b/openjpeg/.footprint.i686
@@ -1,8 +1,34 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/extract_j2k_from_mj2
+-rwxr-xr-x	root/root	usr/bin/frames_to_mj2
+-rwxr-xr-x	root/root	usr/bin/image_to_j2k
+-rwxr-xr-x	root/root	usr/bin/j2k_dump
+-rwxr-xr-x	root/root	usr/bin/j2k_to_image
+-rwxr-xr-x	root/root	usr/bin/mj2_to_frames
+-rwxr-xr-x	root/root	usr/bin/wrap_j2k_in_mj2
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/openjpeg.h
+drwxr-xr-x	root/root	usr/include/openjpeg-1.4/
+-rw-r--r--	root/root	usr/include/openjpeg-1.4/openjpeg.h
+lrwxrwxrwx	root/root	usr/include/openjpeg.h -> openjpeg-1.4/openjpeg.h
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libopenjpeg-2.1.3.0.so
 -rw-r--r--	root/root	usr/lib/libopenjpeg.a
-lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so -> libopenjpeg.so.2
-lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so.2 -> libopenjpeg-2.1.3.0.so
+-rwxr-xr-x	root/root	usr/lib/libopenjpeg.la
+lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so -> libopenjpeg.so.1.4.0
+lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so.1 -> libopenjpeg.so.1.4.0
+-rwxr-xr-x	root/root	usr/lib/libopenjpeg.so.1.4.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/libopenjpeg.pc -> libopenjpeg1.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libopenjpeg1.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/openjpeg-1.4/
+-rw-r--r--	root/root	usr/share/doc/openjpeg-1.4/CHANGES
+-rw-r--r--	root/root	usr/share/doc/openjpeg-1.4/LICENSE
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/image_to_j2k.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/j2k_dump.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/j2k_to_image.1.gz
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/libopenjpeg.3.gz
diff --git a/openjpeg/.footprint.x86_64 b/openjpeg/.footprint.x86_64
index fa03c1b41..5bb5d6ef5 100644
--- a/openjpeg/.footprint.x86_64
+++ b/openjpeg/.footprint.x86_64
@@ -1,8 +1,34 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/extract_j2k_from_mj2
+-rwxr-xr-x	root/root	usr/bin/frames_to_mj2
+-rwxr-xr-x	root/root	usr/bin/image_to_j2k
+-rwxr-xr-x	root/root	usr/bin/j2k_dump
+-rwxr-xr-x	root/root	usr/bin/j2k_to_image
+-rwxr-xr-x	root/root	usr/bin/mj2_to_frames
+-rwxr-xr-x	root/root	usr/bin/wrap_j2k_in_mj2
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/openjpeg.h
+drwxr-xr-x	root/root	usr/include/openjpeg-1.4/
+-rw-r--r--	root/root	usr/include/openjpeg-1.4/openjpeg.h
+lrwxrwxrwx	root/root	usr/include/openjpeg.h -> openjpeg-1.4/openjpeg.h
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libopenjpeg-2.1.3.0.so
 -rw-r--r--	root/root	usr/lib/libopenjpeg.a
-lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so -> libopenjpeg.so.2
-lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so.2 -> libopenjpeg-2.1.3.0.so
+-rwxr-xr-x	root/root	usr/lib/libopenjpeg.la
+lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so -> libopenjpeg.so.1.4.0
+lrwxrwxrwx	root/root	usr/lib/libopenjpeg.so.1 -> libopenjpeg.so.1.4.0
+-rwxr-xr-x	root/root	usr/lib/libopenjpeg.so.1.4.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+lrwxrwxrwx	root/root	usr/lib/pkgconfig/libopenjpeg.pc -> libopenjpeg1.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libopenjpeg1.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/openjpeg-1.4/
+-rw-r--r--	root/root	usr/share/doc/openjpeg-1.4/CHANGES
+-rw-r--r--	root/root	usr/share/doc/openjpeg-1.4/LICENSE
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/image_to_j2k.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/j2k_dump.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/j2k_to_image.1.gz
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/libopenjpeg.3.gz
diff --git a/openjpeg/.md5sum.i686 b/openjpeg/.md5sum.i686
index 6d50ec0b4..a62e4c00a 100644
--- a/openjpeg/.md5sum.i686
+++ b/openjpeg/.md5sum.i686
@@ -1,2 +1,3 @@
-2557f485513e77f6dcea77f4741c4fa1  30_fix_build_for_debian.dpatch
-f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz
+46d1d26b59ce546444f3fe8d7c685775  openjpeg-1.4-autoconf.patch
+7870bb84e810dec63fcf3b712ebb93db  openjpeg_v1_4_sources_r697.tgz
+b584f98c991065e097179445cbebb87d  zlib-include.patch
diff --git a/openjpeg/.md5sum.x86_64 b/openjpeg/.md5sum.x86_64
index 6d50ec0b4..a62e4c00a 100644
--- a/openjpeg/.md5sum.x86_64
+++ b/openjpeg/.md5sum.x86_64
@@ -1,2 +1,3 @@
-2557f485513e77f6dcea77f4741c4fa1  30_fix_build_for_debian.dpatch
-f9a3ccfa91ac34b589e9bf7577ce8ff9  openjpeg_v1_3.tar.gz
+46d1d26b59ce546444f3fe8d7c685775  openjpeg-1.4-autoconf.patch
+7870bb84e810dec63fcf3b712ebb93db  openjpeg_v1_4_sources_r697.tgz
+b584f98c991065e097179445cbebb87d  zlib-include.patch
diff --git a/openjpeg/30_fix_build_for_debian.dpatch b/openjpeg/30_fix_build_for_debian.dpatch
deleted file mode 100644
index afd995054..000000000
--- a/openjpeg/30_fix_build_for_debian.dpatch
+++ /dev/null
@@ -1,70 +0,0 @@
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_build_for_debian.dpatch by <robin.cornelius@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dont apply the -s strip flag to the shared lib debian will do it for us 
-## DP: where necessary
-## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm
-
-@DPATCH@
-
-Index: ./Makefile
-===================================================================
---- ./Makefile	(revision 96)
-+++ ./Makefile	(working copy)
-@@ -18,8 +18,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS)
- 
- MODULES = $(SRCS:.c=.o)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-@@ -54,7 +53,7 @@
- 	$(AR) r $@ $(MODULES)
- 
- $(SHAREDLIB): $(MODULES)
--	$(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+	$(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm
- 
- install: OpenJPEG
- 	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-
-Index: ./indexer_JPIP/Makefile
-===================================================================
---- ./indexer_JPIP/Makefile	(revision 95)
-+++ ./indexer_JPIP/Makefile	(working copy)
-@@ -1,7 +1,6 @@
- CC = gcc
- 
--LDFLAGS = -lm
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
- 
- all: index_create
- 
-Index: ./codec/Makefile
-===================================================================
---- ./codec/Makefile	(revision 96)
-+++ ./codec/Makefile	(working copy)
-@@ -1,13 +1,13 @@
- # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
- 
--CFLAGS = -O3 -lstdc++ # -g -p -pg
-+CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg
- 
- all: j2k_to_image image_to_j2k
- 
--j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-+j2k_to_image: j2k_to_image.c
- 	gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
- 
--image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-+image_to_j2k: image_to_j2k.c
- 	gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
- 
- clean:
-
diff --git a/openjpeg/Pkgfile b/openjpeg/Pkgfile
index eab2f6b65..115855de8 100755
--- a/openjpeg/Pkgfile
+++ b/openjpeg/Pkgfile
@@ -2,22 +2,24 @@
 # URL: http://www.ijg.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: 
-# Run on:
+# Depends on: lcms2
+# Run on: lcms2
 
 name=openjpeg
-version=1.3
+version=1.4
 release=1
-_version=v1_3
-source=( http://www.openjpeg.org/openjpeg_${_version}.tar.gz \
-	30_fix_build_for_debian.dpatch)
-
+_version=v1_4
+_revision=r697
+source=(http://openjpeg.googlecode.com/files/openjpeg_${_version}_sources_${_revision}.tgz
+	openjpeg-1.4-autoconf.patch
+	zlib-include.patch)
 
 build() {
-	cd OpenJPEG_${_version}
-	patch -Np1 -i ../30_fix_build_for_debian.dpatch
+	cd ${name}_${_version}_sources_${_revision}
+	patch -Np1 -i ../openjpeg-1.4-autoconf.patch
+	patch -p0 < ../zlib-include.patch
+	rm -rf libs
+	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
-	ln -s libopenjpeg.so.2 $PKG/usr/lib/libopenjpeg.so
 }
-  
diff --git a/openjpeg/openjpeg-1.4-autoconf.patch b/openjpeg/openjpeg-1.4-autoconf.patch
new file mode 100644
index 000000000..988b72b7d
--- /dev/null
+++ b/openjpeg/openjpeg-1.4-autoconf.patch
@@ -0,0 +1,78 @@
+diff -up openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/doc/Makefile.am
+--- openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR	2011-01-02 12:14:47.000000000 -0600
++++ openjpeg_v1_4_sources_r697/doc/Makefile.am	2011-01-12 12:12:20.959518549 -0600
+@@ -20,30 +20,30 @@ all-local:
+ 	@cp man/man3/* .
+ 
+ install-data-hook:
+-	$(INSTALL) -d $(doc_dir)
+-	$(INSTALL) -d ${mandir}/man1 ${mandir}/man3
++	$(INSTALL) -d $(DESTDIR)$(doc_dir)
++	$(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3
+ if with_libjpwl
+-	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
+-	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
++	@(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
++	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
+ endif
+-	@(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+-	@(cd ${mandir}/man3 && $(RM) libopenjpeg* )
++	@(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
++	@(cd $(DESTDIR)${mandir}/man3 && $(RM) libopenjpeg* )
+ 	@gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3
+-	@cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
+-	@cp libopenjpeg.3.gz ${mandir}/man3
++	@cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(DESTDIR)${mandir}/man1
++	@cp libopenjpeg.3.gz $(DESTDIR)${mandir}/man3
+ 	@$(RM) *\.gz
+ if with_libjpwl
+-	@(cd ${mandir}/man1 && \
++	@(cd $(DESTDIR)${mandir}/man1 && \
+ 	$(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \
+ 	$(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz)
+ 	@(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
+ endif
+-	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir)
++	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir)
+ 
+ uninstall-hook:
+-	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
++	@(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
+ 	$(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+-	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
++	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
+ 	$(RM) libopenjpeg* )
+-	@(cd $(doc_dir) && $(RM) * )
+-	@rmdir $(doc_dir)
++	@(cd $(DESTDIR)$(doc_dir) && $(RM) * )
++	@rmdir $(DESTDIR)$(doc_dir)
+diff -up openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/Makefile.am
+--- openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR	2011-01-02 12:14:55.000000000 -0600
++++ openjpeg_v1_4_sources_r697/Makefile.am	2011-01-12 12:15:37.006321242 -0600
+@@ -9,7 +9,7 @@ clean-local:
+ 
+ distclean-local: clean-local
+ 
+-pkgconf_dir = /usr/lib/pkgconfig
++pkgconf_dir = $(libdir)/pkgconfig
+ 
+ install-data-hook:
+ 	@echo ""
+@@ -17,12 +17,12 @@ install-data-hook:
+ 	cat $$f/.report.txt ; \
+ 	done
+ 	@echo ""
+-	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
++	@echo "Installing: libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)"
+ 	@echo ""
+-	@$(INSTALL) -d $(pkgconf_dir)
+-	@cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc
+-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \
++	@$(INSTALL) -d $(DESTDIR)$(pkgconf_dir)
++	@cp libopenjpeg.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc
++	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \
+ 	$(LN_S) libopenjpeg1.pc libopenjpeg.pc)
+ 
+ uninstall-hook:
+-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
++	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
diff --git a/openjpeg/zlib-include.patch b/openjpeg/zlib-include.patch
new file mode 100644
index 000000000..8c11883cf
--- /dev/null
+++ b/openjpeg/zlib-include.patch
@@ -0,0 +1,11 @@
+--- codec/convert.c.bak	2012-01-23 01:05:14.455791163 +0100
++++ codec/convert.c	2012-01-23 01:05:40.934377069 +0100
+@@ -51,6 +51,8 @@
+ #endif /* _WIN32 */
+ #endif /* HAVE_LIBPNG */
+ 
++#include <zlib.h>
++
+ #include "../libopenjpeg/openjpeg.h"
+ #include "convert.h"
+