From cd4626d53b41f2f5b5a493ae992ba5585eeffbc7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 8 Jan 2015 18:43:22 +0000 Subject: [PATCH] speex: bump version. * speexdsp is splitted in another package. --- .../speex/patches/speex-1.2~rc1.patchset | 52 ------------------- ...ex-1.2~rc1.recipe => speex-1.2~rc2.recipe} | 14 ++--- 2 files changed, 5 insertions(+), 61 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} (85%) 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 c979f0257..000000000 --- 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 85% rename from media-libs/speex/speex-1.2~rc1.recipe rename to media-libs/speex/speex-1.2~rc2.recipe index b89de4ea4..c700c792f 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc2.recipe @@ -18,18 +18,15 @@ COPYRIGHT=" 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" +SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc2.tar.gz" +CHECKSUM_SHA256="caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891" +REVISION="1" 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 @@ -57,7 +54,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -SOURCE_DIR="speex-1.2rc1" +SOURCE_DIR="speex-1.2rc2" BUILD() { @@ -73,7 +70,7 @@ INSTALL() { make install - prepareInstalledDevelLibs libspeex libspeexdsp + prepareInstalledDevelLibs libspeex fixPkgconfig # devel package @@ -93,7 +90,6 @@ INSTALL() 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