Skip to content

Instantly share code, notes, and snippets.

@lubosz
Created July 14, 2015 12:19
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save lubosz/70cfe180cb5e2a553ce6 to your computer and use it in GitHub Desktop.
Save lubosz/70cfe180cb5e2a553ce6 to your computer and use it in GitHub Desktop.
fix devil-ilut AUR build
From c350ea91cee78fe0fb63e534b480089f348f527b Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz.sarnecki@collabora.co.uk>
Date: Tue, 14 Jul 2015 14:18:20 +0200
Subject: [PATCH] fix build
---
PKGBUILD | 5 +++--
const-restrict.patch | 13 +++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 const-restrict.patch
diff --git a/PKGBUILD b/PKGBUILD
index 243b79d..811f52b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,13 +15,14 @@ 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 const-restrict.patch)
md5sums=('7918f215524589435e5ec2e8736d5e1d'
- '0f839ccefd43b0ee8b4b3f99806147fc')
+ '0f839ccefd43b0ee8b4b3f99806147fc' '751afdfd1163c6b8d86c4461de663c00')
build() {
cd devil-$pkgver
patch -Np1 -i ../libpng14.patch
+ patch -Np1 -i ../const-restrict.patch
if [[ $CARCH != x86_64 ]]; then
OPTIMIZATION=--disable-sse3
diff --git a/const-restrict.patch b/const-restrict.patch
new file mode 100644
index 0000000..9da0e5e
--- /dev/null
+++ b/const-restrict.patch
@@ -0,0 +1,13 @@
+diff --git a/src-IL/include/il_internal.h b/src-IL/include/il_internal.h
+index 6f976cc..e723a6f 100644
+--- a/src-IL/include/il_internal.h
++++ b/src-IL/include/il_internal.h
+@@ -227,7 +227,7 @@ ILboolean ilIsValidBlpL(const void *Lump, ILuint Size);
+ ILboolean ilLoadBlp(ILconst_string FileName);
+ ILboolean ilLoadBlpF(ILHANDLE File);
+ ILboolean ilLoadBlpL(const void *Lump, ILuint Size);
+-ILboolean ilIsValidBmp(ILconst_string CONST_RESTRICT FileName);
++ILboolean ilIsValidBmp(ILconst_string FileName);
+ ILboolean ilIsValidBmpF(ILHANDLE File);
+ ILboolean ilIsValidBmpL(const void *Lump, ILuint Size);
+ ILboolean ilLoadBmp(ILconst_string FileName);
--
2.4.5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment