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

6 files changed, 81 insertions, 54 deletions

diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index c027b9c8fec..8c3cf722c67 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/01/13 16:50:12 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/14 09:33:58 wiz Exp $
 #
 
-DISTNAME=		k3b-0.12.17
-PKGREVISION=		1
+DISTNAME=		k3b-1.0rc4
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/k3b/PLIST b/sysutils/k3b/PLIST
index 8e67bfd4421..18c03ef82bc 100644
--- a/sysutils/k3b/PLIST
+++ b/sysutils/k3b/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2006/07/20 11:22:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/01/14 09:33:58 wiz Exp $
 bin/k3b
 bin/k3bsetup
+include/k3b_export.h
+include/k3bactivepipe.h
 include/k3baudiocdtrackdrag.h
 include/k3baudiocdtracksource.h
 include/k3baudiocuefilewritingjob.h
@@ -24,6 +26,7 @@ include/k3bcdrdaowriter.h
 include/k3bcdrecordwriter.h
 include/k3bcdtext.h
 include/k3bcdtextvalidator.h
+include/k3bchecksumpipe.h
 include/k3bclonejob.h
 include/k3bcore.h
 include/k3bcuefileparser.h
@@ -31,8 +34,10 @@ include/k3bcutcombobox.h
 include/k3bdatadoc.h
 include/k3bdataitem.h
 include/k3bdatajob.h
+include/k3bdebug.h
 include/k3bdefaultexternalprograms.h
 include/k3bdevice.h
+include/k3bdevice_export.h
 include/k3bdevicecombobox.h
 include/k3bdeviceglobals.h
 include/k3bdevicehandler.h
@@ -40,6 +45,7 @@ include/k3bdevicemanager.h
 include/k3bdeviceselectiondialog.h
 include/k3bdevicetypes.h
 include/k3bdiritem.h
+include/k3bdirsizejob.h
 include/k3bdiskinfo.h
 include/k3bdoc.h
 include/k3bdvdcopyjob.h
@@ -49,10 +55,14 @@ include/k3bdvdjob.h
 include/k3bexceptions.h
 include/k3bexternalbinmanager.h
 include/k3bfileitem.h
+include/k3bfilesplitter.h
+include/k3bfilesysteminfo.h
 include/k3bglobals.h
 include/k3bglobalsettings.h
 include/k3bgrowisofswriter.h
+include/k3bimagefilereader.h
 include/k3binffilewriter.h
+include/k3bintmapcombobox.h
 include/k3bintvalidator.h
 include/k3biso9660.h
 include/k3biso9660backend.h
@@ -73,6 +83,7 @@ include/k3bmovixjob.h
 include/k3bmsf.h
 include/k3bmsfedit.h
 include/k3bmultichoicedialog.h
+include/k3bpipe.h
 include/k3bplugin.h
 include/k3bpluginconfigwidget.h
 include/k3bpluginfactory.h
@@ -82,10 +93,12 @@ include/k3bprogressdialog.h
 include/k3bprojectplugin.h
 include/k3bpushbutton.h
 include/k3bradioaction.h
+include/k3brichtextlabel.h
 include/k3bsignalwaiter.h
-include/k3bsimplejob.h
+include/k3bsimplejobhandler.h
 include/k3bstdguiitems.h
 include/k3bstringutils.h
+include/k3btempfile.h
 include/k3bthread.h
 include/k3bthreadjob.h
 include/k3bthreadwidget.h
@@ -93,17 +106,21 @@ include/k3bthroughputestimator.h
 include/k3btoc.h
 include/k3btocfilewriter.h
 include/k3btoolbox.h
+include/k3btoolbutton.h
 include/k3btrack.h
 include/k3bvalidators.h
 include/k3bvcddoc.h
 include/k3bvcdjob.h
 include/k3bvcdoptions.h
