[arch-commits] Commit in vcdimager/repos (8 files)

2014-11-11 Thread Bartłomiej Piotrowski
Date: Tuesday, November 11, 2014 @ 15:04:40
  Author: bpiotrowski
Revision: 226058

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  vcdimager/repos/staging-i686/
  vcdimager/repos/staging-i686/PKGBUILD
(from rev 226057, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 226057, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-i686/vcdimager.install
(from rev 226057, vcdimager/trunk/vcdimager.install)
  vcdimager/repos/staging-x86_64/
  vcdimager/repos/staging-x86_64/PKGBUILD
(from rev 226057, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 226057, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-x86_64/vcdimager.install
(from rev 226057, vcdimager/trunk/vcdimager.install)

+
 staging-i686/PKGBUILD  |   33 +
 staging-i686/vcdimager-0.7.24-libcdio-0.83.patch   |  337 +++
 staging-i686/vcdimager.install |   21 +
 staging-x86_64/PKGBUILD|   33 +
 staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch |  337 +++
 staging-x86_64/vcdimager.install   |   21 +
 6 files changed, 782 insertions(+)

Copied: vcdimager/repos/staging-i686/PKGBUILD (from rev 226057, 
vcdimager/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-11-11 14:04:40 UTC (rev 226058)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: damir da...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=vcdimager
+pkgver=0.7.24
+pkgrel=6
+pkgdesc=A full-featured mastering suite for authoring disassembling and 
analyzing Video CD's and Super Video CD's
+arch=('i686' 'x86_64')
+url=http://www.vcdimager.org/;
+license=('GPL')
+depends=('libcdio' 'libxml2' 'popt')
+install=vcdimager.install
+source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz
+vcdimager-0.7.24-libcdio-0.83.patch)
+md5sums=('3af22978fd79c79d5fda6513b6811145'
+ 'f4e7376fd9d975951d2b93a5e9123fdc')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch (from 
rev 226057, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
===
--- staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(rev 0)
+++ staging-i686/vcdimager-0.7.24-libcdio-0.83.patch2014-11-11 14:04:40 UTC 
(rev 226058)
@@ -0,0 +1,337 @@
+diff -u vcdimager-0.7.23/include/libvcd/info.h 
vcdimager-0.7.23/include/libvcd/info.h
+--- vcdimager-0.7.23/include/libvcd/info.h
 vcdimager-0.7.23/include/libvcd/info.h
+@@ -32,6 +32,9 @@
+ #include libvcd/version.h
+ #include libvcd/types.h
+ #include libvcd/files.h
++
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/ds.h
+
+--- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c
 vcdimager-0.7.23/frontends/cli/vcd-info.c
+@@ -38,6 +38,8 @@
+ #define POPT_ARGFLAG_OPTIONAL 0
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/bytesex.h
+ #include cdio/iso9660.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/cli/cdxa2mpeg.c
 vcdimager-0.7.23/frontends/cli/cdxa2mpeg.c
+@@ -33,6 +33,8 @@
+ #include stdlib.h
+ #include errno.h
+ #include unistd.h
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/sector.h
+ #include cdio/bytesex.h
+ 
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_build.c
+@@ -27,8 +27,14 @@
+ #include string.h
+ #include errno.h
+ 
++#ifdef HAVE_TIME_H
++#include time.h
++#endif
++
+ #include popt.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include libxml/parserInternals.h
+ #include libxml/parser.h
+ #include libxml/valid.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_common.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_common.c
+@@ -25,6 +25,9 @@
+ #include stdio.h
+ #include stdlib.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
++
+ /* Private includes */
+ #include vcd_assert.h
+ #include vcd.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/info_private.c
 vcdimager-0.7.23/lib/info_private.c
+@@ -46,6 +46,8 @@
+ #include unistd.h
+ #endif
+ 
++/* We don't want to 

[arch-commits] Commit in vcdimager/repos (8 files)

2014-01-14 Thread Jan de Groot
Date: Tuesday, January 14, 2014 @ 12:19:45
  Author: jgc
Revision: 204034

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  vcdimager/repos/staging-i686/
  vcdimager/repos/staging-i686/PKGBUILD
(from rev 204033, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 204033, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-i686/vcdimager.install
(from rev 204033, vcdimager/trunk/vcdimager.install)
  vcdimager/repos/staging-x86_64/
  vcdimager/repos/staging-x86_64/PKGBUILD
(from rev 204033, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 204033, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-x86_64/vcdimager.install
(from rev 204033, vcdimager/trunk/vcdimager.install)

+
 staging-i686/PKGBUILD  |   33 +
 staging-i686/vcdimager-0.7.24-libcdio-0.83.patch   |  337 +++
 staging-i686/vcdimager.install |   21 +
 staging-x86_64/PKGBUILD|   33 +
 staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch |  337 +++
 staging-x86_64/vcdimager.install   |   21 +
 6 files changed, 782 insertions(+)

Copied: vcdimager/repos/staging-i686/PKGBUILD (from rev 204033, 
vcdimager/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-01-14 11:19:45 UTC (rev 204034)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: damir da...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=vcdimager
+pkgver=0.7.24
+pkgrel=5
+pkgdesc=A full-featured mastering suite for authoring disassembling and 
analyzing Video CD's and Super Video CD's
+arch=('i686' 'x86_64')
+url=http://www.vcdimager.org/;
+license=('GPL')
+depends=('libcdio' 'libxml2' 'popt')
+install=vcdimager.install
+source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz
+vcdimager-0.7.24-libcdio-0.83.patch)
+md5sums=('3af22978fd79c79d5fda6513b6811145'
+ 'f4e7376fd9d975951d2b93a5e9123fdc')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch (from 
rev 204033, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
===
--- staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(rev 0)
+++ staging-i686/vcdimager-0.7.24-libcdio-0.83.patch2014-01-14 11:19:45 UTC 
(rev 204034)
@@ -0,0 +1,337 @@
+diff -u vcdimager-0.7.23/include/libvcd/info.h 
vcdimager-0.7.23/include/libvcd/info.h
+--- vcdimager-0.7.23/include/libvcd/info.h
 vcdimager-0.7.23/include/libvcd/info.h
+@@ -32,6 +32,9 @@
+ #include libvcd/version.h
+ #include libvcd/types.h
+ #include libvcd/files.h
++
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/ds.h
+
+--- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c
 vcdimager-0.7.23/frontends/cli/vcd-info.c
+@@ -38,6 +38,8 @@
+ #define POPT_ARGFLAG_OPTIONAL 0
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/bytesex.h
+ #include cdio/iso9660.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/cli/cdxa2mpeg.c
 vcdimager-0.7.23/frontends/cli/cdxa2mpeg.c
+@@ -33,6 +33,8 @@
+ #include stdlib.h
+ #include errno.h
+ #include unistd.h
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/sector.h
+ #include cdio/bytesex.h
+ 
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_build.c
+@@ -27,8 +27,14 @@
+ #include string.h
+ #include errno.h
+ 
++#ifdef HAVE_TIME_H
++#include time.h
++#endif
++
+ #include popt.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include libxml/parserInternals.h
+ #include libxml/parser.h
+ #include libxml/valid.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_common.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_common.c
+@@ -25,6 +25,9 @@
+ #include stdio.h
+ #include stdlib.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
++
+ /* Private includes */
+ #include vcd_assert.h
+ #include vcd.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/info_private.c
 vcdimager-0.7.23/lib/info_private.c
+@@ -46,6 +46,8 @@
+ #include unistd.h
+ #endif
+ 
++/* We don't want to pull in 

[arch-commits] Commit in vcdimager/repos (8 files)

2013-01-08 Thread Jan de Groot
Date: Tuesday, January 8, 2013 @ 08:40:02
  Author: jgc
Revision: 174886

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  vcdimager/repos/staging-i686/
  vcdimager/repos/staging-i686/PKGBUILD
(from rev 174885, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 174885, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-i686/vcdimager.install
(from rev 174885, vcdimager/trunk/vcdimager.install)
  vcdimager/repos/staging-x86_64/
  vcdimager/repos/staging-x86_64/PKGBUILD
(from rev 174885, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 174885, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-x86_64/vcdimager.install
(from rev 174885, vcdimager/trunk/vcdimager.install)

+
 staging-i686/PKGBUILD  |   30 +
 staging-i686/vcdimager-0.7.24-libcdio-0.83.patch   |  337 +++
 staging-i686/vcdimager.install |   21 +
 staging-x86_64/PKGBUILD|   30 +
 staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch |  337 +++
 staging-x86_64/vcdimager.install   |   21 +
 6 files changed, 776 insertions(+)

Copied: vcdimager/repos/staging-i686/PKGBUILD (from rev 174885, 
vcdimager/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-01-08 13:40:02 UTC (rev 174886)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: damir da...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=vcdimager
+pkgver=0.7.24
+pkgrel=3
+pkgdesc=A full-featured mastering suite for authoring disassembling and 
analyzing Video CD's and Super Video CD's
+arch=('i686' 'x86_64')
+url=http://www.vcdimager.org/;
+license=('GPL')
+depends=('libcdio' 'libxml2' 'popt')
+options=('!libtool')
+install=vcdimager.install
+source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz
+vcdimager-0.7.24-libcdio-0.83.patch)
+md5sums=('3af22978fd79c79d5fda6513b6811145'
+ 'f4e7376fd9d975951d2b93a5e9123fdc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch (from 
rev 174885, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
===
--- staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(rev 0)
+++ staging-i686/vcdimager-0.7.24-libcdio-0.83.patch2013-01-08 13:40:02 UTC 
(rev 174886)
@@ -0,0 +1,337 @@
+diff -u vcdimager-0.7.23/include/libvcd/info.h 
vcdimager-0.7.23/include/libvcd/info.h
+--- vcdimager-0.7.23/include/libvcd/info.h
 vcdimager-0.7.23/include/libvcd/info.h
+@@ -32,6 +32,9 @@
+ #include libvcd/version.h
+ #include libvcd/types.h
+ #include libvcd/files.h
++
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/ds.h
+
+--- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c
 vcdimager-0.7.23/frontends/cli/vcd-info.c
+@@ -38,6 +38,8 @@
+ #define POPT_ARGFLAG_OPTIONAL 0
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/bytesex.h
+ #include cdio/iso9660.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/cli/cdxa2mpeg.c
 vcdimager-0.7.23/frontends/cli/cdxa2mpeg.c
+@@ -33,6 +33,8 @@
+ #include stdlib.h
+ #include errno.h
+ #include unistd.h
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/sector.h
+ #include cdio/bytesex.h
+ 
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_build.c
+@@ -27,8 +27,14 @@
+ #include string.h
+ #include errno.h
+ 
++#ifdef HAVE_TIME_H
++#include time.h
++#endif
++
+ #include popt.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include libxml/parserInternals.h
+ #include libxml/parser.h
+ #include libxml/valid.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_common.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_common.c
+@@ -25,6 +25,9 @@
+ #include stdio.h
+ #include stdlib.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
++
+ /* Private includes */
+ #include vcd_assert.h
+ #include vcd.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/info_private.c
 vcdimager-0.7.23/lib/info_private.c
+@@ -46,6 +46,8 @@
+ #include unistd.h
+ #endif
+ 
++/* We don't want to pull in 

[arch-commits] Commit in vcdimager/repos (8 files)

2012-02-23 Thread Allan McRae
Date: Thursday, February 23, 2012 @ 08:35:52
  Author: allan
Revision: 150872

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  vcdimager/repos/staging-i686/
  vcdimager/repos/staging-i686/PKGBUILD
(from rev 150871, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 150871, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-i686/vcdimager.install
(from rev 150871, vcdimager/trunk/vcdimager.install)
  vcdimager/repos/staging-x86_64/
  vcdimager/repos/staging-x86_64/PKGBUILD
(from rev 150871, vcdimager/trunk/PKGBUILD)
  vcdimager/repos/staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch
(from rev 150871, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
  vcdimager/repos/staging-x86_64/vcdimager.install
(from rev 150871, vcdimager/trunk/vcdimager.install)

+
 staging-i686/PKGBUILD  |   35 +
 staging-i686/vcdimager-0.7.24-libcdio-0.83.patch   |  337 +++
 staging-i686/vcdimager.install |   21 +
 staging-x86_64/PKGBUILD|   35 +
 staging-x86_64/vcdimager-0.7.24-libcdio-0.83.patch |  337 +++
 staging-x86_64/vcdimager.install   |   21 +
 6 files changed, 786 insertions(+)

Copied: vcdimager/repos/staging-i686/PKGBUILD (from rev 150871, 
vcdimager/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-02-23 13:35:52 UTC (rev 150872)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: damir da...@archlinux.org
+# Contributor: Tom Newsom jeeps...@gmx.co.uk
+
+pkgname=vcdimager
+pkgver=0.7.24
+pkgrel=2
+pkgdesc=A full-featured mastering suite for authoring disassembling and 
analyzing Video CD's and Super Video CD's
+arch=('i686' 'x86_64')
+url=http://www.vcdimager.org/;
+license=('GPL')
+depends=('libcdio=0.82' 'libxml2=2.7.3' 'popt')
+options=('!libtool')
+install=vcdimager.install
+source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz
+vcdimager-0.7.24-libcdio-0.83.patch)
+md5sums=('3af22978fd79c79d5fda6513b6811145'
+ 'f4e7376fd9d975951d2b93a5e9123fdc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: vcdimager/repos/staging-i686/vcdimager-0.7.24-libcdio-0.83.patch (from 
rev 150871, vcdimager/trunk/vcdimager-0.7.24-libcdio-0.83.patch)
===
--- staging-i686/vcdimager-0.7.24-libcdio-0.83.patch
(rev 0)
+++ staging-i686/vcdimager-0.7.24-libcdio-0.83.patch2012-02-23 13:35:52 UTC 
(rev 150872)
@@ -0,0 +1,337 @@
+diff -u vcdimager-0.7.23/include/libvcd/info.h 
vcdimager-0.7.23/include/libvcd/info.h
+--- vcdimager-0.7.23/include/libvcd/info.h
 vcdimager-0.7.23/include/libvcd/info.h
+@@ -32,6 +32,9 @@
+ #include libvcd/version.h
+ #include libvcd/types.h
+ #include libvcd/files.h
++
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/ds.h
+
+--- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c
 vcdimager-0.7.23/frontends/cli/vcd-info.c
+@@ -38,6 +38,8 @@
+ #define POPT_ARGFLAG_OPTIONAL 0
+ #endif
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/cdio.h
+ #include cdio/bytesex.h
+ #include cdio/iso9660.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/cli/cdxa2mpeg.c
 vcdimager-0.7.23/frontends/cli/cdxa2mpeg.c
+@@ -33,6 +33,8 @@
+ #include stdlib.h
+ #include errno.h
+ #include unistd.h
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include cdio/sector.h
+ #include cdio/bytesex.h
+ 
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_build.c
+@@ -27,8 +27,14 @@
+ #include string.h
+ #include errno.h
+ 
++#ifdef HAVE_TIME_H
++#include time.h
++#endif
++
+ #include popt.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
+ #include libxml/parserInternals.h
+ #include libxml/parser.h
+ #include libxml/valid.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_common.c
 vcdimager-0.7.23/frontends/xml/vcd_xml_common.c
+@@ -25,6 +25,9 @@
+ #include stdio.h
+ #include stdlib.h
+ 
++/* We don't want to pull in cdio's config */
++#define __CDIO_CONFIG_H__
++
+ /* Private includes */
+ #include vcd_assert.h
+ #include vcd.h
+only in patch2:
+unchanged:
+--- vcdimager-0.7.23.orig/lib/info_private.c
 vcdimager-0.7.23/lib/info_private.c