sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix detection of TEAC R56S

Browse source 
PR:		71010
Reported by:	Reinhard Lenninger
Submitted by:	maintainer

- Upgrade to 0.11.14

PR:		71113
Submitted by:	maintainer
This commit is contained in:
Tilman Keskinoz 2004-09-02 15:26:02 +00:00
parent c964784809
commit d4fe0e7316
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=117946
32 changed files with 88 additions and 590 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/k3b-kde4/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= k3b PORTNAME= k3b
PORTVERSION= 0.11.12 PORTVERSION= 0.11.14
PORTREVISION= 1
CATEGORIES= sysutils multimedia kde CATEGORIES= sysutils multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

5
sysutils/k3b-kde4/distinfo
View file

@ -1,3 +1,2 @@
MD5 (k3b-0.11.12.tar.bz2) = 32537417ea39adbc5c4d7bd30c07f8b5 MD5 (k3b-0.11.14.tar.bz2) = c990df553515c8a5107df796afa4d091
SIZE (k3b-0.11.12.tar.bz2) = 3187611 SIZE (k3b-0.11.14.tar.bz2) = 3189709

4
sysutils/k3b-kde4/files/patch-src-Makefile.in
View file

@ -1,5 +1,5 @@
--- src/Makefile.in.orig Thu Jun 24 19:34:03 2004 --- src/Makefile.in.orig Tue Aug 10 12:56:08 2004
+++ src/Makefile.in Sun Jul 11 12:24:22 2004 +++ src/Makefile.in Sun Aug 22 15:28:36 2004
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
#>+ 1 #>+ 1
k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp k3bprojectinterface.cpp k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp k3bprojectinterface.cpp k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp

162
sysutils/k3b-kde4/files/patch-src-core-k3bdefaultexternalprograms.cpp
View file

@ -1,162 +0,0 @@
--- src/core/k3bdefaultexternalprograms.cpp.orig Fri May 21 19:03:21 2004
+++ src/core/k3bdefaultexternalprograms.cpp Sat Jul 31 09:49:57 2004
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <stdlib.h>
+#include "k3bprocess.h"
@@ -123,7 +124,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-version";
@@ -162,7 +163,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
out.setProcess( &fp );
fp << path << "-help";
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -236,7 +237,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-version";
@@ -265,7 +266,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
out.setProcess( &fp );
fp << path << "-help";
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -321,7 +322,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path << "-version";
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -349,7 +350,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -410,7 +411,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path << "-version";
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -438,7 +439,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -498,7 +499,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path ;
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -530,7 +531,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
fp << path << "write" << "-h";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -599,7 +600,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path ;
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -653,7 +654,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path << "-V";
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -710,7 +711,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "--version";
@@ -769,7 +770,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-version";
@@ -838,14 +839,14 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path;
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
// different locales make searching for the +- char difficult
// so we simply ignore it.
- int pos = out.output().find( QRegExp("DVD.*RW format utility") );
+ int pos = out.output().find( QRegExp("DVD.*RW.* format utility") );
if( pos < 0 )
return false;
@@ -913,7 +914,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-h";

63
sysutils/k3b-kde4/files/patch-src-core-k3bprocess.cpp
View file

