[SCM] vdr-plugin-cdda packaging repository branch, master, updated. debian/0.1.0-32-1-g6d26c6f

etobi git at e-tobi.net
Sat Mar 31 22:50:08 UTC 2012


The following commit has been merged in the master branch:
commit e07325fe12ccc7a9d1f33037cec84db11abaf888
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 31 13:01:12 2012 +0200

    Auto-detect libcdda driver

diff --git a/debian/changelog b/debian/changelog
index 4c78331..8bd3508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ vdr-plugin-cdda (0.1.0-32) experimental; urgency=low
 
   * Dropped README.source
   * Source format 3.0 (quilt)
+  * Auto-detect libcdda driver
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 31 Mar 2012 12:45:18 +0200
 
diff --git a/debian/patches/driver_autodetect.patch b/debian/patches/driver_autodetect.patch
new file mode 100644
index 0000000..a955a95
--- /dev/null
+++ b/debian/patches/driver_autodetect.patch
@@ -0,0 +1,17 @@
+#
+# Use DRIVER_UNKNOWN to let libcdda detect the driver automatically
+#
+
+Index: vdr-plugin-cdda/cdda_device.c
+===================================================================
+--- vdr-plugin-cdda.orig/cdda_device.c	2012-03-31 12:57:55.000000000 +0200
++++ vdr-plugin-cdda/cdda_device.c	2012-03-31 12:59:18.000000000 +0200
+@@ -225,7 +225,7 @@
+   if (NULL == mp_cdIo) {
+     mp_device = strdup(name);
+     if (NULL != mp_device) {
+-      mp_cdIo = cdio_open(mp_device, DRIVER_LINUX);
++      mp_cdIo = cdio_open(mp_device, DRIVER_UNKNOWN);
+       if (NULL == mp_cdIo)
+         return scCannotOpenDevice;
+       cdio_set_speed(mp_cdIo,2);
diff --git a/debian/patches/series b/debian/patches/series
index ad1530d..b528ea8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 90_cdda-1.3.38.patch
 90_gcc-4.4.patch
 90_missing-includes.patch
+driver_autodetect.patch

-- 
vdr-plugin-cdda packaging repository



More information about the pkg-vdr-dvb-changes mailing list