ref: 51efb34db97378a51f5de458a0b27136630176e0
parent: b7967b94d3fe8159325269091dedc8b769339cea
author: Diego Biurrun <[email protected]>
date: Mon Oct 20 07:58:54 EDT 2014
whitespace cleanup
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -6,7 +6,7 @@
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +56,7 @@
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
--- a/NEWS
+++ b/NEWS
@@ -146,4 +146,3 @@
* internal key cache mechanism
* stability fixes
-
--- a/README
+++ b/README
@@ -59,4 +59,3 @@
The VideoLAN web site at http://www.videolan.org/ is a good start for
information about MPEG and DVD playback. Have a look at the support
section to look for answers.
-
--- a/configure.ac
+++ b/configure.ac
@@ -189,7 +189,7 @@
])
])
dnl
- dnl Darwin
+ dnl Darwin
dnl
AC_CHECK_HEADER(IOKit/storage/IODVDMediaBSDClient.h,[
AC_DEFINE(DARWIN_DVD_IOCTL, 1, Have IOKit DVD IOCTL headers)
@@ -199,7 +199,7 @@
dnl Final tests to check what was detected
dnl
if test x$LINUX_DVD_STRUCT = x1; then
- AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
+ AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
Define if Linux-like dvd_struct is defined.)
if test x$OPENBSD_DVD_STRUCT = x1; then
AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1,
--- a/libdvdcss.spec
+++ b/libdvdcss.spec
@@ -1,8 +1,8 @@
-%define name libdvdcss
-%define version 1.2.9
-%define release 1
+%define name libdvdcss
+%define version 1.2.9
+%define release 1
-%define major 2
+%define major 2
%define libname %{name}%{major}%define buildfor_rh9 %([[ -e /etc/mandrake-release ]] && echo 0 || echo 1)
@@ -16,17 +16,17 @@
%endif
-Name: %{name}-Version: %{version}-Release: %{release}+Name: %{name}+Version: %{version}+Release: %{release}Summary: Library for accessing DVDs like block devices with transparent decryption
-Source: %{name}-%{version}.tar.bz2-License: GPL
-Group: System/Libraries
-URL: http://www.videolan.org/libdvdcss/
-Packager: Yves Duret <[email protected]>
-BuildRoot: %_tmppath/%name-%version-%release-root
-Conflicts: libdvdcss0.0.1, libdvdcss0.0.2
+Source: %{name}-%{version}.tar.bz2+License: GPL
+Group: System/Libraries
+URL: http://www.videolan.org/libdvdcss/
+Packager: Yves Duret <[email protected]>
+BuildRoot: %_tmppath/%name-%version-%release-root
+Conflicts: libdvdcss0.0.1, libdvdcss0.0.2
%description
libdvdcss is a simple library designed for accessing DVDs like a block device
@@ -60,14 +60,14 @@
%package -n %{libname}-devel Summary: Development tools for programs which will use the %{name} libraryGroup: Development/C
-Requires: %{libname} = %version-%release+Requires: %{libname} = %version-%release Provides: %{name}-devel = %version-%release-
+
%description -n %{libname}-devel The %{name}-devel package includes the header files and static librariesnecessary for developing programs which will manipulate DVDs files using
the %{name} library.-
+
If you are going to develop programs which will manipulate DVDs, you
should install %{name}-devel. You'll also need to have the %{name}package installed.
@@ -86,7 +86,7 @@
[ %buildroot != "/" ] && rm -Rf %buildroot
%post -n %{libname} -p /sbin/ldconfig-
+
%postun -n %{libname} -p /sbin/ldconfig %files -n %{libname}@@ -156,7 +156,7 @@
* Sat Apr 06 2002 Guillaume Rousse <[email protected]> 1.1.1-1plf
- 1.1.1
-* Wed Jan 30 2002 Guillaume Rousse <[email protected]> 1.0.0-3plf
+* Wed Jan 30 2002 Guillaume Rousse <[email protected]> 1.0.0-3plf
- new plf extension
* Wed Dec 05 2001 Guillaume Rousse <[email protected]> 1.0.0-3mdk
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -239,8 +239,8 @@
[cc_flag_visibility_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $cc_cv_werror"
CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
- cc_cv_flag_visibility='yes',
- cc_cv_flag_visibility='no')
+ cc_cv_flag_visibility='yes',
+ cc_cv_flag_visibility='no')
CFLAGS="$cc_flag_visibility_save_CFLAGS"])
AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
@@ -260,7 +260,7 @@
[int some_function() {int a = 3;
return (int)__builtin_expect(a, 3);
- }],
+ }],
[cc_cv_func_expect=yes],
[cc_cv_func_expect=no])
CFLAGS="$ac_save_CFLAGS"
--- a/src/device.c
+++ b/src/device.c
@@ -1072,4 +1072,3 @@
return i_blocks;
}
#endif
-
--- a/src/error.c
+++ b/src/error.c
@@ -64,4 +64,3 @@
}
}
#endif
-
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -777,4 +777,3 @@
{return dvdcss->b_scrambled;
}
-
--- a/test/csstest.c
+++ b/test/csstest.c
@@ -124,4 +124,3 @@
for( ; i_amount ; i_amount--, p_buffer++ ) printf( "%.2x", *p_buffer );
printf( "...\n" );
}
-
--- a/test/dvd_region.c
+++ b/test/dvd_region.c
@@ -176,7 +176,7 @@
int type, region_mask, rpc_scheme;
int region = 1;
int ret;
-
+
printf("Drive region info:\n"); if( (ret = ioctl_ReportRPC(fd, &type, ®ion_mask, &rpc_scheme)) < 0) {@@ -194,11 +194,11 @@
break;
case 2:
printf("Drive region is set, with additional " \- "restrictions required to make a change\n");
+ "restrictions required to make a change\n");
break;
case 3:
printf("Drive region has been set permanently, but " \- "may be reset by the vendor if necessary\n");
+ "may be reset by the vendor if necessary\n");
break;
default:
printf("Invalid( %x)\n", type);@@ -211,7 +211,7 @@
if( region_mask)
while(region_mask) {if( !(region_mask & 1) )
- printf("%d playable\n", region);+ printf("%d playable\n", region);region++;
region_mask >>= 1;
}
@@ -222,12 +222,12 @@
switch( rpc_scheme ) {case 0:
printf("The Logical Unit does not enforce Region " \- "Playback Controls( RPC)\n");
+ "Playback Controls( RPC)\n");
break;
case 1:
printf("The Logical Unit _shall_ adhere to the "- "specification and all requirements of the " \
- "CSS license agreement concerning RPC\n");
+ "specification and all requirements of the " \
+ "CSS license agreement concerning RPC\n");
break;
default:
printf("Reserved( %x)\n", rpc_scheme);@@ -238,9 +238,9 @@
static void usage(void)
{- fprintf( stderr,
- "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" );
-}
+ fprintf( stderr,
+ "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" );
+}
int main(int argc, char *argv[])
{@@ -298,7 +298,7 @@
fprintf( stderr, "you must specify the region!\n" );
exit(0);
}
-
+
if( (ret = set_region(fd, region)) < 0 )
return ret;
}