Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

1 files changed, 0 insertions, 35 deletions

diff --git a/abs/extra-testing/myth2ipod/myth2ipod.patch b/abs/extra-testing/myth2ipod/myth2ipod.patch
deleted file mode 100755
index 95785ab..0000000
--- a/abs/extra-testing/myth2ipod/myth2ipod.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- myth2ipod.txt	2007-06-01 10:00:02.000000000 -0500
-+++ myth2ipod.txt.modified	2007-06-01 11:24:26.000000000 -0500
-@@ -12,10 +12,10 @@
- 	
- # User variables
- 	my $portable = "ipod";
--	my $feedfile = "/myth/ipodfeed/feed.php";
--	my $feedpath = "/myth/ipodfeed/";
--	my $wwwloc = "/var/www/";
--	my $feedurl = "http://hostname/ipodfeed/";
-+	my $feedfile = "/data/media/ipodfeed/feed.php";
-+	my $feedpath = "/data/media/ipodfeed/";
-+	my $wwwloc = "/data/srv/httpd/htdocs/";
-+	my $feedurl = "http://REPLACEME/ipodfeed/";
- 	my $nuvoptions ="--mode=iPod --nice=19 --cutlist --nodenoise --nodeinterlace --nomultipass";
- 	
- # Some variables
-@@ -136,7 +136,7 @@
- 	# Create cutlist from commercial flagging if -cut was passed to the script
- 	if ($cut == 1){
- 	printf("Generating cutlist\n"); 
--	$cmd = "/usr/bin/mythcommflag --chanid $chanid --starttime $start --gencutlist";
-+	$cmd = "/usr/local/bin/mythcommflag --chanid $chanid --starttime $start --gencutlist";
- 	print $cmd."\n"; 
- 	if(system($cmd)) { print "It looks like I was not able to generate a cutlist.\n"; } 
- 	}
-@@ -147,7 +147,7 @@
- 	if(system($cmd)) { print "Nuvexport encoding seems to have failed\n"; } 
- 	
- 	# Now clean up the output so iPods with firmware 1.1 and above can use it
--	$cmd = "/usr/local/bin/MP4Box -add $feedpath$chanid\_$start.temp.mp4 $feedpath$chanid\_$start.$portable.mp4";
-+	$cmd = "/usr/bin/MP4Box -add $feedpath$chanid\_$start.temp.mp4 $feedpath$chanid\_$start.$portable.mp4";
- 	print $cmd."\n"; 
- 	if(system($cmd)) { print "MP4Box cleanup seems to have failed\n"; } 
- 	return 0;