summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-08-05 14:38:49 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-08-05 14:38:49 +0200
commit8fbd202239b8833af79e1deefcadc128b7e979eb (patch)
treee47b5bace70278f53b24112f2ba9e4f5bb521061
parentc5acd40a763f8688aa564679643e6d5458425d4d (diff)
Fix libsrtp using a predefined constant as a variable.
-rw-r--r--extra/libsrtp/PKGBUILD9
-rw-r--r--extra/libsrtp/mips.patch55
2 files changed, 61 insertions, 3 deletions
diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD
index 13f8142c3..1013f6bc8 100644
--- a/extra/libsrtp/PKGBUILD
+++ b/extra/libsrtp/PKGBUILD
@@ -9,13 +9,16 @@ pkgver=1.4.4
pkgrel=2
pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
url="http://srtp.sourceforge.net/srtp.html"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
license=('BSD')
-source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz")
-md5sums=('9b449edb011c934ca97009e7e0566d22')
+source=("http://downloads.sourceforge.net/srtp/srtp-${pkgver}.tgz"
+ "mips.patch")
+md5sums=('9b449edb011c934ca97009e7e0566d22'
+ 'bfb3ec203daf786b9ffb33f30cb126ea')
build() {
cd "${srcdir}"/srtp
+ patch -Np1 -i "$srcdir/mips.patch"
./configure --prefix=/usr
make CFLAGS="${CFLAGS} -fPIC"
}
diff --git a/extra/libsrtp/mips.patch b/extra/libsrtp/mips.patch
new file mode 100644
index 000000000..a1b549fe5
--- /dev/null
+++ b/extra/libsrtp/mips.patch
@@ -0,0 +1,55 @@
+diff -ru srtp.orig/test/srtp_driver.c srtp/test/srtp_driver.c
+--- srtp.orig/test/srtp_driver.c 2012-08-05 14:26:28.703145796 +0200
++++ srtp/test/srtp_driver.c 2012-08-05 14:27:12.003981862 +0200
+@@ -314,7 +314,7 @@
+ if (do_codec_timing) {
+ srtp_policy_t policy;
+ int ignore;
+- double mips = mips_estimate(1000000000, &ignore);
++ double mips_ = mips_estimate(1000000000, &ignore);
+
+ crypto_policy_set_rtp_default(&policy.rtp);
+ crypto_policy_set_rtcp_default(&policy.rtcp);
+@@ -323,33 +323,33 @@
+ policy.key = test_key;
+ policy.next = NULL;
+
+- printf("mips estimate: %e\n", mips);
++ printf("mips estimate: %e\n", mips_);
+
+ printf("testing srtp processing time for voice codecs:\n");
+ printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n");
+ printf("G.711\t\t%d\t\t\t%e\n", 80,
+- (double) mips * (80 * 8) /
++ (double) mips_ * (80 * 8) /
+ srtp_bits_per_second(80, &policy) / .01 );
+ printf("G.711\t\t%d\t\t\t%e\n", 160,
+- (double) mips * (160 * 8) /
++ (double) mips_ * (160 * 8) /
+ srtp_bits_per_second(160, &policy) / .02);
+ printf("G.726-32\t%d\t\t\t%e\n", 40,
+- (double) mips * (40 * 8) /
++ (double) mips_ * (40 * 8) /
+ srtp_bits_per_second(40, &policy) / .01 );
+ printf("G.726-32\t%d\t\t\t%e\n", 80,
+- (double) mips * (80 * 8) /
++ (double) mips_ * (80 * 8) /
+ srtp_bits_per_second(80, &policy) / .02);
+ printf("G.729\t\t%d\t\t\t%e\n", 10,
+- (double) mips * (10 * 8) /
++ (double) mips_ * (10 * 8) /
+ srtp_bits_per_second(10, &policy) / .01 );
+ printf("G.729\t\t%d\t\t\t%e\n", 20,
+- (double) mips * (20 * 8) /
++ (double) mips_ * (20 * 8) /
+ srtp_bits_per_second(20, &policy) / .02 );
+ printf("Wideband\t%d\t\t\t%e\n", 320,
+- (double) mips * (320 * 8) /
++ (double) mips_ * (320 * 8) /
+ srtp_bits_per_second(320, &policy) / .01 );
+ printf("Wideband\t%d\t\t\t%e\n", 640,
+- (double) mips * (640 * 8) /
++ (double) mips_ * (640 * 8) /
+ srtp_bits_per_second(640, &policy) / .02 );
+ }
+