icecast: Fix configure if both vorbis and tremor host packages installed

Signed-off-by: Ted Hess <thess@kitschensync.net>
2017-01-19 15:33:07 -05:00 · 2017-01-19 15:33:07 -05:00 · c82573e64e
parent 8dd6ca99fc
commit c82573e64e
2 changed files with 7 additions and 1 deletions
--- 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/
--- 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)
 +{