speex: update to current version.

media-libs/speex/speex-1.2~rc1.recipe → media-libs/speex/speex-1.2~rc2.recipe

@@ -1,70 +1,73 @@
-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
 		cmd:speexdec = $portVersion
 		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
-	"