[pkgsrc/trunk]: pkgsrc/sysutils/k3b Update k3b to 0.12.16.

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/560fa1190cdc
branches:  trunk
changeset: 516385:560fa1190cdc
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jul 20 11:22:25 2006 +0000

description:
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).

diffstat:

 sysutils/k3b/Makefile         |   11 +--
 sysutils/k3b/PLIST            |    6 +-
 sysutils/k3b/distinfo         |   22 +----
 sysutils/k3b/patches/patch-aa |   64 ++++++-----------
 sysutils/k3b/patches/patch-ab |  150 ------------------------------------------
 sysutils/k3b/patches/patch-ac |   12 ---
 sysutils/k3b/patches/patch-ad |  131 ------------------------------------
 sysutils/k3b/patches/patch-ae |   14 ---
 sysutils/k3b/patches/patch-af |   94 --------------------------
 sysutils/k3b/patches/patch-ag |   28 ++-----
 sysutils/k3b/patches/patch-ah |   50 --------------
 sysutils/k3b/patches/patch-ai |   13 ---
 sysutils/k3b/patches/patch-aj |   14 ---
 sysutils/k3b/patches/patch-ak |   15 ----
 sysutils/k3b/patches/patch-al |   14 ---
 15 files changed, 44 insertions(+), 594 deletions(-)

diffs (truncated from 762 to 300 lines):

diff -r a15eb4b8e47c -r 560fa1190cdc sysutils/k3b/Makefile
--- a/sysutils/k3b/Makefile     Thu Jul 20 08:23:41 2006 +0000
+++ b/sysutils/k3b/Makefile     Thu Jul 20 11:22:25 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/06/28 21:19:55 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/07/20 11:22:25 markd Exp $
 #
 
