Remove stale reference to mad.h, added patch to slow down cd-drive

Package-Manager: portage-2.1_pre7-r5

7 files changed, 66 insertions, 20 deletions

diff --git a/media-plugins/vdr-cdda/ChangeLog b/media-plugins/vdr-cdda/ChangeLog
index 10e414eb077d..214f51cc5836 100644
--- a/media-plugins/vdr-cdda/ChangeLog
+++ b/media-plugins/vdr-cdda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-cdda
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.4 2006/03/21 14:22:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.5 2006/04/12 20:12:58 zzam Exp $
+
+*vdr-cdda-0.1.0-r1 (12 Apr 2006)
+
+  12 Apr 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-cdda-0.1.0-cdspeed.diff, files/vdr-cdda-0.1.0.patch,
+  -vdr-cdda-0.1.0.ebuild, +vdr-cdda-0.1.0-r1.ebuild:
+  Remove stale reference to mad.h, added patch to slow down cd-drive
 
   21 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-cdda-0.1.0-fix-segv.diff, +files/vdr-cdda-0.1.0.patch,
diff --git a/media-plugins/vdr-cdda/Manifest b/media-plugins/vdr-cdda/Manifest
index bdfd608a2a32..999a03a94c63 100644
--- a/media-plugins/vdr-cdda/Manifest
+++ b/media-plugins/vdr-cdda/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 180678153ada60b6788b4e95da226162 ChangeLog 855
-MD5 7a723a079564c3e97231c2f5b0be1e38 files/digest-vdr-cdda-0.1.0 65
-MD5 e3c20761b800512efc35c78a61d0f91e files/vdr-cdda-0.1.0.patch 1222
+MD5 b41addc45f8ad88b260795d7c035303c ChangeLog 1126
+RMD160 b4209799466f8c14f3e243fcd8bd942c24c88a8a ChangeLog 1126
+SHA256 ce59a6268c95304b5b50f1e22486bcbdc9a94f4d3d6237cb188a21c985b3bac8 ChangeLog 1126
+MD5 246d44977fc2ee67fe617b355b8b9e5d files/digest-vdr-cdda-0.1.0-r1 241
+RMD160 9ea3f938b7ff3b71683ab530b8ea657afcaa4dbe files/digest-vdr-cdda-0.1.0-r1 241
+SHA256 656bc097a3983043d9a359be607a756ef69609c7e3fb5c1270e3046d1882d8e7 files/digest-vdr-cdda-0.1.0-r1 241
+MD5 90ad12d3de0556fe6e38a25d6f3207ff files/vdr-cdda-0.1.0-cdspeed.diff 607
+RMD160 367e1b7fda29821d67f3ab6ca410419bf590ac8b files/vdr-cdda-0.1.0-cdspeed.diff 607
+SHA256 996bc3032c57a26ddf52f9933cfffc5aed1ef7a0dfdb79c5590e17fad7f57f77 files/vdr-cdda-0.1.0-cdspeed.diff 607
+MD5 c87c921b79d2d98e5aae3d8ba7ac2be9 files/vdr-cdda-0.1.0.patch 1472
+RMD160 2afca5cfe8bbbfd90b7af389be82d12895c014b5 files/vdr-cdda-0.1.0.patch 1472
+SHA256 1871b9035839e7c9cb0e57f61cce5afb6e77639be749e17dac63602e101004b8 files/vdr-cdda-0.1.0.patch 1472
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
-MD5 fe1ce36c7108584ab8755368bb7d16bb vdr-cdda-0.1.0.ebuild 562
+RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300
+SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 metadata.xml 300
+MD5 c3071f0aa6c0edeee8c13fa8ffb02ee0 vdr-cdda-0.1.0-r1.ebuild 590
+RMD160 a6b3b45d37bfab6db7d2060b0439afdf7f6c00fb vdr-cdda-0.1.0-r1.ebuild 590
+SHA256 e092e77837ecdea3ca22d2ad42f56be94e407810fbe77b378257902d452e020d vdr-cdda-0.1.0-r1.ebuild 590
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
-Comment: no further Information
 