+include/k3bverificationjob.h
 include/k3bversion.h
 include/k3bvideodvddoc.h
 include/k3bvideodvdjob.h
 include/k3bwavefilewriter.h
 include/kcutlabel.h
 lib/kde3/kcm_k3bsetup2.la
+lib/kde3/kfile_k3b.la
+lib/kde3/kio_videodvd.la
 lib/kde3/libk3bartsoutputplugin.la
 lib/kde3/libk3baudiometainforenamerplugin.la
 lib/kde3/libk3baudioprojectcddbplugin.la
@@ -286,12 +303,18 @@ share/kde/apps/k3b/plugins/k3boggvorbisdecoder.plugin
 share/kde/apps/k3b/plugins/k3boggvorbisencoder.plugin
 share/kde/apps/k3b/plugins/k3bsoxencoder.plugin
 share/kde/apps/k3b/plugins/k3bwavedecoder.plugin
+share/kde/apps/k3b/servicemenus/k3b_create_audio_cd.desktop
+share/kde/apps/k3b/servicemenus/k3b_create_data_cd.desktop
+share/kde/apps/k3b/servicemenus/k3b_create_data_dvd.desktop
+share/kde/apps/k3b/servicemenus/k3b_create_video_cd.desktop
+share/kde/apps/k3b/servicemenus/k3b_write_bin_image.desktop
+share/kde/apps/k3b/servicemenus/k3b_write_iso_image.desktop
 share/kde/apps/k3b/tips
-share/kde/apps/konqueror/servicemenus/k3b_create_audio_cd.desktop
-share/kde/apps/konqueror/servicemenus/k3b_create_data_cd.desktop
-share/kde/apps/konqueror/servicemenus/k3b_create_video_cd.desktop
-share/kde/apps/konqueror/servicemenus/k3b_write_bin_image.desktop
-share/kde/apps/konqueror/servicemenus/k3b_write_iso_image.desktop
+share/kde/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+share/kde/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
+share/kde/apps/konqueror/servicemenus/k3b_cd_copy.desktop
+share/kde/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
+share/kde/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
 share/kde/icons/hicolor/128x128/apps/k3b.png
 share/kde/icons/hicolor/16x16/apps/k3b.png
 share/kde/icons/hicolor/22x22/apps/k3b.png
@@ -299,6 +322,8 @@ share/kde/icons/hicolor/32x32/apps/k3b.png
 share/kde/icons/hicolor/48x48/apps/k3b.png
 share/kde/icons/hicolor/64x64/apps/k3b.png
 share/kde/mimelnk/application/x-k3b.desktop
+share/kde/services/kfile_k3b.desktop
+share/kde/services/videodvd.protocol
 share/kde/sounds/k3b_error1.wav
 share/kde/sounds/k3b_success1.wav
 share/kde/sounds/k3b_wait_media1.wav
@@ -311,6 +336,7 @@ share/kde/sounds/k3b_wait_media1.wav
 @comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
 @comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
 @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
+@dirrm share/kde/apps/k3b/servicemenus
 @dirrm share/kde/apps/k3b/plugins
 @dirrm share/kde/apps/k3b/pics/crystal
 @dirrm share/kde/apps/k3b/pics/73lab
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 362d0d589a3..29ef400fad4 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2006/09/06 11:47:46 markd Exp $
+$NetBSD: distinfo,v 1.9 2007/01/14 09:33:58 wiz Exp $
 