@ -1,63 +0,0 @@
--- src/core/k3bprocess.cpp.orig Sun Feb 1 09:18:58 2004
+++ src/core/k3bprocess.cpp Sun Jul 11 12:24:22 2004
@@ -28,6 +28,60 @@
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
+#include <ktempfile.h>
+#include <stdlib.h>
+#include <qfile.h>
+MyKProcess & MyKProcess::operator<<(const QString& arg)
+{
+ m_args += " " + arg;
+ return *this;
+}
+
+MyKProcess &MyKProcess::operator<<(const char * arg)
+{
+ m_args += " ";
+ m_args += arg;
+ return *this;
+}
+
+MyKProcess &MyKProcess::operator<<(const QCString & arg)
+{
+ m_args += " " + arg;
+ return *this;
+}
+
+bool MyKProcess::start(KProcess::RunMode runmode, KProcess::Communication comm)
+{
+ // create temp file
+ KTempFile tmpfile;
+ tmpfile.setAutoDelete(true);
+
+ // create call
+ QString call = "/bin/sh -c \"" + m_args + " > " + tmpfile.name() + " 2>&1 \"";
+ printf("MyKProcess call: %s\n", call.latin1());
+
+ // execute it
+ system(call.latin1());
+
+ // read tmp file line by line
+ QFile tmp (tmpfile.name());
+ if ( tmp.open( IO_ReadOnly ) )
+ {
+ QTextStream stream( &tmp );
+ while ( !stream.eof() )
+ {
+ QString s = stream.readLine() + "\n";
+ printf("MyKProcess reponse: %s", s.latin1());
+
+ // send line to receivedStdout signal
+ receivedStdout(this, (char *)s.latin1(), strlen(s.latin1()));
+ }
+
+ // close and delete tmp file
+ tmp.close();
+ }
+ return true;
+}

24
sysutils/k3b-kde4/files/patch-src-core-k3bprocess.h
View file

@ -1,24 +0,0 @@
--- src/core/k3bprocess.h.orig Tue Jan 27 09:19:13 2004
+++ src/core/k3bprocess.h Sun Jul 11 12:24:22 2004
@@ -194,4 +194,21 @@
KProcess* m_process;
};
+/** This is a KProcess fake class. It uses system() to call the process
+ * and waits for its return. It redirects all output into a file and
+ * reads this file after the system() call. The redirected output
+ * (out and err!) is sent to the receivedStdout signal. This eliminates
+ * the problem reported as bug
+ * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=ports/51651
+ */
+class MyKProcess : public KProcess
+{
+ Q_OBJECT
+ QString m_args;
+public:
+ MyKProcess &operator<<(const QString& arg);
+ MyKProcess &operator<<(const char * arg);
+ MyKProcess &operator<<(const QCString & arg);
+ bool start(RunMode runmode = NotifyOnExit, Communication comm = NoCommunication);
+};
#endif

