From 5f0627a84ae46a5669901728fe51d2bf91e1ec96 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 23 Sep 2018 12:58:19 +0000
Subject: [PATCH] libsoundtouch, bump version (#3106)

---
 ....0.0.recipe => libsoundtouch-2.1.0.recipe} | 50 +++++++++++++------
 .../patches/libsoundtouch-2.0.0.patchset      | 31 ------------
 2 files changed, 35 insertions(+), 46 deletions(-)
 rename media-libs/libsoundtouch/{libsoundtouch-2.0.0.recipe => libsoundtouch-2.1.0.recipe} (53%)
 delete mode 100644 media-libs/libsoundtouch/patches/libsoundtouch-2.0.0.patchset

diff --git a/media-libs/libsoundtouch/libsoundtouch-2.0.0.recipe b/media-libs/libsoundtouch/libsoundtouch-2.1.0.recipe
similarity index 53%
rename from media-libs/libsoundtouch/libsoundtouch-2.0.0.recipe
rename to media-libs/libsoundtouch/libsoundtouch-2.1.0.recipe
index 9afa8ac36..63d861f8c 100644
--- a/media-libs/libsoundtouch/libsoundtouch-2.0.0.recipe
+++ b/media-libs/libsoundtouch/libsoundtouch-2.1.0.recipe
@@ -10,30 +10,40 @@ than originally without affecting the sound pitch.
 tempo (speed).
 Playback Rate : Changes both tempo and pitch together as if a vinyl disc was \
 played at different RPM rate."
-HOMEPAGE="http://www.surina.net/soundtouch"
-COPYRIGHT="2001-2014 Olli Parviainen"
+HOMEPAGE="https://www.surina.net/soundtouch/"
+COPYRIGHT="2001-2018 Olli Parviainen"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="http://www.surina.net/soundtouch/soundtouch-$portVersion.tar.gz"
-CHECKSUM_SHA256="d224f7d1421b5f8e74a74c85741345bd9802618a40ae30ce5b427a5705c89d25"
-SOURCE_DIR="soundtouch"
-PATCHES="libsoundtouch-$portVersion.patchset"
+SOURCE_URI="https://gitlab.com/soundtouch/soundtouch/-/archive/$portVersion/soundtouch-$portVersion.tar.bz2"
+CHECKSUM_SHA256="3fb740c7ac4b304342fbf11a91d14fa3e296269b9fec6266609c4620477d0ad6"
+SOURCE_DIR="soundtouch-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="1.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= ${portVersion%.*}"
+
 PROVIDES="
-	libsoundtouch$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:soundstretch$secondaryArchSuffix
-	lib:libSoundTouch$secondaryArchSuffix = 1.0.0 compat >= 1
+	libsoundtouch$secondaryArchSuffix = $portVersionCompat
+	cmd:soundstretch$commandSuffix = $portVersion
+	lib:libSoundTouch$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	libsoundtouch${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libSoundTouch$secondaryArchSuffix = 1.0.0 compat >= 1
+	libsoundtouch${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libSoundTouch$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libsoundtouch$secondaryArchSuffix == $portVersion base
@@ -52,11 +62,15 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+defineDebugInfoPackage libsoundtouch$secondaryArchSuffix \
+	"$commandBinDir"/soundstretch \
+	"$libDir"/libSoundTouch.so.$libVersion
+
 BUILD()
 {
 	mkdir -p config/m4
 	autoreconf -fi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir"
 	make $jobArgs
 }
 
@@ -64,12 +78,18 @@ INSTALL()
 {
 	make install
 
+	rm -f "$libDir"/*.la
+
 	prepareInstalledDevelLibs libSoundTouch
 	fixPkgconfig
 
-	rm -Rf $prefix/doc
-
 	# devel package
 	packageEntries devel \
-		$developDir
+		"$dataDir" \
+		"$developDir"
+}
+
+TEST()
+{
+	make check
 }
diff --git a/media-libs/libsoundtouch/patches/libsoundtouch-2.0.0.patchset b/media-libs/libsoundtouch/patches/libsoundtouch-2.0.0.patchset
deleted file mode 100644
index f4d83c07e..000000000
--- a/media-libs/libsoundtouch/patches/libsoundtouch-2.0.0.patchset
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4eb47a006bf841a6ae969b3c969bd300952f9251 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Thu, 12 Feb 2015 17:01:45 +0000
-Subject: Haiku build fix
-
-
-diff --git a/configure.ac b/configure.ac
-index d3df5eb..6f0e2f4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,7 +26,7 @@ AC_SUBST(LIB_SONAME)
- 
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR([config/m4])
--AM_CONFIG_HEADER([config.h include/soundtouch_config.h])
-+AC_CONFIG_HEADERS([include/soundtouch_config.h])
- AM_INIT_AUTOMAKE
- AM_SILENT_RULES([yes])
- #AC_DISABLE_SHARED	dnl This makes libtool only build static libs 
-@@ -225,7 +225,7 @@ AC_FUNC_MALLOC
- AC_TYPE_SIGNAL
- 
- dnl make -lm get added to the LIBS
--AC_CHECK_LIB(m, sqrt,,AC_MSG_ERROR([compatible libc math library not found])) 
-+AC_CHECK_LIB(m, sqrt) 
- 
- dnl add whatever functions you might want to check for here
- #AC_CHECK_FUNCS([floor ftruncate memmove memset mkdir modf pow realpath sqrt strchr strdup strerror strrchr strstr strtol])
--- 
-2.2.2
-