summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Bornkessel <hd_brummy@gentoo.org>2012-06-30 18:45:04 +0000
committerJörg Bornkessel <hd_brummy@gentoo.org>2012-06-30 18:45:04 +0000
commit704b4e07018c1ec10cac24c9a0e48ace2417e2c3 (patch)
tree54c0a8e32b41ef9c67218377dae9e36a37b7a33b /media-plugins/vdr-burn/files
parentcleanup; eapi=4; vdr-plugin-2.eclass (diff)
downloadgentoo-2-704b4e07018c1ec10cac24c9a0e48ace2417e2c3.tar.gz
gentoo-2-704b4e07018c1ec10cac24c9a0e48ace2417e2c3.tar.bz2
gentoo-2-704b4e07018c1ec10cac24c9a0e48ace2417e2c3.zip
cleanup; vdr-plugin-2.eclass
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'media-plugins/vdr-burn/files')
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-gentoo.diff37
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-makefile.diff22
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff44
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff18
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff16
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff22
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff45
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1_ldflags.diff12
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff35
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_ldflags.diff12
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff34
-rw-r--r--media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff34
12 files changed, 0 insertions, 331 deletions
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-gentoo.diff b/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-gentoo.diff
deleted file mode 100644
index 475767d21701..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-gentoo.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: burn-0.1.0-pre22-ff1/burn.c
-===================================================================
---- burn-0.1.0-pre22-ff1.orig/burn.c
-+++ burn-0.1.0-pre22-ff1/burn.c
-@@ -87,14 +87,14 @@ namespace vdr_burn
-
- bool plugin::Start()
- {
-- m_configPath = ConfigDirectory(PLUGIN_NAME);
-+ m_configPath = "/usr/share/vdr/burn";
-
- manager::start();
- logger_vdr::start();
- #if APIVERSNUM < 10507
- RegisterI18n( i18n::get_phrases() );
- #endif
-- gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
-+ gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
- if ( !skin_list::get().load( get_config_path() ) )
- return false;
-
-Index: burn-0.1.0-pre22-ff1/vdrburn-dvd.sh
-===================================================================
---- burn-0.1.0-pre22-ff1.orig/vdrburn-dvd.sh
-+++ burn-0.1.0-pre22-ff1/vdrburn-dvd.sh
-@@ -78,9 +78,8 @@ case $1 in
- CUT="-cut $MPEG_DATA_PATH/px.cut"
- fi
-
-- $JAVA_HOME/bin/java -Djava.awt.headless=true \
-- -jar $PROJECTX_HOME/ProjectX.jar \
-- -ini $CONFIG_PATH/ProjectX.ini \
-+ /usr/bin/projectx_nogui \
-+ -ini /usr/share/vdr/burn/projectx-vdr.ini \
- $CUT \
- -demux -out "$MPEG_DATA_PATH" -name vdrsync \
- $(ls "$MPEG_TMP_PATH/convert/"[0-9][0-9][0-9]*.*)
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-makefile.diff
deleted file mode 100644
index d066b85abe0b..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_p1-makefile.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: burn-0.1.0-pre21/Makefile
-===================================================================
---- burn-0.1.0-pre21.orig/Makefile
-+++ burn-0.1.0-pre21/Makefile
-@@ -133,7 +133,7 @@ all: libvdr-$(PLUGIN).so burn-buffers i1
-
- SUBDIRS:
- @for dir in $(SUBDIRS); do \
-- make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
-+ $(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
- done
-
- libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
-@@ -165,7 +165,7 @@ clean:
- @-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
- scan-test test t/*.o
- @for dir in $(SUBDIRS); do \
-- make -C $$dir clean ; \
-+ $(MAKE) -C $$dir clean ; \
- done
-
- ### Implicit rules:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff b/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff
deleted file mode 100644
index 4039d1a43a48..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.1.0_pre22_setdefaults-V2.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-will set a always missconfigured part to a default setup
-remove the config part (RemovePath, RequantTyp)
-from osd plugin setup
-
-12 Mar 2009 ,Joerg Bornkessel <hd_brummy@gentoo.org>
-
-diff -Naur burn-0.1.0-pre21.orig/setup.c burn-0.1.0-pre21/setup.c
---- burn-0.1.0-pre21.orig/setup.c 2009-03-12 03:33:46.387393024 +0100
-+++ burn-0.1.0-pre21/setup.c 2009-03-12 03:37:56.204037636 +0100
-@@ -83,11 +83,11 @@
- //!--- plugin_setup -----------------------------------------------------------
-
- plugin_setup::plugin_setup():
-- PROCTOOLS_INIT_PROPERTY( RemovePath, false ),
-+ PROCTOOLS_INIT_PROPERTY( RemovePath, true ),
- PROCTOOLS_INIT_PROPERTY( CustomDiskSize, 200 ),
- PROCTOOLS_INIT_PROPERTY( BurnSpeed, 0 ),
- PROCTOOLS_INIT_PROPERTY( DemuxType, demuxtype_vdrsync ),
-- PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_metakine ),
-+ PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_transcode ),
- PROCTOOLS_INIT_PROPERTY( PreserveLogFiles, false ),
- PROCTOOLS_INIT_PROPERTY( DefaultLanguage, 0 ),
- PROCTOOLS_INIT_PROPERTY( MainMenuStatus, true ),
-@@ -115,7 +115,7 @@
- PROCTOOLS_INIT_PROPERTY( SkinIndex, 0 ),
- PROCTOOLS_INIT_PROPERTY( ChaptersMode, chaptersmode_10 ),
- PROCTOOLS_INIT_PROPERTY( StoreMode, storemode_burn ),
-- PROCTOOLS_INIT_PROPERTY( DmhArchiveMode, true ),
-+ PROCTOOLS_INIT_PROPERTY( DmhArchiveMode, false ),
- PROCTOOLS_INIT_PROPERTY( DiskSize, disksize_singlelayer ),
- PROCTOOLS_INIT_PROPERTY( CutOnDemux, false ),
- PROCTOOLS_INIT_PROPERTY( SkipTitlemenu, true ),
-@@ -199,9 +199,9 @@
- m_defaults = job_defaults();
-
- Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
-- Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
-+// Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
- Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
-- Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
-+// Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
- Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
- Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
- Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff
deleted file mode 100644
index ebb27bd131fe..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-paths.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: burn-0.2.0-beta1/burn.c
-===================================================================
---- burn-0.2.0-beta1.orig/burn.c
-+++ burn-0.2.0-beta1/burn.c
-@@ -96,11 +96,11 @@ namespace vdr_burn
-
- bool plugin::Start()
- {
-- m_configPath = ConfigDirectory(PLUGIN_NAME);
-+ m_configPath = "/usr/share/vdr/burn";
-
- manager::start();
- logger_vdr::start();
-- gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
-+ gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
- if ( !skin_list::get().load( get_config_path() ) )
- return false;
-
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff
deleted file mode 100644
index 3f31bedd4cbd..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-gentoo-projectx.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: burn-0.2.0-beta1/vdrburn-dvd.sh
-===================================================================
---- burn-0.2.0-beta1.orig/vdrburn-dvd.sh
-+++ burn-0.2.0-beta1/vdrburn-dvd.sh
-@@ -111,9 +111,8 @@ case $1 in
- CUT="-cut $MPEG_DATA_PATH/px.cut"
- fi
-
-- $JAVA_HOME/bin/java -Djava.awt.headless=true \
-- -jar $PROJECTX_HOME/ProjectX.jar \
-- -ini $CONFIG_PATH/ProjectX.ini \
-+ /usr/bin/projectx_nogui \
-+ -ini /usr/share/vdr/burn/projectx-vdr.ini \
- $TTXT_OPTS \
- $CUT -id $USED_TRACKS \
- -demux -out "$MPEG_DATA_PATH" -name vdrsync \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff
deleted file mode 100644
index 20c2f80fb780..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-makefile.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: burn-0.2.0-beta1/Makefile
-===================================================================
---- burn-0.2.0-beta1.orig/Makefile
-+++ burn-0.2.0-beta1/Makefile
-@@ -136,7 +136,7 @@ all: libvdr-$(PLUGIN).so burn-buffers i1
-
- SUBDIRS:
- @for dir in $(SUBDIRS); do \
-- make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
-+ $(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
- done
-
- libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
-@@ -169,7 +169,7 @@ clean:
- @-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
- scan-test test t/*.o
- @for dir in $(SUBDIRS); do \
-- make -C $$dir clean ; \
-+ $(MAKE) -C $$dir clean ; \
- done
-
- ### Implicit rules:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff
deleted file mode 100644
index 1f6e80fd837c..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1-setdefaults-V2.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-will set a always missconfigured part to a default setup
-remove the config part (RemovePath, RequantTyp)
-from osd plugin setup
-
-12 Mar 2009 ,Joerg Bornkessel <hd_brummy@gentoo.org>
-
-Index: burn-0.2.0-beta1/setup.c
-===================================================================
---- burn-0.2.0-beta1.orig/setup.c
-+++ burn-0.2.0-beta1/setup.c
-@@ -88,11 +88,11 @@ bool cBurnParameters::ProcessArgs(int ar
- //!--- plugin_setup -----------------------------------------------------------
-
- plugin_setup::plugin_setup():
-- PROCTOOLS_INIT_PROPERTY( RemovePath, false ),
-+ PROCTOOLS_INIT_PROPERTY( RemovePath, true ),
- PROCTOOLS_INIT_PROPERTY( CustomDiskSize, 200 ),
- PROCTOOLS_INIT_PROPERTY( BurnSpeed, 0 ),
- PROCTOOLS_INIT_PROPERTY( DemuxType, demuxtype_vdrsync ),
-- PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_metakine ),
-+ PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_transcode ),
- PROCTOOLS_INIT_PROPERTY( PreserveLogFiles, false ),
- PROCTOOLS_INIT_PROPERTY( DefaultLanguage, 0 ),
- PROCTOOLS_INIT_PROPERTY( MainMenuStatus, true ),
-@@ -120,7 +120,7 @@ bool cBurnParameters::ProcessArgs(int ar
- PROCTOOLS_INIT_PROPERTY( SkinIndex, 0 ),
- PROCTOOLS_INIT_PROPERTY( ChaptersMode, chaptersmode_10 ),
- PROCTOOLS_INIT_PROPERTY( StoreMode, storemode_burn ),
-- PROCTOOLS_INIT_PROPERTY( DmhArchiveMode, true ),
-+ PROCTOOLS_INIT_PROPERTY( DmhArchiveMode, false ),
- PROCTOOLS_INIT_PROPERTY( DiskSize, disksize_singlelayer ),
- PROCTOOLS_INIT_PROPERTY( CutOnDemux, false ),
- PROCTOOLS_INIT_PROPERTY( SkipTitlemenu, true ),
-@@ -204,9 +204,9 @@ bool cBurnParameters::ProcessArgs(int ar
- m_defaults = job_defaults();
-
- Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
-- Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
-+// Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
- Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
-- Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
-+// Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
- Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
- Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
- Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1_ldflags.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1_ldflags.diff
deleted file mode 100644
index 1e5e4dc1bdcc..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta1_ldflags.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur burn-0.2.0-beta1.orig/Makefile burn-0.2.0-beta1/Makefile
---- burn-0.2.0-beta1.orig/Makefile 2010-12-02 18:05:06.000000000 +0100
-+++ burn-0.2.0-beta1/Makefile 2010-12-02 18:05:35.000000000 +0100
-@@ -145,7 +145,7 @@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
-
- burn-buffers: buffers.o
-- $(CXX) $(CXXFLAGS) $< -o $@
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@
-
- scan-test: $(OBJS) proctools scan-test.o
- $(CXX) $(CXXFLAGS) scan-test.o $(OBJS) -o $@ \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff
deleted file mode 100644
index 81f1e4311f04..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_gentoo-path.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-some path adaption to gentoo
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
-diff -Naur burn-0.2.0-beta5.orig/burn.c burn-0.2.0-beta5/burn.c
---- burn-0.2.0-beta5.orig/burn.c 2011-02-02 01:04:23.000000000 +0100
-+++ burn-0.2.0-beta5/burn.c 2011-02-02 01:10:36.000000000 +0100
-@@ -96,11 +96,11 @@
-
- bool plugin::Start()
- {
-- m_configPath = ConfigDirectory(PLUGIN_NAME);
-+ m_configPath = "/usr/share/vdr/burn";
-
- manager::start();
- logger_vdr::start();
-- gdwrapper::setup::set_font_path( m_configPath + "/fonts" );
-+ gdwrapper::setup::set_font_path( "/usr/share/fonts/ttf-bitstream-vera" );
- if ( !skin_list::get().load( get_config_path() ) )
- return false;
-
-diff -Naur burn-0.2.0-beta5.orig/vdrburn-dvd.sh burn-0.2.0-beta5/vdrburn-dvd.sh
---- burn-0.2.0-beta5.orig/vdrburn-dvd.sh 2011-02-02 01:04:23.000000000 +0100
-+++ burn-0.2.0-beta5/vdrburn-dvd.sh 2011-02-02 01:07:21.000000000 +0100
-@@ -113,9 +113,8 @@
- CUT="-cut $MPEG_DATA_PATH/px.cut"
- fi
-
-- $JAVA_HOME/bin/java -Djava.awt.headless=true \
-- -jar $PROJECTX_HOME/ProjectX.jar \
-- -ini $CONFIG_PATH/ProjectX.ini \
-+ /usr/bin/projectx_nogui \
-+ -ini /usr/share/vdr/burn/projectx-vdr.ini \
- $TTXT_OPTS \
- $CUT -id $USED_TRACKS \
- -demux -out "$MPEG_DATA_PATH" -name vdrsync \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_ldflags.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_ldflags.diff
deleted file mode 100644
index 1e5e4dc1bdcc..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_ldflags.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur burn-0.2.0-beta1.orig/Makefile burn-0.2.0-beta1/Makefile
---- burn-0.2.0-beta1.orig/Makefile 2010-12-02 18:05:06.000000000 +0100
-+++ burn-0.2.0-beta1/Makefile 2010-12-02 18:05:35.000000000 +0100
-@@ -145,7 +145,7 @@
- @cp $@ $(LIBDIR)/$@.$(APIVERSION)
-
- burn-buffers: buffers.o
-- $(CXX) $(CXXFLAGS) $< -o $@
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@
-
- scan-test: $(OBJS) proctools scan-test.o
- $(CXX) $(CXXFLAGS) scan-test.o $(OBJS) -o $@ \
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff
deleted file mode 100644
index 99c29aa4d7f9..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_makefile.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-fix for fails to build with parallel make
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
-diff -Naur burn-0.2.0-beta5.orig/Makefile burn-0.2.0-beta5/Makefile
---- burn-0.2.0-beta5.orig/Makefile 2011-02-02 01:32:42.000000000 +0100
-+++ burn-0.2.0-beta5/Makefile 2011-02-02 01:34:20.000000000 +0100
-@@ -9,6 +9,9 @@
- #
- PLUGIN = burn
-
-+# Enable DMH Archive
-+#ENABLE_DMH_ARCHIVE = 1
-+
- ### 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')
-@@ -144,7 +147,7 @@
-
- SUBDIRS:
- @for dir in $(SUBDIRS); do \
-- make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
-+ $(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \
- done
-
- libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile
-@@ -176,7 +179,7 @@
- @-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \
- scan-test test t/*.o
- @for dir in $(SUBDIRS); do \
-- make -C $$dir clean ; \
-+ $(MAKE) -C $$dir clean ; \
- done
-
- ### Implicit rules:
diff --git a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff b/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff
deleted file mode 100644
index c0973eec2e80..000000000000
--- a/media-plugins/vdr-burn/files/vdr-burn-0.2.0_beta5_setdefaults.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-set default settings
-unset gentoo unsupportede packages (m2vrequantizer)
-disable unneeded menuentrys
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (02 Feb 2011)
-diff -Naur burn-0.2.0-beta5.orig/setup.c burn-0.2.0-beta5/setup.c
---- burn-0.2.0-beta5.orig/setup.c 2011-02-02 01:16:48.000000000 +0100
-+++ burn-0.2.0-beta5/setup.c 2011-02-02 01:22:35.000000000 +0100
-@@ -88,11 +88,11 @@
- //!--- plugin_setup -----------------------------------------------------------
-
- plugin_setup::plugin_setup():
-- PROCTOOLS_INIT_PROPERTY( RemovePath, false ),
-+ PROCTOOLS_INIT_PROPERTY( RemovePath, true ),
- PROCTOOLS_INIT_PROPERTY( CustomDiskSize, 200 ),
- PROCTOOLS_INIT_PROPERTY( BurnSpeed, 0 ),
- PROCTOOLS_INIT_PROPERTY( DemuxType, demuxtype_projectx ),
-- PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_metakine ),
-+ PROCTOOLS_INIT_PROPERTY( RequantType, requanttype_transcode ),
- PROCTOOLS_INIT_PROPERTY( PreserveLogFiles, false ),
- PROCTOOLS_INIT_PROPERTY( DefaultLanguage, 0 ),
- PROCTOOLS_INIT_PROPERTY( MainMenuStatus, true ),
-@@ -217,9 +217,9 @@
- m_defaults = job_defaults();
-
- Add( new menu::text_item( tr("--- Common settings --------------------------------------------------") ) );
-- Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
-+// Add( new menu::bool_edit_item( tr("Remove path component"), m_setup.RemovePath ) );
- Add( new menu::list_edit_item( tr("Demux using"), m_setup.DemuxType, demuxtype_strings ) );
-- Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
-+// Add( new menu::list_edit_item( tr("Requant using"), m_setup.RequantType, requanttype_strings ) );
- Add( new menu::number_edit_item( tr("Burn speed"), m_setup.BurnSpeed, 0, 32, tr("unlimited") ) );
- Add( new menu::bool_edit_item( tr("Preserve logfiles"), m_setup.PreserveLogFiles ) );
- Add( new menu::list_edit_item( tr("Spare language code"), m_setup.DefaultLanguage, track_info::get_language_codes(), false ) );