7:48 p.m.
Author: thl
Update of /cvs/free/rpms/vdr-burn/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26822
Modified Files:
.cvsignore sources
Added Files:
vdr-burn-0.1.0-pre21-config.patch
vdr-burn-0.1.0-pre21-finnish.patch vdr-burn.conf vdr-burn.spec
Log Message:
initial import from livna
vdr-burn-0.1.0-pre21-config.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-config.patch ---
Index: Makefile
===================================================================
RCS file: /var/cvsroot/burn/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 1 Oct 2006 21:26:44 -0000 1.23
+++ Makefile 12 Dec 2006 20:31:14 -0000
@@ -81,11 +81,11 @@
endif
ifndef DVDDEV
-DVDDEV=/dev/dvd
+DVDDEV=/dev/dvdrw
endif
ifndef ISODIR
-ISODIR=/pub/export
+ISODIR=$(shell vdr-config --videodir)
endif
DEFINES += -DTMPDIR='"$(TMPDIR)"'
-DDVDDEV='"$(DVDDEV)"' -DISODIR='"$(ISODIR)"'
Index: README
===================================================================
RCS file: /var/cvsroot/burn/README,v
retrieving revision 1.11
diff -u -r1.11 README
--- README 16 Sep 2006 19:37:54 -0000 1.11
+++ README 12 Dec 2006 20:31:14 -0000
@@ -92,7 +92,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/dvd) and ISODIR (default: /pub/export)
+ DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir)
vdr-1.4.2 # 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
===================================================================
RCS file: /var/cvsroot/burn/vdrburn-archive.sh,v
retrieving revision 1.5
diff -u -r1.5 vdrburn-archive.sh
--- vdrburn-archive.sh 24 Oct 2006 17:46:27 -0000 1.5
+++ vdrburn-archive.sh 12 Dec 2006 20:31:14 -0000
@@ -43,12 +43,12 @@
;;
recordingmark)
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr"
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr"
;;
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
===================================================================
RCS file: /var/cvsroot/burn/vdrburn-dvd.sh,v
retrieving revision 1.23
diff -u -r1.23 vdrburn-dvd.sh
--- vdrburn-dvd.sh 24 Oct 2006 17:46:27 -0000 1.23
+++ vdrburn-dvd.sh 12 Dec 2006 20:31:14 -0000
@@ -29,11 +29,11 @@
# as $MPEG_TMP_PATH)
if [ -z $JAVA_HOME ]; then
- export JAVA_HOME=/opt/j2re1.4.2
+ export JAVA_HOME=/usr/lib/jvm/jre
fi
if [ -z $PROJECTX_HOME ]; then
- export PROJECTX_HOME=/opt/ProjectX
+ export PROJECTX_HOME=/usr/share/java
fi
# Some versions of growisofs refuse to start when run with sudo, and may
@@ -61,7 +61,7 @@
CUT="-cut"
fi
- vdrsync.pl -o "$MPEG_TMP_PATH" \
+ vdrsync -o "$MPEG_TMP_PATH" \
-v-filter "burn-buffers" \
-a-filter "burn-buffers" \
-ac3-filter "burn-buffers" \
@@ -197,15 +197,15 @@
echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}"
rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}"
echo "Creating $RECORDING_PATH/dvd.vdr"
- cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr"
+ cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr"
printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >>
"$RECORDING_PATH/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)
vdr-burn-0.1.0-pre21-finnish.patch:
--- NEW FILE vdr-burn-0.1.0-pre21-finnish.patch ---
Index: i18n.c
===================================================================
RCS file: /var/cvsroot/burn/i18n.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- i18n.c 16 Sep 2006 18:33:36 -0000 1.38
+++ i18n.c 16 Sep 2006 22:08:38 -0000 1.39
@@ -2,7 +2,7 @@
* See the files COPYING and README for copyright information and how to reach
* the author.
*
- * $Id: i18n.c,v 1.38 2006/09/16 18:33:36 lordjaxom Exp $
+ * $Id: i18n.c,v 1.39 2006/09/16 22:08:38 lordjaxom Exp $
*/
#include "i18n.h"
@@ -322,7 +322,7 @@
"",
"",
"",
- "",
+ "(joudutaan pienentämään)",
"",
"",
"",
@@ -3260,7 +3260,7 @@
"",
"",
"",
- "Ohita tyhjä päävalikko",
+ "Ohita tyhjä nimikevalikko",
"",
"",
"",
@@ -3286,7 +3286,7 @@
"",
"",
"",
- "Tarjoa päävalikon ohitusta",
+ "Tarjoa nimikevalikon ohitusta",
"",
"",
"",
@@ -3312,7 +3312,7 @@
"",
"",
"",
- "",
+ "Tehtävän asetukset",
"",
"",
"",
@@ -3338,7 +3338,7 @@
"",
"",
"",
- "",
+ "Ohita lyhyt päävalikko",
"",
"",
"",
@@ -3364,7 +3364,7 @@
"",
"",
"",
- "",
+ "Tarjoa päävalikon ohitusta",
"",
"",
"",
--- NEW FILE vdr-burn.conf ---
# 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"
--- NEW FILE vdr-burn.spec ---
# TODO: disksize 4420? 4462 was too big sometimes with 0.0.x
%define pname burn
%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR)
%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR)
%define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR)
%define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR)
%define vdruser %(vdr-config --user 2>/dev/null || echo ERROR)
%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR)
%define pre pre21
%define gver 0.1.3
Name: vdr-%{pname}
Version: 0.1.0
Release: 0.9.%{pre}%{?dist}.2
Summary: DVD writing plugin for VDR
Group: Applications/Multimedia
# genindex is GPLv2+, rest GPL+
License: GPL+ and GPLv2+
URL: http://www.xeatre.tv/community/burn/
Source0: http://linux.kompiliert.net/contrib/%{name}-%{version}-%{pre}.tgz
Source1: %{name}.conf
Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
Patch0: %{name}-%{version}-pre21-config.patch
Patch1:
http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-burn-cvs-subpicture-id...
Patch2: %{name}-%{version}-pre21-finnish.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: vdr-devel >= 1.3.47
BuildRequires: boost-devel
BuildRequires: gd-devel >= 2.0.33-9.3
Requires: vdr(abi) = %{apiver}
Requires: vdrsync
Requires: m2vrequantiser
Requires: dvdauthor
Requires: mjpegtools
Requires: dvd+rw-tools
Requires: dejavu-lgc-fonts
%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
find -name CVS | xargs rm -rf
chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
%patch0
%patch1
%patch2
sed -i -e 's|/var/lib/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 %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all
make -C genindex-%{gver} %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin
install -pm 755 burn/libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
install -pm 755 burn/*.sh burn/burn-buffers genindex-%{gver}/genindex \
$RPM_BUILD_ROOT%{plugindir}/bin
install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/burn/skins
cp -pR burn/burn/* $RPM_BUILD_ROOT%{configdir}/plugins/burn
rm -rf $RPM_BUILD_ROOT%{configdir}/plugins/burn/{counters,fonts/*}
ln -s %{_datadir}/fonts/dejavu-lgc/DejaVuLGCSans.ttf \
$RPM_BUILD_ROOT%{configdir}/plugins/burn/fonts/
install -Dpm 644 burn/burn/counters/standard \
$RPM_BUILD_ROOT%{vardir}/burn/counters/standard
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0?
%{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \
%{configdir}/reccmds.conf >/dev/null 2>&1 || :
fi
%files
%defattr(-,root,root,-)
%doc burn/COPYING burn/HISTORY burn/README README.genindex
%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
%config(noreplace) %{configdir}/plugins/%{pname}/
%{plugindir}/bin/burn-buffers
%{plugindir}/bin/genindex
%{plugindir}/bin/vdrburn-archive.sh
%{plugindir}/bin/vdrburn-dvd.sh
%{plugindir}/libvdr-%{pname}.so.%{apiver}
%defattr(-,%{vdruser},root)
%config(noreplace) %{vardir}/burn/
%changelog
* Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info -
0.1.0-0.9.pre21.2
- rebuild
* Sat Dec 1 2007 Ville SkyttÀ <ville.skytta at iki.fi> - 0.1.0-0.8.pre21.2
- Use /dev/dvdrw as the default writer device, udev >= 115 no longer creates
/dev/dvdwriter.
- 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:56:12 -0000 1.1
+++ .cvsignore 4 Aug 2008 19:48:24 -0000 1.2
@@ -0,0 +1,3 @@
+vdr-burn-0.1.0-pre21.tgz
+genindex-0.1.3.tar.gz
+vdr-burn-cvs-subpicture-id.diff.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:56:12 -0000 1.1
+++ sources 4 Aug 2008 19:48:24 -0000 1.2
@@ -0,0 +1,3 @@
+11217a15e753b7affaf663a0446e22bb vdr-burn-0.1.0-pre21.tgz
+da67b1ae819bf9c064af49ab64dbf27b genindex-0.1.3.tar.gz
+18a484732c6eade746852642d882ed66 vdr-burn-cvs-subpicture-id.diff.gz