freeswitch-stable: remove BROKEN from mod_av

libffmpeg-full now includes libavresample. Make mod_av available
accordingly.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index 1879590e61c42a483c83665feb08a30f665092a6..5601ebff04f2022807c077cc6a9f227d2f95152b 100644 (file)
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -1056,7 +1056,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,abstraction,API abstraction,This module
 $(eval $(call Package/$(PKG_NAME)/Module,alsa,ALSA endpoint,ALSA endpoint module.,+alsa-lib))
 $(eval $(call Package/$(PKG_NAME)/Module,amr,AMR passthrough,Passthrough AMR codec support.,))
 $(eval $(call Package/$(PKG_NAME)/Module,amrwb,AMR wideband passthrough,Passthrough AMR wideband codec support.,))
-$(eval $(call Package/$(PKG_NAME)/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @BROKEN)) # libffmpeg-full doesn't provide avresample
+$(eval $(call Package/$(PKG_NAME)/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @i386||x86_64))
 $(eval $(call Package/$(PKG_NAME)/Module,avmd,Voicemail detection,This module attempts to determine when a voicemail system has answered\nthe call.,))
 $(eval $(call Package/$(PKG_NAME)/Module,b64,Base64,Transfers data Base64 encoded.,))
 $(eval $(call Package/$(PKG_NAME)/Module,basic,BASIC,BASIC module for FreeSWITCH.,))

diff --git a/net/freeswitch-stable/patches/160-mod_av.patch b/net/freeswitch-stable/patches/160-mod_av.patch
deleted file mode 100644 (file)
index bcdad89..0000000
--- a/net/freeswitch-stable/patches/160-mod_av.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mod/applications/mod_av/Makefile.am
-+++ b/src/mod/applications/mod_av/Makefile.am
-@@ -5,7 +5,7 @@ if HAVE_AVFORMAT
- 
- mod_LTLIBRARIES = mod_av.la
- mod_av_la_SOURCES  = mod_av.c avformat.c avcodec.c
--mod_av_la_CFLAGS   = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(AVRESAMPLE_CFALGS)
-+mod_av_la_CFLAGS   = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(AVRESAMPLE_CFLAGS) -Wno-deprecated-declarations
- mod_av_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS)  $(AVUTIL_LIBS) $(AVRESAMPLE_LIBS)
- mod_av_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz
-