22
sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevice.cpp.orig Wed Jun 23 12:06:46 2004 --- src/device/k3bdevice.cpp.orig Tue Aug 10 09:45:21 2004
+++ src/device/k3bdevice.cpp Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevice.cpp Sun Aug 29 10:41:17 2004
@@ -57,6 +57,13 @@ @@ -57,6 +57,13 @@
#endif // Q_OS_LINUX #endif // Q_OS_LINUX
@ -14,7 +14,7 @@
#ifdef HAVE_RESMGR #ifdef HAVE_RESMGR
extern "C" { extern "C" {
@@ -153,8 +160,10 @@ @@ -154,8 +161,10 @@
d->supportedProfiles = 0; d->supportedProfiles = 0;
@ -25,7 +25,7 @@
// //
@@ -193,6 +202,7 @@ @@ -194,6 +203,7 @@
unsigned char header[2048]; unsigned char header[2048];
::memset( header, 0, 2048 ); ::memset( header, 0, 2048 );
@ -33,11 +33,11 @@
cmd[0] = MMC::GET_CONFIGURATION; cmd[0] = MMC::GET_CONFIGURATION;
cmd[8] = 8; cmd[8] = 8;
if( cmd.transport( TR_DIR_READ, header, 8 ) ) { if( cmd.transport( TR_DIR_READ, header, 8 ) ) {
@@ -769,6 +779,14 @@ @@ -754,6 +764,14 @@
m_bufferSize = 1024; m_bufferSize = 1024;
d->burnfree = false; d->burnfree = false;
} }
+ else if( description().startsWith("CD-R56S") ) { + else if( vendor().startsWith("TEAC") && description().startsWith("CD-R56S") ) {
+ m_writeModes |= TAO; + m_writeModes |= TAO;
+ d->deviceType |= CDROM|CDR; + d->deviceType |= CDROM|CDR;
+ m_maxWriteSpeed = 6; + m_maxWriteSpeed = 6;
@ -45,10 +45,10 @@
+ m_bufferSize = 1302; + m_bufferSize = 1302;
+ d->burnfree = false; + d->burnfree = false;
+ } + }
} else if( vendor().startsWith("MATSHITA") ) {
else if( vendor().startsWith("HP") ) { if( description().startsWith("CD-R CW-7501") ) {
if( description().startsWith("CD-Writer 6020") ) { m_writeModes = TAO|SAO;
@@ -2559,10 +2577,12 @@ @@ -2597,10 +2615,12 @@
{ {
// if the device is already opened we do not close it // if the device is already opened we do not close it
// to allow fast multible method calls in a row // to allow fast multible method calls in a row
@ -61,7 +61,7 @@
// header size is 8 // header size is 8
unsigned char* buffer = 0; unsigned char* buffer = 0;
@@ -2648,13 +2668,16 @@ @@ -2686,13 +2706,16 @@
delete [] buffer; delete [] buffer;
} }

4
sysutils/k3b-kde4/files/patch-src-device-k3bdevice.h
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevice.h.orig Wed Jun 9 18:36:58 2004 --- src/device/k3bdevice.h.orig Thu Jul 29 12:07:16 2004
+++ src/device/k3bdevice.h Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevice.h Sun Aug 22 15:28:36 2004
@@ -677,6 +677,10 @@ @@ -677,6 +677,10 @@
class Private; class Private;

18
sysutils/k3b-kde4/files/patch-src-device-k3bdevicemanager.cpp
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevicemanager.cpp.orig Tue Jun 22 21:50:55 2004 --- src/device/k3bdevicemanager.cpp.orig Sat Jul 17 11:50:08 2004
+++ src/device/k3bdevicemanager.cpp Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevicemanager.cpp Sun Aug 22 15:28:36 2004
@@ -49,6 +49,12 @@ @@ -49,6 +49,12 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -35,7 +35,7 @@
scanFstab(); scanFstab();
return m_foundDevices; return m_foundDevices;
@@ -421,6 +435,7 @@ @@ -423,6 +437,7 @@
bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename) bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename)
{ {
bool ret = false; bool ret = false;
@ -43,7 +43,7 @@
int cdromfd = K3bCdDevice::openDevice( devicename.ascii() ); int cdromfd = K3bCdDevice::openDevice( devicename.ascii() );
if (cdromfd < 0) { if (cdromfd < 0) {
kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl; kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl;
@@ -461,11 +476,36 @@ @@ -463,11 +478,36 @@
} }
::close( cdromfd ); ::close( cdromfd );
@ -80,7 +80,7 @@
K3bDevice* device = 0; K3bDevice* device = 0;
// resolve all symlinks // resolve all symlinks
@@ -497,6 +537,7 @@ @@ -499,6 +539,7 @@
device->m_target = target; device->m_target = target;
device->m_lun = lun; device->m_lun = lun;
} }
@ -88,7 +88,7 @@
if( !device->init() ) { if( !device->init() ) {
kdDebug() << "Could not initialize device " << devicename << endl; kdDebug() << "Could not initialize device " << devicename << endl;
@@ -572,9 +613,20 @@ @@ -574,9 +615,20 @@
if( K3bDevice* dev = findDevice( resolveSymLink(md) ) ) if( K3bDevice* dev = findDevice( resolveSymLink(md) ) )
{ {
@ -109,7 +109,7 @@
dev->setMountDevice( md ); dev->setMountDevice( md );
dev->m_supermount = supermount; dev->m_supermount = supermount;
} }
@@ -583,6 +635,8 @@ @@ -585,6 +637,8 @@
{ {
// compare bus, id, lun since the same device can for example be // compare bus, id, lun since the same device can for example be
// determined as /dev/srX or /dev/scdX // determined as /dev/srX or /dev/scdX
@ -118,7 +118,7 @@
int bus = -1, id = -1, lun = -1; int bus = -1, id = -1, lun = -1;
if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) { if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) {
if( K3bDevice* dev = findDevice( bus, id, lun ) ) { if( K3bDevice* dev = findDevice( bus, id, lun ) ) {
@@ -593,6 +647,17 @@ @@ -595,6 +649,17 @@
} }
} }
} }
@ -136,7 +136,7 @@
} }
@@ -668,5 +733,131 @@ @@ -670,5 +735,131 @@
return QString::fromLatin1( resolved ); return QString::fromLatin1( resolved );
} }

