compilfix for >=vdr-1.7.3; cleanup

Package-Manager: portage-2.1.6.11/cvs/Linux i686

11 files changed, 40 insertions, 561 deletions

diff --git a/media-plugins/vdr-dvd/ChangeLog b/media-plugins/vdr-dvd/ChangeLog
index 82f3c58d90f0..02d533a10b8d 100644
--- a/media-plugins/vdr-dvd/ChangeLog
+++ b/media-plugins/vdr-dvd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-dvd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/ChangeLog,v 1.14 2008/04/28 10:56:59 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/ChangeLog,v 1.15 2009/05/07 20:10:17 hd_brummy Exp $
+
+  07 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/dvd-a52drc-pre20060719.diff, -vdr-dvd-0.3.7_pre20060719.ebuild,
+  -vdr-dvd-0.3.7_pre20070117.ebuild, -vdr-dvd-0.3.7_pre20070819.ebuild,
+  -vdr-dvd-0.3.7_pre20071113.ebuild, vdr-dvd-0.3.7_pre20071113-r1.ebuild,
+  +files/dvd-cvs-20071113_vdr-1.7.3.diff,
+  -files/dvd-a52drc-pre20060819.diff, -files/dvdspeed-cvs-20071113.diff:
+  compilfix for >=vdr-1.7.3; cleanup
 
   28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-dvd-0.3.7_pre20071113-r1.ebuild:
diff --git a/media-plugins/vdr-dvd/Manifest b/media-plugins/vdr-dvd/Manifest
index 82300f0a0219..b1851731d77f 100644
--- a/media-plugins/vdr-dvd/Manifest
+++ b/media-plugins/vdr-dvd/Manifest
@@ -2,28 +2,20 @@
 Hash: SHA1
 
 AUX confd 581 RMD160 ee7db572850178a6412e0462045263f81bcfe715 SHA1 22be5d14e45345cc236fd28a86ecc8343a4c2de0 SHA256 85751162bc14f60a7586f521a9c308cfbce6dacfb51c43bbf64f49a23aa2f600
-AUX dvd-a52drc-pre20060719.diff 3283 RMD160 1ccfe9e6a49908b87c5fc7ccb51131df41249db6 SHA1 62224d7eb8402851934206e6afe96cc27284e37d SHA256 c9f199b0215c2b069a3769cc6334acdd242be796aac383ef7520f13e231e44d8
-AUX dvd-a52drc-pre20060819.diff 3485 RMD160 4b33b92e55b2ae62b4d2fafb17cbb1ba6d2838ce SHA1 822588a8dc4f53549591aef9b5898ad4ef7713e0 SHA256 37a7e836b473ca95d4ae04ef9392fcb7083512e2fdad32a3d64b5f065e7d1ae4
 AUX dvd-a52drc-pre20071113.diff 3161 RMD160 1d7d3af61dec2b43d68af7d8149efe62dff8aee9 SHA1 8bf342b806cf811e4e4917725c09e11a0fc8454e SHA256 4c677f86133fa2aebee5bac9d5cdee8b0229804589e1619682351bc46741aeab
+AUX dvd-cvs-20071113_vdr-1.7.3.diff 504 RMD160 cb1e6522709d7e294cd2969a4bd58366cdf4095e SHA1 c9bc707fc28f95c647d4073d5ab1c32f651de552 SHA256 d5e5c3fcb709dc7f5a1b182b7bb3b6eb30ea16f7836cc7d37d6ed5fd6c08cf5b
 AUX dvdspeed-cvs-20071113-2.diff 9609 RMD160 fb6142325f0cffceaed1b0566cd8db9ec514dac8 SHA1 2e7ccdc4aa86735ea2a4129ded357cbdf55534fa SHA256 63168dd589ee9d51df0135587623102f97ccea19fb5dfe7dcd4a73990b5d8fdb
-AUX dvdspeed-cvs-20071113.diff 9609 RMD160 7ccbc1d514c80f0fb76da4472402c76cf18ff8f7 SHA1 bce9e34d0b3a30416684685a9cffab1bd85e1236 SHA256 0636a0b918457e8faa730250379f4df583a9fe1a5b8c78b4eca571aeae9b9272
 AUX gcc-4.x-compilefix.diff 574 RMD160 a5c22e2c748cbca22f650681e4304b8a142fc6d9 SHA1 b3b2a666942e05f47d56b4b9e42a204c7ea7505e SHA256 c4fc0d8ae4485c9c38a0b08e393b1b5e8d7f4f101101f64fc6a66cdfd412d270
 AUX rc-addon.sh 331 RMD160 538d4cee47b3c43226e7db00f4af2751db028eb4 SHA1 e3b1e28e7fe68043301ef29b6eb8f993a05e6201 SHA256 f8b743d062adea500b3cd513808af1361d218bd723fd008538f995e7e913843b
