From 8323d6dcbde8cdb798b7ef761d604c4a033d9a68 Mon Sep 17 00:00:00 2001
From: miqlas <miqlas@users.noreply.github.com>
Date: Sat, 6 May 2017 14:53:03 +0200
Subject: [PATCH] DEVIL: updated recipe, bump version (#1299)

---
 ...{devil-1.7.8.recipe => devil-1.8.0.recipe} | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)
 rename media-libs/devil/{devil-1.7.8.recipe => devil-1.8.0.recipe} (57%)

diff --git a/media-libs/devil/devil-1.7.8.recipe b/media-libs/devil/devil-1.8.0.recipe
similarity index 57%
rename from media-libs/devil/devil-1.7.8.recipe
rename to media-libs/devil/devil-1.8.0.recipe
index 58fb28751..b6b1696a7 100644
--- a/media-libs/devil/devil-1.7.8.recipe
+++ b/media-libs/devil/devil-1.8.0.recipe
@@ -7,44 +7,57 @@ developer, so unnecessary conversions, etc. are not performed. DevIL utilizes \
 a simple, yet powerful, syntax. DevIL can load, save, convert, manipulate, \
 filter and display a wide variety of image formats."
 HOMEPAGE="http://openil.sourceforge.net/"
-COPYRIGHT="2009 Denton Woods"
+COPYRIGHT="2017 Denton Woods"
 LICENSE="GNU LGPL v2.1"
-REVISION="3"
-SOURCE_URI="http://sourceforge.net/projects/openil/files/DevIL/1.7.8/DevIL-1.7.8.tar.gz"
-CHECKSUM_SHA256="682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd"
+REVISION="1"
+SOURCE_URI="http://sourceforge.net/projects/openil/files/DevIL/$portVersion/DevIL-$portVersion.tar.gz"
+CHECKSUM_SHA256="0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709"
+SOURCE_DIR="DevIL"
 
-ARCHITECTURES="x86_gcc2 x86"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	devil$secondaryArchSuffix = $portVersion
 	lib:libIL$secondaryArchSuffix
+	lib:libILU$secondaryArchSuffix
+	lib:libILUT$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libjasper$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	devil${secondaryArchSuffix}_devel = $portVersion
 	devel:libIL$secondaryArchSuffix
+	devel:libILU$secondaryArchSuffix
+	devel:libILUT$secondaryArchSuffix
 	"
 REQUIRES_devel="
-	haiku$secondaryArchSuffix
 	devil$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgl$secondaryArchSuffix
+	devel:libilmimf$secondaryArchSuffix #openexr
 	devel:libjasper$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
+	devel:liblcms2$secondaryArchSuffix
 	devel:libmng$secondaryArchSuffix
-	devel:libIlmImf$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:awk
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
@@ -54,20 +67,33 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	runConfigure ./configure CFLAGS=-Dpng_set_gray_1_2_4_to_8=png_set_expand_gray_1_2_4_to_8
+	cd DevIL
+	mkdir -p haiku-build
+	cd haiku-build
+
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
+		-DCMAKE_CXX_FLAGS="-fpermissive"
+
 	make $jobArgs
 }
 
 INSTALL()
 {
+	cd DevIL/haiku-build
 	make install
 
 	prepareInstalledDevelLib libIL
 	fixPkgconfig
+
+	mv $prefix/include/* $includeDir
+	rmdir $prefix/include
+
 	packageEntries devel $developDir
 }
 
 TEST()
 {
+	cd DevIL/haiku-build
 	make check
 }