Add patch from Alexis Ballier to build with latest libdvdread, see bug #128224.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 55 insertions, 11 deletions

diff --git a/media-video/streamdvd/ChangeLog b/media-video/streamdvd/ChangeLog
index 00537fe8cfc6..1237cc6f8eba 100644
--- a/media-video/streamdvd/ChangeLog
+++ b/media-video/streamdvd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/streamdvd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/ChangeLog,v 1.15 2006/03/15 13:42:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/ChangeLog,v 1.16 2006/03/31 11:54:47 flameeyes Exp $
+
+  31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/streamdvd-0.4-libdvdread.patch, streamdvd-0.4-r1.ebuild:
+  Add patch from Alexis Ballier to build with latest libdvdread, see bug #128224.
 
   15 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> -streamdvd-0.3.ebuild,
   -streamdvd-0.4.ebuild:
diff --git a/media-video/streamdvd/Manifest b/media-video/streamdvd/Manifest
index ca3468e8953e..634df3e5cc26 100644
--- a/media-video/streamdvd/Manifest
+++ b/media-video/streamdvd/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f730f0c671eb029004c56bfe800aaf48 ChangeLog 2098
-RMD160 ccb17e49678aeeddaba8db54c21630918082626f ChangeLog 2098
-SHA256 04286662a83e1c0f4ff70e0693d83a1bd280385fb90086db7f6e54ae6df0bbec ChangeLog 2098
+MD5 245fe1cbf5a25eb3b34f550bacf67df0 ChangeLog 2300
+RMD160 4848a263d84ce018728b4974ce1be3eafa1ac21c ChangeLog 2300
+SHA256 6ce786e639be01bb538aad5b3f6a9052c00150b42f6de85a5e1fe997afdbf922 ChangeLog 2300
 MD5 d3bf0c2181a72f666e9524bc2a5614cb files/digest-streamdvd-0.4-r1 65
 RMD160 5b663ddefa3bb2db987cdff8c06c8714c53a29c2 files/digest-streamdvd-0.4-r1 65
 SHA256 4876610b3918360bf6a1629201fe4364517d8c3128adb937b107b4d517639abe files/digest-streamdvd-0.4-r1 65
 MD5 9ed1aad968bbdee7309192391e990bae files/streamdvd-0.4-gcc41.patch 463
 RMD160 7cbb8a50d24367b958ed2c4bd9581c27c4353567 files/streamdvd-0.4-gcc41.patch 463
 SHA256 ca4e20daddb00e232db67024d90bfa483d979f028e28602cfa4c5110b885f44f files/streamdvd-0.4-gcc41.patch 463
+MD5 84624631f0fcee28194fdccc5f929e49 files/streamdvd-0.4-libdvdread.patch 1460
+RMD160 ff1b91c0a256131713348a607497d5558debb659 files/streamdvd-0.4-libdvdread.patch 1460
+SHA256 eb900706e0c10198c8bf322b67788b0ca4cea2155b4cce6cbf42052756c35c21 files/streamdvd-0.4-libdvdread.patch 1460
 MD5 99f5b5ffdc2bb741d94e0e053266c298 files/streamdvd-0.4-makefile.patch 1378
 RMD160 bdaabc1592cca2342f6e9967404ce877c49dfdbd files/streamdvd-0.4-makefile.patch 1378
 SHA256 ae86f76792f02af0e660540de44e90e5f59a0ffcb8f28610e81043f24df372ce files/streamdvd-0.4-makefile.patch 1378
@@ -19,13 +22,13 @@ SHA256 42fc345e70ea021442fa21521abc212eeb93377d71d0ca221126cbae82affcfc files/st
 MD5 4cd8662c9a593fb24361610bfae217c9 metadata.xml 496
 RMD160 831cb1d5b0c2f8b2e4a7ad1def5dfef40f15784f metadata.xml 496
 SHA256 d99147daf67459161e74f4a4aaa9f8a06e6aa8ce300f96771f2c00491a97231d metadata.xml 496
