Fix building with newer versions of speex #205893 by Chi-Thanh Christopher Nguyen.

Package-Manager: portage-2.1.4

4 files changed, 145 insertions, 13 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 86d774555efa..a1ab4eedfd88 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.6 2008/01/14 14:03:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.7 2008/01/16 02:24:48 vapier Exp $
+
+  16 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/linphone-2.0.1-speexdsp.patch, linphone-2.0.1-r1.ebuild:
+  Fix building with newer versions of speex #205893 by Chi-Thanh Christopher
+  Nguyen.
 
 *linphone-2.0.1-r1 (14 Jan 2008)
 
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index d50600deb842..fe5993371bd1 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -17,6 +17,10 @@ AUX linphone-2.0.1-mediastreamer-deps.patch 2171 RMD160 282caddf2314583a5c562041
 MD5 2eea70782859312a61e8542d74edb136 files/linphone-2.0.1-mediastreamer-deps.patch 2171
 RMD160 282caddf2314583a5c5620413b70811c6dee03d7 files/linphone-2.0.1-mediastreamer-deps.patch 2171
 SHA256 249c5863c31b2e040f73cd0d0a6b9667b42622c6c27e9e9b67121a9d5de60910 files/linphone-2.0.1-mediastreamer-deps.patch 2171
+AUX linphone-2.0.1-speexdsp.patch 4124 RMD160 ce630327e4f691920ac1d868aff85cce813be1fb SHA1 c47d6e519f1e45c98ce74bdea794d5e97271b78a SHA256 d01c8f5bec88bfc5b87ebe5f1a13b8494a0f898c81741754b930cd07b34b8cef
+MD5 54a8aeee8a4a0473bc554a31f4f59212 files/linphone-2.0.1-speexdsp.patch 4124
+RMD160 ce630327e4f691920ac1d868aff85cce813be1fb files/linphone-2.0.1-speexdsp.patch 4124
+SHA256 d01c8f5bec88bfc5b87ebe5f1a13b8494a0f898c81741754b930cd07b34b8cef files/linphone-2.0.1-speexdsp.patch 4124
 DIST linphone-1.7.1.tar.gz 7537415 RMD160 da5959e3b79c0eeb48b72481b1390e98e7cdadfd SHA1 3134e38b00d82155219f88e38e5ff9199fea1976 SHA256 3a3c606e2313f9871f07e41dfbeb87f6edb404f7927f7737fc22ab1a59a59e48
 DIST linphone-2.0.1.tar.gz 7638627 RMD160 89c120e5118c931daf9f58d1d988185a28bbcf05 SHA1 a8020c4643e7ca05aefe83e9c25e3ac8c3661574 SHA256 33f9e17eba38c55c6b2260e02c98db642dd47d3c38677478a05caa0ae702d16f
 EBUILD linphone-1.7.1-r1.ebuild 2348 RMD160 514bbe5995aa1c19c9ea426ab1c95ae2c08537b0 SHA1 c6e49137c0da356ee0a51d93fc30cca92a861a97 SHA256 005f97a26ecdefb5a9a67853a11f4bb90ac5201cb93cf47e8efdd93a6dca04a3
@@ -27,18 +31,18 @@ EBUILD linphone-1.7.1.ebuild 2079 RMD160 1468451776de6dfd69b1efefe413a9be558ac51
 MD5 cc6ef2e51a0a52f971c5998a0d5d0571 linphone-1.7.1.ebuild 2079
 RMD160 1468451776de6dfd69b1efefe413a9be558ac51d linphone-1.7.1.ebuild 2079
 SHA256 92009903c30c552aa1ac3d81dd3d5a1336a61cf9bb6c6e58ac586952b41f863f linphone-1.7.1.ebuild 2079
-EBUILD linphone-2.0.1-r1.ebuild 2787 RMD160 a78d76fb593e9c33fe9ba099bca1104d5a897c0c SHA1 483ddd8f61273594041b875f8595f7d13da25201 SHA256 6cbb8435c74062e7bf17d73696672b0060d1e03af9013f94b0b0443be8083b84
-MD5 a6c9f0cec7135ee0ddf06bdb2dee41ba linphone-2.0.1-r1.ebuild 2787
-RMD160 a78d76fb593e9c33fe9ba099bca1104d5a897c0c linphone-2.0.1-r1.ebuild 2787
-SHA256 6cbb8435c74062e7bf17d73696672b0060d1e03af9013f94b0b0443be8083b84 linphone-2.0.1-r1.ebuild 2787
+EBUILD linphone-2.0.1-r1.ebuild 2847 RMD160 01c34573d61a22bb6c4461e5fccfdf1b172053d4 SHA1 bd2c3f17450462470f87ed4c879bba46e388ecd1 SHA256 0b043a18cfe8cbdd9f19c8229be881c56e83ed5148792b1d79d3cbe87b9922ee
+MD5 072f1aa7007d2d55f0426165c7149b43 linphone-2.0.1-r1.ebuild 2847
+RMD160 01c34573d61a22bb6c4461e5fccfdf1b172053d4 linphone-2.0.1-r1.ebuild 2847
+SHA256 0b043a18cfe8cbdd9f19c8229be881c56e83ed5148792b1d79d3cbe87b9922ee linphone-2.0.1-r1.ebuild 2847
 EBUILD linphone-2.0.1.ebuild 2629 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 SHA1 a3f11664fb0d776a9c77dd030b959bddf082cbc8 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf
 MD5 c1395e756c6e2ba7ce176a1544ba585e linphone-2.0.1.ebuild 2629
 RMD160 d3e8faa69a4555005064f9f32af4d1d01743fb68 linphone-2.0.1.ebuild 2629
 SHA256 ad68e2b918c7a7ede1ca029da667dce1b2756b511bceeac9d453efc21b9dc6cf linphone-2.0.1.ebuild 2629