-DIST vdr-dvd-0.3.7_pre20060719.tar.gz 71366 RMD160 c44ec4aa2b93ace1b9e51bbace64f9c57fa579ee SHA1 c326a18c6154f176bc78888b487f3f0d9e424dd8 SHA256 1640525ec7f0146e1ec203b1448b18129472d52dc628f9cc977f21e44c527543
-DIST vdr-dvd-0.3.7_pre20070117.tar.gz 71406 RMD160 2efd4308adc6a1318e6900ff954a7f5361a1c271 SHA1 aafdca56eaf10694c524851da51adcb94a10f913 SHA256 3d67f5f430761ea4f5169a398874411f5a16dd0d33f46d82e20dcca49bf62a00
-DIST vdr-dvd-cvs-20070819.tar.bz2 53343 RMD160 12caa23121abf6ba6ec5190c84f358c915fc4832 SHA1 2dfae728f6aadcb5bdf17aa1bb6cbb94fb703b3e SHA256 fa21cc81893c615207e2715d91e960ff9038da9f56210e77a653e9df9bae5245
 DIST vdr-dvd-cvs-20071113.tar.bz2 64057 RMD160 8a7919dddff059c233957dad025f809b1ee59519 SHA1 abf10b204a1ecd5faa6caa01fad4f331ebf32ab7 SHA256 b50e4952c49942fd6ddee38a2c88cb0e56a4fd857508ef3c9588c5ae87fdcbbc
-EBUILD vdr-dvd-0.3.7_pre20060719.ebuild 803 RMD160 c7e2972049ec7acd6b06f2b4ccfc89c029975f32 SHA1 45798e503e2f73d59794eec1c4a83ea4d6bf36ca SHA256 fcd45335ce4e526e0843aa57fc3ada501d93e4100fe45d7a7911680c9bf5a63f
-EBUILD vdr-dvd-0.3.7_pre20070117.ebuild 811 RMD160 c99136a81191a342bb241b0af1a50cf015c8c411 SHA1 106fba60e22c677e2d9e28611e2335fdc69d696e SHA256 20e0013d4891c63ca66c2be468ea75efe6aff891720937b1367f30c831b9fbeb
-EBUILD vdr-dvd-0.3.7_pre20070819.ebuild 884 RMD160 60d333ef428a2e261a50c61c79b8de15036f882e SHA1 6399bd47ef5691df2666ab9cddff8d4029fe6417 SHA256 96b406f10b815865c1c645c5629ef972555a8352e352140f374730e461daa514
-EBUILD vdr-dvd-0.3.7_pre20071113-r1.ebuild 869 RMD160 04452e7e8b674995c99521ccac256f474b8e83ee SHA1 c761115219f9aec4bc82548bcd420c536f1350f4 SHA256 4c43c06a2042cc9558ebf0f9fa8c35ee865ab41b95a63de1f84dad2109f5a201
-EBUILD vdr-dvd-0.3.7_pre20071113.ebuild 870 RMD160 9b3d9330304f992294079848fb77c80955c2d1f7 SHA1 eb2973fcd67091f55b3b16aa1340de93ae29f0e4 SHA256 9cd3de1dd9c0c3fc7bec05558a83776c89aee32c70e6b43ed392dfb7a44c1b99
-MISC ChangeLog 3013 RMD160 c405131821526bc92e4a76cfabbe446ef26aa362 SHA1 8188bf8390fbdfddcbb8ea0d6a78dd201a858a1b SHA256 37303179d325d040ddb35c787bcf312d5048b92ce86adf790ed6a53c7b43f3d5
+EBUILD vdr-dvd-0.3.7_pre20071113-r1.ebuild 930 RMD160 223328166ad33be3537e31e577da7b19f4c70c35 SHA1 ec21df2241b6ca52ed05bb926d50eab14d42aac0 SHA256 8c58081656a15b585e6bfcb284d919b0d98428c88278458845771c8375511ad0
+MISC ChangeLog 3445 RMD160 be0fabf98c98236703c043a414dab5079414190a SHA1 762ada5c4abc1fd8c6bd87d588c3e3b49cf1f3b8 SHA256 6c2989fc30aa0db0c95181db7408cdea2295318945bfa41f9332aad8ba9af58e
 MISC metadata.xml 367 RMD160 4bbe2db77cbe5cc404dd3d6fa10dc12fb46aebda SHA1 869c0f26507fe17e0531969649b65ffc3cc5f244 SHA256 59d2703ac7119217b962009196caa8584f5697acf745a2cf4de3256da580c47e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkgVrYMACgkQt2vP6XvVdOd/sQCfXIdAAdSnMzma2DYzAszcwsf4
