diff options
Diffstat (limited to 'sysutils/k3b/files')
4 files changed, 0 insertions, 412 deletions
diff --git a/sysutils/k3b/files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp b/sysutils/k3b/files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp deleted file mode 100644 index f19d1efda606..000000000000 --- a/sysutils/k3b/files/extra-patch-libk3bdevice-k3bscsicommandbsd.cpp +++ /dev/null @@ -1,286 +0,0 @@ ---- libk3bdevice/k3bscsicommand_bsd.cpp.orig 2012-03-22 03:26:44.000000000 +0600 -+++ libk3bdevice/k3bscsicommand_bsd.cpp 2012-03-22 03:11:30.000000000 +0600 -@@ -17,6 +17,7 @@ - #include "k3bdevice.h" - - #include <k3bdebug.h> -+#include <kdebug.h> - - #include <stdio.h> - #include <errno.h> -@@ -24,41 +25,44 @@ - #include <cam/scsi/scsi_message.h> - #include <cam/scsi/scsi_pass.h> - --#define ERRCODE(s) ((((s)[2]&0x0F)<<16)|((s)[12]<<8)|((s)[13])) --#define EMEDIUMTYPE EINVAL --#define ENOMEDIUM ENODEV --#define CREAM_ON_ERRNO(s) do { \ -- switch ((s)[12]) \ -- { case 0x04: errno=EAGAIN; break; \ -- case 0x20: errno=ENODEV; break; \ -- case 0x21: if ((s)[13]==0) errno=ENOSPC; \ -- else errno=EINVAL; \ -- break; \ -- case 0x30: errno=EMEDIUMTYPE; break; \ -- case 0x3A: errno=ENOMEDIUM; break; \ -- } \ --} while(0) -+namespace /*anonymous*/ -+{ -+ inline int sense_to_err( const struct scsi_sense_data& s ) -+ { -+ int errorCode, senseKey, addSenseCode, addSenseCodeQual; -+ scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode, -+ &senseKey, &addSenseCode, &addSenseCodeQual ); -+ return (errorCode << 24) | (senseKey << 16) | -+ (addSenseCode << 8) | addSenseCodeQual; -+ } -+} - - - - class K3bDevice::ScsiCommand::Private - { -+ typedef union ccb CCB; - public: -- union ccb ccb; -+ Private(); -+ int transport( const Device* device, TransportDirection dir, void* data, size_t len ); -+ unsigned char& operator[]( size_t i ); -+ void clear(); -+ const CCB& get_ccb() { return ccb; } -+ -+ private: -+ CCB ccb; - }; - - - void K3bDevice::ScsiCommand::clear() - { -- memset (&d->ccb,0,sizeof(ccb)); -+ d->clear(); - } - - - unsigned char& K3bDevice::ScsiCommand::operator[]( size_t i ) - { -- if( d->ccb.csio.cdb_len < i+1 ) -- d->ccb.csio.cdb_len = i+1; -- return d->ccb.csio.cdb_io.cdb_bytes[i]; -+ return (*d)[i]; - } - - int K3bDevice::ScsiCommand::transport( TransportDirection dir, -@@ -79,130 +83,103 @@ - m_device->usageUnlock(); - return -1; - } -- d->ccb.ccb_h.path_id = m_device->handle()->path_id; -- d->ccb.ccb_h.target_id = m_device->handle()->target_id; -- d->ccb.ccb_h.target_lun = m_device->handle()->target_lun; -- -- k3bDebug() << "(K3bDevice::ScsiCommand) transport command " << QString::number((int)d->ccb.csio.cdb_io.cdb_bytes[0], 16) << ", length: " << (int)d->ccb.csio.cdb_len << endl; -- int ret=0; -- int direction = CAM_DEV_QFRZDIS; -- if (!len) -- direction |= CAM_DIR_NONE; -- else -- direction |= (dir & TR_DIR_READ)?CAM_DIR_IN : CAM_DIR_OUT; -- cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL */, direction, MSG_SIMPLE_Q_TAG, (u_int8_t *)data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000); -- unsigned char * sense = (unsigned char *)&d->ccb.csio.sense_data; - -- ret = cam_send_ccb(m_device->handle(), &d->ccb); -+ int ret = d->transport( m_device, dir, data, len ); -+ if( ret != 0 ) { -+ const struct scsi_sense_data& s = d->get_ccb().csio.sense_data; -+ int errorCode, senseKey, addSenseCode, addSenseCodeQual; -+ scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode, &senseKey, -+ &addSenseCode, &addSenseCodeQual ); -+ debugError( d->get_ccb().csio.cdb_io.cdb_bytes[0], -+ errorCode, -+ senseKey, -+ addSenseCode, -+ addSenseCodeQual ); -+ } -+ -+ if( needToClose ) -+ m_device->close(); -+ m_device->usageUnlock(); - -- if (ret < 0) { -- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed: " << ret << endl; -+ return ret; -+} - -- if( needToClose ) -- m_device->close(); -+K3bDevice::ScsiCommand::Private::Private() -+ { -+ clear(); -+ } - -- m_device->usageUnlock(); -+void K3bDevice::ScsiCommand::Private::clear() -+ { -+ memset( &ccb, 0, sizeof(ccb) ); -+ } - -- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense; -- debugError( d->ccb.csio.cdb_io.cdb_bytes[0], -- senset->error_code & SSD_ERRCODE, -- senset->flags & SSD_KEY, -- senset->add_sense_code, -- senset->add_sense_code_qual ); -- -- int result = (((senset->error_code & SSD_ERRCODE)<<24) & 0xF000 | -- ((senset->flags & SSD_KEY)<<16) & 0x0F00 | -- (senset->add_sense_code<<8) & 0x00F0 | -- (senset->add_sense_code_qual) & 0x000F ); -+ unsigned char& K3bDevice::ScsiCommand::Private::operator[]( size_t i ) -+ { -+ if( ccb.csio.cdb_len < i + 1 ) -+ ccb.csio.cdb_len = i + 1; -+ return ccb.csio.cdb_io.cdb_bytes[i]; -+ } - -- return result ? result : ret; -+ int K3bDevice::ScsiCommand::Private::transport( const Device* device, TransportDirection dir, void* data, size_t len ) -+ { -+ ccb.ccb_h.path_id = device->handle()->path_id; -+ ccb.ccb_h.target_id = device->handle()->target_id; -+ ccb.ccb_h.target_lun = device->handle()->target_lun; -+ -+ k3bDebug() << "(K3bDevice::ScsiCommand) transport command " << commandString(ccb.csio.cdb_io.cdb_bytes[0]) -+ << " (" << QString::number((int)ccb.csio.cdb_io.cdb_bytes[0], 16) << "), length: " << (int)ccb.csio.cdb_len; -+ int direction = CAM_DEV_QFRZDIS; -+ if (!len) -+ direction |= CAM_DIR_NONE; -+ else -+ direction |= (dir & TR_DIR_READ) ? CAM_DIR_IN : CAM_DIR_OUT; -+ -+ cam_fill_csio( &(ccb.csio), 1, NULL, direction, MSG_SIMPLE_Q_TAG, (uint8_t*)data, len, sizeof(ccb.csio.sense_data), ccb.csio.cdb_len, 30*1000 ); -+ int ret = cam_send_ccb( device->handle(), &ccb ); -+ if( ret < 0 ) { -+ kdError() << "(K3bDevice::ScsiCommand) transport cam_send_ccb failed: ret = " << ret -+ << ", errno = " << errno << ", cam_errbuf = " << cam_errbuf; -+ return 1; - } - -- else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) { -- if( needToClose ) -- m_device->close(); -- m_device->usageUnlock(); -+ else if( (ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP ) { -+ k3bDebug() << "(K3bDevice::ScsiCommand) transport succeeded"; - return 0; - } - -- errno = EIO; -- // FreeBSD 5-CURRENT since 2003-08-24, including 5.2 fails to -- // pull sense data automatically, at least for ATAPI transport, -- // so I reach for it myself... -- if ((d->ccb.csio.scsi_status==SCSI_STATUS_CHECK_COND) && -- !(d->ccb.ccb_h.status&CAM_AUTOSNS_VALID)) -- { -- u_int8_t _sense[18]; -- u_int32_t resid=d->ccb.csio.resid; -- -- memset(_sense,0,sizeof(_sense)); -- -- operator[](0) = 0x03; // REQUEST SENSE -- d->ccb.csio.cdb_io.cdb_bytes[4] = sizeof(_sense); -- d->ccb.csio.cdb_len = 6; -- d->ccb.csio.ccb_h.flags |= CAM_DIR_IN|CAM_DIS_AUTOSENSE; -- d->ccb.csio.data_ptr = _sense; -- d->ccb.csio.dxfer_len = sizeof(_sense); -- d->ccb.csio.sense_len = 0; -- -- ret = cam_send_ccb(m_device->handle(), &d->ccb); -+ k3bDebug() << "(K3bDevice::ScsiCommand) transport command failed: scsi_status = " << QString::number(ccb.csio.scsi_status, 16); - -- d->ccb.csio.resid = resid; -- if (ret<0) -+ if( ccb.csio.scsi_status == SCSI_STATUS_CHECK_COND && -+ !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) && -+ ccb.csio.cdb_io.cdb_bytes[0] != MMC_REQUEST_SENSE ) -+ { -+ k3bDebug() << "(K3bDevice::ScsiCommand) transport requesting sense data"; -+ -+ struct scsi_sense_data sense; -+ ScsiCommand::Private cmd; -+ cmd[0] = MMC_REQUEST_SENSE; -+ cmd[4] = SSD_MIN_SIZE; -+ cmd[5] = 0; // Necessary to set the proper command length -+ -+ memset( &sense, 0, sizeof(sense) ); -+ ret = cmd.transport( device, TR_DIR_READ, &sense, SSD_MIN_SIZE ); -+ if( ret < 0 ) - { -- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (2): " << ret << endl; -- ret = -1; -- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense; -- debugError( d->ccb.csio.cdb_io.cdb_bytes[0], -- senset->error_code & SSD_ERRCODE, -- senset->flags & SSD_KEY, -- senset->add_sense_code, -- senset->add_sense_code_qual ); -- -- if( needToClose ) -- m_device->close(); -- m_device->usageUnlock(); -- -- return -1; -+ kdWarning() << "(K3bDevice::ScsiCommand) transport getting sense data failed: " << ret; -+ return 1; - } -- if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_REQ_CMP) -- { -- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (3): " << ret << endl; -- errno=EIO,-1; -- ret = -1; -- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense; -- debugError( d->ccb.csio.cdb_io.cdb_bytes[0], -- senset->error_code & SSD_ERRCODE, -- senset->flags & SSD_KEY, -- senset->add_sense_code, -- senset->add_sense_code_qual ); -- -- if( needToClose ) -- m_device->close(); -- m_device->usageUnlock(); - -- return -1; -- } -- -- memcpy(sense,_sense,sizeof(_sense)); -+ ccb.csio.sense_data = sense; -+ ccb.ccb_h.status |= CAM_AUTOSNS_VALID; - } - -- ret = ERRCODE(sense); -- k3bDebug() << "(K3bDevice::ScsiCommand) transport failed (4): " << ret << endl; -- if (ret == 0) -- ret = -1; -- else -- CREAM_ON_ERRNO(((unsigned char *)&d->ccb.csio.sense_data)); -- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense; -- debugError( d->ccb.csio.cdb_io.cdb_bytes[0], -- senset->error_code & SSD_ERRCODE, -- senset->flags & SSD_KEY, -- senset->add_sense_code, -- senset->add_sense_code_qual ); -- -- if( needToClose ) -- m_device->close(); -- m_device->usageUnlock(); -- -+ if( !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) ) -+ k3bDebug() << "(K3bDevice::ScsiCommand) sense data is not available"; -+ -+ ret = sense_to_err(ccb.csio.sense_data); -+ if( ret == 0 ) -+ ret = 1; -+ k3bDebug() << "(K3bDevice::ScsiCommand) transport failed: " << ret; - return ret; - } diff --git a/sysutils/k3b/files/patch-libk3b-tools-k3blibdvdcss.cpp b/sysutils/k3b/files/patch-libk3b-tools-k3blibdvdcss.cpp deleted file mode 100644 index 3f8147114df4..000000000000 --- a/sysutils/k3b/files/patch-libk3b-tools-k3blibdvdcss.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libk3b/tools/k3blibdvdcss.cpp.orig 2010-02-08 18:49:23.016438402 +0000 -+++ libk3b/tools/k3blibdvdcss.cpp 2010-02-08 18:49:35.965396300 +0000 -@@ -283,7 +283,7 @@ - K3bLibDvdCss* K3bLibDvdCss::create() - { - if( s_libDvdCss == 0 ) { -- s_libDvdCss = dlopen( "libdvdcss.so.2", RTLD_LAZY|RTLD_GLOBAL ); -+ s_libDvdCss = dlopen( "libdvdcss.so", RTLD_LAZY|RTLD_GLOBAL ); - if( s_libDvdCss ) { - k3b_dvdcss_open = (dvdcss_t (*)(char*))dlsym( s_libDvdCss, "dvdcss_open" ); - k3b_dvdcss_close = (int (*)( dvdcss_t ))dlsym( s_libDvdCss, "dvdcss_close" ); diff --git a/sysutils/k3b/files/patch-libk3bdevice-k3bdevicemanager.cpp b/sysutils/k3b/files/patch-libk3bdevice-k3bdevicemanager.cpp deleted file mode 100644 index 2dbbb2d3c55a..000000000000 --- a/sysutils/k3b/files/patch-libk3bdevice-k3bdevicemanager.cpp +++ /dev/null @@ -1,94 +0,0 @@ ---- libk3bdevice/k3bdevicemanager.cpp.orig Sat Jun 23 20:35:15 2007 -+++ libk3bdevice/k3bdevicemanager.cpp Fri Jul 13 23:37:31 2007 -@@ -357,7 +357,7 @@ - int need_close = 0; - int skip_device = 0; - int bus, target, lun; -- QString dev1, dev2; -+ QString cddev, passdev; - - if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) - { -@@ -400,29 +400,22 @@ - skip_device = 0; - if (need_close) - { -- QString pass = dev1; -- QString dev = "/dev/" + dev2; -- if (dev2.startsWith("pass")) -- { -- pass = dev2; -- dev = "/dev/" + dev1; -- } - #if __FreeBSD_version < 500100 -- dev += "c"; -+ cddev += "c"; - #endif -- if (!dev1.isEmpty() && !dev2.isEmpty() && dev.startsWith("/dev/cd")) -+ if (!cddev.isEmpty() && !passdev.isEmpty()) - { -- Device* device = new Device(dev.latin1()); -+ Device* device = new Device(cddev.latin1()); - device->m_bus = bus; - device->m_target = target; - device->m_lun = lun; -- device->m_passDevice = "/dev/" + pass; -- k3bDebug() << "(BSDDeviceScan) add device " << dev << ":" << bus << ":" << target << ":" << lun << endl; -+ device->m_passDevice = passdev; -+ k3bDebug() << "(BSDDeviceScan) add device " << cddev << ":" << bus << ":" << target << ":" << lun << " (" << passdev << ")" << endl; - addDevice(device); - } - need_close = 0; -- dev1=""; -- dev2=""; -+ cddev=""; -+ passdev=""; - } - bus = dev_result->path_id; - target = dev_result->target_id; -@@ -438,10 +431,11 @@ - if (skip_device != 0) - break; - -- if (need_close > 1) -- dev1 = periph_result->periph_name + QString::number(periph_result->unit_number); -- else -- dev2 = periph_result->periph_name + QString::number(periph_result->unit_number); -+ k3bDebug() << "(BSDDeviceScan) periph: " << periph_result->periph_name << periph_result->unit_number << endl; -+ if (QString("cd") == periph_result->periph_name) -+ cddev = "/dev/cd" + QString::number(periph_result->unit_number); -+ else if (QString("pass") == periph_result->periph_name) -+ passdev = "/dev/pass" + QString::number(periph_result->unit_number); - - need_close++; - break; -@@ -459,24 +453,17 @@ - - if (need_close) - { -- QString pass = dev1; -- QString dev = "/dev/" + dev2; -- if (dev2.startsWith("pass")) -- { -- pass = dev2; -- dev = "/dev/" + dev1; -- } - #if __FreeBSD_version < 500100 -- dev += "c"; -+ cddev += "c"; - #endif -- if (!dev1.isEmpty() && !dev2.isEmpty() && dev.startsWith("/dev/cd")) -+ if (!cddev.isEmpty() && !passdev.isEmpty()) - { -- Device* device = new Device(dev.latin1()); -+ Device* device = new Device(cddev.latin1()); - device->m_bus = bus; - device->m_target = target; - device->m_lun = lun; -- device->m_passDevice = "/dev/" + pass; -- k3bDebug() << "(BSDDeviceScan) add device " << dev << ":" << bus << ":" << target << ":" << lun << endl; -+ device->m_passDevice = passdev; -+ k3bDebug() << "(BSDDeviceScan) add device " << cddev << ":" << bus << ":" << target << ":" << lun << " (" << passdev << ")" << endl; - addDevice(device); - } - } diff --git a/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp b/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp deleted file mode 100644 index 95b3aafd972e..000000000000 --- a/sysutils/k3b/files/patch-plugins-decoder-ffmpeg-k3bffmpegwrapper.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2009-08-15 21:28:47.344449975 +0200 -+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2009-08-15 21:30:16.985967181 +0200 -@@ -31,6 +31,9 @@ - #define FFMPEG_BUILD_PRE_4629 - #endif - -+#ifndef CODEC_ID_MP3LAME -+#define CODEC_ID_MP3LAME CODEC_ID_MP3 -+#endif - - K3bFFMpegWrapper* K3bFFMpegWrapper::s_instance = 0; - -@@ -290,7 +293,7 @@ - #ifdef FFMPEG_BUILD_PRE_4629 - int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, - #else -- int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, -+ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, - #endif - (short*)d->outputBuffer, &d->outputBufferSize, - d->packetData, d->packetSize ); |