Date: Wed, 29 Dec 2004 16:58:38 +0100 From: Heiner <h.eichmann@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75614: Port upgrade: sysutils/k3b to 0.11.8 Message-ID: <200412291658.38931.h.eichmann@gmx.de> Resent-Message-ID: <200412291600.iBTG0mYF067767@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75614
>Category: ports
>Synopsis: Port upgrade: sysutils/k3b to 0.11.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 29 16:00:48 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Heiner Eichmann <h.eichmann@gmx.de>
>Release: FreeBSD 4.10-STABLE i386
>Organization:
Sirius Cybernetics Corp.
>Environment:
=46reeBSD 7of9.unimatrix-zero.borg 4.10-STABLE FreeBSD 4.10-STABLE #1: Sun =
Jun=20
2014:49:25 CEST 2004 =A0 =A0=20
root@7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL =A0i386
>Description:
Upgrade to 0.11.8
>How-To-Repeat:
>Fix:
See attached diff
--Boundary-00=_uQt0BE3Z2ptShUp
Content-Type: text/x-diff;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="diff"
diff -urN ../../sysutils/k3b/Makefile ./Makefile
--- ../../sysutils/k3b/Makefile Mon Nov 15 20:10:59 2004
+++ ./Makefile Thu Dec 16 19:37:46 2004
@@ -6,16 +6,13 @@
#
PORTNAME= k3b
-PORTVERSION= 0.11.17
-PORTREVISION= 1
+PORTVERSION= 0.11.18
CATEGORIES= sysutils multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= h.eichmann@gmx.de
COMMENT= A CD/DVD recording GUI for KDE
-
-EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure
RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools \
cdrdao:${PORTSDIR}/sysutils/cdrdao
diff -urN ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo Mon Nov 15 20:10:59 2004
+++ ./distinfo Sun Dec 12 18:52:12 2004
@@ -1,2 +1,2 @@
-MD5 (k3b-0.11.17.tar.bz2) = 5c07b7ffc2f931d84b18e9fe7aa2b41c
-SIZE (k3b-0.11.17.tar.bz2) = 3187604
+MD5 (k3b-0.11.18.tar.bz2) = f5060c384c6830b51bad0451ec265326
+SIZE (k3b-0.11.18.tar.bz2) = 3189252
diff -urN ../../sysutils/k3b/files/patch-src-Makefile.in ./files/patch-src-Makefile.in
--- ../../sysutils/k3b/files/patch-src-Makefile.in Fri Sep 17 11:30:55 2004
+++ ./files/patch-src-Makefile.in Fri Dec 24 13:32:00 2004
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig Tue Aug 10 12:56:08 2004
-+++ src/Makefile.in Sun Aug 22 15:28:36 2004
-@@ -287,7 +287,7 @@
+--- src/Makefile.in.orig Sat Dec 11 17:46:26 2004
++++ src/Makefile.in Thu Dec 16 20:14:57 2004
+@@ -297,7 +297,7 @@
#>+ 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
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp ./files/patch-src-device-k3bdevice.cpp
--- ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp Thu Sep 2 17:26:02 2004
+++ ./files/patch-src-device-k3bdevice.cpp Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
---- src/device/k3bdevice.cpp.orig Tue Aug 10 09:45:21 2004
-+++ src/device/k3bdevice.cpp Sun Aug 29 10:41:17 2004
+--- src/device/k3bdevice.cpp.orig Sun Nov 28 01:22:29 2004
++++ src/device/k3bdevice.cpp Fri Dec 24 13:31:15 2004
@@ -57,6 +57,13 @@
#endif // Q_OS_LINUX
@@ -14,7 +14,7 @@
#ifdef HAVE_RESMGR
extern "C" {
-@@ -154,8 +161,10 @@
+@@ -188,8 +195,10 @@
d->supportedProfiles = 0;
@@ -25,7 +25,7 @@
//
-@@ -194,6 +203,7 @@
+@@ -228,6 +237,7 @@
unsigned char header[2048];
::memset( header, 0, 2048 );
@@ -33,22 +33,32 @@
cmd[0] = MMC::GET_CONFIGURATION;
cmd[8] = 8;
if( cmd.transport( TR_DIR_READ, header, 8 ) ) {
-@@ -754,6 +764,14 @@
+@@ -820,6 +830,24 @@
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("TEAC") ) {
++ if( description().startsWith("CD-R56S") ) {
++ m_writeModes |= TAO;
++ d->deviceType |= CDROM|CDR;
++ m_maxWriteSpeed = 6;
++ m_maxReadSpeed = 24;
++ m_bufferSize = 1302;
++ d->burnfree = false;
++ }
++ if( description().startsWith("CD-R58S") ) {
++ m_writeModes |= TAO;
++ d->deviceType |= CDROM|CDR;
++ m_maxWriteSpeed = 8;
++ m_maxReadSpeed = 24;
++ m_bufferSize = 4096;
++ d->burnfree = false;
++ }
+ }
else if( vendor().startsWith("MATSHITA") ) {
if( description().startsWith("CD-R CW-7501") ) {
m_writeModes = TAO|SAO;
-@@ -2597,10 +2615,12 @@
+@@ -2663,10 +2691,12 @@
{
// if the device is already opened we do not close it
// to allow fast multible method calls in a row
@@ -61,7 +71,7 @@
// header size is 8
unsigned char* buffer = 0;
-@@ -2686,13 +2706,16 @@
+@@ -2752,13 +2782,16 @@
delete [] buffer;
}
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.h ./files/patch-src-device-k3bdevice.h
--- ../../sysutils/k3b/files/patch-src-device-k3bdevice.h Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-device-k3bdevice.h Fri Dec 24 13:32:00 2004
@@ -1,6 +1,6 @@
---- src/device/k3bdevice.h.orig Thu Jul 29 12:07:16 2004
-+++ src/device/k3bdevice.h Sun Aug 22 15:28:36 2004
-@@ -677,6 +677,10 @@
+--- src/device/k3bdevice.h.orig Sun Nov 28 13:27:24 2004
++++ src/device/k3bdevice.h Thu Dec 16 20:14:57 2004
+@@ -690,6 +690,10 @@
class Private;
Private* d;
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp ./files/patch-src-device-k3bdevicemanager.cpp
--- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-device-k3bdevicemanager.cpp Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
---- src/device/k3bdevicemanager.cpp.orig Sat Jul 17 11:50:08 2004
-+++ src/device/k3bdevicemanager.cpp Sun Aug 22 15:28:36 2004
+--- src/device/k3bdevicemanager.cpp.orig Sun Nov 28 13:27:24 2004
++++ src/device/k3bdevicemanager.cpp Thu Dec 16 20:14:57 2004
@@ -49,6 +49,12 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
@@ -27,15 +27,15 @@
QFile info("/proc/sys/dev/cdrom/info");
QString line,devstring;
info.open(IO_ReadOnly);
-@@ -286,6 +299,7 @@
- // m_foundDevices++;
- // }
+@@ -269,6 +282,7 @@
+ // FIXME: also scan /dev/scsi/hostX.... for devfs without symlinks
+ #endif
+#endif
scanFstab();
return m_foundDevices;
-@@ -423,6 +437,7 @@
+@@ -412,6 +426,7 @@
bool K3bCdDevice::DeviceManager::testForCdrom(const QString& devicename)
{
bool ret = false;
@@ -43,7 +43,7 @@
int cdromfd = K3bCdDevice::openDevice( devicename.ascii() );
if (cdromfd < 0) {
kdDebug() << "could not open device " << devicename << " (" << strerror(errno) << ")" << endl;
-@@ -463,11 +478,36 @@
+@@ -452,11 +467,36 @@
}
::close( cdromfd );
@@ -80,7 +80,7 @@
K3bDevice* device = 0;
// resolve all symlinks
-@@ -499,6 +539,7 @@
+@@ -488,6 +528,7 @@
device->m_target = target;
device->m_lun = lun;
}
@@ -88,7 +88,7 @@
if( !device->init() ) {
kdDebug() << "Could not initialize device " << devicename << endl;
-@@ -574,9 +615,20 @@
+@@ -563,9 +604,20 @@
if( K3bDevice* dev = findDevice( resolveSymLink(md) ) )
{
@@ -109,7 +109,7 @@
dev->setMountDevice( md );
dev->m_supermount = supermount;
}
-@@ -585,6 +637,8 @@
+@@ -574,6 +626,8 @@
{
// compare bus, id, lun since the same device can for example be
// determined as /dev/srX or /dev/scdX
@@ -118,7 +118,7 @@
int bus = -1, id = -1, lun = -1;
if( determineBusIdLun( mountInfo->fs_spec, bus, id, lun ) ) {
if( K3bDevice* dev = findDevice( bus, id, lun ) ) {
-@@ -595,6 +649,17 @@
+@@ -584,6 +638,17 @@
}
}
}
@@ -136,7 +136,7 @@
}
-@@ -670,5 +735,131 @@
+@@ -659,5 +724,131 @@
return QString::fromLatin1( resolved );
}
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h ./files/patch-src-device-k3bdevicemanager.h
--- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-device-k3bdevicemanager.h Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
--- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004
-+++ src/device/k3bdevicemanager.h Sun Aug 22 15:28:36 2004
++++ src/device/k3bdevicemanager.h Thu Dec 16 20:14:57 2004
@@ -112,6 +112,10 @@
class Private;
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp ./files/patch-src-device-k3bscsicommand.cpp
--- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-device-k3bscsicommand.cpp Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
---- src/device/k3bscsicommand.cpp.orig Wed Jan 21 11:20:11 2004
-+++ src/device/k3bscsicommand.cpp Sun Aug 22 15:28:36 2004
+--- src/device/k3bscsicommand.cpp.orig Sun Aug 15 11:58:23 2004
++++ src/device/k3bscsicommand.cpp Thu Dec 16 20:14:57 2004
@@ -58,13 +58,14 @@
@@ -21,7 +21,7 @@
K3bCdDevice::ScsiCommand::ScsiCommand( const K3bCdDevice::CdDevice* dev )
: m_device(dev)
-@@ -135,6 +136,155 @@
+@@ -141,6 +142,155 @@
return 0;
}
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h ./files/patch-src-device-k3bscsicommand.h
--- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-device-k3bscsicommand.h Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
--- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004
-+++ src/device/k3bscsicommand.h Sun Aug 22 15:28:36 2004
++++ src/device/k3bscsicommand.h Thu Dec 16 20:14:57 2004
@@ -17,9 +17,27 @@
#define _K3B_SCSI_COMMAND_H_
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp ./files/patch-src-rip-k3bdvdrippingprocess.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-rip-k3bdvdrippingprocess.cpp Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
--- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004
-+++ src/rip/k3bdvdrippingprocess.cpp Sun Aug 22 15:28:36 2004
++++ src/rip/k3bdvdrippingprocess.cpp Thu Dec 16 20:14:57 2004
@@ -285,10 +285,13 @@
void K3bDvdRippingProcess::slotPreProcessingDvd() {
QString video;
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp ./files/patch-src-rip-k3bmovieview.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-rip-k3bmovieview.cpp Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
--- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004
-+++ src/rip/k3bmovieview.cpp Sun Aug 22 15:28:36 2004
++++ src/rip/k3bmovieview.cpp Thu Dec 16 20:14:57 2004
@@ -223,8 +223,11 @@
}
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp ./files/patch-src-rip-k3btcwrapper.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-rip-k3btcwrapper.cpp Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
--- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004
-+++ src/rip/k3btcwrapper.cpp Sun Aug 22 15:28:36 2004
++++ src/rip/k3btcwrapper.cpp Thu Dec 16 20:14:57 2004
@@ -65,7 +65,12 @@
//K3bProcess *p = new K3bProcess();
emit tcprobeTitleParsed( m_currentTitle );
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp ./files/patch-src-rip-k3bvideocdrip.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp Fri Sep 17 11:30:56 2004
+++ ./files/patch-src-rip-k3bvideocdrip.cpp Fri Dec 24 13:32:00 2004
@@ -1,5 +1,5 @@
--- src/rip/k3bvideocdrip.cpp.orig Wed Jan 21 11:20:20 2004
-+++ src/rip/k3bvideocdrip.cpp Sun Aug 22 15:28:36 2004
++++ src/rip/k3bvideocdrip.cpp Thu Dec 16 20:14:57 2004
@@ -41,7 +41,8 @@
m_ripsourceType( 0 ),
m_videooptions( options ),
--Boundary-00=_uQt0BE3Z2ptShUp--
>Release-Note:
>Audit-Trail:
>Unformatted:
--Boundary-00=_uQt0BE3Z2ptShUp
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
X-send-pr-version: send-pr 3.113
X-GNATS-Notify:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412291658.38931.h.eichmann>