[SCM] libdvdcss/master: Remove patch applied upstream.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Mon Mar 12 10:12:49 UTC 2012


The following commit has been merged in the master branch:
commit 29a2540d3ef8b1051646a2c292157faa11fbb7f3
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Mar 12 11:08:22 2012 +0100

    Remove patch applied upstream.

diff --git a/debian/patches/r249-assume-rpc1-drive.patch b/debian/patches/r249-assume-rpc1-drive.patch
deleted file mode 100644
index e356f73..0000000
--- a/debian/patches/r249-assume-rpc1-drive.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 36965c5..63c767a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-r249-assume-rpc1-drive.patch
 symbol-visibility.patch

-- 
libdvdcss packaging



More information about the pkg-multimedia-commits mailing list