Update to 0.50.13.

PR:		52968
Submitted by:	maintainer

2 files changed, 55 insertions, 67 deletions

diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
index 219ffc5f5c28..a16b0f572f6b 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::Config.pm
@@ -1,15 +1,32 @@
---- lib/Video/DVDRip/Config.pm.orig	Fri Dec 20 12:09:39 2002
-+++ lib/Video/DVDRip/Config.pm	Fri Dec 20 12:14:45 2002
-@@ -52,7 +52,7 @@
+--- lib/Video/DVDRip/Config.pm.orig	Sun Jun  1 18:01:40 2003
++++ lib/Video/DVDRip/Config.pm	Sun Jun  1 18:07:08 2003
+@@ -51,14 +51,9 @@
+ 		value => 4.2,
+ 	},
  	dvd_device => {
- 		label => "DVD device",
- 		type => 'file',
+-		label => "DVD device",
+-		type => 'file',
 -		value => "/dev/dvd",
+-	},
+-	dvd_mount_point => {
+ 		label => "DVD mount point",
+-		type => 'dir',
+-		value => "/cdrom",
++		type => 'file',
 +		value => "/dev/cd0c",
  	},
- 	dvd_mount_point => {
- 		label => "DVD mount point",
-@@ -81,7 +81,7 @@
+ 	writer_device => {
+ 		label => "Writer device file",
+@@ -58,7 +58,7 @@
+ 	writer_device => {
+ 		label => "Writer device file",
+ 		type => 'file',
+-		value => "/dev/cdrom",
++		value => "/dev/cd0c",
+ 	},
+ 	eject_command => {
+ 		label => "Eject Command",
+@@ -91,7 +86,7 @@
  	play_stdin_command => {
  		label => "STDIN player command",
  		type  => 'string',
@@ -18,7 +35,18 @@
  		presets => [
  			'mplayer -aid %(%a+128) -',
  			'xine stdin://mpeg2 -g -pq -a %a',
-@@ -124,7 +124,7 @@
+@@ -149,8 +149,8 @@
+ 		type  => 'string',
+ 		value => 'divx4',
+ 		presets => [
+-			"SVCD","VCD","divx4","divx5",
+-			"xvid","xvidcvs","ffmpeg","fame",
++			"SVCD","VCD",
++			"xvid","ffmpeg","fame",
+ 			"af6"
+ 		],
+ 	},
+@@ -181,7 +176,7 @@
  	burn_cdrecord_cmd => {
  		label => "cdrecord command",
  		type  => 'string',
@@ -27,63 +55,23 @@
  		presets => [
  			'/usr/lib/xcdroast-0.98/bin/xcdrwrap CDRECORD',
  			'cdrecord',
-@@ -171,11 +171,10 @@
- 	default_video_codec => {
- 		label => "Default Video Codec",
- 		type  => 'string',
--		value => 'divx4',
-+		value => 'xvid',
- 		presets => [
--			"SVCD","VCD","divx4","divx5",
--			"xvid","xvidcvs","ffmpeg4","fame",
--			"af6"
-+			"SVCD","VCD","xvid","ffmpeg4",
-+			"fame","af6"
- 		],
- 	},
- );
---- lib/Video/DVDRip/Config.pm.orig	Fri Jan  3 15:21:22 2003
-+++ lib/Video/DVDRip/Config.pm		Fri Jan  3 15:27:10 2003
-@@ -54,11 +54,6 @@
- 		type => 'file',
- 		value => "/dev/dvd",
- 	},
--	dvd_mount_point => {
--		label => "DVD mount point",
--		type => 'dir',
--		value => "/cdrom",
--	},
- 	play_dvd_command => {
- 		label => "DVD player command",
- 		type  => 'string',
---- lib/Video/DVDRip/Config.pm.orig	Fri Jan  3 15:42:30 2003
-+++ lib/Video/DVDRip/Config.pm	Fri Jan  3 15:43:33 2003
-@@ -50,7 +50,7 @@
- 		value => 5,
- 	},
- 	dvd_device => {
--		label => "DVD device",
-+		label => "DVD mount point",
- 		type => 'file',
- 		value => "/dev/cd0c",
- 	},
-@@ -176,7 +176,7 @@
+@@ -235,7 +230,7 @@
  
  my @CONFIG_ORDER = (
  	"Filesystem" => [qw(
 -		dvd_device         dvd_mount_point
 +		dvd_device
- 		base_project_dir
- 		dvdrip_files_dir   ogg_file_ext
+ 		base_project_dir   dvdrip_files_dir
+ 		ogg_file_ext
  	)],
---- lib/Video/DVDRip/Config.pm.orig	Fri Jan  3 15:47:07 2003
-+++ lib/Video/DVDRip/Config.pm	Fri Jan  3 15:47:17 2003
-@@ -546,7 +546,7 @@
+@@ -617,8 +617,8 @@
  sub test_play_file_command  	{ _executable (@_) 	}
  sub test_play_stdin_command 	{ _executable (@_) 	}
- 
+ sub test_rar_command 		{ _executable (@_) 	}
 -sub test_dvd_device		{ _writable (@_)	}
-+sub test_dvd_device		{ _exists (@_)	}
+-sub test_writer_device		{ _writable (@_)	}
++sub test_dvd_device		{ _exists (@_)		}
++sub test_writer_device		{ _exists (@_)		}
  sub test_dvd_mount_point	{ _exists (@_)		}
  sub test_base_project_dir	{ _writable (@_)	}
  sub test_dvdrip_files_dir	{ _writable (@_)	}
diff --git a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
index 199610f93064..a4380a3e991b 100644
--- a/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
+++ b/multimedia/dvdrip/files/patch-lib::Video::DVDRip::GUI::Project::TranscodeTab.pm
@@ -1,11 +1,11 @@
---- lib/Video/DVDRip/GUI/Project/TranscodeTab.pm.orig	Fri Dec 20 12:15:47 2002
-+++ lib/Video/DVDRip/GUI/Project/TranscodeTab.pm	Fri Dec 20 12:16:11 2002
-@@ -218,7 +218,7 @@
- 
- 	$entry = Gtk::Combo->new;
- 	$entry->show;
--	$entry->set_popdown_strings ("SVCD","VCD","divx4","divx5","xvid","xvidcvs","ffmpeg","fame","af6");
-+	$entry->set_popdown_strings ("SVCD","VCD","xvid","ffmpeg","fame","af6");
- 	$entry->set_usize(80,undef);
- 	$hbox->pack_start($entry, 0, 1, 0);
+--- lib/Video/DVDRip/GUI/Project/TranscodeTab.pm.orig	Mon Jun  2 15:41:16 2003
++++ lib/Video/DVDRip/GUI/Project/TranscodeTab.pm	Mon Jun  2 16:04:28 2003
+@@ -1205,7 +1205,7 @@
+ 			->set_popdown_strings( "SVCD", "VCD" );
+ 	} else {
+ 		$widgets->{tc_video_codec_combo}
+-			->set_popdown_strings( "divx4","divx5","xvid","xvidcvs","ffmpeg","fame","af6" );
++			->set_popdown_strings( "xvid","ffmpeg","fame","af6" );
+ 	}
  
+ 	$widgets->{tc_video_codec}->set_text($title->tc_video_codec);