2
sysutils/k3b-kde4/files/patch-src-device-k3bdevicemanager.h
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004 --- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004
+++ src/device/k3bdevicemanager.h Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevicemanager.h Sun Aug 22 15:28:36 2004
@@ -112,6 +112,10 @@ @@ -112,6 +112,10 @@
class Private; class Private;

2
sysutils/k3b-kde4/files/patch-src-device-k3bscsicommand.cpp
View file

@ -1,5 +1,5 @@
--- src/device/k3bscsicommand.cpp.orig Wed Jan 21 11:20:11 2004 --- src/device/k3bscsicommand.cpp.orig Wed Jan 21 11:20:11 2004
+++ src/device/k3bscsicommand.cpp Sun Jul 11 12:24:22 2004 +++ src/device/k3bscsicommand.cpp Sun Aug 22 15:28:36 2004
@@ -58,13 +58,14 @@ @@ -58,13 +58,14 @@

2
sysutils/k3b-kde4/files/patch-src-device-k3bscsicommand.h
View file

@ -1,5 +1,5 @@
--- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004 --- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004
+++ src/device/k3bscsicommand.h Sun Jul 11 12:24:22 2004 +++ src/device/k3bscsicommand.h Sun Aug 22 15:28:36 2004
@@ -17,9 +17,27 @@ @@ -17,9 +17,27 @@
#define _K3B_SCSI_COMMAND_H_ #define _K3B_SCSI_COMMAND_H_

2
sysutils/k3b-kde4/files/patch-src-rip-k3bdvdrippingprocess.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004 --- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004
+++ src/rip/k3bdvdrippingprocess.cpp Sun Jul 11 12:24:22 2004 +++ src/rip/k3bdvdrippingprocess.cpp Sun Aug 22 15:28:36 2004
@@ -285,10 +285,13 @@ @@ -285,10 +285,13 @@
void K3bDvdRippingProcess::slotPreProcessingDvd() { void K3bDvdRippingProcess::slotPreProcessingDvd() {
QString video; QString video;

2
sysutils/k3b-kde4/files/patch-src-rip-k3bmovieview.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004 --- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004
+++ src/rip/k3bmovieview.cpp Sun Jul 11 12:24:22 2004 +++ src/rip/k3bmovieview.cpp Sun Aug 22 15:28:36 2004
@@ -223,8 +223,11 @@ @@ -223,8 +223,11 @@
} }

2
sysutils/k3b-kde4/files/patch-src-rip-k3btcwrapper.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004 --- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004
+++ src/rip/k3btcwrapper.cpp Sun Jul 11 12:24:22 2004 +++ src/rip/k3btcwrapper.cpp Sun Aug 22 15:28:36 2004
@@ -65,7 +65,12 @@ @@ -65,7 +65,12 @@
//K3bProcess *p = new K3bProcess(); //K3bProcess *p = new K3bProcess();
emit tcprobeTitleParsed( m_currentTitle ); emit tcprobeTitleParsed( m_currentTitle );

4
sysutils/k3b-kde4/files/patch-src-rip-k3bvideocdrip.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3bvideocdrip.cpp.orig Sun Jul 11 15:13:42 2004 --- src/rip/k3bvideocdrip.cpp.orig Wed Jan 21 11:20:20 2004
+++ src/rip/k3bvideocdrip.cpp Sun Jul 11 15:14:07 2004 +++ src/rip/k3bvideocdrip.cpp Sun Aug 22 15:28:36 2004
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
m_ripsourceType( 0 ), m_ripsourceType( 0 ),
m_videooptions( options ), m_videooptions( options ),

