diff options
Diffstat (limited to 'sysutils/k3b/patches/patch-ab')
-rw-r--r-- | sysutils/k3b/patches/patch-ab | 150 |
1 files changed, 0 insertions, 150 deletions
diff --git a/sysutils/k3b/patches/patch-ab b/sysutils/k3b/patches/patch-ab deleted file mode 100644 index 95473a91543..00000000000 --- a/sysutils/k3b/patches/patch-ab +++ /dev/null @@ -1,150 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2006/06/13 12:36:16 markd Exp $ - ---- libk3bdevice/k3bdevice.cpp.orig 2006-04-12 05:26:45.000000000 +1200 -+++ libk3bdevice/k3bdevice.cpp -@@ -63,6 +63,10 @@ typedef unsigned char u8; - #define CD_FRAMESIZE_RAW 2352 - #endif - -+#ifdef Q_OS_NETBSD -+#include <sys/cdio.h> -+#endif -+ - #ifdef HAVE_RESMGR - extern "C" { - #include <resmgr.h> -@@ -100,7 +104,7 @@ const char* K3bDevice::Device::cdrdao_dr - }; - - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD) - int K3bDevice::openDevice( const char* name, bool write ) - { - int fd = -1; -@@ -143,6 +147,9 @@ public: - #ifdef Q_OS_LINUX - deviceFd(-1), - #endif -+#ifdef Q_OS_NETBSD -+ deviceFd(-1), -+#endif - #ifdef Q_OS_FREEBSD - cam(0), - #endif -@@ -157,6 +164,9 @@ public: - #ifdef Q_OS_LINUX - int deviceFd; - #endif -+#ifdef Q_OS_NETBSD -+ int deviceFd; -+#endif - #ifdef Q_OS_FREEBSD - struct cam_device *cam; - #endif -@@ -1465,6 +1475,19 @@ bool K3bDevice::Device::fixupToc( K3bDev - - bool K3bDevice::Device::block( bool b ) const - { -+#ifdef Q_OS_NETBSD -+ bool success = false; -+ bool needToClose = !isOpen(); -+ int arg = b ? 1 : 0; -+ -+ if( open() ) { -+ if ( ::ioctl( d->deviceFd, DIOCLOCK, &arg ) >= 0) -+ success = true; -+ if( needToClose ) -+ close(); -+ } -+ return success; -+#else - ScsiCommand cmd( this ); - cmd[0] = MMC_PREVENT_ALLOW_MEDIUM_REMOVAL; - if( b ) -@@ -1475,6 +1498,7 @@ bool K3bDevice::Device::block( bool b ) - kdDebug() << "(K3bDevice::Device) MMC ALLOW MEDIA REMOVAL failed." << endl; - - return ( r == 0 ); -+#endif - } - - bool K3bDevice::Device::rewritable() const -@@ -1496,6 +1520,19 @@ bool K3bDevice::Device::rewritable() con - - bool K3bDevice::Device::eject() const - { -+#ifdef Q_OS_NETBSD -+ bool success = false; -+ bool needToClose = !isOpen(); -+ int arg = 0; -+ -+ if( open() ) { -+ if ( ::ioctl( d->deviceFd, DIOCEJECT, &arg ) >= 0) -+ success = true; -+ if( needToClose ) -+ close(); -+ } -+ return success; -+#else - ScsiCommand cmd( this ); - cmd[0] = MMC_START_STOP_UNIT; - -@@ -1507,15 +1544,30 @@ bool K3bDevice::Device::eject() const - cmd[4] = 0x2; // LoEj = 1, Start = 0 - - return !cmd.transport(); -+#endif - } - - - bool K3bDevice::Device::load() const - { -+#ifdef Q_OS_NETBSD -+ bool success = false; -+ bool needToClose = !isOpen(); -+ int arg = 0; -+ -+ if( open() ) { -+ if ( ::ioctl( d->deviceFd, CDIOCCLOSE, &arg ) >= 0) -+ success = true; -+ if( needToClose ) -+ close(); -+ } -+ return success; -+#else - ScsiCommand cmd( this ); - cmd[0] = MMC_START_STOP_UNIT; - cmd[4] = 0x3; // LoEj = 1, Start = 1 - return !cmd.transport(); -+#endif - } - - -@@ -1557,7 +1609,7 @@ bool K3bDevice::Device::open( bool write - } - return (d->cam != 0); - #endif --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD) - if( d->deviceFd == -1 ) - d->deviceFd = openDevice( QFile::encodeName(devicename()), write ); - -@@ -1574,7 +1626,7 @@ void K3bDevice::Device::close() const - d->cam = 0; - } - #endif --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD) - if( d->deviceFd != -1 ) { - ::close( d->deviceFd ); - d->deviceFd = -1; -@@ -1588,7 +1640,7 @@ bool K3bDevice::Device::isOpen() const - #ifdef Q_OS_FREEBSD - return d->cam; - #endif --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_NETBSD) - return ( d->deviceFd != -1 ); - #endif - } |