Gentoo Archives: gentoo-commits

From: "Joerg Bornkessel (hd_brummy)" <hd_brummy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-burn/files: vdr-burn-0.2.2-r1_gentoo-path.diff vdr-burn-0.2.0-missing-include-for-function-setpriority.patch vdr-burn-0.2.0_gentoo-path.diff vdr-burn-0.2.0_setdefaults.diff vdr-1.7.27.diff vdr-burn-0.2.0_vdr-1.7.33.diff vdr-burn-0.2.0_makefile.diff
Date: Sun, 01 Mar 2015 13:09:06
Message-Id: 20150301130900.80C3D12CEA@oystercatcher.gentoo.org
1 hd_brummy 15/03/01 13:09:00
2
3 Added: vdr-burn-0.2.2-r1_gentoo-path.diff
4 Removed:
5 vdr-burn-0.2.0-missing-include-for-function-setpriority.patch
6 vdr-burn-0.2.0_gentoo-path.diff
7 vdr-burn-0.2.0_setdefaults.diff vdr-1.7.27.diff
8 vdr-burn-0.2.0_vdr-1.7.33.diff
9 vdr-burn-0.2.0_makefile.diff
10 Log:
11 using corefonts instead of ttf-bitstream-vera now, wrt bug 335782
12
13 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)
14
15 Revision Changes Path
16 1.1 media-plugins/vdr-burn/files/vdr-burn-0.2.2-r1_gentoo-path.diff
17
18 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.2-r1_gentoo-path.diff?rev=1.1&view=markup
19 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.2-r1_gentoo-path.diff?rev=1.1&content-type=text/plain
20
21 Index: vdr-burn-0.2.2-r1_gentoo-path.diff
22 ===================================================================
23 some path adaption to gentoo vdr
24 use corefonts instead of ttf-bitstream-vera, #335782
25
26 Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (1 Mar 2015)
27 diff -Naur burn-0.2.0.orig/burn.c burn-0.2.0/burn.c
28 --- burn-0.2.0.orig/burn.c 2012-02-12 19:46:51.000000000 +0100
29 +++ burn-0.2.0/burn.c 2012-02-12 19:49:21.000000000 +0100
30 @@ -96,11 +96,11 @@
31
32 bool plugin::Start()
33 {
34 - m_configPath = ConfigDirectory(PLUGIN_NAME);
35 + m_configPath = "/usr/share/vdr/burn";
36
37 manager::start();
38 logger_vdr::start();
39 - gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
40 + gdwrapper::setup::set_font_path( "/usr/share/fonts/corefonts" );
41 if ( !skin_list::get().load( get_config_path() ) )
42 return false;
43
44 diff -Naur burn-0.2.0.orig/vdrburn-dvd.sh burn-0.2.0/vdrburn-dvd.sh
45 --- burn-0.2.0.orig/vdrburn-dvd.sh 2012-02-12 19:46:51.000000000 +0100
46 +++ burn-0.2.0/vdrburn-dvd.sh 2012-02-12 19:52:22.000000000 +0100
47 @@ -92,9 +92,8 @@
48 CUT="-cut $MPEG_DATA_PATH/px.cut"
49 fi
50
51 - $IO_NICE $JAVA_EXE -Djava.awt.headless=true \
52 - -jar $PROJECTX_JAR \
53 - -ini $CONFIG_PATH/ProjectX.ini \
54 + /usr/bin/projectx_cli \
55 + -ini /usr/share/vdr/burn/projectx-vdr.ini \
56 $TTXT_OPTS \
57 $CUT -id $USED_TRACKS \
58 -demux -out "$MPEG_DATA_PATH" -name vdrsync \
59 diff -Naur burn-0.2.0.orig/vdrburn-dvd.sh burn-0.2.0/vdrburn-dvd.sh
60 --- burn-0.2.0.orig/vdrburn-dvd.sh 2012-02-15 21:58:34.000000000 +0100
61 +++ burn-0.2.0/vdrburn-dvd.sh 2012-02-15 22:00:47.000000000 +0100
62 @@ -78,7 +78,7 @@
63 ;;
64
65 demux)
66 - [ -r $CONFIG_PATH/vdrburn-dvd.conf ] && . $CONFIG_PATH/vdrburn-dvd.conf
67 + PROJECTX_JAR="/usr/share/projectx/lib/projectx.jar"
68 [ -z "$JAVA_EXE" ] && JAVA_EXE=$(which java)
69
70 [ ! -x "$JAVA_EXE" ] && echo "ERROR: java executable \"$JAVA_EXE\" not found" && exit 1