Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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.0_beta5_gentoo-path.diff rc-addon.sh vdr-burn-0.2.0_beta5_makefile.diff vdr-burn-0.2.0_beta5_setdefaults.diff
Date: Wed, 02 Feb 2011 19:59:28
Message-Id: 20110202195918.8C82E2004E@flycatcher.gentoo.org
1 hd_brummy 11/02/02 19:59:18
2
3 Modified: rc-addon.sh
4 Added: vdr-burn-0.2.0_beta5_gentoo-path.diff
5 vdr-burn-0.2.0_beta5_makefile.diff
6 vdr-burn-0.2.0_beta5_setdefaults.diff
7 Log:
8 beta5 bump
9
10 (Portage version: 2.1.9.25/cvs/Linux i686)
11
12 Revision Changes Path
13 1.4 media-plugins/vdr-burn/files/rc-addon.sh
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh?rev=1.4&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh?rev=1.4&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh?r1=1.3&r2=1.4
18
19 Index: rc-addon.sh
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh,v
22 retrieving revision 1.3
23 retrieving revision 1.4
24 diff -u -r1.3 -r1.4
25 --- rc-addon.sh 10 Oct 2009 10:07:21 -0000 1.3
26 +++ rc-addon.sh 2 Feb 2011 19:59:18 -0000 1.4
27 @@ -1,4 +1,4 @@
28 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh,v 1.3 2009/10/10 10:07:21 zzam Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/files/rc-addon.sh,v 1.4 2011/02/02 19:59:18 hd_brummy Exp $
30 #
31 # rc-addon-script for plugin burn
32 #
33 @@ -13,11 +13,11 @@
34
35 # be shure BURN_ISODIR is available!
36 make_isodir() {
37 -if [ ! -e "${BURN_ISODIR}" ]; then
38 - mkdir "${BURN_ISODIR}"
39 - touch "${BURN_ISODIR}"/.keep.rc-burn
40 - chown -R vdr:vdr "${BURN_ISODIR}"
41 -fi
42 + if [ ! -e "${BURN_ISODIR}" ]; then
43 + mkdir "${BURN_ISODIR}"
44 + touch "${BURN_ISODIR}"/.keep.rc-burn
45 + chown -R vdr:vdr "${BURN_ISODIR}"
46 + fi
47 }
48
49 make_isodir
50 @@ -28,6 +28,5 @@
51 add_plugin_param "-d ${BURN_DATADIR}"
52 add_plugin_param "-D ${BURN_DVDWRITER}"
53 add_plugin_param "-i ${BURN_ISODIR}"
54 -
55 }
56 -
57 +
58
59
60
61 1.1 media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff
62
63 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff?rev=1.1&view=markup
64 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff?rev=1.1&content-type=text/plain
65
66 Index: vdr-burn-0.2.0_beta5_gentoo-path.diff
67 ===================================================================
68 some path adaption to gentoo
69
70 Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (02 Feb 2011)
71 diff -Naur burn-0.2.0-beta5.orig/burn.c burn-0.2.0-beta5/burn.c
72 --- burn-0.2.0-beta5.orig/burn.c 2011-02-02 01:04:23.000000000 +0100
73 +++ burn-0.2.0-beta5/burn.c 2011-02-02 01:10:36.000000000 +0100
74 @@ -96,11 +96,11 @@
75
76 bool plugin::Start()
77 {
78 - m_configPath = ConfigDirectory(PLUGIN_NAME);
79 + m_configPath = "/usr/share/vdr/burn";
80
81 manager::start();
82 logger_vdr::start();
83 - gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
84 + gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
85 if ( !skin_list::get().load( get_config_path() ) )
86 return false;
87
88 diff -Naur burn-0.2.0-beta5.orig/vdrburn-dvd.sh burn-0.2.0-beta5/vdrburn-dvd.sh
89 --- burn-0.2.0-beta5.orig/vdrburn-dvd.sh 2011-02-02 01:04:23.000000000 +0100
90 +++ burn-0.2.0-beta5/vdrburn-dvd.sh 2011-02-02 01:07:21.000000000 +0100
91 @@ -113,9 +113,8 @@
92 CUT="-cut $MPEG_DATA_PATH/px.cut"
93 fi
94
95 - $JAVA_HOME/bin/java -Djava.awt.headless=true \
96 - -jar $PROJECTX_HOME/ProjectX.jar \
97 - -ini $CONFIG_PATH/ProjectX.ini \
98 + /usr/bin/projectx_nogui \
99 + -ini /usr/share/vdr/burn/projectx-vdr.ini
100 $TTXT_OPTS \
101 $CUT -id $USED_TRACKS \
102 -demux -out "$MPEG_DATA_PATH" -name vdrsync \
103
104
105
106 1.1 media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff
107
108 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff?rev=1.1&view=markup
109 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff?rev=1.1&content-type=text/plain
110
111 Index: vdr-burn-0.2.0_beta5_makefile.diff
112 ===================================================================
113 fix for fails to build with parallel make
114
115 Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (02 Feb 2011)
116 diff -Naur burn-0.2.0-beta5.orig/Makefile burn-0.2.0-beta5/Makefile
117 --- burn-0.2.0-beta5.orig/Makefile 2011-02-02 01:32:42.000000000 +0100
118 +++ burn-0.2.0-beta5/Makefile 2011-02-02 01:34:20.000000000 +0100
119 @@ -9,6 +9,9 @@
120 #
121 PLUGIN = burn
122
123 +# Enable DMH Archive
124 +#ENABLE_DMH_ARCHIVE = 1
125 +
126 ### The version number of this plugin (taken from the main source file):
127
128 VERSION = $(shell grep 'const char\* plugin::VERSION *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
129 @@ -144,7 +147,7 @@
130
131 SUBDIRS:
132 @for dir in $(SUBDIRS); do \
133 - make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
134 + $(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
135 done
136
137 libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
138 @@ -176,7 +179,7 @@
139 @-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
140 scan-test test t/*.o
141 @for dir in $(SUBDIRS); do \
142 - make -C $$dir clean ; \
143 + $(MAKE) -C $$dir clean ; \
144 done
145
146 ### Implicit rules:
147
148
149
150 1.1 media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff
151
152 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff?rev=1.1&view=markup
153 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff?rev=1.1&content-type=text/plain
154
155 Index: vdr-burn-0.2.0_beta5_setdefaults.diff
156 ===================================================================
157 set default settings
158 unset gentoo unsupportede packages (m2vrequantizer)
159 disable unneeded menuentrys
160
161 Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (02 Feb 2011)
162 diff -Naur burn-0.2.0-beta5.orig/setup.c burn-0.2.0-beta5/setup.c
163 --- burn-0.2.0-beta5.orig/setup.c 2011-02-02 01:16:48.000000000 +0100
164 +++ burn-0.2.0-beta5/setup.c 2011-02-02 01:22:35.000000000 +0100
165 @@ -88,11 +88,11 @@
166 //!--- plugin_setup -----------------------------------------------------------
167
168 plugin_setup::plugin_setup():
169 - PROCTOOLS_INIT_PROPERTY( RemovePath, false ),
170 + PROCTOOLS_INIT_PROPERTY( RemovePath, true ),
171 PROCTOOLS_INIT_PROPERTY( CustomDiskSize, 200 ),
172 PROCTOOLS_INIT_PROPERTY( BurnSpeed, 0 ),
173 PROCTOOLS_INIT_PROPERTY( DemuxType, demuxtype_projectx ),
174 - PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_metakine ),
175 + PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_transcode ),
176 PROCTOOLS_INIT_PROPERTY( PreserveLogFiles, false ),
177 PROCTOOLS_INIT_PROPERTY( DefaultLanguage, 0 ),
178 PROCTOOLS_INIT_PROPERTY( MainMenuStatus, true ),
179 @@ -217,9 +217,9 @@
180 m_defaults = job_defaults();
181
182 Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
183 - Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
184 +// Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
185 Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
186 - Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
187 +// Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
188 Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
189 Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
190 Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
Report Message
Find on MARC Find on Google Groups