Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [1641] trunk
|
From: <ppr...@us...> - 2008-03-11 01:43:20
|
Revision: 1641
http://astlinux.svn.sourceforge.net/astlinux/?rev=1641&view=rev
Author: pprindeville
Date: 2008-03-10 18:43:20 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
Retooling using the posted fix for bug 12117.
Modified Paths:
--------------
trunk/asterisk.makeopts
trunk/package/asterisk/asterisk.mk
Added Paths:
-----------
trunk/package/asterisk/asterisk-bugid12117.patch
Removed Paths:
-------------
trunk/package/asterisk/asterisk-sounds.patch
Modified: trunk/asterisk.makeopts
===================================================================
--- trunk/asterisk.makeopts 2008-03-10 07:13:44 UTC (rev 1640)
+++ trunk/asterisk.makeopts 2008-03-11 01:43:20 UTC (rev 1641)
@@ -9,7 +9,7 @@
MENUSELECT_OPTS_app_voicemail=
MENUSELECT_CFLAGS=LOADABLE_MODULES
MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-ULAW CORE-SOUNDS-EN-G729
+MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM CORE-SOUNDS-EN-ULAW CORE-SOUNDS-EN-G729
MENUSELECT_MOH=MOH-FREEPLAY-ULAW MOH-FREEPLAY-G729
MENUSELECT_EXTRA_SOUNDS=
MENUSELECT_BUILD_DEPS=res_adsi chan_local app_meetme res_monitor res_smdi res_features DEBUG_THREADS
Added: trunk/package/asterisk/asterisk-bugid12117.patch
===================================================================
--- trunk/package/asterisk/asterisk-bugid12117.patch (rev 0)
+++ trunk/package/asterisk/asterisk-bugid12117.patch 2008-03-11 01:43:20 UTC (rev 1641)
@@ -0,0 +1,55 @@
+Index: asterisk-1.4.18/Makefile
+===================================================================
+--- asterisk-1.4.18/Makefile.orig 2008-01-29 09:21:33.000000000 -0800
++++ asterisk-1.4.18/Makefile 2008-03-10 18:27:46.000000000 -0700
+@@ -315,7 +315,7 @@
+ @exit 1
+
+ menuselect.makeopts: menuselect/menuselect menuselect-tree
+- menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
++ menuselect/menuselect --check-deps menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+
+ $(MOD_SUBDIRS_EMBED_LDSCRIPT):
+ @echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+@@ -738,10 +738,10 @@
+ gmenuconfig: gmenuselect
+
+ menuselect: menuselect/menuselect menuselect-tree
+- -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
++ -@menuselect/menuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
+ gmenuselect: menuselect/gmenuselect menuselect-tree
+- -@menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
++ -@menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
+ menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
+ @CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+Index: asterisk-1.4.18/menuselect/menuselect.c
+===================================================================
+--- asterisk-1.4.18/menuselect/menuselect.c (revision 287)
++++ asterisk-1.4.18/menuselect/menuselect.c (working copy)
+@@ -632,13 +632,23 @@
+ {
+ struct category *cat;
+ struct member *mem;
++ int negate = 0;
+
++ if (!strncmp(member, "-", 1)) {
++ member++;
++ negate = 1;
++ }
++
+ AST_LIST_TRAVERSE(&categories, cat, list) {
+ if (strcmp(category, cat->name))
+ continue;
+ AST_LIST_TRAVERSE(&cat->members, mem, list) {
+ if (!strcmp(member, mem->name)) {
+- mem->was_enabled = mem->enabled = cat->positive_output;
++ if (negate) {
++ mem->was_enabled = mem->enabled = !cat->positive_output;
++ } else {
++ mem->was_enabled = mem->enabled = cat->positive_output;
++ }
+ break;
+ }
+ }
Deleted: trunk/package/asterisk/asterisk-sounds.patch
===================================================================
--- trunk/package/asterisk/asterisk-sounds.patch 2008-03-10 07:13:44 UTC (rev 1640)
+++ trunk/package/asterisk/asterisk-sounds.patch 2008-03-11 01:43:20 UTC (rev 1641)
@@ -1,18 +0,0 @@
---- asterisk-1.4.18/sounds/sounds.xml-orig 2008-03-10 03:15:18.000000000 -0500
-+++ asterisk-1.4.18/sounds/sounds.xml 2008-03-10 03:15:45.000000000 -0500
-@@ -6,7 +6,6 @@
- <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
- </member>
- <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
-- <defaultenabled>yes</defaultenabled>
- </member>
- <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
- </member>
-@@ -39,7 +38,6 @@
- </category>
- <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
- <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
-- <defaultenabled>yes</defaultenabled>
- </member>
- <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
- </member>
Modified: trunk/package/asterisk/asterisk.mk
===================================================================
--- trunk/package/asterisk/asterisk.mk 2008-03-10 07:13:44 UTC (rev 1640)
+++ trunk/package/asterisk/asterisk.mk 2008-03-11 01:43:20 UTC (rev 1641)
@@ -72,6 +72,9 @@
$(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE)
zcat $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $@
+
+$(ASTERISK_DIR)/.patched: $(ASTERISK_DIR)/.source
toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk\*.patch
ifeq ($(strip $(BR2_PACKAGE_ASTERISK_BACKPORTS)),y)
@@ -101,9 +104,9 @@
done
endif
- touch $(ASTERISK_DIR)/.source
+ touch $@
-$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source
+$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched
ifeq ($(strip $(BR2_PACKAGE_ASTERISK_LIBPQ_CUSTOM)),y)
cp package/asterisk/custom/*.c $(ASTERISK_DIR)/apps/
toolchain/patch-kernel.sh package/asterisk/custom/\*.patch
@@ -128,14 +131,14 @@
--with-ltdl=$(STAGING_DIR)/usr \
$(ASTERISK_CONFIGURE_ARGS) \
$(ASTERISK_CONFIGURE_CURL) \
- );
+ )
$(MAKE) -C $(ASTERISK_DIR)/menuselect menuselect
ifeq ($(strip $(BR2_PACKAGE_ASTERISK_MENUSELECT)),y)
$(MAKE) -C $(ASTERISK_DIR) menuselect
else
$(MAKE) -C $(ASTERISK_DIR) menuselect.makeopts
endif
- touch $(ASTERISK_DIR)/.configured
+ touch $@
$(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured
cp $(STAGING_DIR)/include/dlfcn.h $(STAGING_DIR)/usr/include/dlfcn.h # Can I do this?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
