diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:47:04 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:47:04 -0300 |
commit | 79f56eaaa1e752a2f67072051b612acf5c648f69 (patch) | |
tree | a466c8fa3a070419d3a816b79a2d38ec80ad04ce /extra/openjpeg | |
parent | 37ac99de3bc1df2e6c5e0cd8b6af631d589cb4ab (diff) | |
parent | d739da01541d53414129d3171df221cfe2440fe5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/antiword/PKGBUILD
community/apcupsd/PKGBUILD
community/busybox/PKGBUILD
community/chrpath/PKGBUILD
community/driftnet/PKGBUILD
community/emesene/PKGBUILD
community/fdm/PKGBUILD
community/fftw2/PKGBUILD
community/gsynaptics/PKGBUILD
community/gtk-rezlooks-engine/PKGBUILD
community/httptunnel/PKGBUILD
community/libnfnetlink/PKGBUILD
community/libopenraw/PKGBUILD
community/mashup/PKGBUILD
community/pcb/PKGBUILD
community/portaudio_cpp/PKGBUILD
community/preload/PKGBUILD
community/rlog/PKGBUILD
community/scponly/PKGBUILD
community/splint/PKGBUILD
community/wmname/PKGBUILD
community/xosd/PKGBUILD
community/xxkb/PKGBUILD
community/znc/PKGBUILD
core/glibc/PKGBUILD
core/libtool/PKGBUILD
extra/at/PKGBUILD
extra/autogen/PKGBUILD
extra/bmp-musepack/PKGBUILD
extra/capi4k-utils/PKGBUILD
extra/cdrdao/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/cmt/PKGBUILD
extra/compface/PKGBUILD
extra/dasher/PKGBUILD
extra/dcfldd/PKGBUILD
extra/dmapi/PKGBUILD
extra/docker/PKGBUILD
extra/dvd+rw-tools/PKGBUILD
extra/dvdrtools/PKGBUILD
extra/fcgi/PKGBUILD
extra/festival/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gecko-sharp-2.0/PKGBUILD
extra/gimp-gap/PKGBUILD
extra/gmetadom/PKGBUILD
extra/gnome-speech/PKGBUILD
extra/gnome-vfsmm/PKGBUILD
extra/gnutls/PKGBUILD
extra/graphite/PKGBUILD
extra/i8kutils/PKGBUILD
extra/id3/PKGBUILD
extra/java-access-bridge/PKGBUILD
extra/kdelibs/PKGBUILD
extra/koffice/PKGBUILD
extra/ladspa/PKGBUILD
extra/libcddb/PKGBUILD
extra/libcroco/PKGBUILD
extra/libdc1394/PKGBUILD
extra/libdca/PKGBUILD
extra/libgee/PKGBUILD
extra/libglademm/PKGBUILD
extra/libgnomecanvasmm/PKGBUILD
extra/libsigsegv/PKGBUILD
extra/libstdc++5/PKGBUILD
extra/libwebkit/PKGBUILD
extra/libytnef/PKGBUILD
extra/lua/PKGBUILD
extra/mcpp/PKGBUILD
extra/metalog/PKGBUILD
extra/mp3wrap/PKGBUILD
extra/mt-st/PKGBUILD
extra/naim/PKGBUILD
extra/ocaml/PKGBUILD
extra/oxine/PKGBUILD
extra/php/PKGBUILD
extra/poppler/PKGBUILD
extra/pstoedit/PKGBUILD
extra/qt/PKGBUILD
extra/speex/PKGBUILD
extra/sweep/PKGBUILD
extra/t1lib/PKGBUILD
extra/taglib-extras/PKGBUILD
extra/unixodbc/PKGBUILD
extra/wireshark/PKGBUILD
extra/ypbind-mt/PKGBUILD
gnome-unstable/caribou/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/cogl/PKGBUILD
gnome-unstable/dconf/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/empathy/empathy.install
gnome-unstable/eog/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gconf/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gdm/fix_external_program_directories.patch
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-color-manager/PKGBUILD
gnome-unstable/gnome-contacts/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-menus/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gnome-power-manager/PKGBUILD
gnome-unstable/gnome-screensaver/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gnome-utils/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gtkmm3/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwnck3/PKGBUILD
gnome-unstable/mash/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/mx/PKGBUILD
gnome-unstable/pulseaudio/PKGBUILD
gnome-unstable/pygobject/PKGBUILD
gnome-unstable/pygobject2/PKGBUILD
gnome-unstable/seahorse/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/totem/PKGBUILD
gnome-unstable/upower/PKGBUILD
gnome-unstable/vala/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-gtk/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nspr/PKGBUILD
multilib/lib32-nss/PKGBUILD
multilib/lib32-nss/add_spi+cacert_ca_certs.patch
multilib/lib32-openssl/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/wine/PKGBUILD
testing/util-linux/PKGBUILD
Diffstat (limited to 'extra/openjpeg')
-rw-r--r-- | extra/openjpeg/PKGBUILD | 41 | ||||
-rw-r--r-- | extra/openjpeg/openjpeg-1.4-autoconf.patch | 78 |
2 files changed, 103 insertions, 16 deletions
diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD index a32242d91..0b30d5fc8 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 'mips64el') 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) |