Mercurial > mxe-octave

diff src/vcdimager-1-configure.patch @ 3632:4e78b4a9e87c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add libcdio,mpcdec, vcdimager, a52dec, wavpack from mxe_devel * dist-files.mk: add libcdio.mk,libmpcdec-1-configure_ac.patch,libmpcdec.mk, vcdimager-* * index.html: add libcdio, libmpcdec, a52dec, wavpack * src/libcdio.mk: new file * src/libmpcdec-1-configure_ac.patch: new file * src/libmpcdec.mk: new file * src/vcdimager-1-configure.patch: new file * src/vcdimager.mk: new file * src/a52dec.mk: new file * src/wavpack-1-exec_prefix.patch: new file * src/wavpack.mk: new file
author John Donoghue <john.donoghue@ieee.org>
date Mon, 30 Jun 2014 06:10:45 -0400
parents
children
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/vcdimager-1-configure.patch	Mon Jun 30 06:10:45 2014 -0400
@@ -0,0 +1,54 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -urN vcdimager-0.7.24/configure.ac vcdimager-0.7.24-patch/configure.ac
+--- vcdimager-0.7.24/configure.ac	2011-03-18 01:43:53.000000000 +0200
++++ vcdimager-0.7.24-patch/configure.ac	2013-12-18 10:58:39.175296932 +0200
+@@ -154,9 +154,13 @@
+ fi
+ 
+ if test "x$enable_xml_fe" = "xyes"; then
+-  AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
++  PKG_CHECK_MODULES(XML, libxml-2.0)
++  dnl Using this causes pain and suffering
++  dnl AM_PATH_XML2(2.3.8, , enable_xml_fe=no)
+ fi
+ 
++
++
+ dnl headers
+ 
+ dnl AC_DEFINE(_DEVELOPMENT_, [], enable warnings about being development release)
+diff -urN vcdimager-0.7.24/frontends/xml/Makefile.am vcdimager-0.7.24-patch/frontends/xml/Makefile.am
+--- vcdimager-0.7.24/frontends/xml/Makefile.am	2004-08-15 15:16:49.000000000 +0300
++++ vcdimager-0.7.24-patch/frontends/xml/Makefile.am	2013-12-18 11:07:39.344356593 +0200
+@@ -27,7 +27,7 @@
+ 
+ MAINTAINERCLEANFILES = $(man_MANS)
+ 
+-INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
++INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
+ 
+ BUILT_SOURCES = videocd_dtd.inc
+ MOSTLYCLEANFILES = videocd_dtd.inc
+diff -urN vcdimager-0.7.24/frontends/xml/Makefile.in vcdimager-0.7.24-patch/frontends/xml/Makefile.in
+--- vcdimager-0.7.24/frontends/xml/Makefile.in	2011-03-18 01:46:36.000000000 +0200
++++ vcdimager-0.7.24-patch/frontends/xml/Makefile.in	2013-12-18 11:08:17.458924350 +0200
+@@ -222,7 +222,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ XML2_CONFIG = @XML2_CONFIG@
+-XML_CPPFLAGS = @XML_CPPFLAGS@
++XML_CFLAGS = @XML_CFLAGS@
+ XML_LIBS = @XML_LIBS@
+ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+@@ -279,7 +279,7 @@
+ top_srcdir = @top_srcdir@
+ man_MANS = vcdxbuild.1 vcdxgen.1 vcdxrip.1 vcdxminfo.1
+ MAINTAINERCLEANFILES = $(man_MANS)
+-INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CPPFLAGS)
++INCLUDES = -I$(top_srcdir) $(LIBPOPT_CFLAGS) $(LIBVCD_CFLAGS) $(XML_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBISO9660_CFLAGS) $(XML_CFLAGS)
+ BUILT_SOURCES = videocd_dtd.inc
+ MOSTLYCLEANFILES = videocd_dtd.inc
+ EXTRA_DIST = videocd.dtd $(man_MANS)