libshout (#5548)

media-libs/libshout/libshout-2.4.5.recipe

@@ -3,23 +3,35 @@ DESCRIPTION="Libshout is a library for communicating with and sending data to \
 an icecast server.  It handles the socket connection, the timing of the \
 data, and prevents bad data from getting to the icecast server."
 HOMEPAGE="http://www.icecast.org/"
-COPYRIGHT="2002-2019 the Icecast team
+COPYRIGHT="2002-2020 the Icecast team
 	2011,2019 Xiph.Org Foundation
 	2012-2015 Philipp Schafft
 	2014 Michael Smith
 	2014 Brendan Cully
 	1995-1997 by Sam Rushing"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://downloads.xiph.org/releases/libshout/libshout-$portVersion.tar.gz"
-CHECKSUM_SHA256="0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe"
+CHECKSUM_SHA256="d9e568668a673994ebe3f1eb5f2bee06e3236a5db92b8d0c487e1c0f886a6890"
+PATCHES="libshout-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="3.2.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libshout$secondaryArchSuffix = $portVersion
-	lib:libshout$secondaryArchSuffix = 3.2.0 compat >= 3
+	cmd:shout$commandSuffix
+	lib:libshout$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -32,7 +44,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libshout${secondaryArchSuffix}_devel = $portVersion
-	devel:libshout$secondaryArchSuffix = 3.2.0 compat >= 3
+	devel:libshout$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libshout$secondaryArchSuffix == $portVersion base
@@ -62,7 +74,7 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage libshout$secondaryArchSuffix \
-	$libDir/libshout.so.3.2.0
+	$libDir/libshout.so.$libVersion
 
 PATCH()
 {
@@ -73,7 +85,8 @@ BUILD()
 {
 	export LIBS="-lnetwork"
 	autoreconf -fi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir
 	make $jobArgs
 }
 

media-libs/libshout/patches/libshout-2.4.5.patchset

@@ -0,0 +1,22 @@
+From ffedbb341be6b63f257d6fc9a7c8a6394931487a Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Thu, 31 Dec 2020 11:52:52 +0000
+Subject: Fix missing symbol 'pthread_attr_setinheritsched'
+
+
+diff --git a/src/common/thread/thread.c b/src/common/thread/thread.c
+index c4baecf..5e06f7b 100644
+--- a/src/common/thread/thread.c
++++ b/src/common/thread/thread.c
+@@ -301,7 +301,7 @@ thread_type *thread_create_c(char *name, void *(*start_routine)(void *),
+ 
+         pthread_attr_setstacksize (&attr, 512*1024);
+ 
+-#ifndef __ANDROID__
++#if !defined(__ANDROID__) && !defined(__HAIKU__)
+         pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED);
+ #endif
+ 
+-- 
+2.28.0
+