3
sysutils/k3b/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= k3b PORTNAME= k3b
PORTVERSION= 0.11.12 PORTVERSION= 0.11.14
PORTREVISION= 1
CATEGORIES= sysutils multimedia kde CATEGORIES= sysutils multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME} MASTER_SITE_SUBDIR= ${PORTNAME}

5
sysutils/k3b/distinfo
View file

@ -1,3 +1,2 @@
MD5 (k3b-0.11.12.tar.bz2) = 32537417ea39adbc5c4d7bd30c07f8b5 MD5 (k3b-0.11.14.tar.bz2) = c990df553515c8a5107df796afa4d091
SIZE (k3b-0.11.12.tar.bz2) = 3187611 SIZE (k3b-0.11.14.tar.bz2) = 3189709

4
sysutils/k3b/files/patch-src-Makefile.in
View file

@ -1,5 +1,5 @@
--- src/Makefile.in.orig Thu Jun 24 19:34:03 2004 --- src/Makefile.in.orig Tue Aug 10 12:56:08 2004
+++ src/Makefile.in Sun Jul 11 12:24:22 2004 +++ src/Makefile.in Sun Aug 22 15:28:36 2004
@@ -287,7 +287,7 @@ @@ -287,7 +287,7 @@
#>+ 1 #>+ 1
k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp k3bprojectinterface.cpp k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp k3bprojectinterface.cpp k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp

162
sysutils/k3b/files/patch-src-core-k3bdefaultexternalprograms.cpp
View file

@ -1,162 +0,0 @@
--- src/core/k3bdefaultexternalprograms.cpp.orig Fri May 21 19:03:21 2004
+++ src/core/k3bdefaultexternalprograms.cpp Sat Jul 31 09:49:57 2004
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <stdlib.h>
+#include "k3bprocess.h"
@@ -123,7 +124,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-version";
@@ -162,7 +163,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
out.setProcess( &fp );
fp << path << "-help";
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -236,7 +237,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-version";
@@ -265,7 +266,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
out.setProcess( &fp );
fp << path << "-help";
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -321,7 +322,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path << "-version";
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -349,7 +350,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -410,7 +411,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path << "-version";
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -438,7 +439,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
fp << path << "-help";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -498,7 +499,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path ;
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -530,7 +531,7 @@
// probe features
- KProcess fp;
+ MyKProcess fp;
fp << path << "write" << "-h";
out.setProcess( &fp );
if( fp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -599,7 +600,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path ;
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -653,7 +654,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
vp << path << "-V";
K3bProcess::OutputCollector out( &vp );
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
@@ -710,7 +711,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "--version";
@@ -769,7 +770,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-version";
@@ -838,14 +839,14 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path;
if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
// different locales make searching for the +- char difficult
// so we simply ignore it.
- int pos = out.output().find( QRegExp("DVD.*RW format utility") );
+ int pos = out.output().find( QRegExp("DVD.*RW.* format utility") );
if( pos < 0 )
return false;
@@ -913,7 +914,7 @@
K3bExternalBin* bin = 0;
// probe version
- KProcess vp;
+ MyKProcess vp;
K3bProcess::OutputCollector out( &vp );
vp << path << "-h";

63
sysutils/k3b/files/patch-src-core-k3bprocess.cpp
View file

@ -1,63 +0,0 @@
--- src/core/k3bprocess.cpp.orig Sun Feb 1 09:18:58 2004
+++ src/core/k3bprocess.cpp Sun Jul 11 12:24:22 2004
@@ -28,6 +28,60 @@
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
+#include <ktempfile.h>
+#include <stdlib.h>
+#include <qfile.h>
+MyKProcess & MyKProcess::operator<<(const QString& arg)
+{
+ m_args += " " + arg;
+ return *this;
+}
+
+MyKProcess &MyKProcess::operator<<(const char * arg)
+{
+ m_args += " ";
+ m_args += arg;
+ return *this;
+}
+
+MyKProcess &MyKProcess::operator<<(const QCString & arg)
+{
+ m_args += " " + arg;
+ return *this;
+}
+
+bool MyKProcess::start(KProcess::RunMode runmode, KProcess::Communication comm)
+{
+ // create temp file
+ KTempFile tmpfile;
+ tmpfile.setAutoDelete(true);
+
+ // create call
+ QString call = "/bin/sh -c \"" + m_args + " > " + tmpfile.name() + " 2>&1 \"";
+ printf("MyKProcess call: %s\n", call.latin1());
+
+ // execute it
+ system(call.latin1());
+
+ // read tmp file line by line
+ QFile tmp (tmpfile.name());
+ if ( tmp.open( IO_ReadOnly ) )
+ {
+ QTextStream stream( &tmp );
+ while ( !stream.eof() )
+ {
+ QString s = stream.readLine() + "\n";
+ printf("MyKProcess reponse: %s", s.latin1());
+
+ // send line to receivedStdout signal
+ receivedStdout(this, (char *)s.latin1(), strlen(s.latin1()));
+ }
+
+ // close and delete tmp file
+ tmp.close();
+ }
+ return true;
+}

24
sysutils/k3b/files/patch-src-core-k3bprocess.h
View file

@ -1,24 +0,0 @@
--- src/core/k3bprocess.h.orig Tue Jan 27 09:19:13 2004
+++ src/core/k3bprocess.h Sun Jul 11 12:24:22 2004
@@ -194,4 +194,21 @@
KProcess* m_process;
};
+/** This is a KProcess fake class. It uses system() to call the process
+ * and waits for its return. It redirects all output into a file and
+ * reads this file after the system() call. The redirected output
+ * (out and err!) is sent to the receivedStdout signal. This eliminates
+ * the problem reported as bug
+ * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=ports/51651
+ */
+class MyKProcess : public KProcess
+{
+ Q_OBJECT
+ QString m_args;
+public:
+ MyKProcess &operator<<(const QString& arg);
+ MyKProcess &operator<<(const char * arg);
+ MyKProcess &operator<<(const QCString & arg);
+ bool start(RunMode runmode = NotifyOnExit, Communication comm = NoCommunication);
+};
#endif

