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

2013-07-14 Thread Bartłomiej Piotrowski 
Date: Sunday, July 14, 2013 @ 11:01:02
  Author: bpiotrowski
Revision: 94078

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

Added:
  mplayer2/repos/community-staging-i686/
  
mplayer2/repos/community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch
(from rev 94077, 
mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch)
  mplayer2/repos/community-staging-i686/PKGBUILD
(from rev 94077, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-staging-i686/mplayer2.install
(from rev 94077, mplayer2/trunk/mplayer2.install)
  mplayer2/repos/community-staging-x86_64/
  
mplayer2/repos/community-staging-x86_64/0001-demux_gif-declare-missing-PrintGifError.patch
(from rev 94077, 
mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch)
  mplayer2/repos/community-staging-x86_64/PKGBUILD
(from rev 94077, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-staging-x86_64/mplayer2.install
(from rev 94077, mplayer2/trunk/mplayer2.install)

-+
 community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch   |  
 34 +
 community-staging-i686/PKGBUILD |  
 66 ++
 community-staging-i686/mplayer2.install |  
 11 +
 community-staging-x86_64/0001-demux_gif-declare-missing-PrintGifError.patch |  
 34 +
 community-staging-x86_64/PKGBUILD   |  
 66 ++
 community-staging-x86_64/mplayer2.install   |  
 11 +
 6 files changed, 222 insertions(+)

Copied: 
mplayer2/repos/community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch
 (from rev 94077, 
mplayer2/trunk/0001-demux_gif-declare-missing-PrintGifError.patch)
===
--- community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch   
(rev 0)
+++ community-staging-i686/0001-demux_gif-declare-missing-PrintGifError.patch   
2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,34 @@
+From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= b...@bpiotrowski.pl
+Date: Sun, 14 Jul 2013 10:51:11 +0200
+Subject: [PATCH] demux_gif: declare missing PrintGifError
+
+Apparently it has been removed from newer Giflib releases.
+---
+ libmpdemux/demux_gif.c | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
+index eee7a85..3d761c0 100644
+--- a/libmpdemux/demux_gif.c
 b/libmpdemux/demux_gif.c
+@@ -44,6 +44,16 @@ typedef struct {
+ 
+ #define GIF_SIGNATURE (('G'  16) | ('I'  8) | 'F')
+ 
++static void PrintGifError(void)
++{
++  char *Err = GifErrorString();
++
++  if (Err != NULL)
++fprintf(stderr, \nGIF-LIB error: %s.\n, Err);
++  else
++fprintf(stderr, \nGIF-LIB undefined error %d.\n, GifError());
++}
++
+ #ifndef CONFIG_GIF_TVT_HACK
+ // not supported by certain versions of the library
+ static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
+-- 
+1.8.3.2
+

Copied: mplayer2/repos/community-staging-i686/PKGBUILD (from rev 94077, 
mplayer2/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-07-14 09:01:02 UTC (rev 94078)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Contributor: Martin Panter vadmium+...@gmail.com
+# Contributor: Stéphane Gaudreault steph...@archlinux.org
+
+pkgname=mplayer2
+pkgver=20130428
+pkgrel=2
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer 
project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.mplayer2.org/'
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 
'ffmpeg'
+ 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
+ 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 
'libdvdread'
+ 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
+ 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils' 
'git')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+options=(!emptydirs)
+source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa
+0001-demux_gif-declare-missing-PrintGifError.patch)
+sha256sums=('SKIP'
+'f5442289fee5eaf3c86c28cc5cbf2af8e85c6ccfdc9c2a73c71aa22efb7cdf09')
+
+pkgver() {
+  cd $pkgname
+  git log -1 --format=%cd --date=short | sed 's|-||g'
+}
+
+prepare() {
+  cd $pkgname
+  sed

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

2013-06-09 Thread Bartłomiej Piotrowski 
Date: Sunday, June 9, 2013 @ 18:56:19
  Author: bpiotrowski
Revision: 92601

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

Added:
  mplayer2/repos/community-i686/PKGBUILD
(from rev 92600, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-i686/mplayer2.install
(from rev 92600, mplayer2/trunk/mplayer2.install)
  mplayer2/repos/community-x86_64/PKGBUILD
(from rev 92600, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-x86_64/mplayer2.install
(from rev 92600, mplayer2/trunk/mplayer2.install)
Deleted:
  mplayer2/repos/community-i686/PKGBUILD
  mplayer2/repos/community-i686/mplayer2.install
  mplayer2/repos/community-x86_64/PKGBUILD
  mplayer2/repos/community-x86_64/mplayer2.install

---+
 /PKGBUILD |  116 
 /mplayer2.install |   22 ++
 community-i686/PKGBUILD   |   59 --
 community-i686/mplayer2.install   |   11 ---
 community-x86_64/PKGBUILD |   59 --
 community-x86_64/mplayer2.install |   11 ---
 6 files changed, 138 insertions(+), 140 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-06-09 16:56:05 UTC (rev 92600)
+++ community-i686/PKGBUILD 2013-06-09 16:56:19 UTC (rev 92601)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
-# Contributor: Martin Panter vadmium+...@gmail.com
-# Contributor: Stéphane Gaudreault steph...@archlinux.org
-
-pkgname=mplayer2
-pkgver=20130309
-pkgrel=2
-pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer 
project'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.mplayer2.org/'
-install=$pkgname.install
-depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 
'ffmpeg'
- 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
- 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 
'libdvdread'
- 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
- 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
- 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
-makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-options=(!emptydirs)
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('03aeccbd82b3598e0656b54ae6ab60c79afdb78eabe1b2915e7912db7efbd343'
-'SKIP')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
-  find -type f -exec sed -e 's/python3/python/' -i {} \;
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --confdir=/etc/mplayer \
-  --enable-translation --language=all \
-  --enable-runtime-cpudetection \
-  --enable-joystick \
-  --disable-speex \
-  --disable-openal \
-  --disable-libdv \
-  --disable-musepack
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
-  install -dm755 $pkgdir/usr/share/mplayer/
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf 
$pkgdir/usr/share/mplayer/subfont.ttf
-
-  install -dm755 $pkgdir/usr/share/applications/
-  install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
-}

Copied: mplayer2/repos/community-i686/PKGBUILD (from rev 92600, 
mplayer2/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-06-09 16:56:19 UTC (rev 92601)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Contributor: Martin Panter vadmium+...@gmail.com
+# Contributor: Stéphane Gaudreault steph...@archlinux.org
+
+pkgname=mplayer2
+pkgver=20130428
+pkgrel=1
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer 
project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.mplayer2.org/'
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 
'ffmpeg'
+ 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
+ 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 
'libdvdread'
+ 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
+ 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils' 
'git')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')

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

2013-04-19 Thread Bartłomiej Piotrowski 
Date: Friday, April 19, 2013 @ 22:25:06
  Author: bpiotrowski
Revision: 88562

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

Added:
  mplayer2/repos/community-i686/PKGBUILD
(from rev 88561, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-i686/mplayer2.install
(from rev 88561, mplayer2/trunk/mplayer2.install)
  mplayer2/repos/community-x86_64/PKGBUILD
(from rev 88561, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-x86_64/mplayer2.install
(from rev 88561, mplayer2/trunk/mplayer2.install)
Deleted:
  mplayer2/repos/community-i686/PKGBUILD
  mplayer2/repos/community-i686/mplayer2.install
  mplayer2/repos/community-x86_64/PKGBUILD
  mplayer2/repos/community-x86_64/mplayer2.install

---+
 /PKGBUILD |  110 
 /mplayer2.install |   22 +++
 community-i686/PKGBUILD   |   55 --
 community-i686/mplayer2.install   |   11 ---
 community-x86_64/PKGBUILD |   55 --
 community-x86_64/mplayer2.install |   11 ---
 6 files changed, 132 insertions(+), 132 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2013-04-19 20:24:48 UTC (rev 88561)
+++ community-i686/PKGBUILD 2013-04-19 20:25:06 UTC (rev 88562)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
-# Contributor: Martin Panter vadmium+...@gmail.com
-# Contributor: Stéphane Gaudreault steph...@archlinux.org
-
-pkgname=mplayer2
-pkgver=20130126
-pkgrel=1
-pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer 
project'
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://www.mplayer2.org/;
-install=$pkgname.install
-depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 
'ffmpeg'
- 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
- 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 
'libdvdread'
- 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
- 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
- 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
-makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-options=(!emptydirs)
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('53faf18a1bedb76e980255410b56e59ea4cd5f69984832fc5e942e15dc89622b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
-  find -type f -exec sed -e 's/python3/python/' -i {} \;
-
-  ./configure --prefix=/usr --confdir=/etc/mplayer \
-  --enable-translation --language=all \
-  --enable-runtime-cpudetection \
-  --enable-joystick \
-  --disable-speex \
-  --disable-openal \
-  --disable-libdv \
-  --disable-musepack
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
-  install -dm755 $pkgdir/usr/share/mplayer/
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf 
$pkgdir/usr/share/mplayer/subfont.ttf
-
-  install -dm755 $pkgdir/usr/share/applications/
-  install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
-}

Copied: mplayer2/repos/community-i686/PKGBUILD (from rev 88561, 
mplayer2/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-04-19 20:25:06 UTC (rev 88562)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Contributor: Martin Panter vadmium+...@gmail.com
+# Contributor: Stéphane Gaudreault steph...@archlinux.org
+
+pkgname=mplayer2
+pkgver=20130309
+pkgrel=1
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer 
project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.mplayer2.org/;
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 
'ffmpeg'
+ 'fontconfig' 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray'
+ 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss' 'libdvdnav' 
'libdvdread'
+ 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
+ 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+options=(!emptydirs)

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

2013-02-07 Thread Bartłomiej Piotrowski 
Date: Thursday, February 7, 2013 @ 18:38:46
  Author: bpiotrowski
Revision: 83968

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

Added:
  mplayer2/repos/community-staging-i686/
  mplayer2/repos/community-staging-i686/PKGBUILD
(from rev 83967, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-staging-i686/cdio-api-fixes.patch
(from rev 83967, mplayer2/trunk/cdio-api-fixes.patch)
  mplayer2/repos/community-staging-i686/mplayer2.install
(from rev 83967, mplayer2/trunk/mplayer2.install)
  mplayer2/repos/community-staging-x86_64/
  mplayer2/repos/community-staging-x86_64/PKGBUILD
(from rev 83967, mplayer2/trunk/PKGBUILD)
  mplayer2/repos/community-staging-x86_64/cdio-api-fixes.patch
(from rev 83967, mplayer2/trunk/cdio-api-fixes.patch)
  mplayer2/repos/community-staging-x86_64/mplayer2.install
(from rev 83967, mplayer2/trunk/mplayer2.install)

---+
 community-staging-i686/PKGBUILD   |   57 
 community-staging-i686/cdio-api-fixes.patch   |   50 +
 community-staging-i686/mplayer2.install   |   11 
 community-staging-x86_64/PKGBUILD |   57 
 community-staging-x86_64/cdio-api-fixes.patch |   50 +
 community-staging-x86_64/mplayer2.install |   11 
 6 files changed, 236 insertions(+)

Copied: mplayer2/repos/community-staging-i686/PKGBUILD (from rev 83967, 
mplayer2/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-07 17:38:46 UTC (rev 83968)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Contributor: Martin Panter vadmium+...@gmail.com
+# Contributor: Stéphane Gaudreault steph...@archlinux.org
+
+pkgname=mplayer2
+pkgver=20121128
+pkgrel=3
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer 
project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://www.mplayer2.org/;
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 
'ffmpeg' 'fontconfig'
+ 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 
'libcdio-paranoia' 'libdca' 'libdvdcss'
+ 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 
'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 
'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+options=(!emptydirs)
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
+cdio-api-fixes.patch)
+md5sums=('696adb2503b2202fe39de6c98b573cd6'
+ '5ff5fa9d0fd50239ed3a1756b31e6a9d')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
+  find -type f -exec sed -e 's/python3/python/' -i {} \;
+
+  patch -Np1 -i $srcdir/cdio-api-fixes.patch
+
+  ./configure --prefix=/usr --confdir=/etc/mplayer \
+  --enable-translation --language=all \
+  --enable-runtime-cpudetection \
+  --enable-joystick \
+  --disable-speex \
+  --disable-openal \
+  --disable-libdv \
+  --disable-musepack
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+
+  install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
+  install -dm755 $pkgdir/usr/share/mplayer/
+  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf 
$pkgdir/usr/share/mplayer/subfont.ttf
+
+  install -dm755 $pkgdir/usr/share/applications/
+  install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
+}

Copied: mplayer2/repos/community-staging-i686/cdio-api-fixes.patch (from rev 
83967, mplayer2/trunk/cdio-api-fixes.patch)
===
--- community-staging-i686/cdio-api-fixes.patch (rev 0)
+++ community-staging-i686/cdio-api-fixes.patch 2013-02-07 17:38:46 UTC (rev 
83968)
@@ -0,0 +1,50 @@
+diff -upr mplayer2-20121128.orig/stream/stream_cdda.c 
mplayer2-20121128/stream/stream_cdda.c
+--- mplayer2-20121128.orig/stream/stream_cdda.c2013-01-10 
19:37:31.0 +0200
 mplayer2-20121128/stream/stream_cdda.c 2013-01-10 20:23:25.0 
+0200
+@@ -17,8 +17,8 @@
+  */
+ 
+ #include config.h
+-#include cdio/cdda.h
+-#include cdio/paranoia.h
++#include cdio/paranoia/cdda.h
++#include cdio/paranoia/paranoia.h
+ #include cdio/cdio.h
+ 
+ #include stdio.h
+@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = {
+ };
+ 
+ static const char *cdtext_name[] = {
+-[CDTEXT_ARRANGER] = Arranger,
+-[CDTEXT_COMPOSER] = Composer,