mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-04 20:06:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/asterisk: upgrade to 11.0.0-beta2

Browse Source 
remove upstreamed patch
This commit is contained in:
Timo Teräs 2012-09-21 08:07:00 +03:00
parent 3547c9f638
commit d294f88b54
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/asterisk/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Timo Teras <timo.teras@iki.fi>
# Maintainer: Timo Teras <timo.teras@iki.fi>
pkgname=asterisk
pkgver=11.0.0_beta1
pkgrel=1
pkgver=11.0.0_beta2
pkgrel=0
pkgdesc="Asterisk: A Module Open Source PBX System"
pkgusers="asterisk"
pkggroups="asterisk"
@ -24,7 +24,6 @@ source="http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$
101-caps-uclibc.patch
ASTERISK-18995.patch
ASTERISK-19109.patch
ASTERISK-20362.patch
asterisk.initd
asterisk.confd
asterisk.logrotate"
@ -180,12 +179,11 @@ sound_en() {
chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
}
md5sums="a99bdeae82f80b25b093eba957581dd9 asterisk-11.0.0-beta1.tar.gz
md5sums="b04db6d6828748c73bc5ae7f5c1dc3e6 asterisk-11.0.0-beta2.tar.gz
b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch
6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch
bc6713f5434e07b79d3afdd155461d72 ASTERISK-18995.patch
146befabe95798a67c58d8ac00d397a6 ASTERISK-19109.patch
491aa86a1b3b6d1b9c8dd72314e9859f ASTERISK-20362.patch
74cd25a5638a94ef51e9f4ede2fd28f2 asterisk.initd
ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd
3e65172275684373e1a25c8a11224411 asterisk.logrotate"

30
testing/asterisk/ASTERISK-20362.patch
View File

@ -1,30 +0,0 @@
diff --git a/res/Makefile b/res/Makefile
index bfbca76..c2ad23b 100644
--- a/res/Makefile
+++ b/res/Makefile
@@ -67,17 +67,20 @@ endif
ael/pval.o: ael/pval.c
clean::
+ ${MAKE} -C pjproject clean
rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
pjproject/build.mak:
cd pjproject && ./configure AR="" CFLAGS=-fPIC --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec
-include pjproject/build.mak
+pjproject.stamp: pjproject/build.mak
+ ${MAKE} -j1 -C pjproject dep
+ ${MAKE} -j1 -C pjproject
+ touch pjproject.stamp
-res_rtp_asterisk.o: pjproject/build.mak $(PJ_LIB_FILES)
+-include pjproject/build.mak
+
+res_rtp_asterisk.o: pjproject.stamp
res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
-
-$(PJ_LIB_FILES):
- cd pjproject && make dep && make