Merge pull request #215 from micmac1/prevent-build-all
authorJiri Slachta <jiri.slachta@gmail.com>
Sat, 2 Dec 2017 17:44:14 +0000 (18:44 +0100)
committerGitHub <noreply@github.com>
Sat, 2 Dec 2017 17:44:14 +0000 (18:44 +0100)
Asterisk: Prevent building of all default modules

net/asterisk-15.x/Makefile
net/asterisk-15.x/patches/053-musl-mutex-init.patch [new file with mode: 0644]
net/baresip/Makefile

index b466ee125a719bf4d8c18c525dc8106626b1d813..8c274266e36b4c5a4aed764f2119579645a9a9f4 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk15
 PKG_VERSION:=15.1.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
diff --git a/net/asterisk-15.x/patches/053-musl-mutex-init.patch b/net/asterisk-15.x/patches/053-musl-mutex-init.patch
new file mode 100644 (file)
index 0000000..98cdccf
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/include/asterisk/lock.h
++++ b/include/asterisk/lock.h
+@@ -66,7 +66,7 @@
+ #define AST_PTHREADT_NULL (pthread_t) -1
+ #define AST_PTHREADT_STOP (pthread_t) -2
+-#if (defined(SOLARIS) || defined(BSD))
++#if (defined(SOLARIS) || defined(BSD) || !defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP))
+ #define AST_MUTEX_INIT_W_CONSTRUCTORS
+ #endif /* SOLARIS || BSD */
index e358e6a178fff0b6b7e5d5892f4dcdf98667c047..9e47f5994a665730772bd0aad7f96ab8c67ed41f 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=baresip
 PKG_VERSION:=0.5.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.creytiv.com/pub
@@ -150,7 +150,7 @@ $(eval $(call BuildPackage,baresip))
 $(eval $(call BuildPlugin,alsa,ALSA audio driver,alsa,+alsa-lib))
 $(eval $(call BuildPlugin,aubridge,Audio bridge module,aubridge,))
 $(eval $(call BuildPlugin,aufile,Audio module for using a WAV-file as audio input,aufile,))
-$(eval $(call BuildPlugin,avcodec,Video codec using FFmpeg,avcodec,+libffmpeg-full))
+$(eval $(call BuildPlugin,avcodec,Video codec using FFmpeg,avcodec,+libffmpeg-full +libx264))
 $(eval $(call BuildPlugin,avformat,Video source using FFmpeg,avformat,+libffmpeg-full))
 $(eval $(call BuildPlugin,cons,UDP/TCP console UI driver,cons,))
 $(eval $(call BuildPlugin,debug_cmd,Debug commands,debug_cmd,))