-1jYAnjEVNP/zBoa+WPpvJx54B9ZhUbIa
-=v3xY
+iD8DBQFKA0A4dn07HTTCgIoRAiFHAJ97pGMxQJFr9YyL5/VNTz0qnJA1qACeOkNb
+78FaCmMdt/nOSCDfu6zW65o=
+=VaWj
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-dvd/files/dvd-a52drc-pre20060719.diff b/media-plugins/vdr-dvd/files/dvd-a52drc-pre20060719.diff
deleted file mode 100644
index 8858a2a6e4e9..000000000000
--- a/media-plugins/vdr-dvd/files/dvd-a52drc-pre20060719.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-Add switch to enable A52 DRC Support
-
-written by
-Sebastian Kemper <sebastian_ml@gmx.net> ( 14 Jul 2006 )
-update
-Joerg Bornkessel <hd_brummy@gentoo.org> ( 19 Jul 2006 )
-diff -Naur dvd.orig/i18n.c dvd/i18n.c
---- dvd.orig/i18n.c	2006-07-19 14:06:36.000000000 +0200
-+++ dvd/i18n.c	2006-07-19 14:24:07.630116533 +0200
-@@ -392,5 +392,30 @@
-         "Vybraná zvuková stopa není k dispozici!",          // Czech
- #endif
-     },
-+	{
-+		"Setup.DVD$A52 DRC",
-+		"A52 DRC",                                             // Deutsch
-+		"A52 DRC",                                             // Slovenski
-+		"A52 DRC",                                             // Italiano
-+		"A52 DRC",                                             // Nederlands
-+		"A52 DRC",                                             // Portugus
-+		"A52 DRC",                                             // Franais
-+		"A52 DRC",                                             // Norsk
-+		"A52 DRC",                                             // suomi
-+		"A52 DRC",                                             // Polski
-+		"A52 DRC",                                             // Espanol
-+		"A52 DRC",                                             // ÅëëçíéêÜ (Greek)
-+		"A52 DRC",                                             // Svenska
-+		"A52 DRC",                                             // Romaneste
-+		"A52 DRC",                                             // Magyar
-+		"A52 DRC",                                             // Catal
-+		"A52 DRC",                                             // ÀãááÚØÙ (Russian)
-+		"A52 DRC",                                             // Hrvatski (Croatian)
-+		"A52 DRC",                                             // Eesti
-+		"A52 DRC",                                             // Dansk
-+#if VDRVERSNUM >= 10342
-+		"A52 DRC",												// Czech
-+#endif	
-+    },
-     { NULL }
- };
-diff -Naur dvd.orig/setup-dvd.c dvd/setup-dvd.c
---- dvd.orig/setup-dvd.c	2006-07-19 14:06:36.000000000 +0200
-+++ dvd/setup-dvd.c	2006-07-19 14:21:03.962638032 +0200
-@@ -34,7 +34,7 @@
-     ReadAHead     = 0;
-     Gain          = 4;
- 
--    AC3dynrng  = 0;
-+    AC3dynrng  = 1;
- }
- 
- bool cDVDSetup::SetupParse(const char *Name, const char *Value)
-@@ -48,6 +48,7 @@
-     else if (!strcasecmp(Name, "HideMainMenu"))  HideMainMenu  = atoi(Value);
-     else if (!strcasecmp(Name, "ReadAHead"))     ReadAHead     = atoi(Value);
-     else if (!strcasecmp(Name, "Gain"))          Gain          = atoi(Value);
-+	else if (!strcasecmp(Name, "AC3dynrng"))     AC3dynrng     = atoi(Value);
-     else
- 	return false;
-     return true;
-@@ -67,6 +68,7 @@
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$Hide Mainmenu Entry"),         &data.HideMainMenu));
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$ReadAHead"),                   &data.ReadAHead));
-     Add(new cMenuEditIntItem( tr("Setup.DVD$Gain (analog)"),               &data.Gain, 0, 10));
-+	Add(new cMenuEditBoolItem(tr("Setup.DVD$A52 DRC"),                     &data.AC3dynrng));
- }
- 
- void cMenuSetupDVD::Store(void)
-@@ -80,6 +82,7 @@
-     SetupStore("HideMainMenu",  DVDSetup.HideMainMenu  );
-     SetupStore("ReadAHead",     DVDSetup.ReadAHead  );
-     SetupStore("Gain",          DVDSetup.Gain  );
-+	SetupStore("AC3dynrng",     DVDSetup.AC3dynrng  );
- }
- 
- 
diff --git a/media-plugins/vdr-dvd/files/dvd-a52drc-pre20060819.diff b/media-plugins/vdr-dvd/files/dvd-a52drc-pre20060819.diff
deleted file mode 100644
index 4a6c9570a141..000000000000
--- a/media-plugins/vdr-dvd/files/dvd-a52drc-pre20060819.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-Add switch to enable A52 DRC Support
-
-written by
-Sebastian Kemper <sebastian_ml@gmx.net> ( 14 Jul 2006 )
-update
-Joerg Bornkessel <hd_brummy@gentoo.org> ( 19 Jul 2006 )
-Index: dvd-cvs-20070819/i18n.c
-===================================================================
---- dvd-cvs-20070819.orig/i18n.c
-+++ dvd-cvs-20070819/i18n.c
-@@ -408,5 +408,30 @@ const tI18nPhrase DvdPhrases[] = {
-         "Seçilen audio ses bulunamadý!"                     // Türkçe
- #endif
-     },
-+	{
-+		"Setup.DVD$A52 DRC",
-+		"A52 DRC",                                             // Deutsch
-+		"A52 DRC",                                             // Slovenski
-+		"A52 DRC",                                             // Italiano
-+		"A52 DRC",                                             // Nederlands
-+		"A52 DRC",                                             // Portugus
-+		"A52 DRC",                                             // Franais
-+		"A52 DRC",                                             // Norsk
-+		"A52 DRC",                                             // suomi
-+		"A52 DRC",                                             // Polski
-+		"A52 DRC",                                             // Espanol
-+		"A52 DRC",                                             // ÅëëçíéêÜ (Greek)
-+		"A52 DRC",                                             // Svenska
-+		"A52 DRC",                                             // Romaneste
-+		"A52 DRC",                                             // Magyar
-+		"A52 DRC",                                             // Catal
-+		"A52 DRC",                                             // ÀãááÚØÙ (Russian)
-+		"A52 DRC",                                             // Hrvatski (Croatian)
-+		"A52 DRC",                                             // Eesti
-+		"A52 DRC",                                             // Dansk
-+#if VDRVERSNUM >= 10342
-+		"A52 DRC",												// Czech
-+#endif	
-+    },
-     { NULL }
- };
-Index: dvd-cvs-20070819/setup-dvd.c
-===================================================================
---- dvd-cvs-20070819.orig/setup-dvd.c
-+++ dvd-cvs-20070819/setup-dvd.c
-@@ -34,7 +34,7 @@ cDVDSetup::cDVDSetup(void)
-     ReadAHead     = 0;
-     Gain          = 4;
- 
--    AC3dynrng     = 0;
-+    AC3dynrng     = 1;
- }
- 
- bool cDVDSetup::SetupParse(const char *Name, const char *Value)
-@@ -48,6 +48,7 @@ bool cDVDSetup::SetupParse(const char *N
-     else if (!strcasecmp(Name, "HideMainMenu"))  HideMainMenu  = atoi(Value);
-     else if (!strcasecmp(Name, "ReadAHead"))     ReadAHead     = atoi(Value);
-     else if (!strcasecmp(Name, "Gain"))          Gain          = atoi(Value);
-+	else if (!strcasecmp(Name, "AC3dynrng"))     AC3dynrng     = atoi(Value);
-     else
- 	return false;
-     return true;
-@@ -73,6 +74,7 @@ cMenuSetupDVD::cMenuSetupDVD(void)
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$Hide Mainmenu Entry"),         &data.HideMainMenu));
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$ReadAHead"),                   &data.ReadAHead));
-     Add(new cMenuEditIntItem( tr("Setup.DVD$Gain (analog)"),               &data.Gain, 0, 10));
-+	Add(new cMenuEditBoolItem(tr("Setup.DVD$A52 DRC"),                     &data.AC3dynrng));
- }
- 
- void cMenuSetupDVD::Store(void)
-@@ -86,6 +88,7 @@ void cMenuSetupDVD::Store(void)
-     SetupStore("HideMainMenu",  DVDSetup.HideMainMenu  );
-     SetupStore("ReadAHead",     DVDSetup.ReadAHead  );
-     SetupStore("Gain",          DVDSetup.Gain  );
-+	SetupStore("AC3dynrng",     DVDSetup.AC3dynrng  );
- }
- 
- 
diff --git a/media-plugins/vdr-dvd/files/dvd-cvs-20071113_vdr-1.7.3.diff b/media-plugins/vdr-dvd/files/dvd-cvs-20071113_vdr-1.7.3.diff
new file mode 100644
index 000000000000..75ef50051b72
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/dvd-cvs-20071113_vdr-1.7.3.diff
@@ -0,0 +1,16 @@
+compile fix for >=vdr-1.7.3
+Joerg Bornkessel <hd_brummy@gentoo.org> 07 May 2009
+diff -Naur dvd-cvs-20071113.orig/player-dvd.h dvd-cvs-20071113/player-dvd.h
+--- dvd-cvs-20071113.orig/player-dvd.h	2009-05-07 21:54:38.000000000 +0200
++++ dvd-cvs-20071113/player-dvd.h	2009-05-07 21:56:05.000000000 +0200
+@@ -27,6 +27,10 @@
+ #include "dvdspu.h"
+ #include "ca52.h"
+ 
++#if VDRVERSNUM >= 10703
++#define FRAMESPERSEC 25
++#endif
++
+ class IntegerListObject : public cListObject {
+     private:
+         int value;
diff --git a/media-plugins/vdr-dvd/files/dvdspeed-cvs-20071113.diff b/media-plugins/vdr-dvd/files/dvdspeed-cvs-20071113.diff
deleted file mode 100644
index 4b30c8bdae2e..000000000000
--- a/media-plugins/vdr-dvd/files/dvdspeed-cvs-20071113.diff
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nur dvd/i18n.c dvd.new/i18n.c
---- dvd/i18n.c	2007-11-13 15:59:36.000000000 +0100
-+++ dvd.new/i18n.c	2007-11-13 15:51:06.000000000 +0100
-@@ -280,6 +280,32 @@
- #endif
-     },
-     {
-+     "Setup.DVD$DVD-ROM Speed",                             // English
-+        "DVD-ROM-Geschwindigkeit",                          // Deutsch
-+        "DVD-ROM Speed",                                    // Slovenski
-+        "DVD-ROM Speed",                                    // Italiano
-+        "DVD-ROM Speed",                                    // Nederlands
-+        "DVD-ROM Speed",                                    // Português
-+        "DVD-ROM Speed",                                    // Français
-+        "DVD-ROM Speed",                                    // Norsk
-+        "DVD-ROM Speed",                                    // suomi
-+        "DVD-ROM Speed",                                    // Polski
-+        "DVD-ROM Speed",                                    // Español
-+        "DVD-ROM Speed",                                    // ÅëëçíéêÜ (Greek)
-+        "DVD-ROM Speed",                                    // Svenska
-+        "DVD-ROM Speed",                                    // Romaneste
-+        "DVD-ROM Speed",                                    // Magyar
-+        "DVD-ROM Speed",                                    // Català
-+        "DVD-ROM Speed",                                    // ÀãááÚØÙ (Russian)
-+        "DVD-ROM Speed",                                    // Hrvatski (Croatian)
-+        "DVD-ROM Speed",                                    // Eesti
-+        "DVD-ROM Speed",                                    // Dansk
-+        "DVD-ROM Speed",                                    // Czech
-+#if VDRVERSNUM >= 10502
-+        "DVD-ROM Speed"                                     // Türkçe
-+#endif
-+    },
-+    {
-     "Setup.DVD$Gain (analog)",
-         "Verstärkung (analog)",                             // Deutsch
-         "Ojaèanje (analogno)",                              // Slovenski
-diff -Nur dvd/player-dvd.c dvd.new/player-dvd.c
---- dvd/player-dvd.c	2007-09-17 21:04:43.000000000 +0200
-+++ dvd.new/player-dvd.c	2007-11-13 15:58:50.000000000 +0100
-@@ -35,6 +35,11 @@
- #include "control-dvd.h"
- #include "dvd.h"
- 
-+/* Needed for DvdSetSpeed() */
-+#include <linux/cdrom.h>
-+#include <scsi/sg.h>
-+#include <sys/ioctl.h>
-+
- /**
-  * this was "weak"'s solution of a forced
-  * SPU only stream choice,
-@@ -252,6 +257,7 @@
- bool cDvdPlayer::HasBitStreamOut = false;
- bool cDvdPlayer::HasSoftDeviceOut = false;
- bool cDvdPlayer::SoftDeviceOutActive = false;
-+bool cDvdPlayer::DvdSetSpeedActive = false;
- 
- const int cDvdPlayer::MaxAudioTracks    = 0x20;
- const int cDvdPlayer::AudioTrackMask    = 0x1F;
-@@ -565,6 +571,93 @@
- #endif
- }
- 
-+/* This function was ripped off of mplayer */
-+void cDvdPlayer::DvdSetSpeed(const char *device, int speed)
-+{
-+#if defined(SG_IO) && defined(GPCMD_SET_STREAMING)
-+    int fd;
-+    unsigned char buffer[28];
-+    unsigned char cmd[16];
-+    unsigned char sense[16];
-+    struct sg_io_hdr sghdr;
-+    struct stat st;
-+
-+    memset(&sghdr, 0, sizeof(sghdr));
-+    memset(buffer, 0, sizeof(buffer));
-+    memset(sense, 0, sizeof(sense));
-+    memset(cmd, 0, sizeof(cmd));
-+    memset(&st, 0, sizeof(st));
-+
-+    if (stat(device, &st) == -1) {
-+        esyslog("ERROR: dvd-plugin: DVD device %s doesn't exist", device);
-+        return;
-+    }
-+
-+    if (!S_ISBLK(st.st_mode)) {
-+        esyslog("ERROR: dvd-plugin: DVD device %s is not a block device", device);
-+        return;
-+    }
-+
-+    if ((fd = open(device, O_RDWR | O_NONBLOCK)) == -1) {
-+        esyslog("ERROR: dvd-plugin: Failed to open DVD device %s O_RDWR | O_NONBLOCK", device);
-+        return;
-+    }
-+
-+    if (speed < 100 && speed > 0) { /* speed times 1350KB/s (DVD single speed) */
-+        speed *= 1350;
-+    }
-+
-+    switch (speed) {
-+        case 0: /* don't touch speed setting */
-+            close(fd);
-+            return;
-+        case -1: /* restore default value */
-+            speed = 0;
-+            buffer[0] = 4; /* restore default */
-+            isyslog("dvd-plugin: Restoring initial DVD drive speed");
-+            break;
-+        default: /* limit to <speed> KB/s */
-+            isyslog("dvd-plugin: Limiting speed to %d KB/s", speed);
-+            break;
-+    }
-+
-+    sghdr.interface_id = 'S';
-+    sghdr.timeout = 5000;
-+    sghdr.dxfer_direction = SG_DXFER_TO_DEV;
-+    sghdr.mx_sb_len = sizeof(sense);
-+    sghdr.dxfer_len = sizeof(buffer);
-+    sghdr.cmd_len = sizeof(cmd);
-+    sghdr.sbp = sense;
-+    sghdr.dxferp = buffer;
-+    sghdr.cmdp = cmd;
-+
-+    cmd[0] = GPCMD_SET_STREAMING;
-+    cmd[10] = sizeof(buffer);
-+
-+    buffer[8] = 0xff;  /* first sector 0, last sector 0xffffffff */
-+    buffer[9] = 0xff;
-+    buffer[10] = 0xff;
-+    buffer[11] = 0xff;
-+
-+    buffer[12] = buffer[20] = (speed >> 24) & 0xff; /* <speed> kilobyte */
-+    buffer[13] = buffer[21] = (speed >> 16) & 0xff;
-+    buffer[14] = buffer[22] = (speed >> 8)  & 0xff;
-+    buffer[15] = buffer[23] = speed & 0xff;
-+
-+    buffer[18] = buffer[26] = 0x03; /* 1 second */
-+    buffer[19] = buffer[27] = 0xe8;
-+
-+    if (ioctl(fd, SG_IO, &sghdr) < 0) {
-+        esyslog("ERROR: dvd-plugin: DVD speed limiting failed");
-+        close(fd);
-+        return;
-+    }
-+    isyslog("dvd-plugin: DVD speed limiting successful");
-+    DvdSetSpeedActive = true;
-+    close(fd);
-+#endif
-+}
-+
- void cDvdPlayer::Action(void) {
-     memset(event_buf, 0, sizeof(uint8_t)*4096);
- 
-@@ -590,12 +683,21 @@
-     }
-     dsyslog("dvd-plugin: SoftDeviceOutActive=%d, HasSoftDeviceOut=%d", SoftDeviceOutActive, HasSoftDeviceOut);
- 
-+    /* Try to reduce drive speed if the user wants us to */
-+    if (DVDSetup.Speed)
-+        DvdSetSpeed(const_cast<char *>(cDVD::getDVD()->DeviceName()), DVDSetup.Speed);
-+
-     if (dvdnav_open(&nav, const_cast<char *>(cDVD::getDVD()->DeviceName())) != DVDNAV_STATUS_OK) {
-         Skins.Message(mtError, tr("Error.DVD$Error opening DVD!"));
-         esyslog("ERROR: dvd-plugin cannot open dvdnav device %s -> input thread ended (pid=%d) !", const_cast<char *>(cDVD::getDVD()->DeviceName()), getpid());
-         active = running = false;
-         nav=NULL;
-         fflush(NULL);
-+        /* Try to restore drive speed if it was previously changed */
-+        if (DvdSetSpeedActive) {
-+            DvdSetSpeed(const_cast<char *>(cDVD::getDVD()->DeviceName()), -1);
-+            DvdSetSpeedActive = false;
-+        }
-         return;
-     }
-     dvdnav_set_readahead_flag(nav, DVDSetup.ReadAHead);
-@@ -1203,6 +1305,12 @@
-   dvdnav_close(nav);
-   nav=NULL;
- 
-+  /* Try to restore drive speed if it was previously changed */
-+  if (DvdSetSpeedActive) {
-+      DvdSetSpeed(const_cast<char *>(cDVD::getDVD()->DeviceName()), -1);
-+      DvdSetSpeedActive = false;
-+  }
-+
-   DEBUGDVD("%s:%d: input thread ended (pid=%d)\n", __FILE__, __LINE__, getpid());
-   fflush(NULL);
- }
-diff -Nur dvd/player-dvd.h dvd.new/player-dvd.h
---- dvd/player-dvd.h	2007-09-17 21:04:43.000000000 +0200
-+++ dvd.new/player-dvd.h	2007-11-13 15:51:06.000000000 +0100
-@@ -168,6 +168,7 @@
-     static bool HasBitStreamOut;
-     static bool SoftDeviceOutActive; // currently used to switch for xine
-     static bool HasSoftDeviceOut;    // currently used to switch for xine
-+    static bool DvdSetSpeedActive;
- 
-     //dvd stuff
-     int currButtonN;
-@@ -229,6 +230,7 @@
-     void DrawSPU();
-     void HideSPU();
-     void EmptySPU();
-+    void DvdSetSpeed(const char*, int);
- 
-     void Pause(void);
-     void Play(void);
-diff -Nur dvd/setup-dvd.c dvd.new/setup-dvd.c
---- dvd/setup-dvd.c	2007-11-13 15:59:36.000000000 +0100
-+++ dvd.new/setup-dvd.c	2007-11-13 15:51:06.000000000 +0100
-@@ -35,6 +35,7 @@
-     Gain          = 4;
- 
-     AC3dynrng     = 0;
-+    Speed         = 0;
- }
- 
- bool cDVDSetup::SetupParse(const char *Name, const char *Value)
-@@ -47,6 +48,7 @@
-     else if (!strcasecmp(Name, "ShowSubtitles")) ShowSubtitles = atoi(Value);
-     else if (!strcasecmp(Name, "HideMainMenu"))  HideMainMenu  = atoi(Value);
-     else if (!strcasecmp(Name, "ReadAHead"))     ReadAHead     = atoi(Value);
-+    else if (!strcasecmp(Name, "Speed"))         Speed         = atoi(Value);
-     else if (!strcasecmp(Name, "Gain"))          Gain          = atoi(Value);
-     else if (!strcasecmp(Name, "AC3dynrng"))     AC3dynrng     = atoi(Value);
-     else
-@@ -73,6 +75,7 @@
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$Display subtitles"),           &data.ShowSubtitles));
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$Hide Mainmenu Entry"),         &data.HideMainMenu));
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$ReadAHead"),                   &data.ReadAHead));
-+    Add(new cMenuEditIntItem( tr("Setup.DVD$DVD-ROM Speed"),               &data.Speed, 0, 4));
-     Add(new cMenuEditIntItem( tr("Setup.DVD$Gain (analog)"),               &data.Gain, 0, 10));
-     Add(new cMenuEditBoolItem(tr("Setup.DVD$A52 DRC"),                     &data.AC3dynrng));
- }
-@@ -87,6 +90,7 @@
-     SetupStore("ShowSubtitles", DVDSetup.ShowSubtitles );
-     SetupStore("HideMainMenu",  DVDSetup.HideMainMenu  );
-     SetupStore("ReadAHead",     DVDSetup.ReadAHead  );
-+    SetupStore("Speed",         DVDSetup.Speed  );
-     SetupStore("Gain",          DVDSetup.Gain  );
-     SetupStore("AC3dynrng",     DVDSetup.AC3dynrng  );
- }
-diff -Nur dvd/setup-dvd.h dvd.new/setup-dvd.h
---- dvd/setup-dvd.h	2005-01-05 17:32:21.000000000 +0100
-+++ dvd.new/setup-dvd.h	2007-11-13 15:51:06.000000000 +0100
-@@ -23,6 +23,7 @@
-     int HideMainMenu;
-     int ReadAHead;
-     int Gain;
-+    int Speed;
- 
-     // AC3 stuff
-     int AC3dynrng;
diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20060719.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20060719.ebuild
deleted file mode 100644
index db7326802217..000000000000
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20060719.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20060719.ebuild,v 1.4 2007/01/17 18:49:06 hd_brummy Exp $
-
-inherit vdr-plugin
-
-S="${WORKDIR}/dvd"
-
-DESCRIPTION="VDR Plugin: DVD-Player"
-HOMEPAGE="http://sourceforge.net/projects/dvdplugin"
-SRC_URI="mirror://vdrfiles/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.34
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdnav-0.1.9
-		>=media-libs/libdvdread-0.9.4
-		>=media-libs/a52dec-0.7.4"
-
-RDEPEND="${DEPEND}"
-
-PATCHES="${FILESDIR}/dvd-a52drc-pre20060719.diff"
-
-src_unpack() {
-vdr-plugin_src_unpack
-
-	# Version number fix
-	sed -i "s:0.3.6-b03:0.3.7-Pre:" dvd.h
-}
diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070117.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070117.ebuild
deleted file mode 100644
index 52d267dc50df..000000000000
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070117.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070117.ebuild,v 1.3 2007/07/10 23:09:00 mr_bones_ Exp $
-
-inherit vdr-plugin
-
-S="${WORKDIR}/dvd"
-
-DESCRIPTION="VDR Plugin: DVD-Player"
-HOMEPAGE="http://sourceforge.net/projects/dvdplugin"
-SRC_URI="mirror://vdrfiles/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.34
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdnav-0.1.9
-		>=media-libs/libdvdread-0.9.4
-		>=media-libs/a52dec-0.7.4"
-
-RDEPEND="${DEPEND}"
-
-PATCHES="${FILESDIR}/dvd-a52drc-pre20060719.diff"
-
-src_unpack() {
-vdr-plugin_src_unpack
-
-	# Version number fix
-	sed -i "s:0.3.6-b03:0.3.7_pre20070117:" dvd.h
-}
diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070819.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070819.ebuild
deleted file mode 100644
index 580aff72495d..000000000000
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070819.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20070819.ebuild,v 1.1 2007/08/18 22:32:25 zzam Exp $
-
-inherit vdr-plugin
-
-MY_P="${PN}-cvs-${PV#*_pre}"
-S="${WORKDIR}/${MY_P#vdr-}"
-
-DESCRIPTION="VDR Plugin: DVD-Player"
-HOMEPAGE="http://sourceforge.net/projects/dvdplugin"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.34
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdnav-0.1.9
-		>=media-libs/libdvdread-0.9.4
-		>=media-libs/a52dec-0.7.4"
-
-RDEPEND="${DEPEND}"
-
-PATCHES="${FILESDIR}/dvd-a52drc-pre20060819.diff"
-
-src_unpack() {
-vdr-plugin_src_unpack
-
-	# Version number fix
-	sed -i "s:0.3.6-b03:${PV}:" dvd.h
-}
diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113-r1.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113-r1.ebuild
index 6f1d54c47846..213965934221 100644
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113-r1.ebuild
+++ b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113-r1.ebuild,v 1.2 2008/04/28 10:56:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113-r1.ebuild,v 1.3 2009/05/07 20:10:17 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -25,6 +25,7 @@ DEPEND=">=media-video/vdr-1.3.34
 
 RDEPEND="${DEPEND}"
 
