Merge pull request #534 from micmac1/fs_rename

freeswitch-stable: rename to freeswitch

net/freeswitch-mod-bcg729/Makefile

@@ -7,21 +7,21 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=freeswitch-stable-mod-bcg729
+PKG_NAME:=freeswitch-mod-bcg729
 
 PKG_VERSION:=20170629
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
 
 PKG_LICENSE:=MPL-1.1
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=freeswitch-mod-bcg729-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/xadhoom/mod_bcg729.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_SUBDIR:=freeswitch-mod-bcg729-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=686eb06d4a395d94c364efff4b63579af76ebec7
-PKG_MIRROR_HASH:=adfdce835bad865b966ed3384a17f48279b422e63b0f49f3eb892258994cb62d
+PKG_MIRROR_HASH:=efc9421223bba3ba7dd127531aa6887c39ed42d5fb8c0b0c67b15f3c98134b0a
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,21 +42,21 @@ BCG729_INCLUDES:= \
 
 BCG729_LDFLAGS:=-lm -Wl,-shared -lbcg729 -Wl,-Bdynamic
 
-define Package/$(PKG_NAME)
+define Package/freeswitch-mod-bcg729
   TITLE:=bcg729 module
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
   URL:=https://github.com/xadhoom/mod_bcg729
-  DEPENDS:=freeswitch-stable +bcg729
+  DEPENDS:=freeswitch +bcg729
 endef
 
-define Package/$(PKG_NAME)/description
+define Package/freeswitch-mod-bcg729/description
 FreeSWITCH G.729 module using the opensource bcg729 implementation by
 Belledonne Communications.
 endef
 
-define Package/$(PKG_NAME)/install
+define Package/freeswitch-mod-bcg729/install
 	$(INSTALL_DIR) $(1)$(BCG729_MOD_DIR)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mod_bcg729.so $(1)$(BCG729_MOD_DIR)
 endef
@@ -78,4 +78,4 @@ define Build/Compile
 		$(BCG729_LDFLAGS)
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,freeswitch-mod-bcg729))

net/freeswitch/Config.in

@@ -1,7 +1,7 @@
 menu "Advanced configuration"
-	depends on PACKAGE_freeswitch-stable
+	depends on PACKAGE_freeswitch
 
-config FS_STABLE_WITH_DEBUG
+config FS_WITH_DEBUG
 	bool "Compile with debug information"
 	default n
 	help
@@ -9,51 +9,51 @@ config FS_STABLE_WITH_DEBUG
 	  want to get meaningful backtraces see
 	  https://wiki.openwrt.org/doc/devel/debugging for starting points.
 
-config FS_STABLE_WITH_FREETYPE
+config FS_WITH_FREETYPE
 	bool "Compile with FreeType support"
 	default y if x86_64
 	help
 	  Add FreeType support to FreeSWITCH
 
-config FS_STABLE_WITH_LIBYUV
+config FS_WITH_LIBYUV
 	bool "Compile with libyuv support"
 	default y if x86_64
 	help
 	  Add libyuv support to FreeSWITCH
 
-config FS_STABLE_WITH_ODBC
+config FS_WITH_ODBC
 	bool "Compile with ODBC support"
 	default y if x86_64
 	help
 	  Enable ODBC support.
 
-config FS_STABLE_WITH_PNG
+config FS_WITH_PNG
 	bool "Compile with PNG support"
 	default y if x86_64
 	help
 	  Add PNG support to FreeSWITCH
 
-config FS_STABLE_WITH_SRTP
+config FS_WITH_SRTP
 	bool "Compile with SRTP support"
 	default y
 	help
 	  Compile with SRTP support.
 
-config FS_STABLE_WITH_VPX
+config FS_WITH_VPX
 	bool "Compile with VPx support"
-	depends on FS_STABLE_WITH_LIBYUV
+	depends on FS_WITH_LIBYUV
 	default y if x86_64
 	help
 	  Compile with VPx video codec support
 
-config FS_STABLE_WITH_ZRTP
+config FS_WITH_ZRTP
 	bool "Compile with ZRTP support"
 	depends on aarch64||aarch64_be||arm||armeb||i386||mips||mips64||mips64el||mipsel||powerpc||powerpc64||powerpcle||sparc||x86_64
 	default y if x86_64
 	help
 	  Compile with ZRTP support.
 
-config FS_STABLE_WITH_MODCONF
+config FS_WITH_MODCONF
 	bool "Include module examples"
 	default y if x86_64
 	help

net/freeswitch/patches/190-mod_pocketsphinx.patch

@@ -5,7 +5,7 @@
  $(SPHINXBASE_BUILDDIR)/Makefile: $(SPHINXBASE_DIR)
  	mkdir -p $(SPHINXBASE_BUILDDIR)
 -	(cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=)
-+	(cd $(SPHINXBASE_BUILDDIR) && sed -i 's|$$(srcdir)/||g' test/regression/Makefile.am && autoreconf -v -f -i -s && $(DEFAULT_VARS) ac_cv_header_alsa_asoundlib_h=no ac_cv_header_jack_jack_h=no ac_cv_header_pulse_pulseaudio_h=no $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python $(FS_STABLE_USE_FIXED_POINT))
++	(cd $(SPHINXBASE_BUILDDIR) && sed -i 's|$$(srcdir)/||g' test/regression/Makefile.am && autoreconf -v -f -i -s && $(DEFAULT_VARS) ac_cv_header_alsa_asoundlib_h=no ac_cv_header_jack_jack_h=no ac_cv_header_pulse_pulseaudio_h=no $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python $(FS_USE_FIXED_POINT))
  	$(TOUCH_TARGET)
  
  $(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_BUILDDIR)/Makefile

net/freeswitch/patches/270-fix-uclibc-iconv-in-gsmopen.patch

@@ -4,7 +4,7 @@
  /***************/
  #endif /* WIN32 */
  
-+#if defined(FS_STABLE_ICONV_INBUF_CONST)
++#if defined(FS_ICONV_INBUF_CONST)
 +#define ICONV_INBUF_TYPE const char **
 +#else
 +#define ICONV_INBUF_TYPE char **