rpms/vdr-burn/F-18 vdr-burn-0.2.2-config.patch, 1.1, 1.2 vdr-burn.spec, 1.14, 1.15 vdr-burn-0.2.2-Makefile.patch, 1.1, NONE
Martin Gansser
martinkg at rpmfusion.org
Tue Jun 11 19:09:45 CEST 2013
Author: martinkg
Update of /cvs/free/rpms/vdr-burn/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9056/F-18
Modified Files:
vdr-burn-0.2.2-config.patch vdr-burn.spec
Removed Files:
vdr-burn-0.2.2-Makefile.patch
Log Message:
vdr-burn-0.2.2-config.patch:
Makefile | 4 ++--
README | 4 ++--
burn/vdrburn-dvd.conf | 2 +-
chain-archive.c | 2 +-
jobs.c | 2 +-
vdrburn-archive.sh | 6 +++---
vdrburn-dvd.sh | 11 ++++++-----
7 files changed, 16 insertions(+), 15 deletions(-)
Index: vdr-burn-0.2.2-config.patch
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-18/vdr-burn-0.2.2-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr-burn-0.2.2-config.patch 23 Feb 2013 14:34:10 -0000 1.1
+++ vdr-burn-0.2.2-config.patch 11 Jun 2013 17:09:44 -0000 1.2
@@ -1,24 +1,17 @@
-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 @@
+diff -up burn-0.2.2/burn/vdrburn-dvd.conf~ burn-0.2.2/burn/vdrburn-dvd.conf
+--- burn-0.2.2/burn/vdrburn-dvd.conf~ 2011-10-08 15:28:55.000000000 +0300
++++ burn-0.2.2/burn/vdrburn-dvd.conf 2013-02-24 23:51:46.936031051 +0200
+@@ -1,5 +1,5 @@
+ # settings for vdrburn-dvd.sh
+
+ # Java and Project X
+-#export JAVA_EXE=/usr/bin/java
++export JAVA_EXE=/usr/bin/java
+ export PROJECTX_JAR=/usr/share/java/ProjectX.jar
+diff -up burn-0.2.2/chain-archive.c~ burn-0.2.2/chain-archive.c
+--- burn-0.2.2/chain-archive.c~ 2006-09-16 21:33:36.000000000 +0300
++++ burn-0.2.2/chain-archive.c 2013-02-24 23:51:46.936031051 +0200
+@@ -64,7 +64,7 @@ namespace vdr_burn
bind( &recording::get_graft_point, _2 ),
" "
)));
@@ -27,14 +20,10 @@
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 @@
+diff -up burn-0.2.2/jobs.c~ burn-0.2.2/jobs.c
+--- burn-0.2.2/jobs.c~ 2011-10-04 19:25:45.000000000 +0300
++++ burn-0.2.2/jobs.c 2013-02-24 23:51:46.936031051 +0200
+@@ -436,7 +436,7 @@ namespace vdr_burn
std::string job::get_archive_id()
{
std::string archive_id = "";
@@ -43,58 +32,80 @@
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 @@
+diff -up burn-0.2.2/Makefile~ burn-0.2.2/Makefile
+--- burn-0.2.2/Makefile~ 2013-02-21 12:04:10.000000000 +0200
++++ burn-0.2.2/Makefile 2013-02-24 23:51:13.517432291 +0200
+@@ -126,7 +126,7 @@ TMPDIR=/tmp
+ endif
+
+ ifndef DVDDEV
+-DVDDEV=/dev/dvdrw
++DVDDEV=/dev/cdrom
+ endif
+
+ ifndef ISODIR
+@@ -134,7 +134,7 @@
+ endif
+
+ ### compile only with ttxtsub support if core VDR is patched
+-ifneq ($(strip $(wildcard $(VDRDIR)/vdrttxtsubshooks.h)),)
++ifneq ($(strip $(wildcard /usr/include/vdr/vdrttxtsubshooks.h)),)
+ DEFINES += -DTTXT_SUBTITLES
+ endif
+
+diff -up burn-0.2.2/README~ burn-0.2.2/README
+--- burn-0.2.2/README~ 2011-12-28 18:18:15.000000000 +0200
++++ burn-0.2.2/README 2013-02-24 23:51:46.937031069 +0200
+@@ -77,7 +77,7 @@ Installation
+
+ 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/cdrom) and ISODIR (default: video dir)
+
+ # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins
+
+@@ -119,7 +119,7 @@ The plugin accepts the following paramet
+ -d DIR, --datadir=DIR use DIR for temporary datafiles
+ (default: /var/spool/video)
+ -D DEV --dvd=DEV use DEV as DVD Writer
+- (default: /dev/dvdrw)
++ (default: /dev/cdrom)
+ -i DIR --iso=DIR use DIR to store ISO images
+ (default: /pub/export)
+
+diff -up burn-0.2.2/vdrburn-archive.sh~ burn-0.2.2/vdrburn-archive.sh
+--- burn-0.2.2/vdrburn-archive.sh~ 2011-10-10 21:59:47.000000000 +0300
++++ burn-0.2.2/vdrburn-archive.sh 2013-02-24 23:51:46.937031069 +0200
+@@ -53,7 +53,7 @@ case $1 in
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"
++ 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 @@
+@@ -66,8 +66,8 @@ case $1 in
;;
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))
++ ((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 @@
+diff -up burn-0.2.2/vdrburn-dvd.sh~ burn-0.2.2/vdrburn-dvd.sh
+--- burn-0.2.2/vdrburn-dvd.sh~ 2011-10-10 21:59:34.000000000 +0300
++++ burn-0.2.2/vdrburn-dvd.sh 2013-02-24 23:51:46.937031069 +0200
+@@ -245,15 +245,15 @@ case $1 in
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"
++ 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
;;
@@ -106,8 +117,19 @@
+ 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)
-
+diff -up burn-0.2.2/vdrburn-dvd.sh~ burn-0.2.2/vdrburn-dvd.sh
+--- burn-0.2.2/vdrburn-dvd.sh~ 2011-10-10 21:59:34.000000000 +0300
++++ burn-0.2.2/vdrburn-dvd.sh 2013-03-17 02:27:44.741667614 +0200
+@@ -93,7 +93,8 @@ case $1 in
+ fi
+
+ $IO_NICE $JAVA_EXE -Djava.awt.headless=true \
+- -jar $PROJECTX_JAR \
++ -cp $PROJECTX_JAR:$(build-classpath apache-commons-net jakarta-oro) \
++ net.sourceforge.dvb.projectx.common.Start \
+ -ini $CONFIG_PATH/ProjectX.ini \
+ $TTXT_OPTS \
+ $CUT -id $USED_TRACKS \
Index: vdr-burn.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-burn/F-18/vdr-burn.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vdr-burn.spec 23 Apr 2013 09:11:20 -0000 1.14
+++ vdr-burn.spec 11 Jun 2013 17:09:44 -0000 1.15
@@ -1,32 +1,32 @@
-%define pname burn
-%define gver 0.1.3
+%global gver 0.1.3
+%global pname burn
+%global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$
Name: vdr-%{pname}
Version: 0.2.2
-Release: 2%{?dist}
+Release: 5%{?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}-%{version}.tgz
+Source0: http://projects.vdr-developer.org/attachments/download/1252/%{name}-%{version}.tgz
Source1: %{name}.conf
Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz
-Patch0: %{name}-%{version}-config.patch
-Patch1: %{name}-%{version}-Makefile.patch
+Patch0: %{name}-0.2.2-config.patch
-BuildRequires: vdr-devel >= 1.7.31
+BuildRequires: vdr-devel >= 1.7.38
BuildRequires: boost-devel
-BuildRequires: gd-devel
+BuildRequires: gd-devel >= 2.0.33-9.3
+BuildRequires: gettext
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
-Requires: ProjectX
+Requires: ProjectX >= 0.90.4.00.b29
Requires: m2vrequantiser
Requires: dvdauthor
Requires: mjpegtools
Requires: dvd+rw-tools
-Requires: dejavu-lgc-sans-fonts
-Conflicts: ProjectX < 0.90.4.00.b29
+Requires: dejavu-sans-fonts
+Requires: pxsup2dast
%description
This plugin enables VDR to write compliant DVDs from VDR recordings
@@ -40,14 +40,13 @@
%prep
%setup -q -c -a 2
-cd burn-0.2.2
-find -name CVS | xargs rm -rf
-chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README
-%patch0 -p0
-%patch1 -p1
+mv %{pname}-%{version} burn ; cd burn
+
+%patch0 -p1
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
+
+sed -i -e 's|"Vera"|"DejaVuSans"|g' skins.c
cd ../genindex-%{gver}
sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile
@@ -56,52 +55,44 @@
%build
-make -C burn-%{version} %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -fPIC" LIBDIR=. VDRDIR=. LOCALEDIR=./locale all
+# main build not parallel clean (libvdr-burn.so -> proctools/libproctools.a)
+make -C burn ISODIR=%{vdr_videodir} 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}/libvdr-%{pname}.so $RPM_BUILD_ROOT%{vdr_plugindir}/libvdr-%{pname}.so.%{vdr_apiversion}
-install -pm 755 burn-%{version}/*.sh genindex-%{gver}/genindex \
- $RPM_BUILD_ROOT%{vdr_plugindir}/bin
+%make_install -C burn
+install -dm 755 $RPM_BUILD_ROOT%{vdr_libdir}/bin
+install -pm 755 burn/*.sh genindex-%{gver}/genindex \
+ $RPM_BUILD_ROOT%{vdr_libdir}/bin
install -dm 755 $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/skins
-cp -pR burn-%{version}/burn/* $RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn
+cp -pR burn/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 \
+ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf \
$RPM_BUILD_ROOT%{vdr_configdir}/plugins/burn/fonts/
-install -Dpm 644 burn-%{version}/burn/counters/standard \
+install -Dpm 644 burn/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
-
-# locale
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
-cp -pR burn-%{version}/locale/* $RPM_BUILD_ROOT%{_datadir}/locale
-
%find_lang %{name}
-%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 -f %{name}.lang
-%defattr(-,root,root,-)
-%doc burn-%{version}/COPYING burn-%{version}/HISTORY burn-%{version}/README README.genindex
+%doc burn/COPYING burn/HISTORY burn/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}
+%{vdr_libdir}/bin/genindex
+%{vdr_libdir}/bin/vdrburn-archive.sh
+%{vdr_libdir}/bin/vdrburn-dvd.sh
+%{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion}
%defattr(-,%{vdr_user},root)
-%config(noreplace) %{vdr_vardir}/%{pname}
-
+%config(noreplace) %{vdr_vardir}/burn/
+%defattr(-,root,root,-)
%changelog
+* Sun Apr 28 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.2.2-3
+- https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Mon Apr 22 2013 Martin Gansser <martinkg at fedoraproject.org> - 0.2.2-2
- added Makefile locale fix
- changed build option for new plugin Makefile
@@ -179,7 +170,7 @@
* 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
+* 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
@@ -260,7 +251,7 @@
- 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.
+- 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.
@@ -276,3 +267,4 @@
* Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3
- Update URLs.
+
--- vdr-burn-0.2.2-Makefile.patch DELETED ---
More information about the rpmfusion-commits
mailing list