Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9396c6141a918c49f3a8fd2d09ff8d863dfbb3d7
commit 9396c6141a918c49f3a8fd2d09ff8d863dfbb3d7 Author: bouleetbil <bouleet...@frogdev.info> Date: Wed Oct 28 13:03:31 2009 +0100 streamdvd-0.4-2-i686 *rebuild with libdvdread>=4.1.3 *added some fix diff --git a/source/multimedia/streamdvd/FrugalBuild b/source/multimedia/streamdvd/FrugalBuild index 63ad226..b7fc5bb 100644 --- a/source/multimedia/streamdvd/FrugalBuild +++ b/source/multimedia/streamdvd/FrugalBuild @@ -4,20 +4,25 @@ pkgname=streamdvd pkgver=0.4 -pkgrel=1 +pkgrel=2 pkgdesc="StreamDVD is a fast tool to backup Video DVDs on the fly" url="http://www.badabum.de/streamdvd.html"; -depends=('libdvdread') +depends=('libdvdread>=4.1.3') groups=('multimedia') archs=('i686' 'x86_64') up2date="lynx -dump http://www.badabum.de/streamdvd.html|grep streamdvd-|sed -ne 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://www.badabum.de/down/$pkgname-$pkgver.tar.gz) -sha1sums=('384c8ec3cc9325e0a876b8b6a7e394dd1d2d5f56') +source=(http://www.badabum.de/down/$pkgname-$pkgver.tar.gz gcc41.diff gcc43.diff gcc44.diff libdvdread.diff) +sha1sums=('384c8ec3cc9325e0a876b8b6a7e394dd1d2d5f56' \ + 'd124a9e2f6d64eb0443d255ce9c3fd5387c7b975' \ + 'ba01eb24cc1f7c1db5b84ce42efc5a4016c29414' \ + 'a0291e780075691709ebc2d8c80d157c8fe9971e' \ + 'fe4f43c76e74d7a8fc6994aca580eef0a37f724a') build() { Fmkdir usr/bin/ Fcd StreamDVD-$pkgver + Fpatchall Fmake make addon || return 1 Fmakeinstall INSTALLDIR=$Fdestdir/usr/bin/ diff --git a/source/multimedia/streamdvd/gcc41.diff b/source/multimedia/streamdvd/gcc41.diff new file mode 100644 index 0000000..4ddec4e --- /dev/null +++ b/source/multimedia/streamdvd/gcc41.diff @@ -0,0 +1,13 @@ +Index: StreamDVD-0.4/mplex/zalphastrm.hpp +=================================================================== +--- StreamDVD-0.4.orig/mplex/zalphastrm.hpp ++++ StreamDVD-0.4/mplex/zalphastrm.hpp +@@ -45,7 +45,7 @@ protected: + virtual bool AUBufferNeedsRefill(); + virtual void NextDTSPTS( clockticks &DTS, clockticks &PTS); + virtual void ScanFirstSeqHeader(); +- bool ZAlphaStream::RunOutComplete(); ++ bool RunOutComplete(); + + private: + float z_min; diff --git a/source/multimedia/streamdvd/gcc43.diff b/source/multimedia/streamdvd/gcc43.diff new file mode 100644 index 0000000..89e33f5 --- /dev/null +++ b/source/multimedia/streamdvd/gcc43.diff @@ -0,0 +1,44 @@ +diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp +--- mplex.old/inputstrm.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ mplex/inputstrm.cpp 2008-07-07 23:28:19.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include "config.h" + #include <assert.h> ++#include <climits> + + #include "mjpeg_types.h" + #include "fastintfns.h" +diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp +--- mplex.old/multiplexor.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ mplex/multiplexor.cpp 2008-07-07 23:28:19.000000000 +0200 +@@ -22,6 +22,7 @@ + #include "config.h" + #include <math.h> + #include <stdlib.h> ++#include <cstring> + + #include "mjpeg_types.h" + #include "mjpeg_logging.h" +diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp +--- mplex.old/padstrm.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ mplex/padstrm.cpp 2008-07-07 23:28:19.000000000 +0200 +@@ -25,6 +25,7 @@ + #endif + + #include "padstrm.hpp" ++#include <cstring> + + + +diff -aur mplex.old/zalphastrm_in.cpp mplex/zalphastrm_in.cpp +--- mplex.old/zalphastrm_in.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ mplex/zalphastrm_in.cpp 2008-07-07 23:28:19.000000000 +0200 +@@ -23,6 +23,7 @@ + #include "config.h" + #include <math.h> + #include <stdlib.h> ++#include <cstring> + + #include "zalphastrm.hpp" + #include "interact.hpp" diff --git a/source/multimedia/streamdvd/gcc44.diff b/source/multimedia/streamdvd/gcc44.diff new file mode 100644 index 0000000..2ca12ff --- /dev/null +++ b/source/multimedia/streamdvd/gcc44.diff @@ -0,0 +1,24 @@ +diff -ur StreamDVD-0.4.orig/mplex/lpcmstrm_in.cpp StreamDVD-0.4/mplex/lpcmstrm_in.cpp +--- StreamDVD-0.4.orig/mplex/lpcmstrm_in.cpp 2004-03-09 00:10:53.000000000 +0200 ++++ StreamDVD-0.4/mplex/lpcmstrm_in.cpp 2009-08-05 22:05:48.000000000 +0300 +@@ -52,7 +52,7 @@ + + bool LPCMStream::Probe(IBitStream &bs ) + { +- char *last_dot = strrchr( bs.StreamName(), '.' ); ++ const char *last_dot = strrchr( bs.StreamName(), '.' ); + return + last_dot != NULL + && strcmp( last_dot+1, "lpcm") == 0; +diff -ur StreamDVD-0.4.orig/mplex/yuv4mpeg_ratio.c StreamDVD-0.4/mplex/yuv4mpeg_ratio.c +--- StreamDVD-0.4.orig/mplex/yuv4mpeg_ratio.c 2004-03-09 00:10:53.000000000 +0200 ++++ StreamDVD-0.4/mplex/yuv4mpeg_ratio.c 2009-08-05 22:07:49.000000000 +0300 +@@ -104,7 +104,7 @@ + + int y4m_parse_ratio(y4m_ratio_t *r, const char *s) + { +- char *t = strchr(s, ':'); ++ const char *t = strchr(s, ':'); + if (t == NULL) return Y4M_ERR_RANGE; + r->n = atoi(s); + r->d = atoi(t+1); diff --git a/source/multimedia/streamdvd/libdvdread.diff b/source/multimedia/streamdvd/libdvdread.diff new file mode 100644 index 0000000..b8f59ee --- /dev/null +++ b/source/multimedia/streamdvd/libdvdread.diff @@ -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> _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