-PATCHES="${FILESDIR}/dvd-a52drc-pre20071113.diff
-		${FILESDIR}/dvdspeed-cvs-20071113-2.diff
-		${FILESDIR}/gcc-4.x-compilefix.diff"
+PATCHES=( "${FILESDIR}/dvd-a52drc-pre20071113.diff"
+		"${FILESDIR}/dvdspeed-cvs-20071113-2.diff"
+		"${FILESDIR}/gcc-4.x-compilefix.diff"
+		"${FILESDIR}/dvd-cvs-20071113_vdr-1.7.3.diff" )
diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113.ebuild
deleted file mode 100644
index 0f47f3736351..000000000000
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20071113.ebuild,v 1.1 2007/11/14 04:38:32 hd_brummy Exp $
-
-inherit vdr-plugin
-
-MY_P="${PN}-cvs-${PV#*_pre}"
-S="${WORKDIR}/${MY_P#vdr-}"
-
-DESCRIPTION="VDR Plugin: DVD-Player"
-HOMEPAGE="http://sourceforge.net/projects/dvdplugin"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.34
-		>=media-libs/libdvdcss-1.2.8
-		>=media-libs/libdvdnav-0.1.9
-		>=media-libs/libdvdread-0.9.4
-		>=media-libs/a52dec-0.7.4"
-
-RDEPEND="${DEPEND}"
-
-PATCHES="${FILESDIR}/dvd-a52drc-pre20071113.diff
-		${FILESDIR}/dvdspeed-cvs-20071113.diff
-		${FILESDIR}/gcc-4.x-compilefix.diff"