-DISTNAME=              k3b-0.12.15
-PKGREVISION=           1
+DISTNAME=              k3b-0.12.16
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=          .tar.bz2
@@ -15,16 +14,12 @@
 DEPENDS+=              {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
 
 GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake autoconf perl pkg-config
+USE_TOOLS+=            gmake perl pkg-config
 USE_LANGUAGES=          c c++
 USE_LIBTOOL=            yes
 
 ONLY_FOR_PLATFORM=     FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
 
-pre-configure:
-       cd ${WRKSRC} && autoheader
-       cd ${WRKSRC} && autoconf
-
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
diff -r a15eb4b8e47c -r 560fa1190cdc sysutils/k3b/PLIST
--- a/sysutils/k3b/PLIST        Thu Jul 20 08:23:41 2006 +0000
+++ b/sysutils/k3b/PLIST        Thu Jul 20 11:22:25 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/20 08:53:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/07/20 11:22:25 markd Exp $
 bin/k3b
 bin/k3bsetup
 include/k3baudiocdtrackdrag.h
@@ -105,6 +105,8 @@
 include/kcutlabel.h
 lib/kde3/kcm_k3bsetup2.la
 lib/kde3/libk3bartsoutputplugin.la
+lib/kde3/libk3baudiometainforenamerplugin.la
+lib/kde3/libk3baudioprojectcddbplugin.la
 lib/kde3/libk3bexternalencoder.la
 lib/kde3/libk3bflacdecoder.la
 lib/kde3/libk3blameencoder.la
@@ -115,8 +117,6 @@
 lib/kde3/libk3bsoxencoder.la
 lib/kde3/libk3bwavedecoder.la
 lib/libk3b.la
-lib/libk3baudiometainforenamerplugin.la
-lib/libk3baudioprojectcddbplugin.la
 lib/libk3bdevice.la
 share/applications/kde/k3b.desktop
 share/doc/kde/HTML/en/k3b/audiocd-howto.docbook
diff -r a15eb4b8e47c -r 560fa1190cdc sysutils/k3b/distinfo
--- a/sysutils/k3b/distinfo     Thu Jul 20 08:23:41 2006 +0000
+++ b/sysutils/k3b/distinfo     Thu Jul 20 11:22:25 2006 +0000
@@ -1,17 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/06/20 19:08:13 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/07/20 11:22:25 markd Exp $
 
-SHA1 (k3b-0.12.15.tar.bz2) = 4f2768f6473032fbf6cde2d13b1c2729b7e91e3f
-RMD160 (k3b-0.12.15.tar.bz2) = 9d0ff14b394153d97ef61fcf7b46894ec5d3d511
-Size (k3b-0.12.15.tar.bz2) = 4000389 bytes
-SHA1 (patch-aa) = 5687cff4cfdfddf2258f1e991d67ed262a6a21f2
-SHA1 (patch-ab) = adf633c8ea5b2da95a6c69a2c5abedfd69b79109
-SHA1 (patch-ac) = 3b65ca0ea8e585ce68611c0332a3851a107b68f7
-SHA1 (patch-ad) = 8e111ef2a75595261f95eb533459560f01b6fae7
-SHA1 (patch-ae) = eb0ac8518ae813027aa09961344c0ab1966d4601
-SHA1 (patch-af) = 672150438329827bf89768bfdac9c5a613f02647
-SHA1 (patch-ag) = 19f37774896e691970527fdf18ce44a2c3228aff
-SHA1 (patch-ah) = 7e8822880873b3f7149a73f0d119fb52098114ff
-SHA1 (patch-ai) = cecb17457caf5bd2039b83eaf6d3e4824f5a2055
-SHA1 (patch-aj) = ebb452a3790b0cf228e3b272490bd9d6cb4c6479
-SHA1 (patch-ak) = 471bd5c253aa8aed4c5d9e4f445ad2f4dfa24fd1
-SHA1 (patch-al) = bcc69d3b5b68fad1c46989344b1fb622e7ec6ad4
+SHA1 (k3b-0.12.16.tar.bz2) = 875ebae1e5bc4ef0f186c1025087ed8005c10248
+RMD160 (k3b-0.12.16.tar.bz2) = b4b64924096581bcb0c3432f99f0e27ffe0aca79
+Size (k3b-0.12.16.tar.bz2) = 4004784 bytes
+SHA1 (patch-aa) = cd4f5203ea94d8f10e3d0b024d1edc71b688c709
+SHA1 (patch-ag) = da4c67842212d16c85ed0b5b71f6325578edcf5b
diff -r a15eb4b8e47c -r 560fa1190cdc sysutils/k3b/patches/patch-aa
--- a/sysutils/k3b/patches/patch-aa     Thu Jul 20 08:23:41 2006 +0000
+++ b/sysutils/k3b/patches/patch-aa     Thu Jul 20 11:22:25 2006 +0000
@@ -1,48 +1,30 @@
-$NetBSD: patch-aa,v 1.2 2006/06/20 19:08:13 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2006/07/20 11:22:25 markd Exp $
 
---- libk3b/core/k3bglobals.cpp.orig    2005-12-16 02:09:01.000000000 +1300
+--- libk3b/core/k3bglobals.cpp.orig    2006-06-23 02:45:37.000000000 +1200
 +++ libk3b/core/k3bglobals.cpp
-@@ -38,12 +38,21 @@
- #include <cmath>
- #include <sys/utsname.h>
- #include <sys/stat.h>
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+#define stat64 stat
-+#endif
+@@ -41,16 +41,16 @@
  
--#ifdef __FreeBSD__
-+#include <config.h>
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/param.h>
- #include <sys/mount.h>
- #else
--#include <sys/vfs.h>
-+#  ifdef HAVE_SYS_STATVFS_H
-+#    include <sys/statvfs.h>
-+#  endif
-+#  ifdef HAVE_SYS_STATFS_H
-+#    include <sys/vfs.h>
-+#  endif
+ #include <config.h>
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+-#include <sys/param.h>
+-#include <sys/mount.h>
+-#else
+-#  ifdef HAVE_SYS_STATVFS_H
+-#    include <sys/statvfs.h>
+-#  endif
+-#  ifdef HAVE_SYS_STATFS_H
+-#    include <sys/vfs.h>
+-#  endif
++#  include <sys/param.h>
++#  include <sys/mount.h>
  #endif
++#ifdef HAVE_SYS_STATVFS_H
++#  include <sys/statvfs.h>
++#endif
++#ifdef HAVE_SYS_STATFS_H
++#  include <sys/vfs.h>
++#endif
++
  
  
-@@ -235,10 +244,19 @@ QString K3b::systemName()
  
- bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail )
- {
-+#ifdef HAVE_STATVFS
-+  struct statvfs fs;
-+  if( ::statvfs( QFile::encodeName(path), &fs ) == 0 ) {
-+    unsigned long kBfak = fs.f_frsize/1024;
-+#else
-+#  ifndef HAVE_STATFS
-+#    error "No statfs, no statvfs? Help!"
-+#  endif
-   struct statfs fs;
- 
-   if( ::statfs( QFile::encodeName(path), &fs ) == 0 ) {
-     unsigned long kBfak = fs.f_bsize/1024;
-+#endif
- 
-     size = fs.f_blocks*kBfak;
-     avail = fs.f_bavail*kBfak;
diff -r a15eb4b8e47c -r 560fa1190cdc sysutils/k3b/patches/patch-ab
--- a/sysutils/k3b/patches/patch-ab     Thu Jul 20 08:23:41 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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;
-   }