From 667774af23d9d506268f475f1e443ac4b9013903 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 3 Oct 2020 10:40:04 +0200 Subject: [PATCH] baresip: bump to 1.0.0 - remove 010-openssl-deprecated.patch as upstream seems to have fixed the issue - upstream closed down the server http://www.creytiv.com/ so this changes URLs - dtmfio module removed upstream - always set DESTDIR so that PREFIX is /usr instead of /usr/local - update 002-fix-rem-include.patch and remove LIBREM_PATH usage altogether as it only adds broken include paths which aren't useful in the end anyway Signed-off-by: Sebastian Kemper --- net/baresip/Makefile | 14 +++-- net/baresip/patches/002-fix-rem-include.patch | 53 ++++++++++++++++--- .../patches/010-openssl-deprecated.patch | 11 ---- 3 files changed, 51 insertions(+), 27 deletions(-) delete mode 100644 net/baresip/patches/010-openssl-deprecated.patch diff --git a/net/baresip/Makefile b/net/baresip/Makefile index 453423c..33af8b8 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baresip -PKG_VERSION:=0.6.4 -PKG_RELEASE:=3 +PKG_VERSION:=1.0.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.creytiv.com/pub -PKG_HASH:=61710bd1bec406ae1faf167c5743bad8eef9ced5152a3943b94d7e1cf9597581 +PKG_SOURCE_URL:=https://codeload.github.com/baresip/baresip/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=7b008c0a5b4fccfa0a4003f86dc4aaafeaabbdd259ece4757898e9cb5f04fdcf PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=docs/COPYING @@ -58,7 +58,7 @@ define Package/baresip/Default SECTION:=net CATEGORY:=Network SUBMENU:=Telephony - URL:=http://www.creytiv.com + URL:=https://github.com/baresip/baresip endef define Package/baresip @@ -92,17 +92,16 @@ baresip-mod-v4l2 := USE_V4L2 BARESIP_MOD_OPTIONS:= \ MOD_AUTODETECT= \ - EXTRA_MODULES="dtmfio" \ $(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(subst _,-,$(m))),1)) MAKE_FLAGS+= \ CROSS_COMPILE="$(TARGET_CROSS)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ EXTRA_LFLAGS="$(TARGET_LDFLAGS)" \ LD="$(TARGET_CC)" \ LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ LIBRE_SO="$(STAGING_DIR)/usr/lib" \ - LIBREM_PATH="$(STAGING_DIR)/usr" \ OS=linux \ RELEASE=1 \ SYSROOT="$(shell $(FIND) $(TOOLCHAIN_DIR) -path '*/include/pthread.h' | sed -ne '1s|/include/pthread.h||p')" \ @@ -189,7 +188,6 @@ $(eval $(call BuildPlugin,cons,UDP/TCP console UI driver,cons,)) $(eval $(call BuildPlugin,ctrl_tcp,TCP control interface,ctrl_tcp,)) $(eval $(call BuildPlugin,debug_cmd,Debug commands,debug_cmd,)) $(eval $(call BuildPlugin,dtls_srtp,DTLS-SRTP end-to-end encryption,dtls_srtp,)) -$(eval $(call BuildPlugin,dtmfio,DTMF input/output,dtmfio,)) $(eval $(call BuildPlugin,echo,Echo server module,echo,)) $(eval $(call BuildPlugin,evdev,Linux input driver,evdev,)) $(eval $(call BuildPlugin,fakevideo,Fake video input/output driver,fakevideo,)) diff --git a/net/baresip/patches/002-fix-rem-include.patch b/net/baresip/patches/002-fix-rem-include.patch index e4ecda0..de530b9 100644 --- a/net/baresip/patches/002-fix-rem-include.patch +++ b/net/baresip/patches/002-fix-rem-include.patch @@ -1,16 +1,53 @@ --- a/Makefile +++ b/Makefile -@@ -45,11 +45,11 @@ endif +@@ -44,26 +44,15 @@ endif + include $(LIBRE_MK) + include mk/modules.mk - CFLAGS += -I. -Iinclude -I$(LIBRE_INC) -I$(SYSROOT)/include - CFLAGS += -I$(LIBREM_PATH)/include +-ifndef LIBREM_PATH +-LIBREM_PATH := $(shell [ -d ../rem ] && echo "../rem") +-endif +- +- + CFLAGS += -I. -Iinclude -I$(LIBRE_INC) +-ifneq ($(LIBREM_PATH),) +-CFLAGS += -I$(LIBREM_PATH)/include +-endif -CFLAGS += -I$(SYSROOT)/local/include/rem -I$(SYSROOT)/include/rem -+CFLAGS += -I$(SYSROOT)/local/include/rem -I$(SYSROOT_ALT)/include/rem ++CFLAGS += -I$(SYSROOT_ALT)/include/rem + ifneq ($(SYSROOT_LOCAL),) + CFLAGS += -I$(SYSROOT_LOCAL)/include/rem + endif + CXXFLAGS += -I. -Iinclude -I$(LIBRE_INC) - CXXFLAGS += -I$(LIBREM_PATH)/include +-ifneq ($(LIBREM_PATH),) +-CXXFLAGS += -I$(LIBREM_PATH)/include +-endif -CXXFLAGS += -I$(SYSROOT)/local/include/rem -I$(SYSROOT)/include/rem -+CXXFLAGS += -I$(SYSROOT)/local/include/rem -I$(SYSROOT_ALT)/include/rem - CXXFLAGS += $(EXTRA_CXXFLAGS) - ++CXXFLAGS += -I$(SYSROOT_ALT)/include/rem + ifneq ($(SYSROOT_LOCAL),) + CXXFLAGS += -I$(SYSROOT_LOCAL)/include/rem + endif +@@ -73,10 +62,6 @@ CXXFLAGS += $(EXTRA_CXXFLAGS) # XXX: common for C/C++ + CPPFLAGS += -DHAVE_INTTYPES_H + +-ifneq ($(LIBREM_PATH),) +-CLANG_OPTIONS += -I$(LIBREM_PATH)/include +-endif +- + ifeq ($(OS),win32) + STATIC := yes + endif +@@ -144,10 +129,6 @@ LIB_OBJS := $(OBJS) $(MOD_OBJS) + TEST_OBJS := $(patsubst %.c,$(BUILD)/test/%.o,$(filter %.c,$(TEST_SRCS))) + TEST_OBJS += $(patsubst %.cpp,$(BUILD)/test/%.o,$(filter %.cpp,$(TEST_SRCS))) + +-ifneq ($(LIBREM_PATH),) +-LIBS += -L$(LIBREM_PATH) +-endif +- + # Static build: include module linker-flags in binary + ifneq ($(STATIC),) + LIBS += $(MOD_LFLAGS) diff --git a/net/baresip/patches/010-openssl-deprecated.patch b/net/baresip/patches/010-openssl-deprecated.patch deleted file mode 100644 index 4e691bc..0000000 --- a/net/baresip/patches/010-openssl-deprecated.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/debug_cmd/debug_cmd.c -+++ b/modules/debug_cmd/debug_cmd.c -@@ -56,7 +56,7 @@ static int print_system_info(struct re_printf *pf, void *arg) - - #ifdef USE_OPENSSL - err |= re_hprintf(pf, " OpenSSL: %s\n", -- SSLeay_version(SSLEAY_VERSION)); -+ OpenSSL_version(OPENSSL_VERSION)); - #endif - - return err; -- 2.30.2