6:53 p.m.
Author: martinkg
Update of /cvs/free/rpms/vdr-burn/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26981/F-17
Added Files:
sources vdr-burn-0.2.1-config.patch vdr-burn.conf
vdr-burn.spec
Removed Files:
dead.package
Log Message:
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 19 Feb 2013 18:53:02 -0000 1.4
@@ -0,0 +1,2 @@
+da67b1ae819bf9c064af49ab64dbf27b genindex-0.1.3.tar.gz
+50d349d36bdcf2b341dfab2fa43a31a9 vdr-burn-0.2.1.tgz
vdr-burn-0.2.1-config.patch:
README | 2 +-
chain-archive.c | 2 +-
jobs.c | 2 +-
vdrburn-archive.sh | 6 +++---
vdrburn-dvd.sh | 13 +++++++------
5 files changed, 13 insertions(+), 12 deletions(-)
--- NEW FILE vdr-burn-0.2.1-config.patch ---
Index: README
===================================================================
--- README.orig 2012-10-07 17:31:04.771395847 +0200
+++ README 2012-10-07 17:31:55.124400166 +0200
@@ -77,7 +77,7 @@
3b.(optional) Change the default temporary folder, the default DVD writer device
and the default ISO directory with TMPDIR (default: /tmp),
- DVDDEV (default: /dev/dvdrw) and ISODIR (default: /pub/export)
+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir)
# make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
Index: chain-archive.c
===================================================================
RCS file: /var/cvsroot/burn/chain-archive.c,v
retrieving revision 1.13
diff -u -r1.13 chain-archive.c
--- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13
+++ chain-archive.c 12 Dec 2006 20:31:14 -0000
@@ -64,7 +64,7 @@
bind( &recording::get_graft_point, _2 ),
" "
)));
- graftPoints = format("{0} /dvd.vdr={1}/counters/standard") % graftPoints %
plugin::get_config_path();
+ graftPoints = format("{0} /dvd.vdr=/var/lib/vdr/burn/counters/standard") %
graftPoints;
switch (get_job().get_store_mode()) {
case storemode_create:
Index: jobs.c
===================================================================
RCS file: /var/cvsroot/burn/jobs.c,v
retrieving revision 1.35
diff -u -r1.35 jobs.c
--- jobs.c 1 Oct 2006 21:22:27 -0000 1.35
+++ jobs.c 12 Dec 2006 20:31:14 -0000
@@ -389,7 +389,7 @@
std::string job::get_archive_id()
{
std::string archive_id = "";
- std::string counter_path = format("{0}/counters/standard") %
plugin::get_config_path();
+ std::string counter_path = "/var/lib/vdr/burn/counters/standard";
std::ifstream f(counter_path.c_str());
if (!f) {
proctools::logger::error(proctools::format("couldn't read {0}") %
counter_path);
Index: vdrburn-archive.sh
===================================================================
--- vdrburn-archive.sh.orig 2012-10-07 17:35:46.210420545 +0200
+++ vdrburn-archive.sh 2012-10-07 17:38:38.421435235 +0200
@@ -53,7 +53,7 @@
RECORDING_DMH="$RECPATH"/"$UPPERRECDIR"_DVD/"$RECDIR"
mkdir -p "$RECORDING_DMH"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
# Old style Records ("index.vdr"/"info.vdr")
if [ -f "$RECORDING_PATH"/index.vdr ]; then
cp "$RECORDING_PATH"/info.vdr "$RECORDING_DMH"/info.vdr
@@ -66,8 +66,8 @@
;;
archivemark)
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ (DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
;;
*)
Index: vdrburn-dvd.sh
===================================================================
--- vdrburn-dvd.sh.orig 2012-10-07 17:40:01.859441567 +0200
+++ vdrburn-dvd.sh 2012-10-07 17:48:54.861488725 +0200
@@ -78,7 +78,7 @@
;;
demux)
- [ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf
+ [ -r /etc/vdr/plugins/burn/vdrburn-dvd.conf ] && .
/etc/vdr/plugins/burn/vdrburn-dvd.conf
[ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java)
[ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable
\"$JAVA_EXE\" not found" && exit 1
@@ -94,7 +94,7 @@
$IO_NICE $JAVA_EXE -Djava.awt.headless=true \
-jar $PROJECTX_JAR \
- -ini $CONFIG_PATH/ProjectX.ini \
+ -ini /etc/vdr/plugins/burn/ProjectX.ini \
$TTXT_OPTS \
$CUT -id $USED_TRACKS \
-demux -out "$MPEG_DATA_PATH" -name vdrsync \
@@ -245,15 +245,16 @@
echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}"
rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}"
echo "Creating "$RECORDING_DMH"/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_DMH"/dvd.vdr
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_DMH/dvd.vdr"
printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >>
"$RECORDING_DMH"/dvd.vdr
;;
archivemark)
echo "Creating $DVDAUTHOR_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
- ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1))
- printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
+ cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
+ ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1))
+ printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard"
+
;;
mkiso)
Index: vdr-burn.conf
===================================================================
RCS file: vdr-burn.conf
diff -N vdr-burn.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vdr-burn.conf 19 Feb 2013 18:53:02 -0000 1.3
@@ -0,0 +1,7 @@
+# Configuration snippet for vdr-burn -*- sh -*-
+#
+# Add command line options to pass to the burn plugin to PLUGIN_OPTIONS.
+# See /usr/share/doc/vdr-burn-*/README and "vdr --help" for info about
+# available options for this plugin.
+
+PLUGIN_OPTIONS="-d /tmp"
Index: vdr-burn.spec
===================================================================
RCS file: vdr-burn.spec
diff -N vdr-burn.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ vdr-burn.spec 19 Feb 2013 18:53:02 -0000 1.8
@@ -0,0 +1,262 @@
+%define pname burn
+%define gver 0.1.3
+
+Name: vdr-%{pname}
+Version: 0.2.1
+Release: 1%{?dist}
+Summary: DVD writing plugin for VDR
+
+Group: Applications/Multimedia
+# genindex is GPLv2+, rest GPL+
+License: GPL+ and GPLv2+
+URL: http://projects.vdr-developer.org/projects/plg-burn
+Source0:
http://projects.vdr-developer.org/attachments/download/832/%{name}-%{vers...
+Source1: %{name}.conf
+Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
+Patch0: %{name}-%{version}-config.patch
+
+BuildRequires: vdr-devel >= 1.7.30
+BuildRequires: boost-devel
+BuildRequires: gd-devel
+Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires: vdrsync
+Requires: ProjectX
+Requires: m2vrequantiser
+Requires: dvdauthor
+Requires: mjpegtools
+Requires: dvd+rw-tools
+Requires: dejavu-lgc-sans-fonts
+Conflicts: ProjectX < 0.90.4.00.b29
+
+%description
+This plugin enables VDR to write compliant DVDs from VDR recordings
+while being able to control the process and to watch progress from
+inside VDRs on-screen-display. If the selected recordings don't fit
+the DVD, the video tracks are requantized (shrinked) automatically.
+The created menus support multipage descriptions (in case the
+recording summary exceeds one page).
+
+
+%prep
+%setup -q -c -a 2
+
+cd burn-0.2.1
+find -name CVS | xargs rm -rf
+chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
+%patch0 -p0
+
+sed -i -e 's|/var/lib/vdr/|%{vdr_vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh
+sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c
+
+cd ../genindex-%{gver}
+sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile
+f=README ; iconv -f iso-8859-1 -t utf-8 -o ../README.genindex $f
+cd ..
+
+
+%build
+make -C burn-%{version} %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr
all
+make -C genindex-%{gver} %{?_smp_mflags}
+
+
+%install
+install -dm 755 $RPM_BUILD_ROOT%{vdr_plugindir}/bin
+install -pm 755 burn-%{version}/libvdr-%{pname}.so.%{vdr_apiversion}
$RPM_BUILD_ROOT%{vdr_plugindir}
+install -pm 755 burn-%{version}/*.sh genindex-%{gver}/genindex \
+ $RPM_BUILD_ROOT%{vdr_plugindir}/bin
+install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/skins
+cp -pR burn-%{version}/burn/* $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn
+rm -rf $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/{counters,fonts/*}
+ln -s %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf \
+ $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/fonts/
+install -Dpm 644 burn-%{version}/burn/counters/standard \
+ $RPM_BUILD_ROOT%{vdr_vardir}/burn/counters/standard
+install -Dpm 644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+
+
+%post
+if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0?
+ %{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \
+ %{vdr_configdir}/reccmds.conf >/dev/null 2>&1 || :
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%doc burn-%{version}/COPYING burn-%{version}/HISTORY burn-%{version}/README
README.genindex
+%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+%config(noreplace) %{vdr_configdir}/plugins/%{pname}/
+%{vdr_plugindir}/bin/genindex
+%{vdr_plugindir}/bin/vdrburn-archive.sh
+%{vdr_plugindir}/bin/vdrburn-dvd.sh
+%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
+%defattr(-,%{vdr_user},root)
+%config(noreplace) %{vdr_vardir}/burn/
+
+
+%changelog
+* Mon Feb 18 2013 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.1-1
+- rebuild for new release
+- specfile cleanups
+
+* Thu Oct 11 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-3
+- rebuild for Fedora 18.
+
+* Wed Oct 10 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-2
+- removed vdrsync Requirenment
+- removed no-subtitle patch
+
+* Sun Oct 07 2012 Martin Gansser <linux4martin(a)gmx.de> - 0.2.0-1
+- spec file cleanup
+- rebuild for new release
+- Adapt to VDR 1.7.30.
+- added priority header patch for Fedora 18.
+
+* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.0-0.20.pre21
+- Rebuilt for c++ ABI breakage
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.1.0-0.19.pre21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Mar 27 2009 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.18.pre21
+- and again
+
+* Sat Jan 03 2009 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.17.pre21
+- fixed font deps (once again)
+
+* Mon Dec 15 2008 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.16.pre21
+- fixed dejavu-lgc-* deps
+
+* Thu Nov 27 2008 Felix Kaechele <felix at fetzig dot org> - 0.1.0-0.15.pre21
+- rebuilt due to path adjustments in vdr main package
+
+* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info -
0.1.0-0.14.pre21
+- rebuild
+
+* Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.13.pre21
+- Use UTF-8 with VDR 1.6.x.
+- Disable subtitles with VDR 1.6.x and ProjectX by default (demux problems).
+
+* Tue Apr 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.12.pre21
+- Patch to fix build with GCC 4.3's cleaned up C++ headers.
+
+* Tue Apr 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.11.pre21
+- Rebuild for VDR 1.6.0.
+
+* Sat Dec 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.10.pre21
+- Use /dev/dvdrw as the default writer device, udev >= 115 no longer creates
+ /dev/dvdwriter.
+
+* Sun Nov 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.9.pre21
+- Adjust font paths for dejavu-lgc-fonts 2.21+.
+- Drop old gd-devel missing dependency workaround.
+
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.8.pre21
+- Use DejaVu LGC fonts instead of Bitstream Vera.
+- Improve comments in burn.conf.
+- License: GPL+ and GPLv2+
+
+* Sun Jan 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.7.pre21
+- Rebuild for VDR 1.4.5.
+
+* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.1.0-0.6.pre21
+- 0.1.0-pre21, include private copy of genindex (0.1.3) for now.
+
+* Sat Nov 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-16
+- Rebuild for VDR 1.4.4.
+
+* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.0.009-15
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-14
+- Rebuild for VDR 1.4.3.
+
+* Sun Aug 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-13
+- Rebuild for VDR 1.4.1-3.
+
+* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-12
+- Rebuild for VDR 1.4.1.
+
+* Sun Apr 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-11
+- Rebuild for VDR 1.4.0.
+
+* Mon Apr 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-10
+- Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi).
+- Trim pre-RLO %%changelog entries.
+
+* Sun Mar 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-9
+- Rebuild for VDR 1.3.45.
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.0.009-8
+- drop 0.lvn
+
+* Wed Mar 1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.8
+- Decrease default DVD size to 4420 to accommodate more requant inaccuracy.
+- Rebuild for VDR 1.3.44.
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Sun Feb 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.7
+- Rebuild for VDR 1.3.43.
+
+* Sun Feb 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.6
+- Rebuild for VDR 1.3.42.
+
+* Sun Jan 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.5
+- Rebuild for VDR 1.3.40.
+
+* Sun Jan 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.4
+- Rebuild for VDR 1.3.39.
+
+* Sun Jan 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.3
+- Rebuild for VDR 1.3.38.
+
+* Sat Dec 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.2
+- Q'n'd fix for ISO creation with recordings whose title contain "/".
+- Fix storing of the "clean up after # jobs" configuration option.
+- Don't chmod everything in results to 0777 in author only mode.
+- Use tcmplex-panteltje by default again.
+- Translation improvements.
+- Fix up some paths in README.
+- Ship TODO.
+
+* Sun Nov 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.009-0.lvn.1
+- 0.0.009 + Finnish translations from Rolf Ahrenberg, config patch
+ applied upstream.
+
+* Sat Nov 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.007-0.lvn.1
+- 0.0.007, endstatus and burndefault patches applied/obsoleted upstream.
+
+* Sun Nov 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6k-0.lvn.2
+- Rebuild for VDR 1.3.36.
+
+* Tue Nov 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6k-0.lvn.1
+- 0.0.6k, commands and VDR >= 1.3.25 patches applied upstream.
+- Improve default burn settings.
+- Fix burn status at end when not verifying.
+
+* Mon Oct 3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.8.pre3
+- Rebuild for VDR 1.3.34.
+
+* Sun Sep 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.7.pre3
+- Rebuild for VDR 1.3.33.
+
+* Sun Sep 11 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.6.pre3
+- Rebuild for VDR 1.3.32.
+
+* Tue Aug 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.5.pre3
+- Rebuild for VDR 1.3.31.
+
+* Sun Aug 21 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.4.pre3
+- Rebuild for VDR 1.3.30.
+
+* Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.0.6g-1.lvn.3.pre3
+- Redirected vdr-config invocation standard error to /dev/null
+
+* Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.2.pre3
+- Try to avoid build system problems by not using %%expand with vdr-config.
+
+* Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3
+- Update URLs.
--- dead.package DELETED ---