diff --git a/media-libs/libshout/libshout-2.4.1.recipe b/media-libs/libshout/libshout-2.4.3.recipe similarity index 84% rename from media-libs/libshout/libshout-2.4.1.recipe rename to media-libs/libshout/libshout-2.4.3.recipe index ea5ad348d..8704f69d1 100644 --- a/media-libs/libshout/libshout-2.4.1.recipe +++ b/media-libs/libshout/libshout-2.4.3.recipe @@ -3,24 +3,19 @@ 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-2012 the Icecast team - 2011,2012 Xiph.Org Foundation +COPYRIGHT="2002-2019 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="4" +REVISION="1" SOURCE_URI="http://downloads.xiph.org/releases/libshout/libshout-$portVersion.tar.gz" -CHECKSUM_SHA256="f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d" -PATCHES="libshout-$portVersion.patchset" -if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then - PATCHES+=" - libshout-$portVersion-gcc2.patchset" -fi +CHECKSUM_SHA256="0d8af55d1141bf90710bcd41a768c9cc5adb251502a0af1dd22c8da215d40dfe" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" libshout$secondaryArchSuffix = $portVersion diff --git a/media-libs/libshout/patches/libshout-2.4.1-gcc2.patchset b/media-libs/libshout/patches/libshout-2.4.1-gcc2.patchset deleted file mode 100644 index e39bc0d8f..000000000 --- a/media-libs/libshout/patches/libshout-2.4.1-gcc2.patchset +++ /dev/null @@ -1,29 +0,0 @@ -From c154290e54c5f90a68d56c057beccc9cc3a5524d Mon Sep 17 00:00:00 2001 -From: begasus -Date: Mon, 17 Dec 2018 19:22:38 +0100 -Subject: gcc2 fix - - -diff --git a/src/codec_theora.c b/src/codec_theora.c -index fc1819c..2323d9a 100644 ---- a/src/codec_theora.c -+++ b/src/codec_theora.c -@@ -56,6 +56,7 @@ int _shout_open_theora(ogg_codec_t *codec, ogg_page *page) - - (void)page; - -+ { - theora_data_t *theora_data = calloc(1, sizeof(theora_data_t)); - if (! theora_data) - return SHOUTERR_MALLOC; -@@ -76,6 +77,7 @@ int _shout_open_theora(ogg_codec_t *codec, ogg_page *page) - codec->free_data = free_theora_data; - codec->headers = 1; - theora_data->initial_frames = 0; -+ } - - return SHOUTERR_SUCCESS; - } --- -2.19.1 - diff --git a/media-libs/libshout/patches/libshout-2.4.1.patchset b/media-libs/libshout/patches/libshout-2.4.1.patchset deleted file mode 100644 index ff4723358..000000000 --- a/media-libs/libshout/patches/libshout-2.4.1.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 2ee70a871c7803db827ed63337b58f222f39e067 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Tue, 18 Dec 2018 12:35:04 +0100 -Subject: comment out pthread_attr_setinheritsched - - -diff --git a/src/common/thread/thread.c b/src/common/thread/thread.c -index e29ea20..6238ff2 100644 ---- a/src/common/thread/thread.c -+++ b/src/common/thread/thread.c -@@ -299,7 +299,7 @@ thread_type *thread_create_c(char *name, void *(*start_routine)(void *), - start->thread = thread; - - pthread_attr_setstacksize (&attr, 512*1024); -- pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED); -+ //pthread_attr_setinheritsched (&attr, PTHREAD_INHERIT_SCHED); - if (detached) - { - pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); --- -2.19.1 -