Author: laxathom Update of /cvs/free/rpms/streamdvd/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv6305/F-9 Modified Files: .cvsignore sources Added Files: streamdvd-gcc41.patch streamdvd-gui.patch streamdvd-lsdvd.patch streamdvd-makefile.patch streamdvd-streamdvd.patch streamdvd.spec Log Message: Initial import streamdvd-gcc41.patch: --- NEW FILE streamdvd-gcc41.patch --- --- StreamDVD-0.4/mplex/zalphastrm.hpp 2004-03-08 23:10:53.000000000 +0100 +++ StreamDVD-0.4.new/mplex/zalphastrm.hpp 2006-01-23 13:26:31.000000000 +0100 @@ -45,7 +45,7 @@ virtual bool AUBufferNeedsRefill(); virtual void NextDTSPTS( clockticks &DTS, clockticks &PTS); virtual void ScanFirstSeqHeader(); - bool ZAlphaStream::RunOutComplete(); + bool RunOutComplete(); private: float z_min; streamdvd-gui.patch: --- NEW FILE streamdvd-gui.patch --- --- Gui/StreamDVD/Streams.pm.orig 2005-06-14 17:16:06.000000000 +0200 +++ Gui/StreamDVD/Streams.pm 2005-06-14 17:16:12.000000000 +0200 @@ -1,6 +1,6 @@ # Part of the StreamDVD project -package StreamDVD::Audio; +package StreamDVD::Streams; use strict; use vars qw($VERSION @ISA @EXPORT); streamdvd-lsdvd.patch: --- NEW FILE streamdvd-lsdvd.patch --- --- contrib/lsdvd/lsdvd.c.orig 2005-06-14 17:25:19.000000000 +0200 +++ contrib/lsdvd/lsdvd.c 2005-06-14 17:31:58.000000000 +0200 @@ -32,6 +32,14 @@ printf("%s => ", name); \ printf(x); printf(",\n"); \ } +#define HASHI(name) { \ + INDENT; \ + (name ? \ + printf((_lvl ? "%d => {\n" : "our %%%d = (\n"), name) : \ + printf("{\n")); \ + _lvl++; _lvl_type[_lvl] = 0; \ +} + #define HASH(name) { \ INDENT; \ (name ? \ @@ -287,7 +295,7 @@ pgc = vts_pgcit->pgci_srp[ifo[title_set_nr]->vts_ptt_srpt->title[vts_ttn - 1].ptt[0].pgcn - 1].pgc; if (opt_p) { - HASH(0); + HASHI(0); DEF("ix", "%d", j+1); DEF("length", "%.3f", dvdtime2msec(&pgc->playback_time)/1000.0); DEF("vts_id", "'%.12s'", vtsi_mat->vts_identifier); @@ -343,7 +351,7 @@ audio_attr = &vtsi_mat->vts_audio_attr[i]; sprintf(lang_code, "%c%c", audio_attr->lang_code>>8, audio_attr->lang_code & 0xff); if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("langcode", "'%s'", lang_code); DEF("language", "'%s'", lang_name(lang_code)); @@ -390,7 +398,7 @@ ms = ms + dvdtime2msec(&pgc->cell_playback[cell].playback_time); cell++; } - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("length", "%.3f", ms/1000.0); DEF("startcell", "%d", pgc->program_map[i]); @@ -427,7 +435,7 @@ ARRAY("cell"); for (i=0; i<pgc->nr_of_cells; i++) { - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("length", "%.3f", dvdtime2msec(&pgc->cell_playback[i].playback_time)/1000.0); RETURN; @@ -452,7 +460,7 @@ sprintf(lang_code, "%c%c", subp_attr->lang_code>>8, subp_attr->lang_code & 0xff); if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; } - HASH(0); + HASHI(0); DEF("ix", "%d", i+1); DEF("langcode", "'%s'", lang_code); DEF("language", "'%s'", lang_name(lang_code)); streamdvd-makefile.patch: --- NEW FILE streamdvd-makefile.patch --- --- Makefile.orig 2005-06-14 08:43:53.000000000 +0200 +++ Makefile 2005-06-14 08:47:18.000000000 +0200 @@ -1,16 +1,17 @@ -INSTALLDIR = /usr/local/bin/ +INSTALLDIR=/usr/local/bin +CFLAGS= all: - g++ -g -Wall -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp + g++ -g -Wall $(CFLAGS) -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp addon: - gcc -g -Wall -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c - gcc -g -Wall -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c + gcc -g -Wall $(CFLAGS) -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c + gcc -g -Wall $(CFLAGS) -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c gui: - g++ -g -Wall -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp - gcc -g -Wall -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c - gcc -g -Wall -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c + g++ -g -Wall $(CFLAGS) -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp + gcc -g -Wall $(CFLAGS) -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c + gcc -g -Wall $(CFLAGS) -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c clean: rm -f streamdvd streamanalyze lsdvd streamdvd-streamdvd.patch: --- NEW FILE streamdvd-streamdvd.patch --- --- streamdvd.c.orig 2005-06-14 17:33:13.000000000 +0200 +++ streamdvd.c 2005-06-14 17:34:12.000000000 +0200 @@ -173,7 +173,7 @@ } pts_diff = ( (double)v_pts/90000. ) - ( (double)a_pts/90000. ); - gl->av_delay = pts_diff * 1000.; + gl->av_delay = (int)(pts_diff * 1000.); fprintf(stderr, "AV Delay: %d ms\n", gl->av_delay); } --- requant.c.orig 2005-06-14 17:36:50.000000000 +0200 +++ requant.c 2005-06-14 17:41:47.000000000 +0200 @@ -1308,10 +1308,10 @@ #define NEXT_MACROBLOCK \ do { \ h_offset += 16; \ - if (h_offset == horizontal_size_value) \ + if (h_offset == (int)horizontal_size_value) \ { \ v_offset += 16; \ - if (v_offset > (vertical_size_value - 16)) return; \ + if (v_offset > (int)(vertical_size_value - 16)) return; \ h_offset = 0; \ } \ } while (0) @@ -1431,7 +1431,7 @@ v_offset += 16; } - if (v_offset > (vertical_size_value - 16)) return 1; + if (v_offset > (int)(vertical_size_value - 16)) return 1; return 0; --- NEW FILE streamdvd.spec --- %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} Name: streamdvd Version: 0.4 Release: 7%{?dist} Summary: A fast tool to backup Video DVDs Group: Applications/Multimedia License: GPL URL: http://www.badabum.de/streamdvd.html Source0: http://www.badabum.de/down/streamdvd-0.4.tar.gz Patch0: streamdvd-makefile.patch Patch1: streamdvd-streamdvd.patch Patch2: streamdvd-lsdvd.patch Patch3: streamdvd-gui.patch Patch4: streamdvd-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdvdread-devel >= 0.9.2 BuildRequires: perl %package streamanalyze Summary: Factor-Calculator for streamdvd Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %package gui Summary: Graphical user interface for streamdvd Group: User Interface/X Requires: %{name} = %{version}-%{release} Requires: %{name}-streamanalyze = %{version}-%{release} Requires: dvdauthor >= 0.6.5 Requires: mkisofs >= 1.15 Requires: dvd+rw-tools >= 5.13.4.7.4 Requires: perl(Tk) perl(Tk::BrowseEntry) perl(Tk::Photo) perl(Tk::JPEG) %description StreamDVD is a fast tool to backup Video DVDs 'on the fly', there will be no ripping, demultiplexing, recoding, remultiplexing .... You can select the wanted title, chapters, video, audio and subpicture streams and also a resize factor and StreamDVD will write a 'ready to author' vob file to stdout. %description streamanalyze StreamAnalyze is a little helper for people using StreamDVD to backup movies. Giving the video/audio/subpicture tracks you want to save StreamAnalyze will calculate if the backup would fit on a dvd-r and, if not, prints a shrink factor to reduce the video size. %description gui Graphical user interface for streamdvd %prep %setup -q -n StreamDVD-%{version} %patch0 %patch1 %patch2 %patch3 %patch4 -p1 %{__perl} -pi -e 's/(Tk::JPEG)::Lite/$1/' \ %{_builddir}/StreamDVD-%{version}/Gui/StreamDVD/Gui.pm %build make gui CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_bindir} %{__mkdir_p} $RPM_BUILD_ROOT%{perl_vendorarch}/StreamDVD #install streamdvd, streamanalyze and lsdvd make install INSTALLDIR=$RPM_BUILD_ROOT%{_bindir} #install modules for gui %{__install} %{_builddir}/StreamDVD-%{version}/Gui/StreamDVD/*.pm \ $RPM_BUILD_ROOT%{perl_vendorarch}/StreamDVD/ #install gui %{__install} %{_builddir}/StreamDVD-%{version}/Gui/StreamDVD.pl \ $RPM_BUILD_ROOT%{_bindir}/StreamDVD %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README COPYING %{_bindir}/streamdvd %files streamanalyze %defattr(-,root,root,-) %doc contrib/StreamAnalyze/README contrib/StreamAnalyze/COPYING %doc contrib/lsdvd/AUTHORS contrib/lsdvd/COPYING contrib/lsdvd/README %{_bindir}/streamanalyze %{_bindir}/lsdvd %files gui %defattr(-,root,root,-) %doc Gui/README %{_bindir}/StreamDVD %{perl_vendorarch}/StreamDVD %changelog * Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4-7 - rebuild for RPM Fusion * Sat Mar 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.4-6 - remove -dl workaround * Thu Mar 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.4-5 - fix #802 (devel build) * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Mon Jan 23 2006 Adrian Reber <adrian(a)lisas.de&gt; - 0.4-0.lvn.4 - added gcc 4.1 compile patch * Mon Jul 11 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.4.0.lvn.3 - install StreamDVD gui without .pl suffix * Sun Jun 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.4.0.lvn.2 - fix some perl related stuff - get rid of Tk::JPEG::Lite * Tue Jun 14 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.4-0.lvn.1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/streamdvd/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:54:52 -0000 1.1 +++ .cvsignore 14 Sep 2008 21:35:53 -0000 1.2 @@ -0,0 +1 @@ +streamdvd-0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/streamdvd/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:54:52 -0000 1.1 +++ sources 14 Sep 2008 21:35:53 -0000 1.2 @@ -0,0 +1 @@ +5e85dee490c5c5fb20faf87851fdca74 streamdvd-0.4.tar.gz