This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'.release/4.11.0

1 files changed, 0 insertions, 80 deletions

diff --git a/sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp b/sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp
deleted file mode 100644
index 024a3a2db2c5..000000000000
--- a/sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
---- src/device/k3bdevice.cpp.orig	Tue Aug 10 09:45:21 2004
-+++ src/device/k3bdevice.cpp	Sun Aug 29 10:41:17 2004
-@@ -57,6 +57,13 @@
- 
- #endif // Q_OS_LINUX
- 
-+#ifdef __FreeBSD__
-+#define __BYTE_ORDER BYTE_ORDER
-+#define __BIG_ENDIAN BIG_ENDIAN
-+#define CD_FRAMESIZE_RAW 2352
-+#define nearbyint(x) rint(x)
-+#endif
-+
- 
- #ifdef HAVE_RESMGR
- extern "C" {
-@@ -154,8 +161,10 @@
- 
-   d->supportedProfiles = 0;
- 
-+#ifndef __FreeBSD__
-   if(open() < 0)
-     return false;
-+#endif
- 
- 
-   //
-@@ -194,6 +203,7 @@
-   unsigned char header[2048];
-   ::memset( header, 0, 2048 );
- 
-+  cmd.clear();
-   cmd[0] = MMC::GET_CONFIGURATION;
-   cmd[8] = 8;
-   if( cmd.transport( TR_DIR_READ, header, 8 ) ) {
-@@ -754,6 +764,14 @@
-     m_bufferSize = 1024;
-     d->burnfree = false;
-   }
-+  else if( vendor().startsWith("TEAC") && description().startsWith("CD-R56S") ) {
-+    m_writeModes |= TAO;
-+    d->deviceType |= CDROM|CDR;
-+    m_maxWriteSpeed = 6;
-+    m_maxReadSpeed = 24;
-+    m_bufferSize = 1302;
-+    d->burnfree = false;
-+  }
-   else if( vendor().startsWith("MATSHITA") ) {
-     if( description().startsWith("CD-R   CW-7501") ) {
-       m_writeModes = TAO|SAO;
-@@ -2597,10 +2615,12 @@
- {
-   // if the device is already opened we do not close it
-   // to allow fast multible method calls in a row
-+#ifndef __FreeBSD__
-   bool needToClose = !isOpen();
- 
-   if (open() < 0)
-     return;
-+#endif
- 
-   // header size is 8
-   unsigned char* buffer = 0;
-@@ -2686,13 +2706,16 @@
-     delete [] buffer;
-   }
-     
-+#ifndef __FreeBSD__
-   if( needToClose )
-     close();
-+#endif
- }
- 
- 
- bool K3bCdDevice::CdDevice::readTocPmaAtip( unsigned char** data, int& dataLen, int format, bool time, int track ) const
- {
-+  kdDebug() << "(K3bCdDevice::CdDevice) readTocPmaAtip started,  format:" << format << ", time: " << time << ", track: " << track << endl;
-   unsigned char header[2048];
-   ::memset( header, 0, 2048 );
-