[SCM] vdr-plugin-burn packaging repository branch, master, updated. debian/0.2.0-2-4-g9e8cfc8
etobi
git at e-tobi.net
Sun Mar 24 15:14:21 UTC 2013
The following commit has been merged in the master branch:
commit 9e8cfc8b40f901b70f5ef1905f187309d55e3a98
Author: etobi <git at e-tobi.net>
Date: Sun Mar 24 16:09:59 2013 +0100
Updated patches - synced with yaVDR
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/patches/01_genisoimage.patch b/debian/patches/01_genisoimage.patch
index 69f9243..88a421e 100644
--- a/debian/patches/01_genisoimage.patch
+++ b/debian/patches/01_genisoimage.patch
@@ -1,6 +1,8 @@
---- vdr-plugin-burn-0.2.0~beta6.orig/vdrburn-dvd.sh
-+++ vdr-plugin-burn-0.2.0~beta6/vdrburn-dvd.sh
-@@ -247,7 +247,7 @@ case $1 in
+Index: vdr-plugin-burn/vdrburn-dvd.sh
+===================================================================
+--- vdr-plugin-burn.orig/vdrburn-dvd.sh 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/vdrburn-dvd.sh 2013-03-24 16:11:24.000000000 +0100
+@@ -257,7 +257,7 @@
;;
mkiso)
@@ -9,7 +11,7 @@
;;
burndir)
-@@ -260,7 +260,7 @@ case $1 in
+@@ -270,7 +270,7 @@
;;
pipeiso)
@@ -18,9 +20,11 @@
| tee "$ISO_FILE" > "$ISO_PIPE"
;;
---- vdr-plugin-burn-0.2.0~beta6.orig/vdrburn-archive.sh
-+++ vdr-plugin-burn-0.2.0~beta6/vdrburn-archive.sh
-@@ -14,7 +14,7 @@ echo "Script invokation: $*"
+Index: vdr-plugin-burn/vdrburn-archive.sh
+===================================================================
+--- vdr-plugin-burn.orig/vdrburn-archive.sh 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/vdrburn-archive.sh 2013-03-24 16:11:24.000000000 +0100
+@@ -14,7 +14,7 @@
case $1 in
mkiso)
@@ -29,7 +33,7 @@
-graft-points $GRAFT_POINTS >"$ISO_FILE"
;;
-@@ -29,7 +29,7 @@ case $1 in
+@@ -29,7 +29,7 @@
;;
pipeiso)
diff --git a/debian/patches/02_projectx.patch b/debian/patches/02_projectx.patch
deleted file mode 100644
index a0be2e8..0000000
--- a/debian/patches/02_projectx.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- vdr-plugin-burn-0.2.0~beta6.orig/vdrburn-dvd.sh
-+++ vdr-plugin-burn-0.2.0~beta6/vdrburn-dvd.sh
-@@ -61,13 +61,6 @@ set -e
-
-
-
--if [ -z $JAVA_HOME ]; then
-- export JAVA_HOME=/opt/j2re1.4.2
--fi
--
--if [ -z $PROJECTX_HOME ]; then
-- export PROJECTX_HOME=/opt/ProjectX
--fi
-
- # Some versions of growisofs refuse to start when run with sudo, and may
- # misdetect this condition if vdr itself is started from a sudo session.
-@@ -97,8 +90,7 @@ case $1 in
- CUT="-cut $MPEG_DATA_PATH/px.cut"
- fi
-
-- $IO_NICE $JAVA_HOME/bin/java -Djava.awt.headless=true \
-- -jar $PROJECTX_HOME/ProjectX.jar \
-+ $IO_NICE /usr/bin/projectx \
- -ini $CONFIG_PATH/ProjectX.ini \
- $TTXT_OPTS \
- $CUT -id $USED_TRACKS \
diff --git a/debian/patches/03_default-requantizer.patch b/debian/patches/03_default-requantizer.patch
index 3159789..5230141 100644
--- a/debian/patches/03_default-requantizer.patch
+++ b/debian/patches/03_default-requantizer.patch
@@ -1,6 +1,8 @@
---- vdr-plugin-burn-0.2.0~beta6.orig/setup.c
-+++ vdr-plugin-burn-0.2.0~beta6/setup.c
-@@ -91,7 +91,7 @@ bool cBurnParameters::ProcessArgs(int ar
+Index: vdr-plugin-burn/setup.c
+===================================================================
+--- vdr-plugin-burn.orig/setup.c 2013-03-24 15:59:47.000000000 +0100
++++ vdr-plugin-burn/setup.c 2013-03-24 16:11:04.000000000 +0100
+@@ -91,7 +91,7 @@
PROCTOOLS_INIT_PROPERTY( RemovePath, false ),
PROCTOOLS_INIT_PROPERTY( CustomDiskSize, 200 ),
PROCTOOLS_INIT_PROPERTY( BurnSpeed, 0 ),
diff --git a/debian/patches/04_burn-set-pathes.patch b/debian/patches/04_burn-set-pathes.patch
index 51707f1..0ee1653 100644
--- a/debian/patches/04_burn-set-pathes.patch
+++ b/debian/patches/04_burn-set-pathes.patch
@@ -1,6 +1,8 @@
---- vdr-plugin-burn-0.2.0~beta6.orig/chain-archive.c
-+++ vdr-plugin-burn-0.2.0~beta6/chain-archive.c
-@@ -69,7 +69,7 @@ namespace vdr_burn
+Index: vdr-plugin-burn/chain-archive.c
+===================================================================
+--- vdr-plugin-burn.orig/chain-archive.c 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/chain-archive.c 2013-03-24 16:11:04.000000000 +0100
+@@ -69,7 +69,7 @@
switch (get_job().get_store_mode()) {
case storemode_create:
{
@@ -9,7 +11,7 @@
burn->put_environment("ISO_FILE", get_job().get_iso_path());
burn->put_environment("GRAFT_POINTS", graftPoints);
burn->put_environment("DISC_ID", get_job().get_volume_id());
-@@ -79,7 +79,7 @@ namespace vdr_burn
+@@ -79,7 +79,7 @@
case storemode_burn:
{
@@ -18,7 +20,7 @@
burn->put_environment("DVD_DEVICE", BurnParameters.DvdDevice);
burn->put_environment("GRAFT_POINTS", graftPoints);
burn->put_environment("BURN_SPEED", global_setup().BurnSpeed);
-@@ -93,7 +93,7 @@ namespace vdr_burn
+@@ -93,7 +93,7 @@
string fifo = format("{0}/burnfifo") % get_paths().temp;
make_fifo(fifo);
@@ -27,7 +29,7 @@
pipe->put_environment("CONFIG_PATH", plugin::get_config_path());
pipe->put_environment("GRAFT_POINTS", graftPoints);
pipe->put_environment("ISO_FILE", get_job().get_iso_path());
-@@ -101,7 +101,7 @@ namespace vdr_burn
+@@ -101,7 +101,7 @@
pipe->put_environment("DISC_ID", get_job().get_volume_id());
add_process(pipe);
@@ -36,7 +38,7 @@
burn->put_environment("DVD_DEVICE", BurnParameters.DvdDevice);
burn->put_environment("ISO_PIPE", fifo);
burn->put_environment("BURN_SPEED", global_setup().BurnSpeed);
-@@ -114,7 +114,7 @@ namespace vdr_burn
+@@ -114,7 +114,7 @@
bool chain_archive::prepare_recording_mark()
{
@@ -45,7 +47,7 @@
recordingmark->put_environment("RECORDING_PATH", m_current->get_filename());
recordingmark->put_environment("CONFIG_PATH", plugin::get_config_path());
-@@ -124,7 +124,7 @@ namespace vdr_burn
+@@ -124,7 +124,7 @@
bool chain_archive::prepare_archive_mark()
{
@@ -54,8 +56,10 @@
archivemark->put_environment("CONFIG_PATH", plugin::get_config_path());
add_process(archivemark);
---- vdr-plugin-burn-0.2.0~beta6.orig/common.h
-+++ vdr-plugin-burn-0.2.0~beta6/common.h
+Index: vdr-plugin-burn/common.h
+===================================================================
+--- vdr-plugin-burn.orig/common.h 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/common.h 2013-03-24 16:11:04.000000000 +0100
@@ -18,6 +18,9 @@
#define JOBNAMELEN 255
#define MAXATRACKS (MAXAPIDS + MAXDPIDS)
@@ -66,9 +70,11 @@
class cRecording;
namespace vdr_burn
---- vdr-plugin-burn-0.2.0~beta6.orig/chain-dvd.c
-+++ vdr-plugin-burn-0.2.0~beta6/chain-dvd.c
-@@ -259,7 +259,7 @@ namespace vdr_burn
+Index: vdr-plugin-burn/chain-dvd.c
+===================================================================
+--- vdr-plugin-burn.orig/chain-dvd.c 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/chain-dvd.c 2013-03-24 16:11:04.000000000 +0100
+@@ -258,7 +258,7 @@
prepare_demux();
// start authoring
@@ -77,7 +83,7 @@
make_dir(xml.get_author_path());
author->put_environment("DVDAUTHOR_XML", xml.get_xml_path());
author->put_environment("DVDAUTHOR_PATH", xml.get_author_path());
-@@ -274,7 +274,7 @@ namespace vdr_burn
+@@ -274,7 +274,7 @@
m_pxAudioIndex = 0;
// processes
@@ -86,7 +92,7 @@
demux->put_environment("RECORDING_PATH", m_currentRecording->get_filename());
demux->put_environment("IGNORE_TRACKS", m_currentRecording->get_ignored_cids());
demux->put_environment("USED_TRACKS", m_currentRecording->get_used_cids());
-@@ -301,7 +301,7 @@ namespace vdr_burn
+@@ -301,7 +301,7 @@
else
requant_call = "lxrequant";
@@ -95,7 +101,7 @@
requant->put_environment("VIDEO_FILE", m_currentRecording->get_video_track_path());
requant->put_environment("REQUANT_FILE", m_currentRecording->get_requant_path());
requant->put_environment("REQUANT_FACTOR", get_job().get_requant_factor());
-@@ -315,7 +315,7 @@ namespace vdr_burn
+@@ -315,7 +315,7 @@
const_track_filter::iterator subtitleTrack = subtitleTracks.begin();
while (subtitleTrack != subtitleTracks.end()) {
make_fifo( m_currentRecording->get_subtitle_path(subtitletrack_no) );
@@ -104,7 +110,7 @@
subtitle->put_environment("NUMBER", subtitletrack_no);
if (subtitleTrack->subtitle.type == track_info::subtitletype_teletext)
subtitle->put_environment("TTXTPAGE", subtitleTrack->subtitle.teletextpage);
-@@ -331,7 +331,7 @@ namespace vdr_burn
+@@ -331,7 +331,7 @@
subtitletrack_no++;
}
@@ -113,7 +119,7 @@
mplex->put_environment("MOVIE_FILE",
subtitleTracks.begin() != subtitleTracks.end()
? m_currentRecording->get_subtitle_path(0)
-@@ -407,7 +407,7 @@ namespace vdr_burn
+@@ -407,7 +407,7 @@
switch (get_job().get_store_mode()) {
case storemode_create:
{
@@ -122,7 +128,7 @@
burn->put_environment("DVDAUTHOR_PATH",
dvdauthor_xml::get_author_path(get_job()));
burn->put_environment("ISO_FILE", get_job().get_iso_path());
-@@ -418,7 +418,7 @@ namespace vdr_burn
+@@ -418,7 +418,7 @@
case storemode_burn:
{
@@ -131,7 +137,7 @@
burn->put_environment("DVDAUTHOR_PATH", dvdauthor_xml::get_author_path(get_job()));
burn->put_environment("DVD_DEVICE", BurnParameters.DvdDevice);
burn->put_environment("BURN_SPEED", global_setup().BurnSpeed);
-@@ -433,14 +433,14 @@ namespace vdr_burn
+@@ -433,14 +433,14 @@
fifofmt % get_paths().temp;
make_fifo( fifofmt.str() );
@@ -148,7 +154,7 @@
burn->put_environment("DVD_DEVICE", BurnParameters.DvdDevice);
burn->put_environment("ISO_PIPE", fifofmt.str());
burn->put_environment("BURN_SPEED", global_setup().BurnSpeed);
-@@ -507,7 +507,7 @@ namespace vdr_burn
+@@ -511,7 +511,7 @@
#ifdef ENABLE_DMH_ARCHIVE
bool chain_dvd::prepare_dmh_archive()
{
@@ -157,7 +163,7 @@
dmharchive->put_environment("DVDAUTHOR_PATH", dvdauthor_xml::get_author_path(get_job()));
dmharchive->put_environment("RECORDING_PATH", m_currentRecording->get_filename());
dmharchive->put_environment("TEMP_PATH", m_currentRecording->get_paths().temp);
-@@ -522,7 +522,7 @@ namespace vdr_burn
+@@ -526,7 +526,7 @@
bool chain_dvd::prepare_archive_mark()
{
@@ -166,9 +172,11 @@
archivemark->put_environment("DVDAUTHOR_PATH", dvdauthor_xml::get_author_path(get_job()));
archivemark->put_environment("CONFIG_PATH", plugin::get_config_path());
---- vdr-plugin-burn-0.2.0~beta6.orig/render.c
-+++ vdr-plugin-burn-0.2.0~beta6/render.c
-@@ -101,7 +101,7 @@ namespace vdr_burn
+Index: vdr-plugin-burn/render.c
+===================================================================
+--- vdr-plugin-burn.orig/render.c 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/render.c 2013-03-24 16:11:04.000000000 +0100
+@@ -101,7 +101,7 @@
config.write( page );
// TODO: move rendering into chain
@@ -177,9 +185,11 @@
render.put_environment( "MENU_BACKGROUND", item.get_menu_background( page ) );
render.put_environment( "MENU_SOUNDTRACK", plugin::get_config_path() + "/menu-silence.mp2" );
render.put_environment( "MENU_XML", config.get_xml_path( page ) );
---- vdr-plugin-burn-0.2.0~beta6.orig/proctools/proctest.cc
-+++ vdr-plugin-burn-0.2.0~beta6/proctools/proctest.cc
-@@ -94,7 +94,7 @@ bool procchain_dvd::initialize()
+Index: vdr-plugin-burn/proctools/proctest.cc
+===================================================================
+--- vdr-plugin-burn.orig/proctools/proctest.cc 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/proctools/proctest.cc 2013-03-24 16:11:04.000000000 +0100
+@@ -94,7 +94,7 @@
make_dir("data/dvdauthor");
@@ -188,7 +198,7 @@
proc->put_environment("DVDAUTHOR_PATH", "data/dvdauthor");
add_process(proc);
-@@ -117,13 +117,13 @@ void procchain_dvd::finished(const proce
+@@ -117,13 +117,13 @@
void procchain_dvd::prepare_recording()
{
diff --git a/debian/patches/05_vdr-1.7.21-rec-length.patch b/debian/patches/05_vdr-1.7.21-rec-length.patch
deleted file mode 100644
index 05fe3db..0000000
--- a/debian/patches/05_vdr-1.7.21-rec-length.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- vdr-plugin-burn-0.2.0~beta6.orig/common.c
-+++ vdr-plugin-burn-0.2.0~beta6/common.c
-@@ -138,11 +138,7 @@ std::string progress_bar(double current,
-
- string get_recording_datetime(const cRecording* recording_, char delimiter)
- {
-- string title = recording_->Title('\t', false, -1
--#ifdef LIEMIKUUTIO // hatred... HATRED!!!
-- , true
--#endif
-- );
-+ string title = recording_->Title('\t', false, -1);
-
- string::iterator it = title.begin();
- for (int i = 0; i < 2 && it != title.end(); ++i)
-@@ -178,9 +174,9 @@ string get_recording_osd_line(const cRec
- #endif
-
- string RecLength("--");
-- int length = cIndexFile::Length(recording_->FileName(), recording_->IsPesRecording());
-- if (length >= 0)
-- RecLength = string(format( "{0}'") % (length / SecondsToFrames(60, recording_->FramesPerSecond())));
-+ int length = recording_->LengthInSeconds();
-+ if (length >= 0)
-+ RecLength = string(format( "{0}'") % (length));
-
- result << (recording_->IsNew() ? '*' : ' ') << '\t' << RecLength << '\t' << name;
- return result.str();
diff --git a/debian/patches/10_template.dpatch b/debian/patches/10_template.dpatch
deleted file mode 100644
index 2441ee9..0000000
--- a/debian/patches/10_template.dpatch
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh -e
-## Template for creating custom background from grabbed images
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Template image for custom backgrounds
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-dongleDir=`dirname $0`/dongle
-
-case "$1" in
- -patch)
- uudecode $0
- ;;
- -unpatch)
- decodedFile=`grep "begin\ 644" $0 | awk '{ print $3 }'`
- rm -f $decodedFile
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
- ;;
-esac
-
-exit 0
-
-begin 644 debian/template.png
-MB5!.1PT*&@H````-24A$4@```M````)`"`8```"D,5'?````!F)+1T0`_P#_
-M`/^@O:>3````"7!(67,``!<+```7"P'81B at 9````!W1)344'U at 8,!B0*V)5K
-M@```"/Y)1$%4>-KMW#$. at S`01%$6<7!N/I0I'#D!":%DWSO"4/#MPLL"````
-M````````````````````````````````````````````````````````````
-M`````````````````````````````````````````````````````````/"P
-M,L$H2:P``#")R*JV';GZ_```\+W-!-.3U6X%`("7).W[R`TT```(:```$-``
-M`""@`0!`0`,`@(`&```$-```"&@``!#0```@H`$`0$`#`("`!@``!#0```AH
-M```0T```(*`!`$!``P"`@`8```0T```(:```$-```""@`0!`0`,`@(`&```$
-M-```"&@``!#0```@H`$`0$`#`("`!@``!#0```AH```0T```(*`!`$!``P"`
-M@`8```0T```(:```$-```""@`0!`0`,`@(`&```$-```"&@``!#0```@H`$`
-M0$`#`("`!@``!#0```AH```0T```(*`!`$!``P"`@`8```0T```(:```N$>9
-M8)0D5@``F$1D5=N.=`,-````````````````````````P`G>@7[#.]``<#$L
-M&K\-3!_>@08`@!,V$TQ/T;L5`."S)/Z9M.$&&@``!#0```AH```0T```(*`!
-M`$!``P```AH```0T```(:```$-```""@`0!`0`,```(:```$-```"&@``!#0
-M```@H`$`0$`#```"&@``!#0```AH```0T```(*`!`$!``P```AH```0T```(
-M:```$-```""@`0!`0`,```(:```$-```"&@``!#0```@H`$`0$`#```"&@``
-M!#0```AH```0T```(*`!`$!``P```AH```0T```(:```$-```""@`0!`0`,`
-M``(:```$-```"&@``!#0```@H`$`0$`#```"&@``!#0```AH```0T```(*`!
-M`$!``P```AH```0T```(:```$-```""@`0!`0`,```(:```$-```"&@``!#0
-M```@H`$`0$`#```"&@``!#0```AH```0T```(*`!`$!``P```AH```0T```(
-M:```$-```""@`0!`0`,```(:```$-```"&@``!#0```@H`$`0$`#```"&@``
-M!#0```AH```0T```(*`!`$!``P```AH```0T```(:```$-```""@`0!`0`,`
-M``(:```$-```"&@``!#0```@H`$`0$`#```"&@``!#0```AH```0T```(*`!
-M`$!``P```AH```0T```(:```$-```""@`0!`0`,```(:```$-```"&@``!#0
-M```@H`$`0$`#```"&@``!#0```AH```0T```(*`!`$!``P```AH```0T```(
-M:```$-```""@`0!`0`,```(:```$-```"&@``!#0```@H`$`0$`#```"&@``
-M!#0```AH```0T```(*`!`$!``P```AH```0T```(:```$-```""@`0!`0`,`
-M``(:```$-```"&@``!#0```@H`$`0$`#```"&@``!#0```AH```0T```(*`!
-M`$!``P```AH```0T```(:```$-```""@`0!`0`,```(:```$-```"&@``!#0
-M```@H`$`0$`#```"&@``!#0```AH```0T```(*`!`$!``P```AH```0T```(
-M:```$-```""@`0!`0`,```(:```$-```"&@``!#0```@H`$`0$`#```"&@``
-M!#0```AH```0T```(*`!`$!``P```AH```0T```(:```$-```""@`0!`0`,`
-M``(:```$-```"&@``!#0```@H`$`0$`#```"&@``!#0```AH```0T```(*`!
-M`$!``P```AH```0T```(:```$-```""@`0!`0`,```(:```$-```"&@``!#0
-M```@H`$`0$`#```"&@``!#0```AH```0T```(*`!`$!``P```AH```0T```(
-M:```$-```""@`0!`0`,```(:```$-```"&@``!#0```@H`$`0$`#```"&@``
-M!#0```AH```0T```(*`!`$!``P```AH```0T```(:```$-```""@`0!`0`,`
-M``(:```$-```"&@``!#0```@H`$`0$`#```"&@``!#0```AH```0T```(*`!
-M`$!``P```AH```0T```(:```$-```""@`0!`0`,```(:```$-```"&@``!#0
-M```@H`$`0$`#```"&@``!#0```AH```0T```(*`!`$!``P```AH```0T```(
-M:```$-```""@`0!`0`,```(:```$-```"&@``!#0```@H`$`0$`#```"&@``
-M!#0```AH```0T```(*`!`$!``P```AH```0T```(:```$-```""@`0!`0`,`
-M``(:```$-```"&@``!#0```@H`$`0$`#```"&@``!#0```AH```0T```(*`!
-M`$!``P```AH```0T```(:```$-```""@`0!`0`,```(:```$-```"&@``!#0
-M```@H`$`0$`#```"&@``!#0```AH```0T```(*`!`$!``P```AH```0T```(
-M:```$-```""@`0!`0`,```(:```$-```"&@``!#0```@H`$`0$`#``!E at E&2
-M6`$`+H1%E;;@[[F!!@``````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-@````````````X)<<U`T;58=I9',`````245.1*Y"8((`
-`
-end
diff --git a/debian/patches/94_burnfr_FR.patch b/debian/patches/94_burnfr_FR.patch
deleted file mode 100644
index 12732ab..0000000
--- a/debian/patches/94_burnfr_FR.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -Naur burn-0.2.0-beta6.orig/po/fr_FR.po burn-0.2.0-beta6/po/fr_FR.po
---- burn-0.2.0-beta6.orig/po/fr_FR.po 2011-08-08 15:09:37.000000000 +0200
-+++ burn-0.2.0-beta6/po/fr_FR.po 2011-09-25 10:26:54.414040376 +0200
-@@ -12,7 +12,7 @@
- "Report-Msgid-Bugs-To: <<vdr at smue.org>>\n"
- "POT-Creation-Date: 2011-08-08 14:57+0200\n"
- "PO-Revision-Date: 2008-02-02 22:42+0100\n"
--"Last-Translator: Nicolas Huillard <nhuillard at e-dition.fr>\n"
-+"Last-Translator: Patrice Staudt <patrice.staudt at laposte.net>\n"
- "Language-Team: <vdr at linuxtv.org>\n"
- "Language: \n"
- "MIME-Version: 1.0\n"
-@@ -54,23 +54,23 @@
- msgstr "Couper"
-
- msgid "Skip empty titlemenu"
--msgstr ""
-+msgstr "Sauter menu de titre vide"
-
- msgid "Skip short mainmenu"
--msgstr ""
-+msgstr "Sauter menu princile court"
-
- #, fuzzy
- msgid "Use subtitle tracks"
- msgstr "Piste vidéo"
-
- msgid "--- Common settings --------------------------------------------------"
--msgstr ""
-+msgstr "--- Configuration en commun -------------------------------------------"
-
- msgid "Remove path component"
- msgstr "Couper de chemin"
-
- msgid "Requant using"
--msgstr ""
-+msgstr "Utiliser Requant"
-
- msgid "Burn speed"
- msgstr "Vitesse de gravure"
-@@ -79,22 +79,22 @@
- msgstr "sans limite"
-
- msgid "Preserve logfiles"
--msgstr ""
-+msgstr "Conserver les fichers de protocolles"
-
- msgid "Spare language code"
--msgstr ""
-+msgstr "Supprimer le code de langue"
-
- msgid "Status in main menu"
--msgstr ""
-+msgstr "Statut dans le menu principale"
-
- msgid "Custom disk size (MB)"
- msgstr "Taille définit par l'utilisateur (Mo)"
-
- msgid "--- Job menu settings ------------------------------------------------"
--msgstr ""
-+msgstr "--- Menu de configuration de taches -----------------------------------"
-
- msgid "Offer disk type"
--msgstr ""
-+msgstr "Proposer type de disque"
-
- msgid "Offer chapters"
- msgstr "Proposer les chapitres"
-@@ -112,19 +112,19 @@
- msgstr "Proposer l'archivage DMH"
-
- msgid "Offer skip titlemenu"
--msgstr ""
-+msgstr "Proposer couper le menu de titre"
-
- msgid "Offer skip mainmenu"
--msgstr ""
-+msgstr "Proposer couper le menu principale"
-
- msgid "--- Job defaults -----------------------------------------------------"
--msgstr ""
-+msgstr "--- Taches par defaut -------------------------------------------------"
-
- msgid "Write DVDs"
- msgstr "Gravure DVD"
-
- msgid "Job options"
--msgstr ""
-+msgstr "Options de tâches"
-
- msgid "Video track"
- msgstr "Piste vidéo"
-@@ -147,7 +147,7 @@
- msgstr "DVD avec menu"
-
- msgid "DVD without menus"
--msgstr "DVD avec pas de menu"
-+msgstr "DVD sans menu"
-
- msgid "Archive disk"
- msgstr "Disque archive"
-@@ -195,10 +195,10 @@
- msgstr "ProjectX"
-
- msgid "M2VRequantizer"
--msgstr ""
-+msgstr "M2VRequantizer"
-
- msgid "Transcode"
--msgstr ""
-+msgstr "Transcode"
-
- msgid "lxdvdrip"
- msgstr ""
-@@ -217,19 +217,19 @@
- msgstr "enregistrement"
-
- msgid "Couldn't convert character sets!"
--msgstr ""
-+msgstr "Impossible de convertir le charactére utiliser!"
-
- msgid "Couldn't open image file!"
--msgstr ""
-+msgstr "Impossible d'ouvrir le fichier image!"
-
- msgid "Couldn't create new image!"
--msgstr ""
-+msgstr "Impossible de creer une nouvelle image!"
-
- msgid "Couldn't render menu images!"
--msgstr ""
-+msgstr "Impossible de transformer les images du menu!"
-
- msgid "Couldn't save image file!"
--msgstr ""
-+msgstr "Impossible de sauvegarder le fichier image!"
-
- msgid "Versatile convert-and-burn plugin"
- msgstr "Plugin convertiseur et graveur universel"
-@@ -241,7 +241,7 @@
- msgstr "Tâche de gravure est active"
-
- msgid "Please enter the burn plugin"
--msgstr ""
-+msgstr "Entrez dans le plugin gravure"
-
- msgid "Please insert an empty disk and press Ok"
- msgstr "Veuilliez introduire un DVD vierge et appuyez sur OK"
-@@ -269,10 +269,10 @@
- msgstr "Volume total: %1$.1f MO %2$s"
-
- msgid "(would be shrinked)"
--msgstr ""
-+msgstr "(sera icomprimé)"
-
- msgid "Aspect ratio"
--msgstr ""
-+msgstr "Aspect ratio"
-
- msgid "track editor"
- msgstr ""
-@@ -293,11 +293,11 @@
- msgstr ""
-
- msgid "Language code"
--msgstr ""
-+msgstr "Code de langue"
-
- #, fuzzy
- msgid "Choose title"
--msgstr "Choisir"
-+msgstr "Choisez le titre"
-
- #, fuzzy
- msgid "DVD menu title for "
-@@ -391,19 +391,19 @@
- msgstr "retour"
-
- msgid "Couldn't read index"
--msgstr ""
-+msgstr "Impossible de lire l'index"
-
- msgid "Couldn't browse recording"
--msgstr ""
-+msgstr "Impossible de parcourir les enregistrements"
-
- msgid "mp2"
- msgstr ""
-
- msgid "dolby"
--msgstr ""
-+msgstr "dolby"
-
- msgid "Couldn't read marks"
--msgstr ""
-+msgstr "Impossible de lire les marques"
-
- msgid "Recording is too short"
--msgstr ""
-+msgstr "L'enregistrement est trop cours"
diff --git a/debian/patches/95_bashisms.patch b/debian/patches/95_bashisms.patch
index 781afa7..b4a8e6a 100644
--- a/debian/patches/95_bashisms.patch
+++ b/debian/patches/95_bashisms.patch
@@ -1,6 +1,8 @@
---- vdr-plugin-burn-0.2.0~beta5.orig/vdrburn-archive.sh
-+++ vdr-plugin-burn-0.2.0~beta5/vdrburn-archive.sh
-@@ -59,7 +59,7 @@
+Index: vdr-plugin-burn/vdrburn-archive.sh
+===================================================================
+--- vdr-plugin-burn.orig/vdrburn-archive.sh 2013-03-24 16:11:04.000000000 +0100
++++ vdr-plugin-burn/vdrburn-archive.sh 2013-03-24 16:11:04.000000000 +0100
+@@ -66,7 +66,7 @@
;;
archivemark)
@@ -9,9 +11,11 @@
printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard"
;;
---- vdr-plugin-burn-0.2.0~beta5.orig/vdrburn-dvd.sh
-+++ vdr-plugin-burn-0.2.0~beta5/vdrburn-dvd.sh
-@@ -261,7 +261,7 @@
+Index: vdr-plugin-burn/vdrburn-dvd.sh
+===================================================================
+--- vdr-plugin-burn.orig/vdrburn-dvd.sh 2013-03-24 16:11:04.000000000 +0100
++++ vdr-plugin-burn/vdrburn-dvd.sh 2013-03-24 16:11:04.000000000 +0100
+@@ -252,7 +252,7 @@
archivemark)
echo "Creating $DVDAUTHOR_PATH/dvd.vdr"
cp "$CONFIG_PATH/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr"
diff --git a/debian/patches/gcc-issues.patch b/debian/patches/gcc-issues.patch
index 7211bfe..bda5e5b 100644
--- a/debian/patches/gcc-issues.patch
+++ b/debian/patches/gcc-issues.patch
@@ -1,7 +1,7 @@
Index: vdr-plugin-burn/t/common_functions.c
===================================================================
---- vdr-plugin-burn.orig/t/common_functions.c 2012-05-12 22:54:01.000000000 +0200
-+++ vdr-plugin-burn/t/common_functions.c 2012-05-12 23:01:57.000000000 +0200
+--- vdr-plugin-burn.orig/t/common_functions.c 2012-05-24 22:52:00.000000000 +0200
++++ vdr-plugin-burn/t/common_functions.c 2013-03-24 16:11:23.000000000 +0100
@@ -10,6 +10,7 @@
{
using namespace vdr_burn;
diff --git a/debian/patches/series b/debian/patches/series
index e610245..6d1ba2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
gcc-issues.patch
01_genisoimage.patch
-#02_projectx.patch
03_default-requantizer.patch
04_burn-set-pathes.patch
-#05_vdr-1.7.21-rec-length.patch
-#94_burnfr_FR.patch
95_bashisms.patch
-vdr-1.7.27-burn-0.2.0.diff
+vdr-1.7.33-burn-0.2.2.patch
diff --git a/debian/patches/vdr-1.7.27-burn-0.2.0.diff b/debian/patches/vdr-1.7.27-burn-0.2.0.diff
deleted file mode 100644
index d087655..0000000
--- a/debian/patches/vdr-1.7.27-burn-0.2.0.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/i18n.h.org 2009-05-01 19:30:58.000000000 +0200
-+++ b/i18n.h 2012-04-01 11:11:55.080297631 +0200
-@@ -20,19 +20,7 @@
- // Implemented as a Meyers-Singleton
- class i18n
- {
-- private:
-- static const tI18nPhrase m_phrases[];
--
-- int m_osdLanguage;
--
-- protected:
-- static i18n& get();
--
- public:
-- i18n();
--
-- static const tI18nPhrase* get_phrases() { return m_phrases; }
--
- static const char* translate( const char* text );
- };
-
diff --git a/debian/patches/vdr-1.7.33-burn-0.2.2.patch b/debian/patches/vdr-1.7.33-burn-0.2.2.patch
new file mode 100644
index 0000000..413245c
--- /dev/null
+++ b/debian/patches/vdr-1.7.33-burn-0.2.2.patch
@@ -0,0 +1,280 @@
+Index: vdr-plugin-burn/scanner.c
+===================================================================
+--- vdr-plugin-burn.orig/scanner.c 2013-03-24 15:59:47.000000000 +0100
++++ vdr-plugin-burn/scanner.c 2013-03-24 16:11:04.000000000 +0100
+@@ -26,7 +26,7 @@
+ #include <sys/stat.h>
+ #include <vdr/remux.h>
+ #include <vdr/device.h>
+-#include "libsi/si.h"
++#include <libsi/si.h>
+
+
+ #define DEBUG(x...) isyslog(x)
+@@ -390,7 +390,7 @@
+ logger::debug(format( "scanning ts positions: {0}/{1}-{2}/{3}") % start.first % start.second % end.first % end.second);
+
+ bool PmtFound = false;
+- int PatVersion, PmtVersion;
++ int PatVersion, PmtVersion, pmtPid;
+
+ PatPmtParser.Reset();
+ m_vdrFile.seek(start);
+@@ -405,15 +405,17 @@
+ if ( Pid == 0)
+ PatPmtParser.ParsePat(DataPtr, TS_SIZE);
+ #if VDRVERSNUM < 10733
+- else if (Pid == PatPmtParser.PmtPid())
++ else if (Pid == PatPmtParser.PmtPid()) {
+ #else
+- else if (PatPmtParser.IsPmtPid(Pid))
++ else if (PatPmtParser.IsPmtPid(Pid)) {
+ #endif
++ pmtPid = Pid;
+ PatPmtParser.ParsePmt(DataPtr, TS_SIZE);
++ }
+ else if (PatPmtParser.GetVersions(PatVersion, PmtVersion)) {
+ PmtFound = true;
+ int streams = 0;
+- logger::debug(format( "PID found: Vpid=0x{1}, Vtype=0x{2}") % format::base( PatPmtParser.Vpid(), 16 ) % format::base( PatPmtParser.Vtype(), 16 ));
++ logger::debug(format( "PID found: PMT PID=0x{0}, Vpid=0x{1}, Vtype=0x{2}") % format::base( pmtPid, 16 ) % format::base( PatPmtParser.Vpid(), 16 ) % format::base( PatPmtParser.Vtype(), 16 ));
+ if ( PatPmtParser.Vpid() && (PatPmtParser.Vtype() == 2)) { // accept only MPEG2
+ track_info track( PatPmtParser.Vpid(), track_info::streamtype_video );
+ m_tracks.push_back( track );
+Index: vdr-plugin-burn/t/common_functions.c
+===================================================================
+--- vdr-plugin-burn.orig/t/common_functions.c 2013-03-24 16:11:04.000000000 +0100
++++ vdr-plugin-burn/t/common_functions.c 2013-03-24 16:11:04.000000000 +0100
+@@ -13,8 +13,8 @@
+ using namespace proctools;
+
+ string path = "/video0/Claire's \"Erbe\"";
+- string escaped = shell_escape(path, "'");
++ string escaped = proctools::shell_escape(path, "'");
+ BOOST_CHECK_EQUAL(escaped, "/video0/Claire\\'s \"Erbe\"");
+- escaped = shell_escape(path, "\"");
++ escaped = proctools::shell_escape(path, "\"");
+ BOOST_CHECK_EQUAL(escaped, "/video0/Claire's \\\"Erbe\\\"");
+ }
+Index: vdr-plugin-burn/Makefile
+===================================================================
+--- vdr-plugin-burn.orig/Makefile 2013-03-24 15:59:47.000000000 +0100
++++ vdr-plugin-burn/Makefile 2013-03-24 16:11:04.000000000 +0100
+@@ -14,10 +14,9 @@
+
+ ### The version number of this plugin (taken from the main source file):
+
+-VERSION = $(shell grep 'const char\* plugin::VERSION *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
++VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+ ### The directory environment:
+-#VDRDIR = ../../..
+
+ # Use package data if installed...otherwise assume we're under the VDR source directory:
+ PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+@@ -36,56 +35,9 @@
+
+ APIVERSION = $(call PKGCFG,apiversion)
+
+-
+-### Backward compatibility stuff
+-ifeq ($(LOCDIR),)
+-### The C++ compiler and options:
+-
+-CXX ?= g++
+-CXXFLAGS ?= -O3 -Wall -Woverloaded-virtual -fPIC
+-
+-### The directory environment:
+-
+-VDRDIR = ../../..
+-LIBDIR = ../../lib
+-
+-### Allow user defined options to overwrite defaults:
+-
+--include $(VDRDIR)/Make.config
+-
+-ifdef DEBUG
+- CXXFLAGS = -g -Wall -Woverloaded-virtual -fPIC
+-else
+- DEFINES += -DNDEBUG
+-endif
+-
+-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+-
+-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-
+-LOCDIR = $(VDRDIR)/locale
+-
+-### Includes and Defines (add further entries here):
+-
+-DEFINES += -D_GNU_SOURCE
+-
+-INCLUDES += -I$(VDRDIR)/include
+-
+-### Run 'install' for target 'all':
+-
+-all: install
+-
+-ifeq ($(shell grep 'I18N_DEFAULT_LOCALE' $(VDRDIR)/i18n.h),)
+-OLD_I18N = 1
+-
+-i18n install-i18n:
+-
+-endif
+-else
+ ### Allow user defined options to overwrite defaults:
+
+ -include $(PLGCFG)
+-endif # compatibility section
+
+ ### The name of the distribution archive:
+
+@@ -98,24 +50,16 @@
+
+ ### Includes and Defines (add further entries here):
+
+-INCLUDES += -I$(VDRDIR)/include -I. $(shell gdlib-config --cflags)
++INCLUDES += $(shell gdlib-config --cflags)
+ LIBS += $(shell gdlib-config --ldflags --libs) -lgd
+-DEFINES += -DPLUGIN_NAME='"$(PLUGIN)"' -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_LARGEFILE_SOURCE
+-
+-### The object files (add further files here):
+-
+-OBJS = burn.o chain-vdr.o chain-dvd.o jobs.o logger-vdr.o skins.o \
+- manager.o menuburn.o menubase.o \
+- etsi-const.o tracks.o scanner.o gdwrapper.o iconvwrapper.o \
+- menuitems.o setup.o common.o config.o render.o \
+- genindex/pes.o
++DEFINES += -DPLUGIN_NAME='"$(PLUGIN)"' -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+ ifdef ENABLE_DMH_ARCHIVE
+ DEFINES += -DENABLE_DMH_ARCHIVE
+ OBJS += chain-archive.o
+ endif
+
+-SUBDIRS = proctools # tinyxml
++SUBDIRS = proctools
+ SUBLIBS=$(shell for i in $(SUBDIRS); do echo $$i/lib$$i.a; done)
+
+ LIBS += $(SUBLIBS)
+@@ -140,9 +84,18 @@
+
+ DEFINES += -DTMPDIR='"$(TMPDIR)"' -DDVDDEV='"$(DVDDEV)"' -DISODIR='"$(ISODIR)"'
+
++
++### The object files (add further files here):
++
++OBJS = $(PLUGIN).o chain-vdr.o chain-dvd.o jobs.o logger-vdr.o skins.o \
++ manager.o menuburn.o menubase.o \
++ etsi-const.o tracks.o scanner.o gdwrapper.o iconvwrapper.o \
++ menuitems.o setup.o common.o config.o render.o \
++ genindex/pes.o
++
+ ### The main target:
+
+-all: SUBDIRS $(SOFILE) i18n
++all: $(SUBLIBS) $(SOFILE) i18n
+
+ ### Implicit rules:
+
+@@ -160,7 +113,6 @@
+
+ ### Internationalization (I18N):
+
+-ifeq ($(OLD_I18N),)
+ PODIR = po
+ I18Npo = $(wildcard $(PODIR)/*.po)
+ I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+@@ -171,10 +123,10 @@
+ msgfmt -c -o $@ $<
+
+ $(I18Npot): $(wildcard *.c)
+- xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
++ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+
+ %.po: $(I18Npot)
+- msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
++ msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+ @touch $@
+
+ $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+@@ -184,24 +136,14 @@
+ i18n: $(I18Nmo) $(I18Npot)
+
+ install-i18n: $(I18Nmsgs)
+-endif
+
+ ### Targets:
+
+-.PHONY: all dist clean SUBDIRS
+-
+-#SUBDIRS:
+ $(SUBLIBS):
+ @for dir in $(SUBDIRS); do \
+ $(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
+ done
+
+-$(SOFILE): $(OBJS) Makefile $(SUBLIBS)
+- $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
+-
+-install-lib: $(SOFILE)
+- install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+-
+ scan-test: $(OBJS) proctools scan-test.o
+ $(CXX) $(CXXFLAGS) scan-test.o $(OBJS) -o $@ \
+ $(LIBS) -ljpeg -lpthread -ldl -lcap \
+@@ -210,20 +152,25 @@
+ gd-test: gdwrapper.o gdtest.o
+ $(CXX) $(CXXFLAGS) $^ -o $@ $(LIBS)
+
++$(SOFILE): $(OBJS) $(SUBLIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
++
++install-lib: $(SOFILE)
++ install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
++
+ install: install-lib install-i18n
+
+ dist: $(I18Npo) clean
+- @-rm -rf $(TMPDIR)/vdrdist/$(ARCHIVE)
+- @mkdir -p $(TMPDIR)/vdrdist/$(ARCHIVE)
+- @cp -a * $(TMPDIR)/vdrdist/$(ARCHIVE)
+- @tar czf $(PACKAGE).tgz -C $(TMPDIR)/vdrdist $(ARCHIVE)
+- @-rm -rf $(TMPDIR)/vdrdist
++ @-rm -rf $(TMPDIR)/$(ARCHIVE)
++ @mkdir $(TMPDIR)/$(ARCHIVE)
++ @cp -a * $(TMPDIR)/$(ARCHIVE)
++ @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
++ @-rm -rf $(TMPDIR)/$(ARCHIVE)
+ @echo Distribution package created as $(PACKAGE).tgz
+
+-
+ clean:
+ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+- @-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ \
++ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ \
+ scan-test test t/*.o
+ @for dir in $(SUBDIRS); do \
+ $(MAKE) -C $$dir clean ; \
+@@ -233,11 +180,11 @@
+
+ TESTOBJS = t/main.o t/common_functions.o
+
+-test: $(TESTOBJS) $(OBJS) proctools
+- $(CXX) $(CXXFLAGS) $(TESTOBJS) $(OBJS) -o $@ $(LIBS) \
+- -lboost_unit_test_framework -ljpeg -lpthread -ldl -lcap \
+- $(shell ls $(VDRDIR)/*.o | grep -v vdr.o) $(VDRDIR)/libsi/libsi.a
+- ./test
++#test: $(TESTOBJS) $(OBJS) proctools
++# $(CXX) $(CXXFLAGS) $(TESTOBJS) $(OBJS) -o $@ $(LIBS) \
++# -lboost_unit_test_framework -ljpeg -lpthread -ldl -lcap \
++# $(shell ls $(VDRDIR)/*.o | grep -v vdr.o) $(VDRDIR)/libsi/libsi.a
++# ./test
+
+ env:
+ @echo "Configuration:"
+@@ -245,3 +192,4 @@
+ @echo " APIVERSION $(APIVERSION)"
+ @echo " CXX $(CXX) CXXFLAGS $(CXXFLAGS)"
+ @echo " VDRDIR $(VDRDIR) LIBDIR $(LIBDIR) LOCDIR $(LOCDIR)"
++
--
vdr-plugin-burn packaging repository
More information about the pkg-vdr-dvb-changes
mailing list