Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

4 files changed, 7 insertions, 46 deletions

diff --git a/libre/giflib-lts/PKGBUILD b/libre/giflib-lts/PKGBUILD
deleted file mode 100644
index f6848bb86..000000000
--- a/libre/giflib-lts/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 213644 2014-05-27 09:23:45Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
-# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
-# Contributor: mightyjaym <jm.ambrosino@free.fr>
-
-# Maintainer: Márcio Silva (Parabola) <coadde@parabola.nu>
-
-_pkgname=giflib
-pkgname=giflib-lts
-pkgver=5.0.6
-pkgrel=1
-pkgdesc="A library for reading and writing gif images"
-url="http://sourceforge.net/projects/giflib/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MIT')
-depends=('glibc')
-makedepends=('xmlto' 'docbook-xml' 'docbook-xsl')
-source=(http://downloads.sourceforge.net/sourceforge/giflib/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('603838feeed62e9eaa90415742adddf9')
-
-build() {
-  cd ${_pkgname}-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd ${_pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-
-  # remove bin, lib and man files
-  rm -rv "${pkgdir}/usr/"{bin,lib/libgif.so,share/man}
-  mv -v "${pkgdir}/usr/include/"gif_lib{,-lts}.h
-}
diff --git a/libre/opencolorio/PKGBUILD b/libre/opencolorio/PKGBUILD
index 3ce13113a..5bccbcc0f 100644
--- a/libre/opencolorio/PKGBUILD
+++ b/libre/opencolorio/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=opencolorio
 pkgver=1.0.9
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc='A color management framework for visual effects and animation (built for the blender package)'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://$pkgname.org"
diff --git a/libre/openimageio/PKGBUILD b/libre/openimageio/PKGBUILD
index f60f498cb..86538c3f6 100644
--- a/libre/openimageio/PKGBUILD
+++ b/libre/openimageio/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=openimageio
 pkgver=1.4.12
-pkgrel=3.parabola1
+pkgrel=3.parabola2
 pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender package)'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.$pkgname.org/"
 license=('custom')
-depends=('boost-libs' 'freetype2' 'glew' 'libtiff' 'libwebp' 'openjpeg' 'opencolorio' 'openexr' 'giflib-lts') # add giflib-lts to build pkg
+depends=('boost-libs' 'freetype2' 'glew' 'libtiff' 'libwebp' 'openjpeg' 'openexr') # 'opencolorio'
 makedepends=('boost' 'cmake' 'git' 'python2' 'qt4')
 optdepends=('qt4: iv image viewer'
             'python2: bindings support')
@@ -35,9 +35,8 @@ prepare() {
     sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i
            ' src/make/detectplatform.mk
 
-  # gif lts
-  sed -i 's|gif_lib[.]h|gif_lib-lts.h|
-         ' src/gif.imageio/gifinput.cpp
+  # fix for giflib 5.1
+  sed -i 's|DGifCloseFile [(]m_gif_file[)] == GIF_ERROR|DGifCloseFile (m_gif_file, 0) == GIF_ERROR|' src/gif.imageio/gifinput.cpp
 }
 
 build() {
@@ -61,8 +60,7 @@ package() {
   make DESTDIR=$pkgdir install
 
   # license
-  cd ..
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/pacman-mirrorlist/PKGBUILD b/libre/pacman-mirrorlist/PKGBUILD
index f35adafcc..edff7d792 100644
--- a/libre/pacman-mirrorlist/PKGBUILD
+++ b/libre/pacman-mirrorlist/PKGBUILD
@@ -21,4 +21,4 @@ package() {
   install -m644 $srcdir/mirrorlist-${pkgver}.txt $pkgdir/etc/pacman.d/mirrorlist
 }
 
-md5sums=('31c810b4eb182ee2d96243d65c8915df')
+md5sums=('617387fe7dae1bffecb23d487d0449c5')