commit 3e4e4c43b1133179e297b8eb6311cac3f2e6fa46 parent 56f34f0c035d56f9fa915b10ddc2fe147070ebfc Author: Thomas Heil <heil@terminal-consulting.de> Date: Wed, 9 Nov 2016 22:55:16 +0100 Merge pull request #3418 from miska/crtmpserver crtmpserver: Disable apple streaming to fix build Diffstat:
| M | multimedia/crtmpserver/Makefile | | | 2 | +- |
| A | multimedia/crtmpserver/patches/080-disable-apple-streaming.patch | | | 12 | ++++++++++++ |
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/multimedia/crtmpserver/Makefile b/multimedia/crtmpserver/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crtmpserver PKG_REV:=b6fdcdb953d1e99c48a0c37a8c80f2cad2db443b PKG_VERSION:=2012-07-18+git-$(PKG_REV) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_PARALLEL:=2 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> PKG_LICENSE:=GPL-3.0 diff --git a/multimedia/crtmpserver/patches/080-disable-apple-streaming.patch b/multimedia/crtmpserver/patches/080-disable-apple-streaming.patch @@ -0,0 +1,12 @@ +--- a/builders/make/apps.mk ++++ b/builders/make/apps.mk +@@ -110,6 +110,6 @@ vptests: thelib $(VPTESTS_OBJS) + %.vptests.o: %.cpp + $(CXXCOMPILER) $(COMPILE_FLAGS) $(DEFINES) $(VPTESTS_INCLUDE) -c $< -o $@ + +-ALL_APPS_OBJS= $(ADMIN_OBJS) $(APPLESTREAMINGCLIENT_OBJS) $(APPSELECTOR_OBJS) $(FLVPLAYBACK_OBJS) $(PROXYPUBLISH_OBJS) $(SAMPLEFACTORY_OBJS) $(STRESSTEST_OBJS) $(VPTESTS_OBJS) +-ACTIVE_APPS= -DHAS_APP_ADMIN -DHAS_APP_APPLESTREAMINGCLIENT -DHAS_APP_APPSELECTOR -DHAS_APP_FLVPLAYBACK -DHAS_APP_PROXYPUBLISH -DHAS_APP_SAMPLEFACTORY -DHAS_APP_STRESSTEST -DHAS_APP_VPTESTS +-applications: thelib admin applestreamingclient appselector flvplayback proxypublish samplefactory stresstest vptests ++ALL_APPS_OBJS= $(ADMIN_OBJS) $(APPSELECTOR_OBJS) $(FLVPLAYBACK_OBJS) $(PROXYPUBLISH_OBJS) $(SAMPLEFACTORY_OBJS) $(STRESSTEST_OBJS) $(VPTESTS_OBJS) ++ACTIVE_APPS= -DHAS_APP_ADMIN -DHAS_APP_APPSELECTOR -DHAS_APP_FLVPLAYBACK -DHAS_APP_PROXYPUBLISH -DHAS_APP_SAMPLEFACTORY -DHAS_APP_STRESSTEST -DHAS_APP_VPTESTS ++applications: thelib admin appselector flvplayback proxypublish samplefactory stresstest vptests