22
sysutils/k3b/files/patch-src-device-k3bdevice.cpp
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevice.cpp.orig Wed Jun 23 12:06:46 2004 --- src/device/k3bdevice.cpp.orig Tue Aug 10 09:45:21 2004
+++ src/device/k3bdevice.cpp Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevice.cpp Sun Aug 29 10:41:17 2004
@@ -57,6 +57,13 @@ @@ -57,6 +57,13 @@
#endif // Q_OS_LINUX #endif // Q_OS_LINUX
@ -14,7 +14,7 @@
#ifdef HAVE_RESMGR #ifdef HAVE_RESMGR
extern "C" { extern "C" {
@@ -153,8 +160,10 @@ @@ -154,8 +161,10 @@
d->supportedProfiles = 0; d->supportedProfiles = 0;
@ -25,7 +25,7 @@
// //
@@ -193,6 +202,7 @@ @@ -194,6 +203,7 @@
unsigned char header[2048]; unsigned char header[2048];
::memset( header, 0, 2048 ); ::memset( header, 0, 2048 );
@ -33,11 +33,11 @@
cmd[0] = MMC::GET_CONFIGURATION; cmd[0] = MMC::GET_CONFIGURATION;
cmd[8] = 8; cmd[8] = 8;
if( cmd.transport( TR_DIR_READ, header, 8 ) ) { if( cmd.transport( TR_DIR_READ, header, 8 ) ) {
@@ -769,6 +779,14 @@ @@ -754,6 +764,14 @@
m_bufferSize = 1024; m_bufferSize = 1024;
d->burnfree = false; d->burnfree = false;
} }
+ else if( description().startsWith("CD-R56S") ) { + else if( vendor().startsWith("TEAC") && description().startsWith("CD-R56S") ) {
+ m_writeModes |= TAO; + m_writeModes |= TAO;
+ d->deviceType |= CDROM|CDR; + d->deviceType |= CDROM|CDR;
+ m_maxWriteSpeed = 6; + m_maxWriteSpeed = 6;
@ -45,10 +45,10 @@
+ m_bufferSize = 1302; + m_bufferSize = 1302;
+ d->burnfree = false; + d->burnfree = false;
+ } + }
} else if( vendor().startsWith("MATSHITA") ) {
else if( vendor().startsWith("HP") ) { if( description().startsWith("CD-R CW-7501") ) {
if( description().startsWith("CD-Writer 6020") ) { m_writeModes = TAO|SAO;
@@ -2559,10 +2577,12 @@ @@ -2597,10 +2615,12 @@
{ {
// if the device is already opened we do not close it // if the device is already opened we do not close it
// to allow fast multible method calls in a row // to allow fast multible method calls in a row
@ -61,7 +61,7 @@
// header size is 8 // header size is 8
unsigned char* buffer = 0; unsigned char* buffer = 0;
@@ -2648,13 +2668,16 @@ @@ -2686,13 +2706,16 @@
delete [] buffer; delete [] buffer;
} }

4
sysutils/k3b/files/patch-src-device-k3bdevice.h
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevice.h.orig Wed Jun 9 18:36:58 2004 --- src/device/k3bdevice.h.orig Thu Jul 29 12:07:16 2004
+++ src/device/k3bdevice.h Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevice.h Sun Aug 22 15:28:36 2004
@@ -677,6 +677,10 @@ @@ -677,6 +677,10 @@
class Private; class Private;

18
sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevicemanager.cpp.orig Tue Jun 22 21:50:55 2004 --- src/device/k3bdevicemanager.cpp.orig Sat Jul 17 11:50:08 2004
+++ src/device/k3bdevicemanager.cpp Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevicemanager.cpp Sun Aug 22 15:28:36 2004
@@ -49,6 +49,12 @@ @@ -49,6 +49,12 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -35,7 +35,7 @@
scanFstab(); scanFstab();
return m_foundDevices; return m_foundDevices;
@@ -421,6 +435,7 @@ @@ -423,6 +437,7 @@
bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename) bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename)
{ {
bool ret = false; bool ret = false;
@ -43,7 +43,7 @@
int cdromfd = K3bCdDevice::openDevice( devicename.ascii() ); int cdromfd = K3bCdDevice::openDevice( devicename.ascii() );
if (cdromfd < 0) { if (cdromfd < 0) {
kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl; kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl;
@@ -461,11 +476,36 @@ @@ -463,11 +478,36 @@
} }
::close( cdromfd ); ::close( cdromfd );
@ -80,7 +80,7 @@
K3bDevice* device = 0; K3bDevice* device = 0;
// resolve all symlinks // resolve all symlinks
@@ -497,6 +537,7 @@ @@ -499,6 +539,7 @@
device->m_target = target; device->m_target = target;
device->m_lun = lun; device->m_lun = lun;
} }
@ -88,7 +88,7 @@
if( !device->init() ) { if( !device->init() ) {
kdDebug() << "Could not initialize device " << devicename << endl; kdDebug() << "Could not initialize device " << devicename << endl;
@@ -572,9 +613,20 @@ @@ -574,9 +615,20 @@
if( K3bDevice* dev = findDevice( resolveSymLink(md) ) ) if( K3bDevice* dev = findDevice( resolveSymLink(md) ) )
{ {
@ -109,7 +109,7 @@
dev->setMountDevice( md ); dev->setMountDevice( md );
dev->m_supermount = supermount; dev->m_supermount = supermount;
} }
@@ -583,6 +635,8 @@ @@ -585,6 +637,8 @@
{ {
// compare bus, id, lun since the same device can for example be // compare bus, id, lun since the same device can for example be
// determined as /dev/srX or /dev/scdX // determined as /dev/srX or /dev/scdX
@ -118,7 +118,7 @@
int bus = -1, id = -1, lun = -1; int bus = -1, id = -1, lun = -1;
if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) { if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) {
if( K3bDevice* dev = findDevice( bus, id, lun ) ) { if( K3bDevice* dev = findDevice( bus, id, lun ) ) {
@@ -593,6 +647,17 @@ @@ -595,6 +649,17 @@
} }
} }
} }
@ -136,7 +136,7 @@
} }
@@ -668,5 +733,131 @@ @@ -670,5 +735,131 @@
return QString::fromLatin1( resolved ); return QString::fromLatin1( resolved );
} }

