fixes

4 files changed, 70 insertions, 0 deletions

diff --git a/media-video/drip/files/digest-drip-0.8.1-r4 b/media-video/drip/files/digest-drip-0.8.1-r4
new file mode 100644
index 000000000000..53af5b8fffdc
--- /dev/null
+++ b/media-video/drip/files/digest-drip-0.8.1-r4
@@ -0,0 +1 @@
+MD5 b88e9731f7266f0e0b9ff412c13a3624 drip-0.8.1.tar.gz 603487
diff --git a/media-video/drip/files/drip-0.8.1-fix-dvd-symlink.patch b/media-video/drip/files/drip-0.8.1-fix-dvd-symlink.patch
new file mode 100644
index 000000000000..d6a8627578f0
--- /dev/null
+++ b/media-video/drip/files/drip-0.8.1-fix-dvd-symlink.patch
@@ -0,0 +1,29 @@
+--- drip-0.8.1/src/main.c	Mon May 27 21:36:47 2002
++++ drip-0.8.1.azarah/src/main.c	Mon May 27 21:39:54 2002
+@@ -231,10 +231,14 @@
+     device = g_string_new("");
+ 	
+     /* Look for a device in mtab  */
+-    device = drip_system("grep dvd /etc/fstab | awk '{print $1}'",&result,FALSE,TRUE);
++    device = drip_system("/usr/bin/dripgetdvd.sh dvd",&result,FALSE,TRUE);
+     if (device->len==0 || strstr(device->str,"{empty output}")!=NULL) {
+-        /* Couldn't find anything. Safe default */
+-        g_string_sprintf(device,"%s","/dev/cdrom");
++        /* Couldn't find anything related to dvd, trying cdrom */
++		device = drip_system("/usr/bin/dripgetdvd.sh cdrom",&result,FALSE,TRUE);
++		if (device->len==0 || strstr(device->str,"{empty output}")!=NULL) {
++			/* Nothing we can do to stop failure, set default */
++	        g_string_sprintf(device,"%s","/dev/cdrom");
++		}
+     }
+     return device->str;
+ }
+@@ -591,7 +595,7 @@
+     if (config_ok == FALSE) {
+         /* Default divx related settings */
+         g_log(DRIP_LD,G_LOG_LEVEL_INFO,"Setting up default configuration...");
+-        g_string_sprintf(Config.DVDdevice,"%s","/dev/cdrom");
++        g_string_sprintf(Config.DVDdevice,"%s",detect_dvdrom());
+         /* Traceback if Config.DVDdevice is a symbolic link */
+         DVDsymlink();
+ 
diff --git a/media-video/drip/files/drip-0.8.1-missing-stdio.patch b/media-video/drip/files/drip-0.8.1-missing-stdio.patch
new file mode 100644
index 000000000000..8820f183f388
--- /dev/null
+++ b/media-video/drip/files/drip-0.8.1-missing-stdio.patch
@@ -0,0 +1,20 @@
+--- drip-0.8.1/encoder/demuxer.cpp	Mon May 27 20:37:12 2002
++++ drip-0.8.1.azarah/encoder/demuxer.cpp	Mon May 27 20:37:33 2002
+@@ -10,6 +10,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <stdio.h>
+ #include "fast_memcpy.hh"
+ 
+ 
+--- drip-0.8.1/encoder/encoder.cpp	Mon May 27 20:35:57 2002
++++ drip-0.8.1.orig/encoder/encoder.cpp	Mon May 27 20:39:10 2002
+@@ -15,6 +15,7 @@
+ #include <gtk/gtk.h>
+ #include <unistd.h>
+ #include <fstream>
++#include <stdio.h>
+ #include <errno.h>
+ #include <pthread.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/media-video/drip/files/dripgetdvd.sh b/media-video/drip/files/dripgetdvd.sh
new file mode 100644
index 000000000000..3e07b9c39940
--- /dev/null
+++ b/media-video/drip/files/dripgetdvd.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if test -z "$1"
+then
+	exit 1
+fi
+
+DVD="`grep $1 /etc/fstab | awk '{print $1}'`"
+
+while test -L "${DVD}"
+do
+	NEWDVD="`readlink ${DVD}`"
+	if test -z "`echo ${NEWDVD} |grep -e "^/dev"`"
+	then
+		DVD="${DVD%/*}/${NEWDVD}"
+	fi
+done
+
+echo ${DVD}
+