head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.4 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.2 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.6.0.44 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.42 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.40 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.6.0.38 pkgsrc-2011Q1-base:1.6 pkgsrc-2010Q4:1.6.0.36 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.34 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.32 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.30 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.28 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.26 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.24 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.22 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.20 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.18 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.16 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.14 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.12 pkgsrc-2008Q1:1.6.0.10 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.8 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.6 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.4 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.2 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.3.0.4 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.2 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.1.1.0.2 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2012.03.22.06.39.00; author markd; state dead; branches; next 1.6; 1.6 date 2007.03.18.13.25.56; author markd; state Exp; branches; next 1.5; 1.5 date 2007.01.16.22.38.08; author joerg; state Exp; branches; next 1.4; 1.4 date 2007.01.14.09.33.58; author wiz; state Exp; branches; next 1.3; 1.3 date 2006.07.20.11.22.25; author markd; state dead; branches; next 1.2; 1.2 date 2006.06.13.12.36.16; author markd; state Exp; branches; next 1.1; 1.1 date 2006.02.01.00.53.00; author markd; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2006.02.01.00.53.00; author markd; state Exp; branches; next ; desc @@ 1.7 log @Update to 2.0.2 KDE4 version. @ text @$NetBSD: patch-ab,v 1.6 2007/03/18 13:25:56 markd Exp $ --- src/projects/k3bencodingconverter.cpp.orig 2007-03-17 08:04:05.000000000 +1300 +++ src/projects/k3bencodingconverter.cpp @@@@ -62,7 +62,7 @@@@ bool K3bEncodingConverter::encodedLocall { #ifdef HAVE_ICONV_H QCString utf8Encoded( s.length()*2 ); -#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) +#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__) const char* in = s.data(); #else char* in = s.data(); @@@@ -111,7 +111,7 @@@@ bool K3bEncodingConverter::convert( cons iconv_t ic = ::iconv_open( to.local8Bit(), from.local8Bit() ); result.resize( s.length() * 2 ); -#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) +#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__) const char* in = s.data(); #else char* in = s.data(); @ 1.6 log @Update k3b to 1.0 Changes since rc4: bug fixes. new themes. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 2007/01/16 22:38:08 joerg Exp $ @ 1.5 log @Use sys/endian.h on DragonFly as well. As DragonFly has the FreeBSD define of Qt set, but ships with a Single Unix Specification compliant iconv.h, don't use the FreeBSD (libiconv) or NetBSD (incorrect iconv.h) code. This should be fixed upstream by utilising the ICONV_CONST configure test, but for a local pkgsrc fix it is too much work. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/projects/k3bencodingconverter.cpp.orig 2007-01-09 13:36:36.000000000 +0000 d9 1 a9 1 -#ifdef Q_OS_FREEBSD d18 1 a18 1 -#ifdef Q_OS_FREEBSD @ 1.4 log @Update to 1.0rc4 (which supports flac-1.1.3). Ok markd@@ 1.0rc4 ====== * K3b now includes a VideoDVD kio slave. It can be used in Konqueror through the protocol videodvd:/ to copy the files from a VideoDVD with on-the-fly decryption if libdvdcss is installed. (Be aware that in some countries it is not permitted to use libdvdcss.) * New Device menu containing all the actions possible for a device (like eject, unmount, ...). This includes the possibility of assigning shortcuts to these kind of actions. * K3b now warns if user parameters for external programs have been specified. This has been introduced because there were some bug report that were caused by faulty user parameters. * Cleaned up all the job classes: No job creates a widget anymore. This allows for non-GUI usage of libk3b. For example in a kioslave. * New option in the data project to not cache the inodes. That means it is possible to have multiple actual copies of the same file on one CD/DVD. * K3b now tries to disable stuff that might influence the burning process. This includes the KDED module mediamanager, SuSEPlugger, and automounting (currently supported: subfs, supermount). * New Audio Track source editor dialog to cut audio track sources at the beginning and the end. * Splitted "read retries" and "ignore read errors" for data and audio sectors in cd copy and set new defaults for audio sectors which make more sense: 5 retires and skip unreadable sectors. * New Mediamanager which makes K3b always know which device contains which medium. This makes medium handling more smooth and the user now selects a medium instead of a device. Other advantages: - No waiting time anymore when asking for information on media (including for example Audio CD ripping). - Nice default image filenames. - CD Copy: Enable/disable options based on the source medium - Automatically select newly inserted media as burning medium * DCOP call directBurn() now returns a boolean value stating if the process could be started. * New DCOP calls cddaRip(), videocdrip(), and videodvdrip() with media:/ url support. * K3b can now handle media:/ urls from the command line to specify devices * Better Lame settings dialog. Easier to use for the novice user and better defaults. * Nicer Ogg Vorbis encoder settings dialog. * K3b now shows the DVD Medium ID in the disk information view. * K3b now displays a rough estimate on the remaining time for the current job. * New automatic media size mode for the projects. This means K3b uses the size from an inserted medium for the project maximum size. * Make a suggestion for the filename when saving a project based on the Volume ID (data projects) or the CD-Text title (Audio CD) * The Audio encoder plugins are now able to provide (very simplistic) user feedback in case of an error. * New settings "Swap byte order" and "Write Wave header" in the audio encoding plugin using external apps. This makes way for the usage of such programs as mppenc to encode Musepack files. In fact, mppenc is set up as a default along with flac if installed. * New DCOP interface: K3bJobInterface which provides DCOP signals for the currently running job. It may, for example, be used to provide information to a Karamba module. * New KFile plugin for K3b projects. For now it only shows the type of the project (Data DVD or Audio CD or ...) but may be extended to show arbitrary information. * K3b now chooses default image names based on the project name or the volumeid/cdtext title in case of CD/DVD copy. * The K3b Project DCOP Interface now uses the QString type for url parameters instead of KURL. * Save/load audio cd track sources in audio projects * Display a beautified volume id. For example: THE_TRANSPORTER -> The Transporter * Check if the image directory exists before starting to create a project image * Possibility to hide the OSD temporarily for one process. * Completely rewritten Video DVD ripping and transcoding support: - Simple on-the-fly transcoding of Video DVD titles - Interface similar to Audio CD ripping - Preview images in the ripping window - Automatic clipping - Simple resizing with automatic aspect ratio handling * File System presets for all data projects including all the advanced options. * Completely rewritten data project verification - K3b now compares the written image instead of the single files - Verification of Video DVD projects * Little GUI changes: - Changed the dialog layout in the action dialogs. - Simplified the layout of the burn dialogs for data projects (more advanced settings hidden) - Improved theme support (transparent themes) * Device buffer status display for DVD burning with growisofs >= 7.0 * Support for Audio CD ripping with libcdio instead of libcdparanoia @ text @d10 1 a10 1 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) d19 1 a19 1 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) @ 1.3 log @Update k3b to 0.12.16. * FreeBSD Compile fixes (thanks to Heiner Eichmann). * NetBSD support (thanks to Mark Davies) * Always force 44.1khz in the Lame MP3 encoder plugin. * Fixed VideoDVD creation on rewritable media. * Fixed Copy of Enhanced Audio CDs with CD-Text. * Changed default boot cataloge name from "boot.cataloge" to "boot.catalog" * Fixed a crash when reusing the same DVD Iso Image writing dialog. * Ignore case when comparing MD5 sums entered by the user. * Make sure that filenames in a data project's folder are unique. * Allow index statements bigger than 99 minutes in cue files. * Properly set the length of SCSI commands (again this fixes some device detection problems). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2006/06/13 12:36:16 markd Exp $ d3 3 a5 73 --- 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 +#endif + #ifdef HAVE_RESMGR extern "C" { #include @@@@ -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 d7 16 a22 74 +#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 } @ 1.2 log @Rework how device locking/ejecting is done. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- libk3bdevice/k3bdevice.cpp.orig 2005-12-16 02:08:38.000000000 +1300 d9 3 a11 3 +// #ifdef Q_OS_NETBSD +// #include +// #endif d45 2 a46 1 @@@@ -1466,15 +1482,7 @@@@ bool K3bDevice::Device::fixupToc( K3bDev d49 13 d63 7 a69 10 - cmd[0] = MMC_PREVENT_ALLOW_MEDIUM_REMOVAL; - if( b ) - cmd[4] = 0x01; - int r = cmd.transport(); - - if( r ) - kdDebug() << "(K3bDevice::Device) MMC ALLOW MEDIA REMOVAL failed." << endl; - - return ( r == 0 ); + return cmd.traylock( b ); d73 2 a74 1 @@@@ -1497,25 +1505,14 @@@@ bool K3bDevice::Device::rewritable() con d77 13 d91 7 a97 11 - cmd[0] = MMC_START_STOP_UNIT; - - // Since all other eject methods I saw also start the unit before ejecting - // we do it also although I don't know why... - cmd[4] = 0x1; // Start unit - cmd.transport(); - - cmd[4] = 0x2; // LoEj = 1, Start = 0 - - return !cmd.transport(); + return cmd.eject( true ); d103 13 d117 4 a120 4 - cmd[0] = MMC_START_STOP_UNIT; - cmd[4] = 0x3; // LoEj = 1, Start = 1 - return !cmd.transport(); + return !cmd.eject( false ); d124 1 a124 1 @@@@ -1557,7 +1554,7 @@@@ bool K3bDevice::Device::open( bool write d133 1 a133 1 @@@@ -1574,7 +1571,7 @@@@ void K3bDevice::Device::close() const d142 1 a142 1 @@@@ -1588,7 +1585,7 @@@@ bool K3bDevice::Device::isOpen() const @ 1.1.1.1 log @Initial import of k3b version 0.12.10. From the pkgsrc-wip package by Martijn van Buul. Updated to 0.12.10 and finished off by me. K3b is a CD and DVD burning application for Linux and BSD systems optimized for KDE. It provides a comfortable user interface to perform most CD/DVD burning tasks like creating an Audio CD from a set of audio files or copying a CD. The actual burning in K3b is done by the command line utilities cdrecord, cdrdao, and growisofs. @ text @@