From 91ffca6907a054ee3652ba01ffb8d08ac89af7ed Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Thu, 19 Jan 2017 15:33:07 -0500 Subject: [PATCH] icecast: Fix configure if both vorbis and tremor host packages installed Signed-off-by: Ted Hess (cherry picked from commit c82573e64e27a58b3bffda336c51d3545cc88204) --- multimedia/icecast/Makefile | 6 ++++++ multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/multimedia/icecast/Makefile b/multimedia/icecast/Makefile index 97c5bd7aa8..2ef95b7813 100644 --- a/multimedia/icecast/Makefile +++ b/multimedia/icecast/Makefile @@ -55,6 +55,12 @@ CONFIGURE_ARGS+= \ --with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" +# Manually edit configure in case both vorbis and tremor host packages are installed +define Build/Configure + $(SED) 's,-lvorbis -lm,-lvorbisidec -logg ,g' $(PKG_BUILD_DIR)/configure + $(call Build/Configure/Default) +endef + define Package/icecast/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(1)/etc/ diff --git a/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch b/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch index 7fd9d52bab..49861d2e3e 100644 --- a/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch +++ b/multimedia/icecast/patches/001-icecast-2.4.0-tremor.patch @@ -21,7 +21,7 @@ return NULL; } -+/* Some additional functions from vorbis missing from tremore */ ++/* Some additional functions from vorbis missing from tremor */ + +static void _v_writestring(oggpack_buffer *o,char *s, int bytes) +{ -- 2.30.2