-SHA1 (k3b-0.12.17.tar.bz2) = ae23be594b6e2c116fd4c2af8cefb438423d1285
-RMD160 (k3b-0.12.17.tar.bz2) = bb791d7d003285f6623229eae213cf224fd3a128
-Size (k3b-0.12.17.tar.bz2) = 4008650 bytes
-SHA1 (patch-ag) = da4c67842212d16c85ed0b5b71f6325578edcf5b
+SHA1 (k3b-1.0rc4.tar.bz2) = 5b42ef4a74aa04cb9aef220d65c4f26f64afdb8f
+RMD160 (k3b-1.0rc4.tar.bz2) = d9e8253257a0a9c6213ce4fab3366ed2c71b2c76
+Size (k3b-1.0rc4.tar.bz2) = 3828519 bytes
+SHA1 (patch-aa) = 2d6bcf8ee4eeaf7802cf5278bb69db8336c26a62
+SHA1 (patch-ab) = 654821bf3e6411fa7db3c732c1fc1771c54559e6
diff --git a/sysutils/k3b/patches/patch-aa b/sysutils/k3b/patches/patch-aa
new file mode 100644
index 00000000000..d3de4291d7c
--- /dev/null
+++ b/sysutils/k3b/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.5 2007/01/14 09:33:58 wiz Exp $
+
+--- libk3b/tools/k3bfilesysteminfo.cpp.orig	2007-01-09 13:49:54.000000000 +0000
++++ libk3b/tools/k3bfilesysteminfo.cpp
+@@ -31,6 +31,13 @@
+ #endif
+ #ifdef HAVE_SYS_STATVFS_H
+ #  include <sys/statvfs.h>
++#  if defined(Q_OS_NETBSD)
++#    include <sys/param.h>
++#    if __NetBSD_Version__ > 299000000
++#      define statfs		statvfs
++#      define f_type		f_fsid
++#    endif
++#  endif
+ #endif
+ #ifdef HAVE_SYS_VFS_H
+ #  include <sys/vfs.h>
diff --git a/sysutils/k3b/patches/patch-ab b/sysutils/k3b/patches/patch-ab
new file mode 100644
index 00000000000..7bd653e82d4
--- /dev/null
+++ b/sysutils/k3b/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.4 2007/01/14 09:33:58 wiz Exp $
+
+--- src/projects/k3bencodingconverter.cpp.orig	2007-01-09 13:36:36.000000000 +0000
++++ src/projects/k3bencodingconverter.cpp
+@@ -62,7 +62,7 @@ bool K3bEncodingConverter::encodedLocall
+ {
+ #ifdef HAVE_ICONV_H
+   QCString utf8Encoded( s.length()*2 );
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+   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 );
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+   const char* in = s.data();
+ #else
+   char* in = s.data();
diff --git a/sysutils/k3b/patches/patch-ag b/sysutils/k3b/patches/patch-ag
deleted file mode 100644
index f647cdc6494..00000000000
--- a/sysutils/k3b/patches/patch-ag
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/07/20 11:22:25 markd Exp $
-
---- configure.orig	2006-06-23 03:12:00.000000000 +1200
-+++ configure
-@@ -32401,11 +32401,13 @@ rm -f conftest.err conftest.$ac_objext c
- echo "$as_me:$LINENO: result: $linux_scsi" >&5
- echo "${ECHO_T}$linux_scsi" >&6
- 
--if test "FreeBSD" = `uname -s` ; then
-+case "$host_os" in
-+freebsd*|dragonfly*)
- 	# I'll be damned if lousy coding prevents us from running
- 	# this application.
- 	linux_scsi=yes
--fi
-+	;;
-+esac
- 
- if test "x$linux_scsi" = "xno" ; then
- 	DO_NOT_COMPILE="$DO_NOT_COMPILE k3b"
-@@ -34822,11 +34824,14 @@ fi
- # Extra SCSI support libs can go in CAM_LIB, and are linked into
- # libk3bdevice. For Linux, nothing is needed. FreeBSD requires -lcam
- # (which is in base, so no test is needed).
--CAM_LIB=""
--if test "FreeBSD" = `uname -s` ; then
-+case "$host_os" in
-+freebsd* | dragonfly*)
- 	CAM_LIB="-lcam"
--fi
--
-+	;;
-+*)
-+	CAM_LIB=""
-+	;;
-+esac
- 
- 
-