From cf362c4f1a1520e9e9029d417a8a05c84432c4d3 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 18 Apr 2018 13:30:06 +0000
Subject: [PATCH] libpng(15): bump to 1.5.30, add debuginfo, switch to tar.xz.
 (#2461)

---
 ...png-1.5.28.recipe => libpng-1.5.30.recipe} | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)
 rename media-libs/libpng/{libpng-1.5.28.recipe => libpng-1.5.30.recipe} (62%)

diff --git a/media-libs/libpng/libpng-1.5.28.recipe b/media-libs/libpng/libpng-1.5.30.recipe
similarity index 62%
rename from media-libs/libpng/libpng-1.5.28.recipe
rename to media-libs/libpng/libpng-1.5.30.recipe
index a7cca571e..4d46110f9 100644
--- a/media-libs/libpng/libpng-1.5.28.recipe
+++ b/media-libs/libpng/libpng-1.5.30.recipe
@@ -3,23 +3,25 @@ DESCRIPTION="libpng is the official PNG reference library. It supports almost \
 all PNG features, is extensible, and has been extensively tested for over 17 \
 years."
 HOMEPAGE="http://www.libpng.org/"
-COPYRIGHT="1998-2016 Glenn Randers-Pehrson
+COPYRIGHT="1998-2017 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
 	1995-1996 Guy Eric Schalnat, Group 42 Inc."
 LICENSE="LibPNG"
-REVISION="2"
-SOURCE_URI="http://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="7dd9931dbdd43865055eeba52778ace6df5712b7f6f80f73c2b16b912c124a87"
+REVISION="1"
+SOURCE_URI="https://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.xz"
+CHECKSUM_SHA256="7d76275fad2ede4b7d87c5fd46e6f488d2a16b5a69dc968ffa840ab39ba756ed"
 
-ARCHITECTURES="x86_gcc2 x86 ?x86_64 ?arm ?ppc"
+ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 # define libVersion as xy.z.0 when portVersion is x.y.z.
 libVersion="${portVersion/\./}.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 1.5"
 
 PROVIDES="
-	libpng$secondaryArchSuffix = $portVersion compat >= 1.5
-	lib:libpng15$secondaryArchSuffix = $libVersion compat >= 15
+	libpng$secondaryArchSuffix = $portVersionCompat
+	lib:libpng15$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -27,11 +29,11 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
-	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5
-	cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5
-	devel:libpng$secondaryArchSuffix = $libVersion compat >= 15
-	devel:libpng15$secondaryArchSuffix = $libVersion compat >= 15
+	libpng${secondaryArchSuffix}_devel = $portVersionCompat
+	cmd:libpng_config$secondaryArchSuffix = $portVersionCompat
+	cmd:libpng15_config$secondaryArchSuffix = $portVersionCompat
+	devel:libpng$secondaryArchSuffix = $libVersionCompat
+	devel:libpng15$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libpng$secondaryArchSuffix == $portVersion base
@@ -51,6 +53,9 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+defineDebugInfoPackage libpng$secondaryArchSuffix \
+	"$libDir"/libpng15.so.$libVersion
+
 BUILD()
 {
 	aclocal