summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD22
2 files changed, 15 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f27fe748ab0..c8cf420cbe7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Jan 9 17:38:44 UTC 2016
+# Sat Jan 9 22:05:02 UTC 2016
pkgbase = lib32-openjpeg
pkgdesc = An open source JPEG 2000 codec (32bit)
pkgver = 1.5.2
@@ -7,15 +7,10 @@ pkgbase = lib32-openjpeg
url = http://www.openjpeg.org
arch = x86_64
license = BSD
- makedepends = lib32-libtiff
- makedepends = lib32-lcms2
- makedepends = lib32-libpng
makedepends = gcc-multilib
- depends = lib32-zlib
+ depends = lib32-glibc
depends = openjpeg
- optdepends = lib32-lcms2: j2k_to_image and image_to_j2k programs
- optdepends = lib32-libpng: j2k_to_image and image_to_j2k programs
- source = http://downloads.sourceforge.net/openjpeg.mirror/lib32-openjpeg-1.5.2.tar.gz
+ source = http://downloads.sourceforge.net/openjpeg.mirror/openjpeg-1.5.2.tar.gz
sha1sums = 496e99ff1d37b73bbce6a066dd9bd3576ebca0a2
pkgname = lib32-openjpeg
diff --git a/PKGBUILD b/PKGBUILD
index 6d71cef33f82..d791136c97fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,9 @@ pkgdesc="An open source JPEG 2000 codec (32bit)"
arch=(x86_64)
license=('BSD')
url="http://www.openjpeg.org"
-depends=('lib32-zlib' 'openjpeg')
-makedepends=('lib32-libtiff' 'lib32-lcms2' 'lib32-libpng' 'gcc-multilib')
-optdepends=('lib32-lcms2: j2k_to_image and image_to_j2k programs'
- 'lib32-libpng: j2k_to_image and image_to_j2k programs')
-source=(http://downloads.sourceforge.net/openjpeg.mirror/${pkgname}-${pkgver}.tar.gz)
+depends=('lib32-glibc' 'openjpeg')
+makedepends=('gcc-multilib')
+source=(http://downloads.sourceforge.net/openjpeg.mirror/${pkgname//lib32-}-${pkgver}.tar.gz)
sha1sums=('496e99ff1d37b73bbce6a066dd9bd3576ebca0a2')
@@ -23,13 +21,17 @@ build() {
rm -rf thirdparty
./configure --prefix=/usr libdir=/usr/lib32 \
--enable-shared --disable-static --disable-silent-rules
- make
+ make -C libopenjpeg
}
package() {
cd ${pkgname//lib32-}-${pkgver}
- make DESTDIR="${pkgdir}" install
- rm -rf "$pkgdir"/usr/{include,share,bin}
- install -m755 -d "${pkgdir}/usr/share/licenses/lib32-openjpeg"
- ln -s "..openjpeg/LICENSE" "${pkgdir}/usr/share/licenses/lib32-openjpeg/LICENSE"
+ make DESTDIR="${pkgdir}" -C libopenjpeg install
+ rm -rf "$pkgdir"/usr/include
+ # install pkgconfig files
+ install -m755 -d "${pkgdir}"/usr/{lib32/pkgconfig,share/licenses/lib32-openjpeg}
+ install -m644 libopenjpeg1.pc "${pkgdir}"/usr/lib32/pkgconfig/
+ ln -s libopenjpeg1.pc "${pkgdir}"/usr/lib32/pkgconfig/libopenjpeg.pc
+ # install license link
+ ln -s "../openjpeg/LICENSE" "${pkgdir}/usr/share/licenses/lib32-openjpeg/LICENSE"
}