From d67fa43213a2660a0b4e119dd10268a04c82a660 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 23 Jan 2021 11:25:18 +0100
Subject: [PATCH] libusbmuxd: bump version

---
 ...-1.0.10.recipe => libusbmuxd-2.0.2.recipe} | 36 ++++++++++---------
 ....10.patchset => libusbmuxd-2.0.2.patchset} |  0
 2 files changed, 19 insertions(+), 17 deletions(-)
 rename app-pda/libusbmuxd/{libusbmuxd-1.0.10.recipe => libusbmuxd-2.0.2.recipe} (65%)
 rename app-pda/libusbmuxd/patches/{libusbmuxd-1.0.10.patchset => libusbmuxd-2.0.2.patchset} (100%)

diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10.recipe b/app-pda/libusbmuxd/libusbmuxd-2.0.2.recipe
similarity index 65%
rename from app-pda/libusbmuxd/libusbmuxd-1.0.10.recipe
rename to app-pda/libusbmuxd/libusbmuxd-2.0.2.recipe
index 35d18c61e..0da4006ff 100644
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.10.recipe
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2.recipe
@@ -6,9 +6,10 @@ COPYRIGHT="2013-2014 Nikias Bassen
 	2009-2014 Martin Szulecki"
 LICENSE="GNU GPL v2
 	GNU LGPL v2.1"
-REVISION="3"
-SOURCE_URI="https://www.libimobiledevice.org/downloads/libusbmuxd-$portVersion.tar.bz2"
-CHECKSUM_SHA256="1aa21391265d2284ac3ccb7cf278126d10d354878589905b35e8102104fec9f2"
+REVISION="1"
+SOURCE_URI="https://github.com/libimobiledevice/libusbmuxd/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="8ae3e1d9340177f8f3a785be276435869363de79f491d05d8a84a59efc8a8fdc"
+SOURCE_FILENAME="libusbmuxd-$portVersion.tar.gz"
 PATCHES="libusbmuxd-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -21,25 +22,26 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="4.0.0"
+libVersion="6.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
-	libusbmuxd$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libusbmuxd$secondaryArchSuffix = $libVersionCompat
-	cmd:iproxy$commandSuffix = $portVersion compat >= 1
+	libusbmuxd$secondaryArchSuffix = $portVersion
+	lib:libusbmuxd_2.0$secondaryArchSuffix = $libVersionCompat
+	cmd:iproxy$commandSuffix
+	cmd:inetcat$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
-	lib:libplist$secondaryArchSuffix
-	lib:libplist++$secondaryArchSuffix
+	lib:libplist_2.0$secondaryArchSuffix
+	lib:libplist++_2.0$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	libusbmuxd${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libusbmuxd$secondaryArchSuffix = $libVersionCompat
+	libusbmuxd${secondaryArchSuffix}_devel = $portVersion
+	devel:libusbmuxd_2.0$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libusbmuxd$secondaryArchSuffix == $portVersion base
@@ -48,8 +50,8 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libxml2$secondaryArchSuffix
-	devel:libplist$secondaryArchSuffix
-	devel:libplist++$secondaryArchSuffix
+	devel:libplist_2.0$secondaryArchSuffix
+	devel:libplist++_2.0$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -65,11 +67,11 @@ BUILD_PREREQUIRES="
 
 defineDebugInfoPackage libusbmuxd$secondaryArchSuffix \
 	"$commandBinDir"/iproxy \
-	"$libDir"/libusbmuxd.so.$libVersion
+	"$libDir"/libusbmuxd-2.0.so.$libVersion
 
 BUILD()
 {
-	autoreconf
+	autoreconf -fi
 	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
 	make
 }
@@ -79,9 +81,9 @@ INSTALL()
 	make install
 
 	# remove libtool file
-	rm $libDir/libusbmuxd.la
+	rm $libDir/libusbmuxd*.*a
 
-	prepareInstalledDevelLib libusbmuxd
+	prepareInstalledDevelLib libusbmuxd-2.0
 	fixPkgconfig
 
 	# devel package
diff --git a/app-pda/libusbmuxd/patches/libusbmuxd-1.0.10.patchset b/app-pda/libusbmuxd/patches/libusbmuxd-2.0.2.patchset
similarity index 100%
rename from app-pda/libusbmuxd/patches/libusbmuxd-1.0.10.patchset
rename to app-pda/libusbmuxd/patches/libusbmuxd-2.0.2.patchset