Attachment 232312 Details for Bug 262408 – Patch for icecast

[patch] Patch for icecast

libxml2-fixup-icecast-pkgconfig.patch (text/plain), 2.45 KB, created by Daniel Engberg on 2022-03-07 23:38:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2022-03-07 23:38:26 UTC

Size: 2.45 KB

patch

obsolete

>diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
>index 9cb6f3d6e60f..913a445a5c49 100644
>--- a/audio/icecast/Makefile
>+++ b/audio/icecast/Makefile
>@@ -25,7 +25,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 		libtheora.so:multimedia/libtheora \
> 		libvorbis.so:audio/libvorbis
> 
>-USES=		cpe gmake gnome localbase ssl
>+USES=		autoreconf cpe gmake gnome localbase libtool pkgconfig ssl
> USE_GNOME=	libxml2 libxslt
> 
> GNU_CONFIGURE=	yes
>diff --git a/audio/icecast/files/patch-conf-Makefile.in b/audio/icecast/files/patch-conf_Makefile.am
>similarity index 52%
>rename from audio/icecast/files/patch-conf-Makefile.in
>rename to audio/icecast/files/patch-conf_Makefile.am
>index d515eed5ad6a..4ad8db47563d 100644
>--- a/audio/icecast/files/patch-conf-Makefile.in
>+++ b/audio/icecast/files/patch-conf_Makefile.am
>@@ -1,6 +1,6 @@
>---- conf/Makefile.in.orig	2016-01-04 21:07:07 UTC
>-+++ conf/Makefile.in
>-@@ -539,8 +539,7 @@ uninstall-am: uninstall-docDATA
>+--- conf/Makefile.am.orig	2022-03-06 05:37:59 UTC
>++++ conf/Makefile.am
>+@@ -10,8 +10,7 @@ doc_DATA = icecast.xml.dist icecast_minimal.xml.dist i
>  
>  install-data-hook:
>  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
>@@ -8,5 +8,5 @@
> -	$(INSTALL_DATA) icecast.xml.dist $(DESTDIR)$(sysconfdir)/icecast.xml
> +	$(INSTALL_DATA) icecast.xml.dist $(DESTDIR)$(sysconfdir)/icecast.xml.sample
>  
>- icecast.xml.dist: $(srcdir)/icecast.xml.in
>- 	$(edit) $(srcdir)/icecast.xml.in > icecast.xml.dist
>+ edit = sed -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
>+ 	-e 's,@localstatedir\@,$(localstatedir),g' \
>diff --git a/audio/icecast/files/patch-configure.in b/audio/icecast/files/patch-configure.in
>new file mode 100644
>index 000000000000..bfda94a1c033
>--- /dev/null
>+++ b/audio/icecast/files/patch-configure.in
>@@ -0,0 +1,26 @@
>+--- configure.in.orig	2018-10-31 17:52:49 UTC
>++++ configure.in
>+@@ -53,9 +53,20 @@ XIPH_NET
>+ 
>+ dnl -- configure options --
>+ 
>+-XIPH_PATH_XSLT
>+-XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$XSLT_CFLAGS])
>+-XIPH_VAR_PREPEND([XIPH_LIBS],[$XSLT_LIBS])
>++PKG_CHECK_MODULES([LIBXSLT], [libxslt], [], [
>++  AC_MSG_ERROR([${LIBXSLT_PKG_ERRORS}. libxslt is required.])
>++])
>++
>++CFLAGS="${CFLAGS} ${LIBXSLT_CFLAGS}"
>++LIBS="${LIBS} ${LIBXSLT_LIBS}"
>++
>++PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [], [
>++  AC_MSG_ERROR([${LIBXML2_PKG_ERRORS}. libxml2 is required.])
>++])
>++AC_CHECK_FUNCS([xsltSaveResultToString])
>++
>++CFLAGS="${CFLAGS} ${LIBXML2_CFLAGS}"
>++LIBS="${LIBS} ${LIBXML2_LIBS}"
>+ 
>+ XIPH_PATH_VORBIS([
>+     XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$VORBIS_CFLAGS])

Actions: View | Diff

Attachments on bug 262408: 232312