Date: Monday, April 16, 2012 @ 10:12:17 Author: jgc Revision: 156265 upgpkg: openjpeg 1.5.0-1
Update to 1.5.0 Modified: openjpeg/trunk/PKGBUILD Deleted: openjpeg/trunk/openjpeg-1.4-autoconf.patch -----------------------------+ PKGBUILD | 22 ++++------- openjpeg-1.4-autoconf.patch | 78 ------------------------------------------ 2 files changed, 8 insertions(+), 92 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-16 13:51:33 UTC (rev 156264) +++ PKGBUILD 2012-04-16 14:12:17 UTC (rev 156265) @@ -2,34 +2,28 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=openjpeg -pkgver=1.4 -_pkgver=v1_4 -_revision=r697 +pkgver=1.5.0 pkgrel=1 pkgdesc="An open source JPEG 2000 codec" arch=(i686 x86_64) license=('BSD') url="http://www.openjpeg.org"; depends=('zlib') -source=(http://openjpeg.googlecode.com/files/openjpeg_${_pkgver}_sources_${_revision}.tgz - openjpeg-1.4-autoconf.patch) -md5sums=('7870bb84e810dec63fcf3b712ebb93db' - '46d1d26b59ce546444f3fe8d7c685775') +options=('!libtool') +source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) +sha1sums=('dce705ae45f137e4698a8cf39d1fbf22bc434fa8') -options=('!makeflags' '!libtool') - build() { - cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}" - patch -Np1 -i ${srcdir}/openjpeg-1.4-autoconf.patch + cd "${srcdir}/${pkgname}-${pkgver}" # make sure we use system libs - rm -rf libs + rm -rf thirtparty ./configure --prefix=/usr \ - --disable-static + --disable-static --disable-silent-rules make } package() { - cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg" install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE" Deleted: openjpeg-1.4-autoconf.patch =================================================================== --- openjpeg-1.4-autoconf.patch 2012-04-16 13:51:33 UTC (rev 156264) +++ openjpeg-1.4-autoconf.patch 2012-04-16 14:12:17 UTC (rev 156265) @@ -1,78 +0,0 @@ -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)
