--- k9copy/distinfo Tue Jan 3 02:59:47 2006 +++ k9copy/distinfo Tue Jan 3 02:59:47 2006 @@ -1,3 +1,3 @@ -MD5 (k9copy-1.0.1.tar.gz) = cc13f799a13784f7c9aaa2d40d608b0b -SHA256 (k9copy-1.0.1.tar.gz) = 1111de1f6cee40f17e3a341f656b046f2a63a5b9debb68c9660c17d217d080bb -SIZE (k9copy-1.0.1.tar.gz) = 1206622 +MD5 (k9copy-1.0.2.tar.gz) = 9037dfa804a6f758c5df7e641c67127d +SHA256 (k9copy-1.0.2.tar.gz) = 1432c327ea38aeaffcfe34c99637ec90b09e31552c132a947a0a0f9e36dfa9e2 +SIZE (k9copy-1.0.2.tar.gz) = 1154768 --- k9copy/files/patch-libk3bdevice-k3bdevice.h Sun Dec 25 12:46:50 2005 +++ k9copy/files/patch-libk3bdevice-k3bdevice.h Sun Dec 25 12:46:50 2005 @@ -0,0 +1,10 @@ +--- libk3bdevice/k3bdevice.h.orig Mon Dec 12 10:32:59 2005 ++++ libk3bdevice/k3bdevice.h Wed Dec 14 23:49:42 2005 +@@ -28,6 +28,7 @@ + + #ifdef Q_OS_FREEBSD + struct cam_device; ++#define stat64 stat + #endif + + namespace K3bDevice --- k9copy/files/patch-libk9copy_k9backupdlg.cpp Thu Jan 5 06:09:19 2006 +++ k9copy/files/patch-libk9copy_k9backupdlg.cpp Thu Jan 5 06:09:19 2006 @@ -0,0 +1,15 @@ +--- libk9copy/k9backupdlg.cpp.orig Thu Jan 5 06:08:21 2006 ++++ libk9copy/k9backupdlg.cpp Thu Jan 5 06:08:38 2006 +@@ -18,7 +18,11 @@ + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + #include + #include + #include --- k9copy/files/patch-libk9copy_k9cell.h Thu Jan 5 06:10:41 2006 +++ k9copy/files/patch-libk9copy_k9cell.h Thu Jan 5 06:10:41 2006 @@ -0,0 +1,15 @@ +--- libk9copy/k9cell.h.orig Thu Jan 5 06:09:52 2006 ++++ libk9copy/k9cell.h Thu Jan 5 06:10:12 2006 +@@ -22,7 +22,11 @@ + + #include + #include +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + #include "k9dvdtitle.h" + enum streamType_t {stAudio,stVideo,stSubpicture,stOther}; + /** --- k9copy/files/patch-libk9copy_k9cellcopylist.h Thu Jan 5 06:11:37 2006 +++ k9copy/files/patch-libk9copy_k9cellcopylist.h Thu Jan 5 06:11:37 2006 @@ -0,0 +1,15 @@ +--- libk9copy/k9cellcopylist.h.orig Thu Jan 5 06:10:57 2006 ++++ libk9copy/k9cellcopylist.h Thu Jan 5 06:11:13 2006 +@@ -24,7 +24,11 @@ + #include "k9dvd.h" + #include "k9cell.h" + #include +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + + class k9CellCopyVTS { + private: --- k9copy/files/patch-libk9copy_k9dvd.cpp Thu Jan 5 06:13:08 2006 +++ k9copy/files/patch-libk9copy_k9dvd.cpp Thu Jan 5 06:13:08 2006 @@ -0,0 +1,44 @@ +--- libk9copy/k9dvd.cpp.orig Fri Dec 9 19:18:03 2005 ++++ libk9copy/k9dvd.cpp Thu Jan 5 06:12:30 2006 +@@ -27,7 +27,11 @@ + #include + #include + #include +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + + #include "k9dvd.h" + #include "k9dvdtitle.h" +@@ -196,7 +200,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); +@@ -204,12 +208,18 @@ + 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 0; ++ } ++ snprintf( title, 32, "%s", tempBuf + 40 ); ++ i=32; + } + + fclose (filehandle); --- k9copy/files/patch-libk9copy_k9dvd.h Thu Jan 5 06:14:11 2006 +++ k9copy/files/patch-libk9copy_k9dvd.h Thu Jan 5 06:14:11 2006 @@ -0,0 +1,15 @@ +--- libk9copy/k9dvd.h.orig Thu Jan 5 06:13:32 2006 ++++ libk9copy/k9dvd.h Thu Jan 5 06:13:58 2006 +@@ -25,7 +25,11 @@ + #include + #include + #include +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + #include + + --- k9copy/files/patch-libk9copy_k9dvdbackup.h Thu Jan 5 06:16:36 2006 +++ k9copy/files/patch-libk9copy_k9dvdbackup.h Thu Jan 5 06:16:36 2006 @@ -0,0 +1,15 @@ +--- libk9copy/k9dvdbackup.h.orig Thu Jan 5 06:16:05 2006 ++++ libk9copy/k9dvdbackup.h Thu Jan 5 06:16:20 2006 +@@ -26,7 +26,11 @@ + #include + #include "k9cell.h" + #include +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + #include "k9cellcopylist.h" + /** + @author Jean-Michel Petit --- k9copy/files/patch-libk9copy_k9dvdtitle.cpp Thu Jan 5 06:17:43 2006 +++ k9copy/files/patch-libk9copy_k9dvdtitle.cpp Thu Jan 5 06:17:43 2006 @@ -0,0 +1,15 @@ +--- libk9copy/k9dvdtitle.cpp.orig Thu Jan 5 06:16:57 2006 ++++ libk9copy/k9dvdtitle.cpp Thu Jan 5 06:17:14 2006 +@@ -31,7 +31,11 @@ + #include + #include + #include +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + + + //*******************k9DVDAudioStream************** --- k9copy/files/patch-libk9copy_k9ifo.cpp Tue Jan 3 03:21:11 2006 +++ k9copy/files/patch-libk9copy_k9ifo.cpp Tue Jan 3 03:21:11 2006 @@ -0,0 +1,12 @@ +--- libk9copy/k9ifo.cpp.orig Sun Dec 18 23:40:34 2005 ++++ libk9copy/k9ifo.cpp Sun Dec 18 23:40:52 2005 +@@ -21,6 +21,9 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include "bswap.h" + + #ifndef DVD_BLOCK_LEN --- k9copy/files/patch-src_K9copy.desktop Thu Jan 1 03:00:00 1970 +++ k9copy/files/patch-src_K9copy.desktop Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- 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 --- k9copy/files/patch-src_Makefile.in Tue Jan 3 04:59:02 2006 +++ k9copy/files/patch-src_Makefile.in Tue Jan 3 04:59:02 2006 @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/Makefile.in.orig Tue Jan 3 04:57:30 2006 ++++ src/Makefile.in Tue Jan 3 04:57:42 2006 +@@ -439,7 +439,7 @@ shellrcdir = $(kde_datadir)/k9copy shellrc_DATA = k9copyui.rc applnkApplication_DATA = K9copy.desktop --- k9copy/files/patch-src_kburndvd.cpp Thu Jan 5 06:06:42 2006 +++ k9copy/files/patch-src_kburndvd.cpp Thu Jan 5 06:06:42 2006 @@ -0,0 +1,15 @@ +--- src/kburndvd.cpp.orig Thu Jan 5 06:04:49 2006 ++++ src/kburndvd.cpp Thu Jan 5 06:05:18 2006 +@@ -24,7 +24,11 @@ + #include + #include + #include +-#include ++#ifdef HAVE_STDINT_H ++ #include ++#elif defined(HAVE_INTTYPES_H) ++ #include ++#endif + #include + + kBurnDVD::kBurnDVD() --- k9copy/files/patch-src_kcddrive.cpp Wed Jan 4 22:50:34 2006 +++ k9copy/files/patch-src_kcddrive.cpp Wed Jan 4 22:50:34 2006 @@ -1,30 +1,27 @@ ---- 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 - #include - #include -+/* - #include - #include -+*/ - #include - - #include -@@ -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; - +--- src/kcddrive.cpp.orig Sun Dec 18 09:36:56 2005 ++++ src/kcddrive.cpp Wed Jan 4 22:49:09 2006 +@@ -21,6 +21,7 @@ + + #include "kcddrive.h" + #include ++#include + #include + kCDDrive::kCDDrive() { + canReadDVD=false; +@@ -55,7 +56,7 @@ + if (process->isRunning()) process->wait(-1); + delete process; + */ +- umount(device.latin1()); ++ unmount(device.latin1(),0); + dev->eject(); + } + } +@@ -99,6 +100,7 @@ + void kCDDrives::scanDrives() { + int i; + drives.clear(); ++ dm->clear(); + dm->scanBus(); + dm->scanFstab(); + --- k9copy/files/patch-src_kdvd.cpp Thu Jan 1 03:00:00 1970 +++ k9copy/files/patch-src_kdvd.cpp Thu Jan 1 03:00:00 1970 @@ -1,34 +0,0 @@ ---- 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'; --- k9copy/files/patch-src_kifo.cpp Thu Jan 1 03:00:00 1970 +++ k9copy/files/patch-src_kifo.cpp Thu Jan 1 03:00:00 1970 @@ -1,12 +0,0 @@ ---- 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 - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif - #include "bswap.h" - - #ifndef DVD_BLOCK_LEN --- k9copy/files/patch-vamps_Makefile.in Thu Jan 1 03:00:00 1970 +++ k9copy/files/patch-vamps_Makefile.in Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- 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 --- k9copy/pkg-descr Tue Jan 3 02:53:08 2006 +++ k9copy/pkg-descr Tue Jan 3 02:53:08 2006 @@ -21,4 +21,4 @@