[packages] restund, baresip, libre: update to v0.2.0

git-svn-id: svn://svn.openwrt.org/openwrt/packages@26979 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/re/Makefile

@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=re
-PKG_VERSION:=0.1.0
+PKG_VERSION:=0.2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
-#PKG_MD5SUM:=734892c8ca5e7e835828048a1289a0cc
+PKG_MD5SUM:=0aa00762fbee7694b9e5844675f5c57d
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -44,14 +44,17 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/share/re
+	$(CP) $(PKG_BUILD_DIR)/mk/re.mk $(1)/usr/share/re/
+	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so*} $(1)/usr/lib/
 endef
 
 define Build/UninstallDev
 	rm -rf \
+		$(STAGING_DIR)/usr/share/re \
 		$(STAGING_DIR)/usr/include/re \
 		$(STAGING_DIR)/usr/lib/libre.{a,so*}
 endef

net/baresip/Config.in

@@ -0,0 +1,66 @@
+menu "Configuration"
+	depends PACKAGE_baresip
+
+
+comment "Audio drivers ---"
+
+config BARESIP_MODULE_ALSA
+	bool "Alsa module"
+	depends PACKAGE_baresip && PACKAGE_alsa-lib
+	default n
+
+config BARESIP_MODULE_OSS
+	bool "OSS module"
+	depends PACKAGE_baresip
+	default y
+
+
+comment "Audio codecs ---"
+
+config BARESIP_MODULE_G711
+	bool "G.711 audio codec"
+	depends PACKAGE_baresip
+	default y
+
+config BARESIP_MODULE_G722
+	bool "G.722 audio codec"
+	depends PACKAGE_baresip && PACKAGE_libspandsp
+	default n
+
+config BARESIP_MODULE_SPEEX
+	bool "Speex audio codec"
+	depends PACKAGE_baresip && PACKAGE_libspeex
+	default n
+
+
+
+comment "Video codecs ---"
+
+config BARESIP_MODULE_AVCODEC
+	bool "FFmpeg avcodec module (H.263, H.264, MPEG4)"
+	depends PACKAGE_baresip && PACKAGE_libffmpeg
+	default n
+
+
+comment "Video source modules ---"
+
+config BARESIP_MODULE_V4L
+	bool "Video4Linux module"
+	depends PACKAGE_baresip
+	default n
+
+config BARESIP_MODULE_V4L2
+	bool "Video4Linux2 module"
+	depends PACKAGE_baresip && PACKAGE_libv4l
+	default n
+
+
+comment "Video display modules ---"
+
+config BARESIP_MODULE_SDL
+	bool "SDL module"
+	depends PACKAGE_baresip && PACKAGE_libsdl
+	default n
+
+
+endmenu

net/baresip/Makefile

@@ -7,17 +7,55 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=baresip
-PKG_VERSION:=0.1.0
+PKG_VERSION:=0.2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub/
-#PKG_MD5SUM:=ee345fe605ffcfce843dae4aed81122b
+PKG_MD5SUM:=c4e160463b2bfb2e326e916089da1c4f
 
 include $(INCLUDE_DIR)/package.mk
 
 EXTRA_DEPS :=
 
+
+BARESIP_MODULES :=
+
+
+define Package/baresip/config
+	source "$(SOURCE)/Config.in"
+endef
+
+
+ifneq ($(CONFIG_BARESIP_MODULE_ALSA),)
+BARESIP_MODULES += USE_ALSA=1
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_AVCODEC),)
+BARESIP_MODULES += USE_FFMPEG=1 USE_FFMPEG_AVFORMAT=
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_G711),)
+BARESIP_MODULES += USE_G711=1
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_G722),)
+BARESIP_MODULES += USE_G722=1
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_OSS),)
+BARESIP_MODULES += USE_OSS=1
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_SDL),)
+BARESIP_MODULES += USE_SDL=1
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_SPEEX),)
+BARESIP_MODULES += USE_SPEEX=1
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_V4L),)
+BARESIP_MODULES += USE_V4L=1
+endif
+ifneq ($(CONFIG_BARESIP_MODULE_V4L2),)
+BARESIP_MODULES += USE_V4L2=1
+endif
+
+
 define Package/baresip
   SECTION:=net
   CATEGORY:=Network
@@ -33,9 +71,8 @@ define Build/Compile
 		LIBRE_INC=../re-$(PKG_VERSION)/include \
 		LIBRE_SO=$(STAGING_DIR)/usr/lib/libre.so \
 		MOD_AUTODETECT= \
-		USE_G711=1 USE_L16=1 \
 		USE_STDIO=1 USE_CONS=1 USE_EVDEV=1 \
-		USE_OSS=1 \
+		$(BARESIP_MODULES) \
 		CC="$(TARGET_CC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \

net/restund/Makefile

@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=restund
-PKG_VERSION:=0.1.0
+PKG_VERSION:=0.2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub/
-#PKG_MD5SUM:=ee345fe605ffcfce843dae4aed81122b
+PKG_MD5SUM:=b8fa2ab40d7952fd78c5d72ab1742232
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,10 +28,10 @@ endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		LIBRE_MK=../re-$(PKG_VERSION)/mk/re.mk \
+		LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \
-		LIBRE_INC=../re-$(PKG_VERSION)/include \
+		LIBRE_INC=$(STAGING_DIR)/usr/include/re \
 		CC="$(TARGET_CC)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		$(PKG_MAKE_OPTS) \
 		SYSROOT="$(TOOLCHAIN_DIR)" \