From 96928e9284154a2b3889e80fc3e7fa27621a1b01 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 16 Jun 2018 05:01:27 +0000
Subject: [PATCH] mpg123: bump to 1.25.10, add debuginfo. (#2691)

Also drop documentation on secondary arches.
---
 ...23-1.25.7.recipe => mpg123-1.25.10.recipe} | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)
 rename media-sound/mpg123/{mpg123-1.25.7.recipe => mpg123-1.25.10.recipe} (53%)

diff --git a/media-sound/mpg123/mpg123-1.25.7.recipe b/media-sound/mpg123/mpg123-1.25.10.recipe
similarity index 53%
rename from media-sound/mpg123/mpg123-1.25.7.recipe
rename to media-sound/mpg123/mpg123-1.25.10.recipe
index 818846df0..c68260c05 100644
--- a/media-sound/mpg123/mpg123-1.25.7.recipe
+++ b/media-sound/mpg123/mpg123-1.25.10.recipe
@@ -2,19 +2,24 @@ SUMMARY="A fast console MPEG audio player and decoder library"
 DESCRIPTION="mpg123 is the fast and free console based real time MPEG audio \
 player for layer 1, 2 and 3."
 HOMEPAGE="https://www.mpg123.org/"
-COPYRIGHT="1995-2017 Michael Hipp and others"
+COPYRIGHT="1995-2018 Michael Hipp and others"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="http://downloads.sourceforge.net/mpg123/mpg123-$portVersion.tar.bz2"
-CHECKSUM_SHA256="31b15ebcf26111b874732e07c8e60de5053ee555eea15fb70c657a4f9f0344f3"
+SOURCE_URI="https://downloads.sourceforge.net/mpg123/mpg123-$portVersion.tar.bz2"
+CHECKSUM_SHA256="6c1337aee2e4bf993299851c70b7db11faec785303cfca3a5c3eb5f329ba7023"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libmpg123Version="0.44.8"
+libout123Version="0.2.2"
+libmpg123VersionCompat="$libmpg123Version compat >= ${libmpg123Version%%.*}"
+libout123VersionCompat="$libout123Version compat >= ${libout123Version%%.*}"
 
 PROVIDES="
 	mpg123$secondaryArchSuffix = $portVersion
-	lib:libmpg123$secondaryArchSuffix = 0.44.6 compat >= 0
-	lib:libout123$secondaryArchSuffix = 0.2.1 compat >= 0
+	lib:libmpg123$secondaryArchSuffix = $libmpg123VersionCompat
+	lib:libout123$secondaryArchSuffix = $libout123VersionCompat
 	cmd:mpg123$secondaryArchSuffix = $portVersion
 	cmd:mpg123_id3dump$secondaryArchSuffix = $portVersion
 	cmd:mpg123_strip$secondaryArchSuffix = $portVersion
@@ -27,8 +32,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	mpg123${secondaryArchSuffix}_devel = $portVersion
-	devel:libmpg123$secondaryArchSuffix = 0.44.6 compat >= 0
-	devel:libout123$secondaryArchSuffix = 0.2.1 compat >= 0
+	devel:libmpg123$secondaryArchSuffix = $libmpg123VersionCompat
+	devel:libout123$secondaryArchSuffix = $libout123VersionCompat
 	"
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
@@ -50,6 +55,15 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage mpg123$secondaryArchSuffix \
+	"$binDir"/mpg123 \
+	"$binDir"/mpg123-id3dump \
+	"$binDir"/mpg123-strip \
+	"$binDir"/out123 \
+	"$libDir"/libmpg123.so.$libmpg123Version \
+	"$libDir"/libout123.so.$libout123Version \
+	"$libDir"/mpg123/output_dummy.so \
+
 BUILD()
 {
 	runConfigure ./configure
@@ -60,6 +74,10 @@ INSTALL()
 {
 	make install
 
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf "$manDir"
+	fi
+
 	rm $libDir/lib*.la
 
 	prepareInstalledDevelLibs \