2
sysutils/k3b/files/patch-src-device-k3bdevicemanager.h
View file

@ -1,5 +1,5 @@
--- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004 --- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004
+++ src/device/k3bdevicemanager.h Sun Jul 11 12:24:22 2004 +++ src/device/k3bdevicemanager.h Sun Aug 22 15:28:36 2004
@@ -112,6 +112,10 @@ @@ -112,6 +112,10 @@
class Private; class Private;

2
sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp
View file

@ -1,5 +1,5 @@
--- src/device/k3bscsicommand.cpp.orig Wed Jan 21 11:20:11 2004 --- src/device/k3bscsicommand.cpp.orig Wed Jan 21 11:20:11 2004
+++ src/device/k3bscsicommand.cpp Sun Jul 11 12:24:22 2004 +++ src/device/k3bscsicommand.cpp Sun Aug 22 15:28:36 2004
@@ -58,13 +58,14 @@ @@ -58,13 +58,14 @@

2
sysutils/k3b/files/patch-src-device-k3bscsicommand.h
View file

@ -1,5 +1,5 @@
--- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004 --- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004
+++ src/device/k3bscsicommand.h Sun Jul 11 12:24:22 2004 +++ src/device/k3bscsicommand.h Sun Aug 22 15:28:36 2004
@@ -17,9 +17,27 @@ @@ -17,9 +17,27 @@
#define _K3B_SCSI_COMMAND_H_ #define _K3B_SCSI_COMMAND_H_

