From 40158d875a15152a73e5e97dc1a25897484349df Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Tue, 17 Apr 2018 10:49:47 +0000
Subject: [PATCH] libgphoto2: bump to 2.5.17, add debuginfo, add libexif.
 (#2457)

Also move $manDir/man3 & $binDir/gphoto2{,-port}-config to devel.
---
 ...2.5.16.recipe => libgphoto2-2.5.17.recipe} | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)
 rename media-libs/libgphoto2/{libgphoto2-2.5.16.recipe => libgphoto2-2.5.17.recipe} (66%)

diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.recipe b/media-libs/libgphoto2/libgphoto2-2.5.17.recipe
similarity index 66%
rename from media-libs/libgphoto2/libgphoto2-2.5.16.recipe
rename to media-libs/libgphoto2/libgphoto2-2.5.17.recipe
index 73a094e78..1d5912fe7 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.recipe
+++ b/media-libs/libgphoto2/libgphoto2-2.5.17.recipe
@@ -10,21 +10,25 @@ HOMEPAGE="http://www.gphoto.org/"
 COPYRIGHT="The gphoto2 team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://sourceforge.net/projects/gphoto/files/libgphoto2-$portVersion.tar.bz2"
-CHECKSUM_SHA256="e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906"
+SOURCE_URI="https://downloads.sourceforge.net/gphoto/libgphoto2-$portVersion.tar.bz2"
+CHECKSUM_SHA256="417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555"
 
-ARCHITECTURES="x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libgphoto2Version="6.1.0"
+libgphoto2_portVersion="12.0.0"
+libgphoto2VersionCompat="$libgphoto2Version compat >= 6"
+libgphoto2_portVersionCompat="$libgphoto2_portVersion compat >= 12"
+
 PROVIDES="
 	libgphoto2$secondaryArchSuffix = $portVersion
-	lib:libgphoto2$secondaryArchSuffix = 6.0.0 compat >= 6
-	lib:libgphoto2_port$secondaryArchSuffix = 12.0.0 compat >= 12
-	cmd:gphoto2_config$secondaryArchSuffix = $portVersion
-	cmd:gphoto2_port_config$secondaryArchSuffix = $portVersion
+	lib:libgphoto2$secondaryArchSuffix = $libgphoto2VersionCompat
+	lib:libgphoto2_port$secondaryArchSuffix = $libgphoto2_portVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libexif$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -35,8 +39,10 @@ REQUIRES="
 
 PROVIDES_devel="
 	libgphoto2${secondaryArchSuffix}_devel = $portVersion
-	devel:libgphoto2$secondaryArchSuffix = 6.0.0 compat >= 6
-	devel:libgphoto2_port$secondaryArchSuffix = 12.0.0 compat >= 12
+	cmd:gphoto2_config$secondaryArchSuffix = $portVersion
+	cmd:gphoto2_port_config$secondaryArchSuffix = $portVersion
+	devel:libgphoto2$secondaryArchSuffix = $libgphoto2VersionCompat
+	devel:libgphoto2_port$secondaryArchSuffix = $libgphoto2_portVersionCompat
 	"
 REQUIRES_devel="
 	libgphoto2$secondaryArchSuffix == $portVersion base
@@ -44,6 +50,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libexif$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libltdl$secondaryArchSuffix
@@ -61,9 +68,13 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libgphoto2$secondaryArchSuffix \
+	"$libDir"/libgphoto2.so.$libgphoto2Version \
+	"$libDir"/libgphoto2_port.so.$libgphoto2_portVersion \
+	"$libDir"/libgphoto2/print-camera-list
+
 BUILD()
 {
-	autoreconf -fi
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -79,5 +90,7 @@ INSTALL()
 	fixPkgconfig
 
 	packageEntries devel \
-		$developDir
+		"$developDir" \
+		"$binDir" \
+		"$manDir"
 }