Sun Sep 11 23:14:33 UTC 2011

2 files changed, 103 insertions, 16 deletions

diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD
index 087da2f78..6d8331004 100644
--- a/extra/openjpeg/PKGBUILD
+++ b/extra/openjpeg/PKGBUILD
@@ -1,27 +1,36 @@
-# $Id: $
+# $Id: PKGBUILD 137660 2011-09-10 10:58:56Z pierre $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=openjpeg
-pkgver=1.3
-_pkgver=v1_3
-pkgrel=3
+pkgver=1.4
+_pkgver=v1_4
+_revision=r697
+pkgrel=1
 pkgdesc="An open source JPEG 2000 codec"
 arch=(i686 x86_64)
 license=('BSD')
 url="http://www.openjpeg.org"
-depends=('glibc')
-source=(http://www.openjpeg.org/openjpeg_${_pkgver}.tar.gz
-	30_fix_build_for_debian.dpatch)
-md5sums=('f9a3ccfa91ac34b589e9bf7577ce8ff9'
-	 '2557f485513e77f6dcea77f4741c4fa1')
+depends=('zlib')
+source=(http://openjpeg.googlecode.com/files/openjpeg_${_pkgver}_sources_${_revision}.tgz
+	openjpeg-1.4-autoconf.patch)
+md5sums=('7870bb84e810dec63fcf3b712ebb93db'
+         '46d1d26b59ce546444f3fe8d7c685775')
+
+options=('!makeflags' '!libtool')
 
 build() {
-  cd "${srcdir}/OpenJPEG_${_pkgver}"
-  patch -Np1 -i "${srcdir}/30_fix_build_for_debian.dpatch" || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}"
+  patch -Np1 -i ${srcdir}/openjpeg-1.4-autoconf.patch
+  # make sure we use system libs
+  rm -rf libs
+  ./configure --prefix=/usr \
+	--disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}"
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg"
-  tr '\r' '\n' < license.txt > "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
-  chmod 644 "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
-  ln -s libopenjpeg.so.2 "${pkgdir}/usr/lib/libopenjpeg.so" || return 1
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE"
 }
diff --git a/extra/openjpeg/openjpeg-1.4-autoconf.patch b/extra/openjpeg/openjpeg-1.4-autoconf.patch
new file mode 100644
index 000000000..988b72b7d
--- /dev/null
+++ b/extra/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)