-iD8DBQFEIAwbdn07HTTCgIoRAnk5AJ9yRVs5vXLZ/pLU8cQlYPUvM86cLACgn2Z9
-f25zhrWNQpXuoFkYTnf9uUI=
-=duih
+iD8DBQFEPV+RZfSl1Kp5KmoRAiBdAJ9X3clWvmpNO2RNoyff+HpadAyHkgCgseHU
+X3RT8vIChIf/DmgeyR+r6c8=
+=52WO
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0 b/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
deleted file mode 100644
index fd15e09bbeeb..000000000000
--- a/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc49e48dd7d3f68d3451ad5f589f74cf vdr-cdda-0.1.0.tar.gz 43589
diff --git a/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0-r1 b/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0-r1
new file mode 100644
index 000000000000..60ef09595e29
--- /dev/null
+++ b/media-plugins/vdr-cdda/files/digest-vdr-cdda-0.1.0-r1
@@ -0,0 +1,3 @@
+MD5 fc49e48dd7d3f68d3451ad5f589f74cf vdr-cdda-0.1.0.tar.gz 43589
+RMD160 8bb2210252134b7bd4940e36c56f70cae3be00a9 vdr-cdda-0.1.0.tar.gz 43589
+SHA256 c68a9ff70bc8c794e582fd8702ffc30bf6c308209c0b0f4ca0136b7fac43c24c vdr-cdda-0.1.0.tar.gz 43589
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-cdspeed.diff b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-cdspeed.diff
new file mode 100644
index 000000000000..1fc57749e538
--- /dev/null
+++ b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0-cdspeed.diff
@@ -0,0 +1,16 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
+## 03_cdbremse
+## http://vdr-portal.de/board/thread.php?postid=429254#post429254
+## All lines beginning with `## DP:' are a description of the patch.
+diff -Nur cdda-0.1.0.orig/cdda_device.c cdda-0.1.0/cdda_device.c
+--- cdda-0.1.0.orig/cdda_device.c	2005-12-23 10:10:30.000000000 +0100
++++ cdda-0.1.0/cdda_device.c	2006-03-06 21:59:25.000000000 +0100
+@@ -228,6 +228,7 @@
+       mp_cdIo = cdio_open(mp_device, DRIVER_LINUX);
+       if (NULL == mp_cdIo)
+         return scCannotOpenDevice;
++	cdio_set_speed(mp_cdIo,2);
+     } else
+       return scOutOfMemory;
+   } else
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch
index e8bac559f12d..3cc53e07f272 100644
--- a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch
+++ b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0.patch
@@ -1,8 +1,17 @@
-Lucian Muresan <lucianm@users.sourceforge.net> ( 21 Mar 2006 )
-modified in cStatus::MsgReplaying
-diff -u cdda-0.1.0.org/audio_player.c cdda-0.1.0/audio_player.c
---- cdda-0.1.0.org/audio_player.c	2006-03-09 09:26:16.000000000 +0100
-+++ cdda-0.1.0/audio_player.c	2006-03-09 09:26:35.000000000 +0100
+diff -ru cdda-0.1.0-orig/audio_decoder.h cdda-0.1.0/audio_decoder.h
+--- cdda-0.1.0-orig/audio_decoder.h	2006-04-12 21:51:51.000000000 +0200
++++ cdda-0.1.0/audio_decoder.h	2006-04-12 21:52:55.000000000 +0200
+@@ -11,7 +11,6 @@
+ 
+ #include <stdint.h>
+ #include <vdr/thread.h>
+-#include <mad.h>
+ #include "audio_buffer.h"
+ 
+ #ifdef DECODER_FAAD
+diff -ru cdda-0.1.0-orig/audio_player.c cdda-0.1.0/audio_player.c
+--- cdda-0.1.0-orig/audio_player.c	2006-04-12 21:51:51.000000000 +0200
++++ cdda-0.1.0/audio_player.c	2006-04-12 21:52:12.000000000 +0200
 @@ -368,7 +368,11 @@
  }
  
@@ -27,9 +36,9 @@ diff -u cdda-0.1.0.org/audio_player.c cdda-0.1.0/audio_player.c
    } else
      free(p_str);
  
-diff -u cdda-0.1.0.org/cdda_menu.h cdda-0.1.0/cdda_menu.h
---- cdda-0.1.0.org/cdda_menu.h	2006-03-09 09:26:16.000000000 +0100
-+++ cdda-0.1.0/cdda_menu.h	2006-03-09 09:27:43.000000000 +0100
+diff -ru cdda-0.1.0-orig/cdda_menu.h cdda-0.1.0/cdda_menu.h
+--- cdda-0.1.0-orig/cdda_menu.h	2006-04-12 21:51:51.000000000 +0200
++++ cdda-0.1.0/cdda_menu.h	2006-04-12 21:52:12.000000000 +0200
 @@ -60,7 +60,7 @@
      char *mp_newCddbServerFqdn;
      int m_newCddbServerPort;
diff --git a/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild b/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild
index 0c3a07a7f164..19b4de3d0eba 100644
--- a/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild
+++ b/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/vdr-cdda-0.1.0.ebuild,v 1.4 2006/03/21 14:22:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/vdr-cdda-0.1.0-r1.ebuild,v 1.1 2006/04/12 20:12:58 zzam Exp $
 
 inherit vdr-plugin
 
@@ -17,6 +17,6 @@ DEPEND=">=media-video/vdr-1.3.22
 	>=dev-libs/libcdio-0.75
 	"
 
-PATCHES="${FILESDIR}/${P}.patch"
+PATCHES="${FILESDIR}/${P}.patch ${FILESDIR}/${P}-cdspeed.diff"