- added buffix patch (read buffer handling bugfix from libdvdread 0.9.7)

- added version patch (change version code from 904 to 907 - this version contains most
  of the functionality enhancements after the fork, i.e. between 0.9.4 and 0.9.7,
  except for (mainly) O_DIRECT)

Changed files:
    libdvdread-buffix.patch -> 1.1
    libdvdread-version.patch -> 1.1
    libdvdread.spec -> 1.40

diff --git a/libdvdread-buffix.patch b/libdvdread-buffix.patch
new file mode 100644 (file)
index 0000000..e8b6260
--- /dev/null
+++ b/libdvdread-buffix.patch
@@ -0,0 +1,25 @@
+--- libdvdread-4.2.0/src/dvd_input.c.orig      2009-06-09 00:02:37.000000000 +0200
++++ libdvdread-4.2.0/src/dvd_input.c   2012-03-16 20:01:21.501749182 +0100
+@@ -218,12 +218,13 @@ static int file_read(dvd_input_t dev, vo
+ {
+   size_t len;
+   ssize_t ret;
++  unsigned char *buf = buffer;
+ 
+   len = (size_t)blocks * DVD_VIDEO_LB_LEN;
+ 
+   while(len > 0) {
+ 
+-    ret = read(dev->fd, buffer, len);
++    ret = read(dev->fd, buf, len);
+ 
+     if(ret < 0) {
+       /* One of the reads failed, too bad.  We won't even bother
+@@ -242,6 +243,7 @@ static int file_read(dvd_input_t dev, vo
+       return (int) (bytes / DVD_VIDEO_LB_LEN);
+     }
+ 
++    buf += ret;
+     len -= ret;
+   }
+ 

diff --git a/libdvdread-version.patch b/libdvdread-version.patch
new file mode 100644 (file)
index 0000000..c150cdd
--- /dev/null
+++ b/libdvdread-version.patch
@@ -0,0 +1,11 @@
+--- libdvdread-4.2.0/src/dvdread/dvd_reader.h.orig     2009-12-07 04:50:20.000000000 +0100
++++ libdvdread-4.2.0/src/dvdread/dvd_reader.h  2012-03-16 19:46:47.965061435 +0100
+@@ -43,7 +43,7 @@
+ /**
+  * The current version.
+  */
+-#define DVDREAD_VERSION 904
++#define DVDREAD_VERSION 907
+ 
+ /**
+  * The length of one Logical Block of a DVD.

diff --git a/libdvdread.spec b/libdvdread.spec
index be9f208451a3bf18d4fa877d13bca57dbbe0bbfc..13f5cb1eb0f3ffa6e63152972bd81aac1362411c 100644 (file)
--- a/libdvdread.spec
+++ b/libdvdread.spec
@@ -12,6 +12,8 @@ Group:                Libraries
 Source0:       http://dvdnav.mplayerhq.hu/releases/%{name}-%{version}.tar.bz2
 # Source0-md5: ab7a19d3ab1a437ae754ef477d6231a4
 Patch0:                %{name}-alpha.patch
+Patch1:                %{name}-buffix.patch
+Patch2:                %{name}-version.patch
 URL:           http://www.mplayerhq.hu/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1.6
@@ -59,6 +61,8 @@ Statyczne biblioteki libdvdread.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}