diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-02-18 17:58:32 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-02-18 17:58:32 +0100 |
| commit | eedfc81b4b512af3c8dbcd218a2f906aaa582d6a (patch) | |
| tree | 3e8e374d7f2fa04b9387cbe1a1c4ba12aa482840 | |
| parent | 6ea9d051a436b5fcc4919a2f8303963e8434f353 (diff) | |
libdvdcss-1.1.11-2, patch from upstream, when could not get RPC status. Assume RPC-I drive
| -rw-r--r-- | libdvdcss-rpc.patch | 23 | ||||
| -rw-r--r-- | libdvdcss.spec | 13 |
2 files changed, 35 insertions, 1 deletions
diff --git a/libdvdcss-rpc.patch b/libdvdcss-rpc.patch new file mode 100644 index 0000000..c70f903 --- /dev/null +++ b/libdvdcss-rpc.patch @@ -0,0 +1,23 @@ +diff -up libdvdcss-1.2.11/src/css.c.orig libdvdcss-1.2.11/src/css.c +--- libdvdcss-1.2.11/src/css.c.orig 2012-02-18 17:43:34.000000000 +0100 ++++ libdvdcss-1.2.11/src/css.c 2012-02-18 17:45:01.000000000 +0100 +@@ -2,7 +2,7 @@ + * css.c: Functions for DVD authentication and descrambling + ***************************************************************************** + * Copyright (C) 1999-2008 VideoLAN +- * $Id: css.c 239 2011-03-23 14:59:36Z jb $ ++ * $Id: css.c 249 2012-02-18 16:22:03Z jb $ + * + * Authors: Stéphane Borel <stef@via.ecp.fr> + * Håkan Hjort <d95hjort@dtek.chalmers.se> +@@ -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/libdvdcss.spec b/libdvdcss.spec index 27ca985..089533a 100644 --- a/libdvdcss.spec +++ b/libdvdcss.spec @@ -1,12 +1,18 @@ Summary: A portable abstraction library for DVD decryption Name: libdvdcss Version: 1.2.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries Source: http://www.videolan.org/pub/videolan/libdvdcss/%{version}/libdvdcss-%{version}.tar.bz2 URL: http://www.videolan.org/libdvdcss/ +# http://svn.videolan.org/revision.php?repname=libdvdcss&path=%2F&rev=249&peg=249 +# If unsure, assume the drive is of RPC-I type +# This can happen when patched drives do not answer to ioctl_ReportRPC correctly +Patch0: %{name}-rpc.patch + + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,6 +38,8 @@ you will need to install %{name}-devel. %prep %setup -q +%patch0 -p1 -b .rpc1 + %build %configure @@ -62,6 +70,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 18 2012 Remi Collet <RPMS@famillecollet.com> - 1.2.11-2 +- If unsure, assume the drive is of RPC-I type + * Mon Nov 22 2011 Remi Collet <RPMS@famillecollet.com> - 1.2.11-1 - Update to 1.2.11 |