From 76f97c463d0797d7c3b880aa20021235d1574549 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Nov 2016 11:08:07 +0100 Subject: [PATCH] speex: update to current version. --- .../speex/patches/speex-1.2~rc1.patchset | 52 -------------- ...ex-1.2~rc1.recipe => speex-1.2~rc2.recipe} | 70 ++++++++----------- 2 files changed, 31 insertions(+), 91 deletions(-) delete mode 100644 media-libs/speex/patches/speex-1.2~rc1.patchset rename media-libs/speex/{speex-1.2~rc1.recipe => speex-1.2~rc2.recipe} (62%) diff --git a/media-libs/speex/patches/speex-1.2~rc1.patchset b/media-libs/speex/patches/speex-1.2~rc1.patchset deleted file mode 100644 index c979f02575..0000000000 --- a/media-libs/speex/patches/speex-1.2~rc1.patchset +++ /dev/null @@ -1,52 +0,0 @@ -From 1342da5851b17b65e2fe12136cd854b47acc7452 Mon Sep 17 00:00:00 2001 -From: Scott McCreary -Date: Sat, 4 Sep 2010 06:59:30 +0000 -Subject: Speex patch to fix typedefs for Haiku build - - -diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h -index 852fed8..217bdfc 100644 ---- a/include/speex/speex_types.h -+++ b/include/speex/speex_types.h -@@ -73,6 +73,15 @@ - typedef int32_t spx_int32_t; - typedef u_int32_t spx_uint32_t; - -+#elif defined(__HAIKU__) -+ -+ /* Haiku */ -+# include -+ typedef short spx_int16_t; -+ typedef unsigned short spx_uint16_t; -+ typedef int spx_int32_t; -+ typedef unsigned int spx_uint32_t; -+ - #elif defined (__EMX__) - - /* OS/2 GCC */ --- -1.7.5 - - -From 7ec1c5672675e7d89ab5b6d1d6550f7d04c7e688 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Tue, 11 Jun 2013 17:15:15 +0200 -Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS - - -diff --git a/configure.ac b/configure.ac -index 057d888..9d0caec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*- - - AC_INIT(libspeex/speex.c) - --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - SPEEX_MAJOR_VERSION=1 - SPEEX_MINOR_VERSION=1 --- -1.7.5 - diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc2.recipe similarity index 62% rename from media-libs/speex/speex-1.2~rc1.recipe rename to media-libs/speex/speex-1.2~rc2.recipe index b89de4ea44..44018e460d 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc2.recipe @@ -1,35 +1,32 @@ -SUMMARY="A Free Codec For Free Speech" -DESCRIPTION="Speex is an Open Source/Free Software patent-free audio \ -compression format designed for speech. The Speex Project aims to lower the \ +SUMMARY="A free codec for speech" +DESCRIPTION="Speex is an open-source/free software patent-free audio \ +compression format designed for speech. The Speex project aims to lower the \ barrier of entry for voice applications by providing a free alternative to \ expensive proprietary speech codecs. Moreover, Speex is well-adapted to \ -Internet applications and provides useful features that are not present in \ -most other codecs. Finally, Speex is part of the GNU Project and is available \ -under the revised BSD license. -" +internet applications and provides useful features that are not present in \ +most other codecs. +Finally, Speex is part of the GNU project and is available under the revised \ +BSD license." HOMEPAGE="http://www.speex.org" -LICENSE="Speex" -COPYRIGHT=" - 2002-2009 Xiph.org Foundation +COPYRIGHT="2002-2009 Xiph.org Foundation 2002-2008 Jean-Marc Valin 2005-2007 Analog Devices Inc. 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) 1993, 2002, 2006 David Rowe 2003 EpicGames - 1992-1994 Jutta Degener, Carsten Bormann - " -SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" -CHECKSUM_SHA256="342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6" -REVISION="3" + 1992-1994 Jutta Degener, Carsten Bormann" +LICENSE="Speex" +REVISION="2" +SOURCE_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc2.tar.gz" +CHECKSUM_SHA256="caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891" +SOURCE_DIR="speex-1.2rc2" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="speex-1.2~rc1.patchset" - PROVIDES=" speex$secondaryArchSuffix = $portVersion lib:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 - lib:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 " if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES @@ -37,34 +34,40 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:speexenc = $portVersion " fi - REQUIRES=" haiku$secondaryArchSuffix lib:libogg$secondaryArchSuffix " + +PROVIDES_devel=" + speex${secondaryArchSuffix}_devel = $portVersion + devel:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 + " +REQUIRES_devel=" + speex$secondaryArchSuffix == $portVersion + " + BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:aclocal + cmd:aclocal_1.15 cmd:autoconf - cmd:automake + cmd:automake_1.15 cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtoolize + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " -SOURCE_DIR="speex-1.2rc1" - BUILD() { libtoolize --copy --force --install - aclocal - automake + aclocal-1.15 autoconf + automake-1.15 --add-missing runConfigure ./configure make $jobArgs } @@ -73,7 +76,7 @@ INSTALL() { make install - prepareInstalledDevelLibs libspeex libspeexdsp + prepareInstalledDevelLibs libspeex fixPkgconfig # devel package @@ -87,14 +90,3 @@ INSTALL() rm -rf $documentationDir fi } - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - speex${secondaryArchSuffix}_devel = $portVersion - devel:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 - devel:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 - " -REQUIRES_devel=" - speex$secondaryArchSuffix == $portVersion - "