From 3666bd7c421da695183b7fb2523c83ffaa32238a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Bernacki?=
 <33581850+Ra-V2@users.noreply.github.com>
Date: Mon, 13 Jan 2020 17:05:03 +0100
Subject: [PATCH] zopfli: move $prefix/include to $includeDir (#4579)

* change path of LIBDIR and INCLUDEDIR
---
 app-arch/zopfli/zopfli-1.0.3.recipe | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app-arch/zopfli/zopfli-1.0.3.recipe b/app-arch/zopfli/zopfli-1.0.3.recipe
index 6e4a729e4..c155d152b 100644
--- a/app-arch/zopfli/zopfli-1.0.3.recipe
+++ b/app-arch/zopfli/zopfli-1.0.3.recipe
@@ -4,7 +4,7 @@ compatible compressor programmed in C"
 HOMEPAGE="https://github.com/google/zopfli"
 COPYRIGHT="2011-2018 Google Inc."
 LICENSE="Apache v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="$HOMEPAGE/archive/zopfli-$portVersion.tar.gz"
 CHECKSUM_SHA256="e955a7739f71af37ef3349c4fa141c648e8775bceb2195be07e86f8e638814bd"
 SOURCE_DIR="zopfli-zopfli-$portVersion"
@@ -19,15 +19,29 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+libVersion="portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	zopfli$secondaryArchSuffix = $portVersion
 	cmd:zopfli
 	cmd:zopflipng
+	lib:libzopfli$secondaryArchSuffix = $libVersionCompat
+	lib:libzopflipng$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	zopfli${secondaryArchSuffix}_devel = $portVersion
+	devel:libzopfli$secondaryArchSuffix = $libVersion
+	devel:libzopflipng$secondaryArchSuffix = $libVersion
+	"
+REQUIRES_devel="
+	zopfli$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -35,6 +49,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
@@ -42,7 +57,10 @@ BUILD()
 	mkdir -p build && cd build
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$prefix
+		-DCMAKE_INSTALL_PREFIX=$prefix \
+		-DZOPFLI_BUILD_SHARED=ON \
+		-DCMAKE_INSTALL_LIBDIR=$libDir \
+		-DCMAKE_INSTALL_INCLUDEDIR=$includeDir
 	make $jobArgs
 }