From 8e84e70ab0ee0b83a1ff0d8fbf7649b82ae37e14 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 19 Jan 2012 02:38:51 +0000 Subject: [PATCH] upgrade baresip, restund, libre, librem to version 0.4.0 Hi, this patch upgrades the following packages to v0.4.0: baresip v0.4.0 (Portable and modular SIP User-Agent with audio and video support) restund v0.4.0 (Modular STUN/TURN server) libre v0.4.0 (Generic library for real-time communications with async IO support) librem v0.4.0 (Audio and video processing media library) detailed changes can be found in /docs/ChangeLog (See http://www.creytiv.com/) Please review and apply if OK. Signed-Off-By: Alfred E. Heggestad SVN-Revision: 29791 --- libs/re/Makefile | 4 +- libs/re/patches/100-re.mk.patch | 292 ------------------------ libs/rem/Makefile | 4 +- net/baresip/Makefile | 6 +- net/baresip/patches/100-loginname.patch | 11 - net/baresip/patches/101-cross.patch | 25 -- net/restund/Makefile | 6 +- net/restund/patches/101-cross.patch | 38 --- 8 files changed, 10 insertions(+), 376 deletions(-) diff --git a/libs/re/Makefile b/libs/re/Makefile index 9c20d0f41..4fa53106e 100644 --- a/libs/re/Makefile +++ b/libs/re/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=re -PKG_VERSION:=0.3.0 +PKG_VERSION:=0.4.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub -PKG_MD5SUM:=1529ea90b141591504b30ac8d7c2af0e +PKG_MD5SUM:=77469714212b40ec7f224ad8648f91d2 include $(INCLUDE_DIR)/package.mk diff --git a/libs/re/patches/100-re.mk.patch b/libs/re/patches/100-re.mk.patch index 722ef4289..e69de29bb 100644 --- a/libs/re/patches/100-re.mk.patch +++ b/libs/re/patches/100-re.mk.patch @@ -1,292 +0,0 @@ ---- /Users/alfredh/src/re-0.3.0/mk/re.mk 2011-08-30 13:07:12.000000000 +0200 -+++ re/mk/re.mk 2011-10-07 21:27:53.000000000 +0200 -@@ -5,34 +5,37 @@ - # - # Imported variables: - # --# PROJECT Project name --# VERSION Version number --# CC Compiler --# GCOV If non-empty, enable GNU Coverage testing --# GPROF If non-empty, enable GNU Profiling --# OPT_SPEED If non-empty, optimize for speed --# OPT_SIZE If non-empty, optimize for size --# USE_OPENSSL If non-empty, link to libssl library --# USE_ZLIB If non-empty, link to libz library --# SYSROOT System root of library and include files --# SYSROOT_ALT Alternative system root of library and include files --# EXTRA_CFLAGS Extra compiler flags appended to CFLAGS --# EXTRA_LFLAGS Extra linker flags appended to LFLAGS -+# ARCH Target architecture -+# CC Compiler -+# CROSS_COMPILE Cross-compiler prefix (optional) -+# EXTRA_CFLAGS Extra compiler flags appended to CFLAGS -+# EXTRA_LFLAGS Extra linker flags appended to LFLAGS -+# GCOV If non-empty, enable GNU Coverage testing -+# GPROF If non-empty, enable GNU Profiling -+# OPT_SIZE If non-empty, optimize for size -+# OPT_SPEED If non-empty, optimize for speed -+# PROJECT Project name -+# RELEASE Release build -+# SYSROOT System root of library and include files -+# SYSROOT_ALT Alternative system root of library and include files -+# USE_OPENSSL If non-empty, link to libssl library -+# USE_ZLIB If non-empty, link to libz library -+# VERSION Version number - # - # Exported variables: - # --# CC Compiler --# CCACHE Compiler ccache tool --# CFLAGS Compiler flags --# DFLAGS Dependency generator flags --# LFLAGS Common linker flags --# SH_LFLAGS Linker flags for shared libraries --# MOD_LFLAGS Linker flags for dynamic modules --# APP_LFLAGS Linker flags for applications using modules --# LIBS Libraries to link against --# LIB_SUFFIX Suffix for shared libraries --# MOD_SUFFIX Suffix for dynamic modules --# BIN_SUFFIX Suffix for binary executables -+# APP_LFLAGS Linker flags for applications using modules -+# BIN_SUFFIX Suffix for binary executables -+# CC Compiler -+# CCACHE Compiler ccache tool -+# CFLAGS Compiler flags -+# DFLAGS Dependency generator flags -+# LFLAGS Common linker flags -+# LIBS Libraries to link against -+# LIB_SUFFIX Suffix for shared libraries -+# MOD_LFLAGS Linker flags for dynamic modules -+# MOD_SUFFIX Suffix for dynamic modules -+# SH_LFLAGS Linker flags for shared libraries - # - - -@@ -177,65 +180,27 @@ - # - # OS section - # -+ - MACHINE := $(shell $(CC) -dumpmachine) --OS := $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]") --#ARCH := $(shell echo $(MACHINE) | sed -e 's/\([^-]*\)-.*/\1/') - --# TODO get ARCH from first tuple in CC -dumpmachine which is more future proof --ifeq ($(MACHINE), i386-mingw32) -- OS := win32 -- ARCH := i386 --endif --ifeq ($(MACHINE), i486-mingw32) -- OS := win32 -- ARCH := i486 -+ifeq ($(CROSS_COMPILE),) -+OS := $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]") - endif --ifeq ($(MACHINE), i586-mingw32msvc) -+ -+ -+# -+# Try to guess the OS -+# -+ -+ifneq ($(strip $(filter i386-mingw32 i486-mingw32 i586-mingw32msvc mingw32, \ -+ $(MACHINE))),) - OS := win32 -- ARCH := i586 --endif - ifeq ($(MACHINE), mingw32) -- OS := win32 -- ARCH := i386 - CROSS_COMPILE := - endif --ifeq ($(MACHINE), i686-pc-cygwin) -- OS := cygwin -- ARCH := i686 --endif --ifeq ($(MACHINE), mipsel-linux-uclibc) -- OS := linux -- ARCH := mipsel --endif --ifeq ($(MACHINE), bfin-linux-uclibc) -- OS := linux -- ARCH := bfin --endif --ifeq ($(MACHINE), bfin-uclinux) -- OS := linux -- ARCH := bfin --endif --ifeq ($(MACHINE), arm-apple-darwin) -- OS := darwin -- ARCH := arm -- CROSS_COMPILE ?= $(MACHINE)- -- CFLAGS += -F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks --endif --ifeq ($(MACHINE), arm-apple-darwin9) -- OS := darwin -- ARCH := arm -- CROSS_COMPILE ?= $(MACHINE)- -- ROOT := /Developer//Platforms/iPhoneOS.platform/Developer -- SDK := $(ROOT)/SDKs/iPhoneOS3.0.sdk -- CFLAGS += -F$(SDK)/System/Library/Frameworks/ -- CFLAGS += -I$(SDK)/usr/include -- CFLAGS += -I$(SDK)/usr/lib/gcc/arm-apple-darwin9/4.2.1/include -- CFLAGS += -isysroot $(SDK) -- LFLAGS += -F$(SDK)/System/Library/Frameworks -- LFLAGS += -L$(SDK)/usr/lib -- LFLAGS += -L$(SDK)/usr/lib/gcc/arm-apple-darwin9/4.2.1/ - endif - -+ - # default - LIB_SUFFIX := .so - MOD_SUFFIX := .so -@@ -276,8 +241,6 @@ - AR := ar - AFLAGS := cru - LIB_SUFFIX := .dylib -- ARCH := $(shell echo $(MACHINE) | \ -- sed -e 's/\([^-]*\)-.*/\1/') - endif - ifeq ($(OS),netbsd) - CFLAGS += -fPIC -DNETBSD -@@ -347,30 +310,121 @@ - endif - - -+ifeq ($(OS),) -+$(warning Could not detect OS) -+endif -+ -+ - ############################################################################## - # - # Architecture section - # -+# detect $(HOST_ARCH) -- Host architecture -+# detect $(ARCH) -- Target architecture -+# -+ -+ -+# -+# detect $(HOST_ARCH) -+# - - ifeq ($(OS),solaris) -+ GETARCH=isainfo -n -+ifeq ($(GETARCH),) - GETARCH=uname -p -+endif - else - GETARCH=uname -m - endif - -+HOST_ARCH := $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4[uv]/sparc64/ \ -+ -e s/armv[3-5].*/arm/ -e s/armv6.*/arm6/ \ -+ -e "s/Power Macintosh/ppc/" \ -+ -e "s/cobalt/mips2/" \ -+ -e s/amd64/x86_64/ -e s/sparcv9/sparc64/ ) -+ -+ifeq ($(HOST_ARCH),sparc) -+ifeq ($(shell uname -m),sun4u) -+ HOST_ARCH := sparc64 -+endif -+ifeq ($(shell uname -m),sun4v) -+ HOST_ARCH := sparc64 -+endif -+endif -+ -+ -+# -+# detect $(ARCH) -+# -+ - ifeq ($(ARCH),) --ARCH := $(shell $(GETARCH) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -- -e s/armv4l/arm/ -e "s/Power Macintosh/ppc/" \ -- -e "s/cobalt/mips2/" \ -- -e s/amd64/x86_64/ ) --endif --# fix sparc -> sparc64 --ifeq ($(ARCH),sparc) -- ifeq ($(shell uname -m),sun4u) -- ARCH := sparc64 -- endif -+ifeq ($(CC_NAME),gcc) -+PREDEF := $(shell $(CC) -dM -E -x c $(EXTRA_CFLAGS) $(CFLAGS) /dev/null) -+ -+ifneq ($(strip $(filter i386 __i386__ __i386 _M_IX86 __X86__ _X86_, \ -+ $(PREDEF))),) -+ARCH := i386 - endif - -+ifneq ($(strip $(filter __i486__,$(PREDEF))),) -+ARCH := i486 -+endif -+ -+ifneq ($(strip $(filter __i586__,$(PREDEF))),) -+ARCH := i586 -+endif -+ -+ifneq ($(strip $(filter __i686__ ,$(PREDEF))),) -+ARCH := i686 -+endif -+ -+ifneq ($(strip $(filter __amd64__ __amd64 __x86_64__ __x86_64, \ -+ $(PREDEF))),) -+ARCH := x86_64 -+endif -+ -+ifneq ($(strip $(filter __arm__ __thumb__,$(PREDEF))),) -+ -+ifneq ($(strip $(filter __ARM_ARCH_6__,$(PREDEF))),) -+ARCH := arm6 -+else -+ARCH := arm -+endif -+ -+endif -+ -+ifneq ($(strip $(filter __mips__ __mips, $(PREDEF))),) -+ARCH := mips -+endif -+ -+ifneq ($(strip $(filter __powerpc __powerpc__ __POWERPC__ __ppc__ \ -+ _ARCH_PPC, $(PREDEF))),) -+ARCH := ppc -+endif -+ -+ifneq ($(strip $(filter __ppc64__ _ARCH_PPC64 , $(PREDEF))),) -+ARCH := ppc64 -+endif -+ -+ifneq ($(strip $(filter __sparc__ __sparc __sparcv8 , $(PREDEF))),) -+ -+ifneq ($(strip $(filter __sparcv9 __sparc_v9__ , $(PREDEF))),) -+ARCH := sparc64 -+else -+ARCH := sparc -+endif -+ -+endif -+ -+endif -+endif -+ -+ -+ifeq ($(ARCH),) -+$(warning Could not detect ARCH) -+endif -+ -+ - CFLAGS += -DARCH=\"$(ARCH)\" - - ifeq ($(ARCH),mipsel) -@@ -549,6 +603,7 @@ - @echo " MODULES: $(MODULES)" - # @echo " SRCS: $(SRCS)" - @echo " MACHINE: $(MACHINE)" -+ @echo " HOST_ARCH: $(HOST_ARCH)" - @echo " ARCH: $(ARCH)" - @echo " OS: $(OS)" - @echo " BUILD: $(BUILD)" diff --git a/libs/rem/Makefile b/libs/rem/Makefile index e65979ca3..fc2d9c0a5 100644 --- a/libs/rem/Makefile +++ b/libs/rem/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rem -PKG_VERSION:=0.3.0 +PKG_VERSION:=0.4.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub -PKG_MD5SUM:=54022d8819c706ea460f6da9b5121ee4 +PKG_MD5SUM:=0d5cf133a62d11a2f80875a8fa7adab6 include $(INCLUDE_DIR)/package.mk diff --git a/net/baresip/Makefile b/net/baresip/Makefile index c389ab87a..3ec702bb1 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=baresip -PKG_VERSION:=0.3.0 -PKG_RELEASE:=2 +PKG_VERSION:=0.4.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub/ -PKG_MD5SUM:=871b876195b67c1147b60d2b663dba05 +PKG_MD5SUM:=770a13543866e801f6544e194097e911 baresip-mods:= \ alsa \ diff --git a/net/baresip/patches/100-loginname.patch b/net/baresip/patches/100-loginname.patch index 403ca1dea..e69de29bb 100644 --- a/net/baresip/patches/100-loginname.patch +++ b/net/baresip/patches/100-loginname.patch @@ -1,11 +0,0 @@ ---- a/src/os.c -+++ b/src/os.c -@@ -100,7 +100,7 @@ static int get_home_unix(char *path, uin - struct passwd *pw; - char *loginname = NULL; - -- loginname = getenv("LOGNAME"); -+ loginname = getenv("USER"); - if (!loginname) { - #ifdef HAVE_UNISTD_H - loginname = getlogin(); diff --git a/net/baresip/patches/101-cross.patch b/net/baresip/patches/101-cross.patch index 6450f6690..e69de29bb 100644 --- a/net/baresip/patches/101-cross.patch +++ b/net/baresip/patches/101-cross.patch @@ -1,25 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -15,6 +15,7 @@ USE_VIDEO := 1 - PROJECT := baresip - VERSION := 0.3.0 - -+ifndef LIBRE_MK - LIBRE_MK := $(shell [ -f ../re/mk/re.mk ] && \ - echo "../re/mk/re.mk") - ifeq ($(LIBRE_MK),) -@@ -29,11 +30,14 @@ ifeq ($(LIBRE_MK),) - LIBRE_MK := $(shell [ -f /usr/local/share/re/re.mk ] && \ - echo "/usr/local/share/re/re.mk") - endif -+endif - - include $(LIBRE_MK) - include mk/modules.mk - -+ifndef LIBREM_PATH - LIBREM_PATH := $(shell [ -d ../rem ] && echo "../rem") -+endif - - - CFLAGS += -I. -Iinclude -I$(LIBRE_INC) -I$(SYSROOT)/include diff --git a/net/restund/Makefile b/net/restund/Makefile index 071b0332d..4c5d97271 100644 --- a/net/restund/Makefile +++ b/net/restund/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=restund -PKG_VERSION:=0.3.0 -PKG_RELEASE:=3 +PKG_VERSION:=0.4.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub/ -PKG_MD5SUM:=e82bdb994b26b8c16d799b3dc8dd0008 +PKG_MD5SUM:=fcfda012e04b5402e898da211dc10b6b restund-mods:= \ mysql \ diff --git a/net/restund/patches/101-cross.patch b/net/restund/patches/101-cross.patch index 1934a131a..e69de29bb 100644 --- a/net/restund/patches/101-cross.patch +++ b/net/restund/patches/101-cross.patch @@ -1,38 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -18,6 +18,7 @@ VERSION := $(VER_MAJOR).$(VER_MINOR).$ - MODULES := binding auth turn stat status - MODULES += $(EXTRA_MODULES) - -+ifndef LIBRE_MK - LIBRE_MK := $(shell [ -f ../re/mk/re.mk ] && \ - echo "../re/mk/re.mk") - ifeq ($(LIBRE_MK),) -@@ -28,19 +29,27 @@ ifeq ($(LIBRE_MK),) - LIBRE_MK := $(shell [ -f /usr/local/share/re/re.mk ] && \ - echo "/usr/local/share/re/re.mk") - endif -+endif - - include $(LIBRE_MK) - - # Optional syslog module -+ifndef USE_SYSLOG - ifneq ($(OS),win32) -+USE_SYSLOG := 1 -+endif -+endif -+ifneq ($(USE_SYSLOG),) - MODULES += syslog - endif - - # Optional MySQL client module -+ifndef USE_MYSQL - USE_MYSQL := $(shell [ -f $(SYSROOT)/include/mysql/mysql.h ] || \ - [ -f $(SYSROOT)/local/include/mysql/mysql.h ] || \ - [ -f $(SYSROOT_ALT)/include/mysql/mysql.h ] || \ - [ -f $(SYSROOT_ALT)/include/mysql5/mysql/mysql.h ] && echo "1") -+endif - ifneq ($(USE_MYSQL),) - MODULES += mysql_ser - endif -- 2.30.2