rpms/vdr/devel vdr-1.6.0-hlcutter-0.2.2-finnish.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 vdr.spec, 1.45, 1.46 vdr-1.4.7-hlcutter-0.2.0-finnish.patch, 1.1, NONE vdr-1.5.18-hlcutter-0.2.0.diff, 1.2, NONE vdr-1.6.0-hlcutter-gcc44.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Mon Jun 15 16:45:17 UTC 2009
- Previous message: rpms/globus-gsi-cert-utils/EL-5 globus-gsi-cert-utils.spec, 1.1, 1.2 import.log, 1.1, 1.2
- Next message: rpms/globus-gsi-sysconfig/devel globus-gsi-sysconfig-mingw.patch, NONE, 1.1 globus-gsi-sysconfig.spec, 1.1, 1.2 import.log, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15932
Modified Files:
.cvsignore sources vdr.spec
Added Files:
vdr-1.6.0-hlcutter-0.2.2-finnish.patch
Removed Files:
vdr-1.4.7-hlcutter-0.2.0-finnish.patch
vdr-1.5.18-hlcutter-0.2.0.diff vdr-1.6.0-hlcutter-gcc44.patch
Log Message:
* Mon Jun 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-24
- Update hlcutter patch to 0.2.2, drop no longer needed gcc 4.4 workaround.
- Resurrect Finnish translation for hlcutter.
vdr-1.6.0-hlcutter-0.2.2-finnish.patch:
--- NEW FILE vdr-1.6.0-hlcutter-0.2.2-finnish.patch ---
diff -up vdr-1.6.0/po/fi_FI.po~ vdr-1.6.0/po/fi_FI.po
--- vdr-1.6.0/po/fi_FI.po~ 2008-03-23 12:31:29.000000000 +0200
+++ vdr-1.6.0/po/fi_FI.po 2009-06-15 19:07:04.000000000 +0300
@@ -743,9 +743,15 @@ msgstr "Pikatallennuksen kesto (min)"
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Suurin tiedostokoko (Mt)"
+msgid "Setup.Recording$Max. recording size (GB)"
+msgstr "Suurin tallennekoko (Gt)"
+
msgid "Setup.Recording$Split edited files"
msgstr "Jaottele muokatut tallenteet"
+msgid "Setup.Recording$Hard Link Cutter"
+msgstr "Käytä kovia linkkejä muokkauksessa"
+
msgid "Replay"
msgstr "Toisto"
diff -up vdr-1.6.0/README-HLCUTTER~ vdr-1.6.0/README-HLCUTTER
--- vdr-1.6.0/README-HLCUTTER~ 2009-06-15 19:02:59.000000000 +0300
+++ vdr-1.6.0/README-HLCUTTER 2009-06-15 19:04:04.000000000 +0300
@@ -21,7 +21,7 @@ Nevertheless the patch is still in devel
The patch is EXPERIMENTAL for multiple /videoxx folders. The safety checks
should prevent data loss, but you should always carefully check the results.
-While editing a recording, the patch searches for any 00x.vdr files that dont
+While editing a recording, the patch searches for any 00x.vdr files that don't
contain editing marks and would normally be copied 1:1 unmodified to the edited
recording. In this case the current target 00x.vdr file will be aborted, and
the cutter process attempts to duplicate the source file as a hard link, so
@@ -72,7 +72,7 @@ disabled, the cutter process behaves ide
There's a //#define HARDLINK_TEST_ONLY in the videodir.c file that enables a
test-mode that hard-links 00x.vdr_ files only, and continues the classic
editing. The resulting 00x.vdr and 00x.vdr_ files should be identical. If you
-delete the un-edited recording, dont forget to delete the *.vdr_ files too,
+delete the un-edited recording, don't forget to delete the *.vdr_ files too,
they will now eat real disk space.
Note: 'du' displays the disk space of hard links only on first appearance, and
@@ -93,7 +93,7 @@ Version 0.1.4
Fix: Last edit mark is not a cut-out
Fix: Write error if link-copied file is smaller than allowed file size
Fix: Broken index/marks if cut-in is at the start of a new file
- Fix: Clear dangeling pointer to free'd cUnbufferedFile,
+ Fix: Clear dangling pointer to free'd cUnbufferedFile,
thx to Matthias Schwarzott
Version 0.1.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 28 May 2009 20:25:18 -0000 1.20
+++ .cvsignore 15 Jun 2009 16:44:46 -0000 1.21
@@ -11,3 +11,4 @@ vdr-1.6.0-ionice.patch.gz
vdr-1.6.0-cap_sys_nice.patch.gz
vdr-1.6.0-liemikuutio-1.27.diff.gz
vdr-jumpplay-1.0-1.6.0.diff
+vdr-1.5.13-hlcutter-0.2.2.diff
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources 28 May 2009 20:25:18 -0000 1.20
+++ sources 15 Jun 2009 16:44:46 -0000 1.21
@@ -11,3 +11,4 @@ bc2dbfe11e0ddbc791ceb2f659081c8c vdr-1.
32004893569e9a68f17d2b4b93410ed5 vdr-1.6.0-cap_sys_nice.patch.gz
189117c22de7932bbfa770091f5d36e0 vdr-1.6.0-liemikuutio-1.27.diff.gz
1ff8f1a90e02b11a42218ffba18b5f26 vdr-jumpplay-1.0-1.6.0.diff
+6c3dccda1910103449984677ed0bfcf4 vdr-1.5.13-hlcutter-0.2.2.diff
Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- vdr.spec 9 Jun 2009 17:30:32 -0000 1.45
+++ vdr.spec 15 Jun 2009 16:44:47 -0000 1.46
@@ -27,7 +27,7 @@
Name: vdr
Version: 1.6.0
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Video Disk Recorder
Group: Applications/Multimedia
@@ -65,11 +65,10 @@ Patch6: %{name}-1.5.18-syncearly
# http://projects.vdr-developer.org/repositories/entry/plg-ttxtsubs/patches/vdr-1.6.0-2-ttxtsubs.patch?format=raw
Patch7: %{name}-1.6.0-2-ttxtsubs.patch
Patch8: %{name}-1.6.0-man-section.patch
-# Patch9: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.0.diff
-# edited so that it applies on top of the liemikuutio patch (menu.c)
-Patch9: %{name}-1.5.18-hlcutter-0.2.0.diff
-# TODO
-Patch10: %{name}-1.4.7-hlcutter-0.2.0-finnish.patch
+# http://www.udo-richter.de/vdr/patches.en.html#hlcutter
+Patch9: http://www.udo-richter.de/vdr/files/vdr-1.5.13-hlcutter-0.2.2.diff
+# Sent to hlcutter upstream 2009-06-15
+Patch10: %{name}-1.6.0-hlcutter-0.2.2-finnish.patch
# mainmenuhooks, timercmd and progressbar-support from
# http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-0.9.24.tgz
Patch11: MainMenuHooks-v1_0.patch
@@ -90,7 +89,6 @@ Patch23: http://www.saunalahti.fi
Patch24: %{name}-1.6.0-const.diff
Patch25: http://toms-cafe.de/vdr/download/vdr-jumpplay-1.0-1.6.0.diff
Patch26: %{name}-jumpplay-1.0-1.6.0-finnish.patch
-Patch27: %{name}-1.6.0-hlcutter-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -191,9 +189,9 @@ sed \
%patch6 -p0
%patch7 -p1
%patch8 -p1
-%patch9 -p0 -F 1
-# TODO: does not apply
-#patch10 -p0
+# fuzz=3 so it applies on top of liemikuutio patch (menu.c)
+%patch9 -p0 -F 3
+%patch10 -p1
%patch11 -p1 -F 2
# timer-info patch needs to come before timercmd patch to avoid conflicts
%patch17 -p1
@@ -211,7 +209,6 @@ sed \
%patch24 -p1
%patch25 -p1 -F 2
%patch26 -p1
-%patch27 -p1
for f in CONTRIBUTORS HISTORY* UPDATE-1.4.0 README.{jumpplay,timer-info} ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -534,6 +531,10 @@ fi
%endif # plugins
%changelog
+* Mon Jun 15 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-24
+- Update hlcutter patch to 0.2.2, drop no longer needed gcc 4.4 workaround.
+- Resurrect Finnish translation for hlcutter.
+
* Tue Jun 9 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-23
- Apply gcc 4.4 build fix from openSUSE and upstream, hlcutter still needs work.
- Drop no longer needed DVB header workaround.
--- vdr-1.4.7-hlcutter-0.2.0-finnish.patch DELETED ---
--- vdr-1.5.18-hlcutter-0.2.0.diff DELETED ---
--- vdr-1.6.0-hlcutter-gcc44.patch DELETED ---
- Previous message: rpms/globus-gsi-cert-utils/EL-5 globus-gsi-cert-utils.spec, 1.1, 1.2 import.log, 1.1, 1.2
- Next message: rpms/globus-gsi-sysconfig/devel globus-gsi-sysconfig-mingw.patch, NONE, 1.1 globus-gsi-sysconfig.spec, 1.1, 1.2 import.log, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list