-MISC ChangeLog 7276 RMD160 6880876f687f3101ab19699082f24ce26047fe06 SHA1 22a905a8326b2373aa36c422de7665d9b68ff77d SHA256 f051d56f76b5acb888ab6b0911bc1f722cef0b3db7a2b00b341498fc5e149ec1
-MD5 bf4f0a4a00849a014e216af4b8491199 ChangeLog 7276
-RMD160 6880876f687f3101ab19699082f24ce26047fe06 ChangeLog 7276
-SHA256 f051d56f76b5acb888ab6b0911bc1f722cef0b3db7a2b00b341498fc5e149ec1 ChangeLog 7276
+MISC ChangeLog 7480 RMD160 c31f01630d5bd843fcf09995405272878e426dcb SHA1 ebf3061473bcd20b5c4726ecd73fd3decab33c6a SHA256 4a5974c1486376649f145e62aacedb6c6af66dcfab29415e8b333f5eb5c34f38
+MD5 c94e2b0bd2ade9eb8e59014c3c701fd2 ChangeLog 7480
+RMD160 c31f01630d5bd843fcf09995405272878e426dcb ChangeLog 7480
+SHA256 4a5974c1486376649f145e62aacedb6c6af66dcfab29415e8b333f5eb5c34f38 ChangeLog 7480
 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38
 MD5 4147a43d9c89e23a84621861984e010e metadata.xml 312
 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 metadata.xml 312
@@ -58,7 +62,7 @@ SHA256 0188b5b395f8a9f060e085021891a3d5f98850ed47c567a1a2f8f1edbd8a5ac7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHi2vHj9hvisErhMIRArs+AJ9ydER/yNCsBXXlePBlkdNy2BIcegCgqHun
-vPwYu2rjCUrx2hSFPlgqEaA=
-=b+zP
+iD8DBQFHjWr2j9hvisErhMIRAgdlAKDAR1EzeQsO2Hi8vX+8YxzfflOoagCghKGq
+UYjqpkmZhf2ZeVe4zze7xdw=
+=9ykl
 -----END PGP SIGNATURE-----
diff --git a/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch b/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch
new file mode 100644
index 000000000000..c0bd4156c1fa
--- /dev/null
+++ b/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch
@@ -0,0 +1,122 @@
+http://bugs.gentoo.org/205893
+
+--- linphone-2.0.1/mediastreamer2/configure
++++ linphone-2.0.1/mediastreamer2/configure
+@@ -21907,6 +21915,117 @@
+ 	build_speex=yes
+ fi
+ 
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for SPEEXDSP" >&5
++echo $ECHO_N "checking for SPEEXDSP... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$SPEEXDSP_CFLAGS"; then
++        pkg_cv_SPEEXDSP_CFLAGS="$SPEEXDSP_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp >= 1.2beta3\"") >&5
++  ($PKG_CONFIG --exists --print-errors "speexdsp >= 1.2beta3") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_SPEEXDSP_CFLAGS=`$PKG_CONFIG --cflags "speexdsp >= 1.2beta3" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$SPEEXDSP_LIBS"; then
++        pkg_cv_SPEEXDSP_LIBS="$SPEEXDSP_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp >= 1.2beta3\"") >&5
++  ($PKG_CONFIG --exists --print-errors "speexdsp >= 1.2beta3") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_SPEEXDSP_LIBS=`$PKG_CONFIG --libs "speexdsp >= 1.2beta3" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speexdsp >= 1.2beta3"`
++        else
++	        SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speexdsp >= 1.2beta3"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$SPEEXDSP_PKG_ERRORS" >&5
++
++	{ { echo "$as_me:$LINENO: error: Package requirements (speexdsp >= 1.2beta3) were not met:
++
++$SPEEXDSP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (speexdsp >= 1.2beta3) were not met:
++
++$SPEEXDSP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++   { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++	SPEEXDSP_CFLAGS=$pkg_cv_SPEEXDSP_CFLAGS
++	SPEEXDSP_LIBS=$pkg_cv_SPEEXDSP_LIBS
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	SPEEX_LIBS="$SPEEX_LIBS $SPEEXDSP_LIBS"
++fi
++
+ 
+ 
+ 
diff --git a/net-voip/linphone/linphone-2.0.1-r1.ebuild b/net-voip/linphone/linphone-2.0.1-r1.ebuild
index 04d80b4a470b..ee2c57199e81 100644
--- a/net-voip/linphone/linphone-2.0.1-r1.ebuild
+++ b/net-voip/linphone/linphone-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-2.0.1-r1.ebuild,v 1.1 2008/01/14 14:03:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-2.0.1-r1.ebuild,v 1.2 2008/01/16 02:24:48 vapier Exp $
 
 # Note: video support in linphone relies on swscaler being disabled
 #       in ffmpeg.  this is because the video code in linphone is old
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/linphone-1.6.0-call.patch
 	epatch "${FILESDIR}"/linphone-1.99.0-core-amd64.patch
 	epatch "${FILESDIR}"/linphone-2.0.1-configure-gsm.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-speexdsp.patch #205893
 	epatch "${FILESDIR}"/linphone-2.0.1-mediastreamer-deps.patch
 }