2
sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004 --- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004
+++ src/rip/k3bdvdrippingprocess.cpp Sun Jul 11 12:24:22 2004 +++ src/rip/k3bdvdrippingprocess.cpp Sun Aug 22 15:28:36 2004
@@ -285,10 +285,13 @@ @@ -285,10 +285,13 @@
void K3bDvdRippingProcess::slotPreProcessingDvd() { void K3bDvdRippingProcess::slotPreProcessingDvd() {
QString video; QString video;

2
sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004 --- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004
+++ src/rip/k3bmovieview.cpp Sun Jul 11 12:24:22 2004 +++ src/rip/k3bmovieview.cpp Sun Aug 22 15:28:36 2004
@@ -223,8 +223,11 @@ @@ -223,8 +223,11 @@
} }

2
sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004 --- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004
+++ src/rip/k3btcwrapper.cpp Sun Jul 11 12:24:22 2004 +++ src/rip/k3btcwrapper.cpp Sun Aug 22 15:28:36 2004
@@ -65,7 +65,12 @@ @@ -65,7 +65,12 @@
//K3bProcess *p = new K3bProcess(); //K3bProcess *p = new K3bProcess();
emit tcprobeTitleParsed( m_currentTitle ); emit tcprobeTitleParsed( m_currentTitle );

4
sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp
View file

@ -1,5 +1,5 @@
--- src/rip/k3bvideocdrip.cpp.orig Sun Jul 11 15:13:42 2004 --- src/rip/k3bvideocdrip.cpp.orig Wed Jan 21 11:20:20 2004
+++ src/rip/k3bvideocdrip.cpp Sun Jul 11 15:14:07 2004 +++ src/rip/k3bvideocdrip.cpp Sun Aug 22 15:28:36 2004
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
m_ripsourceType( 0 ), m_ripsourceType( 0 ),
m_videooptions( options ), m_videooptions( options ),