summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
-rw-r--r--gcc-5.0.patch45
3 files changed, 61 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 06dc3ac6ba3d..4e2e7c32b13a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = devil-ilut
pkgdesc = Library for reading several different image formats (includes ILUT)
pkgver = 1.7.8
- pkgrel = 2
+ pkgrel = 3
url = http://openil.sourceforge.net/
install = devil.install
arch = i686
@@ -18,8 +18,10 @@ pkgbase = devil-ilut
options = !emptydirs
source = http://downloads.sourceforge.net/openil/DevIL-1.7.8.tar.gz
source = libpng14.patch
+ source = gcc-5.0.patch
md5sums = 7918f215524589435e5ec2e8736d5e1d
md5sums = 0f839ccefd43b0ee8b4b3f99806147fc
+ md5sums = 8d1b5d973c93927f60f775aecb448e77
pkgname = devil-ilut
diff --git a/PKGBUILD b/PKGBUILD
index 243b79dd6dcc..733d64311f62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=devil-ilut
pkgver=1.7.8
-pkgrel=2
+pkgrel=3
pkgdesc='Library for reading several different image formats (includes ILUT)'
arch=('i686' 'x86_64')
url='http://openil.sourceforge.net/'
@@ -15,13 +15,21 @@ options=('!docs' '!emptydirs')
license=('GPL')
provides=('devil')
conflicts=('devil')
-source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
+source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz
+ libpng14.patch gcc-5.0.patch)
md5sums=('7918f215524589435e5ec2e8736d5e1d'
- '0f839ccefd43b0ee8b4b3f99806147fc')
+ '0f839ccefd43b0ee8b4b3f99806147fc'
+ '8d1b5d973c93927f60f775aecb448e77')
-build() {
+prepare() {
cd devil-$pkgver
+
patch -Np1 -i ../libpng14.patch
+ patch -Np1 -i ../gcc-5.0.patch
+}
+
+build() {
+ cd devil-$pkgver
if [[ $CARCH != x86_64 ]]; then
OPTIMIZATION=--disable-sse3
@@ -36,5 +44,6 @@ build() {
package() {
cd devil-$pkgver
+
make prefix="${pkgdir}/usr" install
}
diff --git a/gcc-5.0.patch b/gcc-5.0.patch
new file mode 100644
index 000000000000..6e7883754f19
--- /dev/null
+++ b/gcc-5.0.patch
@@ -0,0 +1,45 @@
+diff -ru devil-1.7.8/src-IL/src/il_exr.cpp devil-1.7.8a/src-IL/src/il_exr.cpp
+--- devil-1.7.8/src-IL/src/il_exr.cpp 2009-03-08 08:10:09.000000000 +0100
++++ devil-1.7.8a/src-IL/src/il_exr.cpp 2015-05-15 18:50:35.700339353 +0200
+@@ -11,6 +11,7 @@
+ //-----------------------------------------------------------------------------
+
+
++#include "il.h"
+ #include "il_internal.h"
+ #ifndef IL_NO_EXR
+
+diff -ru devil-1.7.8/src-IL/src/il_nvidia.cpp devil-1.7.8a/src-IL/src/il_nvidia.cpp
+--- devil-1.7.8/src-IL/src/il_nvidia.cpp 2009-03-08 08:10:09.000000000 +0100
++++ devil-1.7.8a/src-IL/src/il_nvidia.cpp 2015-05-15 18:50:46.490308339 +0200
+@@ -11,6 +11,7 @@
+ //-----------------------------------------------------------------------------
+
+
++#include "il.h"
+ #include "il_internal.h"
+ #include "il_dds.h"
+ #include "il_manip.h"
+diff -ru devil-1.7.8/src-IL/src/il_squish.cpp devil-1.7.8a/src-IL/src/il_squish.cpp
+--- devil-1.7.8/src-IL/src/il_squish.cpp 2009-03-08 08:10:09.000000000 +0100
++++ devil-1.7.8a/src-IL/src/il_squish.cpp 2015-05-15 18:56:13.935820622 +0200
+@@ -11,6 +11,7 @@
+ //-----------------------------------------------------------------------------
+
+
++#include "il.h"
+ #include "il_internal.h"
+ /*#include "il_dds.h"
+ #include "il_manip.h"
+diff -ru devil-1.7.8/src-IL/src/il_utx.cpp devil-1.7.8a/src-IL/src/il_utx.cpp
+--- devil-1.7.8/src-IL/src/il_utx.cpp 2009-03-08 08:10:09.000000000 +0100
++++ devil-1.7.8a/src-IL/src/il_utx.cpp 2015-05-15 18:56:33.572405684 +0200
+@@ -12,6 +12,8 @@
+ //
+ //-----------------------------------------------------------------------------
+
++
++#include "il.h"
+ #include "il_internal.h"
+ #ifndef IL_NO_UTX
+ #include "il_utx.h"