[SCM] libdvdcss/master: If unsure, assume the drive is of RPC-I type.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f53238e8ed26799acf9671a0c1ee1423546b4a98
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Mon Feb 20 10:03:14 2012 +0100

    If unsure, assume the drive is of RPC-I type.

diff --git a/debian/patches/r249-assume-rpc1-drive.patch b/debian/patches/r249-assume-rpc1-drive.patch
new file mode 100644
index 0000000..e356f73
--- /dev/null
+++ b/debian/patches/r249-assume-rpc1-drive.patch
@@ -0,0 +1,17 @@
+Description: If unsure, assume the drive is of RPC-I type
+ This can happen when patched drives do not answer to ioctl_ReportRPC correctly
+Origin: http://svn.videolan.org/comp.php?repname=libdvdcss&compare[]=%2F at 248&compare[]=%2F at 249
+
+--- libdvdcss.orig/src/css.c
++++ libdvdcss/src/css.c
+@@ -138,8 +138,8 @@ int _dvdcss_test( dvdcss_t dvdcss )
+ 
+     if( i_ret < 0 )
+     {
+-        print_error( dvdcss, "css error: could not get RPC status" );
+-        return -2;
++        print_error( dvdcss, "css error: could not get RPC status. Assuming RPC-I drive." );
++        i_type = i_mask = i_rpc = 0;
+     }
+ 
+     switch( i_rpc )
diff --git a/debian/patches/series b/debian/patches/series
index 63c767a..36965c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+r249-assume-rpc1-drive.patch
 symbol-visibility.patch

-- 
libdvdcss packaging