chan-sccp-b: switch to git version, update patch

- As suggested by upstream in issue #167, move from svn to git source.
  The resulting module is less than half the size in comparison.

- Rework (and rename) previous "drop-Og-optimization" patch. The
  previous patch worked fine with -Os in CFLAGS (default). But if numeric
  values are used instead (e.g. -O2) this optimization would be completely
  removed. The new patch prevents that.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile
index 31a4a147f9cce12dca1713a82c77df7400ed794a..1961af8b9c5fbaceae6d5c851de6da97b757ef8e 100644 (file)
--- a/net/chan-sccp-b/Makefile
+++ b/net/chan-sccp-b/Makefile
@@ -9,15 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chan-sccp-b
-PKG_REV:=6728
-PKG_VERSION:=v4.2.3-r$(PKG_REV)
-PKG_RELEASE:=2
+PKG_VERSION:=v4.3.0-20170814
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/branches/v4.2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=git://github.com/chan-sccp/chan-sccp.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=016fee3a96b09d5404757f7b178af2e349e55bcc
+PKG_SOURCE_PROTO:=git
 
 PKG_FIXUP:=autoreconf
 
@@ -64,10 +63,9 @@ Package/asterisk11-chan-sccp-b/description = $(Package/description/Default)
 Package/asterisk13-chan-sccp-b/description = $(Package/description/Default)
 
 CONFIGURE_ARGS += \
-       --enable-static \
-       --enable-section-relocation \
-       --enable-conference \
+       --disable-debug \
        --enable-advanced-functions \
+       --enable-conference \
        --enable-video
 
 ifeq ($(BUILD_VARIANT),asterisk13)

diff --git a/net/chan-sccp-b/patches/01-drop-Og-optimization.patch b/net/chan-sccp-b/patches/01-drop-Og-optimization.patch
deleted file mode 100644 (file)
index ee952bd..0000000
--- a/net/chan-sccp-b/patches/01-drop-Og-optimization.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/autoconf/extra.m4
-+++ b/autoconf/extra.m4
-@@ -501,7 +501,7 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
-                               ])
-                       ;;
-               esac
--              CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} "
-+              CFLAGS_saved="${CFLAGS_saved} "
-       ])
-       
-       AS_IF([test "X${enable_debug}" == "Xyes"], [

diff --git a/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch b/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch
new file mode 100644 (file)
index 0000000..19079c9
--- /dev/null
+++ b/net/chan-sccp-b/patches/01-prevent-extra-optimization.patch
@@ -0,0 +1,20 @@
+--- a/autoconf/extra.m4
++++ b/autoconf/extra.m4
+@@ -472,17 +472,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+               ])
+               CPPFLAGS_saved="${CPPFLAGS_saved} -D_FORTIFY_SOURCE=2"
+               GDB_FLAGS=""
+-      ], [
+-              CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`"
+-              optimize_flag="-O0"
+-              case "${CC}" in
+-                      *gcc*)
+-                              AX_CHECK_COMPILE_FLAG(-Og, [
+-                                      optimize_flag="-Og"
+-                              ])
+-                      ;;
+-              esac
+-              CFLAGS_saved="${CFLAGS_saved} ${optimize_flag} "
+       ])
+ 
+       AS_IF([test "X${enable_debug}" == "Xyes"], [