6 files changed, 108 insertions, 0 deletions

diff --git a/multimedia/k9copy/files/patch-src_K9copy.desktop b/multimedia/k9copy/files/patch-src_K9copy.desktop
new file mode 100644
index 000000000000..cba2f03de535
--- /dev/null
+++ b/multimedia/k9copy/files/patch-src_K9copy.desktop
@@ -0,0 +1,10 @@
+--- src/K9copy.desktop.orig    Tue Dec 20 16:03:59 2005
++++ src/K9copy.desktop Tue Dec 20 16:04:12 2005
+@@ -3,6 +3,6 @@
+ Name=k9copy
+ Exec=k9copy -caption "%c" %i %m %u
+ Comment=
+-Icon=/home/jmp/dev/k9copy/src/k9copy.png
++Icon=k9copy
+ MimeTypes=
+ Terminal=false
diff --git a/multimedia/k9copy/files/patch-src_Makefile.in b/multimedia/k9copy/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..efa15fa1984c
--- /dev/null
+++ b/multimedia/k9copy/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig       Tue Dec 20 16:07:46 2005
++++ src/Makefile.in    Tue Dec 20 16:09:14 2005
+@@ -459,7 +459,7 @@
+ shellrcdir = $(kde_datadir)/k9copy
+ shellrc_DATA = k9copyui.rc
+ applnkApplication_DATA = K9copy.desktop
+-applnkApplicationdir = $(kde_appsdir)/Application
++applnkApplicationdir = $(kde_appsdir)/Multimedia
+ AM_CXXFLAGS = -O2 -g3
+ #>- all: all-am
+ #>+ 1
diff --git a/multimedia/k9copy/files/patch-src_kcddrive.cpp b/multimedia/k9copy/files/patch-src_kcddrive.cpp
new file mode 100644
index 000000000000..a05b47882f74
--- /dev/null
+++ b/multimedia/k9copy/files/patch-src_kcddrive.cpp
@@ -0,0 +1,30 @@
+--- src/kcddrive.cpp.orig      Thu Dec 15 16:49:47 2005
++++ src/kcddrive.cpp   Thu Dec 15 16:49:47 2005
+@@ -27,8 +27,10 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
++/*
+ #include <scsi/scsi.h>
+ #include <scsi/sg.h>
++*/
+ #include <unistd.h>
+
+ #include <qfile.h>
+@@ -177,7 +179,7 @@
+         return 0;
+     }
+
+-    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
++/*    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
+         close (fd);
+         return 0;
+     }
+@@ -185,6 +187,7 @@
+         close(fd);
+         return 0;
+     }
++*/
+     id = m_idlun.mux4 & 0xFF;
+     lun = (m_idlun.mux4 >> 8)  & 0xFF;
+
diff --git a/multimedia/k9copy/files/patch-src_kdvd.cpp b/multimedia/k9copy/files/patch-src_kdvd.cpp
new file mode 100644
index 000000000000..096884ad9480
--- /dev/null
+++ b/multimedia/k9copy/files/patch-src_kdvd.cpp
@@ -0,0 +1,34 @@
+--- src/kdvd.cpp.orig  Sun Dec 18 23:50:47 2005
++++ src/kdvd.cpp       Mon Dec 19 00:19:47 2005
+@@ -409,7 +409,7 @@
+         return -1;
+     }
+
+-    if ( fseek(filehandle, 32808, SEEK_SET )) {
++    if ( fseek(filehandle, 32768, SEEK_SET )) {
+         fclose(filehandle);
+         c.sprintf(tr2i18n("Couldn't seek in %s for title\n"), dvd_device);
+         setError(c);
+@@ -417,14 +417,20 @@
+         return -1;
+     }
+
+-    if ( 32 != (i = fread(title, 1, 32, filehandle)) ) {
++    {
++    #define DVD_SEC_SIZ 2048
++    char tempBuf[ DVD_SEC_SIZ ];
++    if ( DVD_SEC_SIZ != fread(tempBuf, 1, DVD_SEC_SIZ, filehandle) ) {
+         fclose(filehandle);
+         c=tr2i18n("Couldn't read enough bytes for title.\n");
+         setError(c);
+         strcpy(title, "unknown");
+         return -1;
+     }
+-
++    snprintf( title, 32, "%s", tempBuf + 40 );
++    i=32;
++    }
++
+     fclose (filehandle);
+
+     title[32] = '\0';
diff --git a/multimedia/k9copy/files/patch-src_kifo.cpp b/multimedia/k9copy/files/patch-src_kifo.cpp
new file mode 100644
index 000000000000..251fbd0ce2cc
--- /dev/null
+++ b/multimedia/k9copy/files/patch-src_kifo.cpp
@@ -0,0 +1,12 @@
+--- src/kifo.cpp.orig  Sun Dec 18 23:40:34 2005
++++ src/kifo.cpp       Sun Dec 18 23:40:52 2005
+@@ -21,6 +21,9 @@
+ #include <dvdread/dvd_reader.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/ifo_print.h>
++#ifdef __FreeBSD__
++#include <osreldate.h>
++#endif
+ #include "bswap.h"
+
+ #ifndef DVD_BLOCK_LEN
diff --git a/multimedia/k9copy/files/patch-vamps_Makefile.in b/multimedia/k9copy/files/patch-vamps_Makefile.in
new file mode 100644
index 000000000000..914d01804265
--- /dev/null
+++ b/multimedia/k9copy/files/patch-vamps_Makefile.in
@@ -0,0 +1,11 @@
+--- vamps/Makefile.in.orig     Tue Dec 20 15:26:47 2005
++++ vamps/Makefile.in  Tue Dec 20 15:30:34 2005
+@@ -329,7 +329,7 @@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ #>- METASOURCES = AUTO
+-usrbindir = /usr/bin
++usrbindir = ${prefix}/bin
+ k9vamps_LDADD = -lpthread -lm
+ k9vamps_SOURCES = requant.h vamps.cpp putvlc.h getvlc.h requant.cpp
+ k9playcell_LDADD = -ldvdread