-MD5 66dcc7396b1a66946643e29545d3c1dd streamdvd-0.4-r1.ebuild 1533
-RMD160 e30d4f1ca62c8db910797911dcec1a584cf20cde streamdvd-0.4-r1.ebuild 1533
-SHA256 75a78a54d232c5e444a68d76b56ec199a7b9ddf8bd330d35655d84ed915064f4 streamdvd-0.4-r1.ebuild 1533
+MD5 bc1c008504389afea8d05150eb0693b3 streamdvd-0.4-r1.ebuild 1577
+RMD160 696cc6ce80daeb6101f9435c185a86107a411def streamdvd-0.4-r1.ebuild 1577
+SHA256 77738d3ad98800df20a27c71a5ad5f76758bdd9fceeaec7f4f4f6f9d6297f274 streamdvd-0.4-r1.ebuild 1577
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEGBm3AiZjviIA2XgRAuEWAKCkYYS+q0/3FTcC5GQv6mEJTvsi0wCgvIqv
-ESfBaZETMcfcR2eCUv5No4k=
-=xGsW
+iD8DBQFELRioAiZjviIA2XgRArwCAKDE+dDCS5T9VcV8Mht70P7DSWpycgCglb4V
+ZaLaZAuU1aalIasYwmZ4Ytc=
+=oXxL
 -----END PGP SIGNATURE-----
diff --git a/media-video/streamdvd/files/streamdvd-0.4-libdvdread.patch b/media-video/streamdvd/files/streamdvd-0.4-libdvdread.patch
new file mode 100644
index 000000000000..b8f59ee54dba
--- /dev/null
+++ b/media-video/streamdvd/files/streamdvd-0.4-libdvdread.patch
@@ -0,0 +1,36 @@
+diff -N -r -u StreamDVD-0.4/contrib/lsdvd/lsdvd.c new/contrib/lsdvd/lsdvd.c
+--- StreamDVD-0.4/contrib/lsdvd/lsdvd.c	2004-03-08 23:10:53.000000000 +0100
++++ new/contrib/lsdvd/lsdvd.c	2006-03-31 12:57:43.000000000 +0200
+@@ -14,6 +14,8 @@
+  *              output info structures in form of a Perl module, by Henk Vergonet.
+  *  2004-02-25  now prints the stream-id's for audio and subpicture streams, by Reinhardt Wolf
+  */
++#define __STDC_LIMIT_MACROS
++#include <stdint.h>
+ #include <dvdread/ifo_read.h>
+ #include <string.h>
+ #include <sys/stat.h>
+diff -N -r -u StreamDVD-0.4/contrib/StreamAnalyze/streamanalyze.c new/contrib/StreamAnalyze/streamanalyze.c
+--- StreamDVD-0.4/contrib/StreamAnalyze/streamanalyze.c	2004-03-08 23:10:53.000000000 +0100
++++ new/contrib/StreamAnalyze/streamanalyze.c	2006-03-31 12:57:27.000000000 +0200
+@@ -19,6 +19,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <getopt.h>
++#define __STDC_LIMIT_MACROS
++#include <stdint.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/dvd_reader.h>
+diff -N -r -u StreamDVD-0.4/streamdvd.c new/streamdvd.c
+--- StreamDVD-0.4/streamdvd.c	2004-03-08 23:10:53.000000000 +0100
++++ new/streamdvd.c	2006-03-31 12:50:45.000000000 +0200
+@@ -19,6 +19,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <getopt.h>
++#define __STDC_LIMIT_MACROS
++#include <stdint.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/dvd_reader.h>
diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
index 7e3112bb0fcf..4a2006d2dc8e 100644
--- a/media-video/streamdvd/streamdvd-0.4-r1.ebuild
+++ b/media-video/streamdvd/streamdvd-0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.4-r1.ebuild,v 1.11 2006/03/15 13:37:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/streamdvd/streamdvd-0.4-r1.ebuild,v 1.12 2006/03/31 11:54:47 flameeyes Exp $
 
 inherit eutils toolchain-funcs
 
@@ -31,6 +31,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-makefile.patch"
 	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-libdvdread.patch"
 }
 
 src_compile() {