Update k3b to 2.0.3a

Bugfixes:
 * Missing "Extract Digital Audio with K3b" in device notifier for Audio
   CD medium
 * Clearing up track info in audio project when CDDB query failed
 * Improper track number in CDDB track edit window title
 * Crash on detecting writing speeds
 * Incorrect capacity returned by HL-DT-ST BH10LS30. Patch by Stephane
   Berthelot, thanks!
 * Compilation fails with new FFMPEG

9 files changed, 165 insertions, 227 deletions

diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index eac73947a34..56b63f8ae34 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.75 2014/11/07 19:39:41 adam Exp $
+# $NetBSD: Makefile,v 1.76 2014/11/15 03:35:26 markd Exp $
 
-DISTNAME=		k3b-2.0.2
-PKGREVISION=		31
+DISTNAME=		k3b-2.0.3a
 CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=k3b/}
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		${MASTER_SITE_KDE:=k3b/}
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		markd@NetBSD.org
 HOMEPAGE=		http://www.k3b.org/
@@ -30,6 +29,8 @@ SUBST_MESSAGE.pathfix=	Add cdrtools path.
 SUBST_FILES.pathfix=	libk3b/core/k3bexternalbinmanager.cpp
 SUBST_SED.pathfix=	-e 's:"/usr/bin/":"${LOCALBASE}/bin", "/usr/bin/":g'
 
+WRKSRC=			${WRKDIR}/k3b-2.0.3
+
 pre-configure:
 	# buildlink loses this symlink
 	ln -s ${BUILDLINK_PREFIX.qt4-libs}/qt4/mkspecs/default ${BUILDLINK_DIR}/qt4/mkspecs/default
@@ -47,7 +48,7 @@ BUILDLINK_TRANSFORM+=   opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../multimedia/libkcddb/buildlink3.mk"
 .include "../../security/polkit-qt/buildlink3.mk"
diff --git a/sysutils/k3b/PLIST b/sysutils/k3b/PLIST
index a2d81ec6a68..0f11fead285 100644
--- a/sysutils/k3b/PLIST
+++ b/sysutils/k3b/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/03/22 06:39:00 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/11/15 03:35:26 markd Exp $
 bin/k3b
 bin/k3bsetup
 include/k3b_export.h
@@ -146,6 +146,18 @@ lib/libk3blib.so.6.0.0
 share/PolicyKit/policy/org.kde.kcontrol.k3bsetup.policy
 share/applications/kde4/k3b.desktop
 share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service
+share/doc/kde/HTML/ca/k3b/K3bAddButton.png
+share/doc/kde/HTML/ca/k3b/K3bAdvancedSettings.png
+share/doc/kde/HTML/ca/k3b/K3bDiskChoice.png
+share/doc/kde/HTML/ca/k3b/K3bMoreActions.png
+share/doc/kde/HTML/ca/k3b/K3bSetVerify.png
+share/doc/kde/HTML/ca/k3b/K3bsetup.png
+share/doc/kde/HTML/ca/k3b/common
+share/doc/kde/HTML/ca/k3b/index.cache.bz2
+share/doc/kde/HTML/ca/k3b/index.docbook
+share/doc/kde/HTML/de/k3b/common
+share/doc/kde/HTML/de/k3b/index.cache.bz2
+share/doc/kde/HTML/de/k3b/index.docbook
 share/doc/kde/HTML/en/k3b/K3bAddButton.png
 share/doc/kde/HTML/en/k3b/K3bAdvancedSettings.png
 share/doc/kde/HTML/en/k3b/K3bDiskChoice.png
@@ -155,6 +167,42 @@ share/doc/kde/HTML/en/k3b/K3bsetup.png
 share/doc/kde/HTML/en/k3b/common
 share/doc/kde/HTML/en/k3b/index.cache.bz2
 share/doc/kde/HTML/en/k3b/index.docbook
+share/doc/kde/HTML/es/k3b/common
+share/doc/kde/HTML/es/k3b/index.cache.bz2
+share/doc/kde/HTML/es/k3b/index.docbook
+share/doc/kde/HTML/et/k3b/common
+share/doc/kde/HTML/et/k3b/index.cache.bz2
+share/doc/kde/HTML/et/k3b/index.docbook
+share/doc/kde/HTML/fr/k3b/K3bAddButton.png
+share/doc/kde/HTML/fr/k3b/K3bAdvancedSettings.png
+share/doc/kde/HTML/fr/k3b/K3bDiskChoice.png
+share/doc/kde/HTML/fr/k3b/K3bMoreActions.png
+share/doc/kde/HTML/fr/k3b/K3bsetup.png
+share/doc/kde/HTML/fr/k3b/common
+share/doc/kde/HTML/fr/k3b/index.cache.bz2
+share/doc/kde/HTML/fr/k3b/index.docbook
+share/doc/kde/HTML/fr/k3b/k3bSetVerify.png
+share/doc/kde/HTML/it/k3b/common
+share/doc/kde/HTML/it/k3b/index.cache.bz2
+share/doc/kde/HTML/it/k3b/index.docbook
+share/doc/kde/HTML/nl/k3b/common
+share/doc/kde/HTML/nl/k3b/index.cache.bz2
+share/doc/kde/HTML/nl/k3b/index.docbook
+share/doc/kde/HTML/pt/k3b/common
+share/doc/kde/HTML/pt/k3b/index.cache.bz2
+share/doc/kde/HTML/pt/k3b/index.docbook
+share/doc/kde/HTML/pt_BR/k3b/common
+share/doc/kde/HTML/pt_BR/k3b/index.cache.bz2
+share/doc/kde/HTML/pt_BR/k3b/index.docbook
+share/doc/kde/HTML/uk/k3b/K3bAddButton.png
+share/doc/kde/HTML/uk/k3b/K3bAdvancedSettings.png
+share/doc/kde/HTML/uk/k3b/K3bDiskChoice.png
+share/doc/kde/HTML/uk/k3b/K3bMoreActions.png
+share/doc/kde/HTML/uk/k3b/K3bSetVerify.png
+share/doc/kde/HTML/uk/k3b/K3bsetup.png
+share/doc/kde/HTML/uk/k3b/common
+share/doc/kde/HTML/uk/k3b/index.cache.bz2
+share/doc/kde/HTML/uk/k3b/index.docbook
 share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf
 share/icons/hicolor/128x128/apps/k3b.png
 share/icons/hicolor/16x16/apps/k3b.png
@@ -358,6 +406,11 @@ share/locale/bg/LC_MESSAGES/k3b.mo
 share/locale/bg/LC_MESSAGES/k3bsetup.mo
 share/locale/bg/LC_MESSAGES/libk3b.mo
 share/locale/bg/LC_MESSAGES/libk3bdevice.mo
+share/locale/bs/LC_MESSAGES/k3b.mo
+share/locale/bs/LC_MESSAGES/k3bsetup.mo
+share/locale/bs/LC_MESSAGES/kio_videodvd.mo
+share/locale/bs/LC_MESSAGES/libk3b.mo
+share/locale/bs/LC_MESSAGES/libk3bdevice.mo
 share/locale/ca/LC_MESSAGES/k3b.mo
 share/locale/ca/LC_MESSAGES/k3bsetup.mo
 share/locale/ca/LC_MESSAGES/kio_videodvd.mo
@@ -387,6 +440,7 @@ share/locale/de/LC_MESSAGES/libk3b.mo
 share/locale/de/LC_MESSAGES/libk3bdevice.mo
 share/locale/el/LC_MESSAGES/k3b.mo
 share/locale/el/LC_MESSAGES/k3bsetup.mo
+share/locale/el/LC_MESSAGES/kio_videodvd.mo
 share/locale/el/LC_MESSAGES/libk3b.mo
 share/locale/el/LC_MESSAGES/libk3bdevice.mo
 share/locale/en_GB/LC_MESSAGES/k3b.mo
@@ -414,10 +468,12 @@ share/locale/eu/LC_MESSAGES/libk3b.mo
 share/locale/eu/LC_MESSAGES/libk3bdevice.mo
 share/locale/fi/LC_MESSAGES/k3b.mo
 share/locale/fi/LC_MESSAGES/k3bsetup.mo
+share/locale/fi/LC_MESSAGES/kio_videodvd.mo
 share/locale/fi/LC_MESSAGES/libk3b.mo
 share/locale/fi/LC_MESSAGES/libk3bdevice.mo
 share/locale/fr/LC_MESSAGES/k3b.mo
 share/locale/fr/LC_MESSAGES/k3bsetup.mo
+share/locale/fr/LC_MESSAGES/kio_videodvd.mo
 share/locale/fr/LC_MESSAGES/libk3b.mo
 share/locale/fr/LC_MESSAGES/libk3bdevice.mo
 share/locale/ga/LC_MESSAGES/k3b.mo
@@ -427,6 +483,7 @@ share/locale/ga/LC_MESSAGES/libk3b.mo
 share/locale/ga/LC_MESSAGES/libk3bdevice.mo
 share/locale/gl/LC_MESSAGES/k3b.mo
 share/locale/gl/LC_MESSAGES/k3bsetup.mo
+share/locale/gl/LC_MESSAGES/kio_videodvd.mo
 share/locale/gl/LC_MESSAGES/libk3b.mo
 share/locale/gl/LC_MESSAGES/libk3bdevice.mo
 share/locale/he/LC_MESSAGES/k3b.mo
@@ -458,6 +515,7 @@ share/locale/is/LC_MESSAGES/libk3b.mo
 share/locale/is/LC_MESSAGES/libk3bdevice.mo
 share/locale/it/LC_MESSAGES/k3b.mo
 share/locale/it/LC_MESSAGES/k3bsetup.mo
+share/locale/it/LC_MESSAGES/kio_videodvd.mo
 share/locale/it/LC_MESSAGES/libk3b.mo
 share/locale/it/LC_MESSAGES/libk3bdevice.mo
 share/locale/ja/LC_MESSAGES/k3b.mo
@@ -465,12 +523,19 @@ share/locale/ja/LC_MESSAGES/k3bsetup.mo
 share/locale/ja/LC_MESSAGES/kio_videodvd.mo
 share/locale/ja/LC_MESSAGES/libk3b.mo
 share/locale/ja/LC_MESSAGES/libk3bdevice.mo
+share/locale/kk/LC_MESSAGES/k3b.mo
+share/locale/kk/LC_MESSAGES/k3bsetup.mo
+share/locale/kk/LC_MESSAGES/kio_videodvd.mo
+share/locale/kk/LC_MESSAGES/libk3b.mo
+share/locale/kk/LC_MESSAGES/libk3bdevice.mo
 share/locale/km/LC_MESSAGES/k3b.mo
 share/locale/km/LC_MESSAGES/k3bsetup.mo
+share/locale/km/LC_MESSAGES/kio_videodvd.mo
 share/locale/km/LC_MESSAGES/libk3b.mo
 share/locale/km/LC_MESSAGES/libk3bdevice.mo
 share/locale/ko/LC_MESSAGES/k3b.mo
 share/locale/ko/LC_MESSAGES/k3bsetup.mo
+share/locale/ko/LC_MESSAGES/kio_videodvd.mo
 share/locale/ko/LC_MESSAGES/libk3b.mo
 share/locale/ko/LC_MESSAGES/libk3bdevice.mo
 share/locale/ku/LC_MESSAGES/k3b.mo
@@ -479,11 +544,17 @@ share/locale/lt/LC_MESSAGES/k3bsetup.mo
 share/locale/lt/LC_MESSAGES/kio_videodvd.mo
 share/locale/lt/LC_MESSAGES/libk3b.mo
 share/locale/lt/LC_MESSAGES/libk3bdevice.mo
+share/locale/lv/LC_MESSAGES/k3b.mo
 share/locale/lv/LC_MESSAGES/k3bsetup.mo
 share/locale/lv/LC_MESSAGES/libk3b.mo
 share/locale/lv/LC_MESSAGES/libk3bdevice.mo
 share/locale/mai/LC_MESSAGES/k3b.mo
 share/locale/mai/LC_MESSAGES/libk3b.mo
+share/locale/mr/LC_MESSAGES/k3b.mo
+share/locale/mr/LC_MESSAGES/k3bsetup.mo
+share/locale/mr/LC_MESSAGES/kio_videodvd.mo
+share/locale/mr/LC_MESSAGES/libk3b.mo
+share/locale/mr/LC_MESSAGES/libk3bdevice.mo
 share/locale/ms/LC_MESSAGES/k3b.mo
 share/locale/ms/LC_MESSAGES/k3bsetup.mo
 share/locale/ms/LC_MESSAGES/kio_videodvd.mo
@@ -519,6 +590,7 @@ share/locale/pa/LC_MESSAGES/libk3b.mo
 share/locale/pa/LC_MESSAGES/libk3bdevice.mo
 share/locale/pl/LC_MESSAGES/k3b.mo
 share/locale/pl/LC_MESSAGES/k3bsetup.mo
+share/locale/pl/LC_MESSAGES/kio_videodvd.mo
 share/locale/pl/LC_MESSAGES/libk3b.mo
 share/locale/pl/LC_MESSAGES/libk3bdevice.mo
 share/locale/pt/LC_MESSAGES/k3b.mo
@@ -533,6 +605,7 @@ share/locale/pt_BR/LC_MESSAGES/libk3b.mo
 share/locale/pt_BR/LC_MESSAGES/libk3bdevice.mo
 share/locale/ro/LC_MESSAGES/k3b.mo
 share/locale/ro/LC_MESSAGES/k3bsetup.mo
+share/locale/ro/LC_MESSAGES/kio_videodvd.mo
 share/locale/ro/LC_MESSAGES/libk3b.mo
 share/locale/ro/LC_MESSAGES/libk3bdevice.mo
 share/locale/ru/LC_MESSAGES/k3b.mo
@@ -551,6 +624,7 @@ share/locale/sk/LC_MESSAGES/libk3b.mo
 share/locale/sk/LC_MESSAGES/libk3bdevice.mo
 share/locale/sl/LC_MESSAGES/k3b.mo
 share/locale/sl/LC_MESSAGES/k3bsetup.mo
+share/locale/sl/LC_MESSAGES/kio_videodvd.mo
 share/locale/sl/LC_MESSAGES/libk3b.mo
 share/locale/sl/LC_MESSAGES/libk3bdevice.mo
 share/locale/sr/LC_MESSAGES/k3b.mo
@@ -587,6 +661,11 @@ share/locale/tr/LC_MESSAGES/k3bsetup.mo
 share/locale/tr/LC_MESSAGES/kio_videodvd.mo
 share/locale/tr/LC_MESSAGES/libk3b.mo
 share/locale/tr/LC_MESSAGES/libk3bdevice.mo
+share/locale/ug/LC_MESSAGES/k3b.mo
+share/locale/ug/LC_MESSAGES/k3bsetup.mo
+share/locale/ug/LC_MESSAGES/kio_videodvd.mo
+share/locale/ug/LC_MESSAGES/libk3b.mo
+share/locale/ug/LC_MESSAGES/libk3bdevice.mo
 share/locale/uk/LC_MESSAGES/k3b.mo
 share/locale/uk/LC_MESSAGES/k3bsetup.mo
 share/locale/uk/LC_MESSAGES/kio_videodvd.mo
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 4b79bf9f958..0376dbc678b 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.21 2013/11/09 22:20:36 markd Exp $
+$NetBSD: distinfo,v 1.22 2014/11/15 03:35:26 markd Exp $
 
-SHA1 (k3b-2.0.2.tar.bz2) = 8b30a4d07942e82559b01bc07dea6bcf2defd532
-RMD160 (k3b-2.0.2.tar.bz2) = a0289eb9ccec9607c2bdac3fc7c69102eec5ee40
-Size (k3b-2.0.2.tar.bz2) = 12833321 bytes
-SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 124d5ba1a3384d012a8b471f55fd624ffe9df5d4
-SHA1 (patch-libk3b_tools_k3bcdparanoialib.cpp) = a7033c2697abea2d3f7acb2af14a90016483ba2f
-SHA1 (patch-libk3bdevice_k3bdevice.cpp) = 8533f0c08551ef9b8429792f607a52675f79e419
-SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = fe07915854808758ab9d989d11b61fdc3b4b95bd
-SHA1 (patch-libk3bdevice_k3bscsicommand_netbsd.cpp) = f2326f21219178443535fc4a80b8bdd46479b1ad
-SHA1 (patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp) = 941f59b0764db37d0356279ffc2e01fe610b04ce
+SHA1 (k3b-2.0.3a.tar.xz) = f1001db3b5b32ef6bdb827742f1ca357c82b216f
+RMD160 (k3b-2.0.3a.tar.xz) = 5f5cd852c2d8368b1899bf80e27f36a3afdc670c
+Size (k3b-2.0.3a.tar.xz) = 9864468 bytes
+SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 63e9f83183a7407e775813960fddea410f2a4d2c
+SHA1 (patch-libk3b_tools_k3bcdparanoialib.cpp) = 15ec2a4191770991137a29ef6ca8605c3626374a
+SHA1 (patch-libk3bdevice_k3bdevice.cpp) = b2b06d4e0bfccea9bd2c6020ae9e02f7782883ba
+SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = f93f38120a14aa16f857d09ae71e416d116ac421
diff --git a/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp b/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp
index 17f0af09202..11c210a7a10 100644
--- a/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp
+++ b/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp
@@ -1,16 +1,13 @@
-$NetBSD: patch-libk3b_jobs_k3bdatatrackreader.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
+$NetBSD: patch-libk3b_jobs_k3bdatatrackreader.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $
 
---- libk3b/jobs/k3bdatatrackreader.cpp.orig	2009-04-22 05:54:02.000000000 +1200
+--- libk3b/jobs/k3bdatatrackreader.cpp.orig	2014-11-04 18:37:31.000000000 +0000
 +++ libk3b/jobs/k3bdatatrackreader.cpp
-@@ -256,7 +256,11 @@ bool K3b::DataTrackReader::run()
+@@ -256,7 +256,7 @@ bool K3b::DataTrackReader::run()
      //
      d->device->setSpeed( 0xffff, 0xffff );
  
-+#ifdef __NetBSD__
-+    s_bufferSizeSectors = 31;
-+#else
+-#ifdef __NETBSD__
++#ifdef Q_OS_NETBSD
+     s_bufferSizeSectors = 31;
+ #else
      s_bufferSizeSectors = 128;
-+#endif
-     unsigned char* buffer = new unsigned char[d->usedSectorSize*s_bufferSizeSectors];
-     while( s_bufferSizeSectors > 0 && read( buffer, d->firstSector.lba(), s_bufferSizeSectors ) < 0 ) {
-         kDebug() << "(K3b::DataTrackReader) determine max read sectors: "
diff --git a/sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp b/sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp
index fd10df6bbf4..49307fc5e55 100644
--- a/sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp
+++ b/sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp
@@ -1,54 +1,40 @@
-$NetBSD: patch-libk3b_tools_k3bcdparanoialib.cpp,v 1.1 2013/11/09 22:20:36 markd Exp $
+$NetBSD: patch-libk3b_tools_k3bcdparanoialib.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $
 
-Allow newer versions of libraries to be found.
-Also fix problem where by k3b wont rip the first track when it is not
-alphabetically the first track to be ripped.
-
---- libk3b/tools/k3bcdparanoialib.cpp.orig	2011-01-15 20:47:29.000000000 +0000
+--- libk3b/tools/k3bcdparanoialib.cpp.orig	2014-11-04 18:37:31.000000000 +0000
 +++ libk3b/tools/k3bcdparanoialib.cpp
-@@ -69,7 +69,7 @@ typedef short int int16_t;
+@@ -68,7 +68,7 @@ typedef short int int16_t;
+ #define LIBCDIO_CDDA "cdio_cdda.dll"
  #define LIBCDIO_PARANOIA "cdio_paranoia.dll"
  #else
- #define LIBCDIO_CDDA "libcdio_cdda.so"
--#define LIBCDIO_PARANOIA "libcdio_paranoia.so.0"
-+#define LIBCDIO_PARANOIA "libcdio_paranoia.so"
- #endif
+-#ifdef __NETBSD__
++#ifdef Q_OS_NETBSD
+ #define CDDA_LIBCDDA_INTERFACE "cdda/libcdda_interace.so"
+ #define CDDA_LIBCDDA_PARANOIA "cdda/libcdda_paranoia.so"
+ #define LIBCDDA_INTERFACE "libcdda_interface.so"
+@@ -555,7 +555,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::
  
- static bool s_haveLibCdio = false;
-@@ -532,11 +532,11 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::
-     if( s_libInterface == 0 ) {
-         s_haveLibCdio = false;
  #ifndef Q_OS_WIN32
--        s_libInterface = dlopen( "libcdda_interface.so.0", RTLD_NOW|RTLD_GLOBAL );
-+        s_libInterface = dlopen( "libcdda_interface.so", RTLD_NOW|RTLD_GLOBAL );
- 
-         // try the redhat & Co. location
-         if( s_libInterface == 0 )
--            s_libInterface = dlopen( "cdda/libcdda_interface.so.0", RTLD_NOW|RTLD_GLOBAL );
-+            s_libInterface = dlopen( "cdda/libcdda_interface.so", RTLD_NOW|RTLD_GLOBAL );
+         if( !s_libInterface ) {
+-#ifndef __NETBSD__
++#ifndef Q_OS_NETBSD
+             s_libInterface = dlopen( LIBCDIO_CDDA_1, RTLD_NOW|RTLD_GLOBAL );
+             if( !s_libInterface ) {
+                 s_libInterface = dlopen( LIBCDIO_CDDA_0, RTLD_NOW|RTLD_GLOBAL );
+@@ -566,7 +566,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::
+                     // try the redhat & Co. location
+                     if( !s_libInterface )
+                         s_libInterface = dlopen( CDDA_LIBCDDA_INTERFACE, RTLD_NOW|RTLD_GLOBAL );
+-#ifndef __NETBSD__
++#ifndef Q_OS_NETBSD
+                 }
+             }
  #endif
-         // try the new cdio lib
-         if( s_libInterface == 0 ) {
-@@ -550,11 +550,11 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::
-         }
- 
+@@ -581,7 +581,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::
  #ifndef Q_OS_WIN32
--        s_libParanoia = dlopen( "libcdda_paranoia.so.0", RTLD_NOW );
-+        s_libParanoia = dlopen( "libcdda_paranoia.so", RTLD_NOW );
- 
-         // try the redhat & Co. location
-         if( s_libParanoia == 0 )
--            s_libParanoia = dlopen( "cdda/libcdda_paranoia.so.0", RTLD_NOW );
-+            s_libParanoia = dlopen( "cdda/libcdda_paranoia.so", RTLD_NOW );
- #endif
-         // try the new cdio lib
-         if( s_haveLibCdio && s_libParanoia == 0 )
-@@ -736,7 +736,7 @@ char* K3b::CdparanoiaLib::read( int* sta
- 
-     if( d->currentSector != d->data->sector() ) {
-         kDebug() << "(K3b::CdparanoiaLib) need to seek before read. Looks as if we are reusing the paranoia instance.";
--        if( !d->data->paranoiaSeek( d->currentSector, SEEK_SET ) )
-+        if( d->data->paranoiaSeek( d->currentSector, SEEK_SET ) == -1 )
-             return 0;
-     }
- 
+         if( s_haveLibCdio ) {
+             s_libParanoia = dlopen( LIBCDIO_PARANOIA, RTLD_NOW );
+-#ifndef __NETBSD__
++#ifndef Q_OS_NETBSD
+             if( !s_libParanoia ) {
+                 s_libParanoia = dlopen( LIBCDIO_PARANOIA_1, RTLD_NOW );
+                 if( !s_libParanoia )
diff --git a/sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp
index 2e01a65cf82..e2fa6558b47 100644
--- a/sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp
+++ b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp
@@ -1,28 +1,29 @@
-$NetBSD: patch-libk3bdevice_k3bdevice.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
+$NetBSD: patch-libk3bdevice_k3bdevice.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $
 
---- libk3bdevice/k3bdevice.cpp.orig	2009-05-07 19:08:16.000000000 +1200
+--- libk3bdevice/k3bdevice.cpp.orig	2014-11-04 18:37:31.000000000 +0000
 +++ libk3bdevice/k3bdevice.cpp
-@@ -35,6 +35,7 @@
+@@ -35,7 +35,7 @@
  #include <Solid/OpticalDrive>
  #include <Solid/Block>
  #include <Solid/StorageAccess>
-+#include <Solid/GenericInterface>
+-#ifdef __NETBSD__
++#ifdef Q_OS_NETBSD
+ #include <Solid/GenericInterface>
+ #endif
  
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -242,9 +243,14 @@ K3b::Device::Device::Handle K3b::Device:
+@@ -245,12 +245,12 @@ K3b::Device::Device::Handle K3b::Device:
  
  K3b::Device::Device::Device( const Solid::Device& dev )
  {
+-#ifdef __NETBSD__
+-    const Solid::GenericInterace *gi = dev.as<Solid::GenericInterface>();
++#ifdef Q_OS_NETBSD
 +    const Solid::GenericInterface *gi = dev.as<Solid::GenericInterface>();
-+
+ #endif
      d = new Private;
      d->solidDevice = dev;
--    d->blockDevice = dev.as<Solid::Block>()->device();
-+    if (gi->propertyExists("block.netbsd.raw_device"))
-+        d->blockDevice = gi->property("block.netbsd.raw_device").toString();
-+    else
-+        d->blockDevice = dev.as<Solid::Block>()->device();
-     d->writeModes = 0;
-     d->maxWriteSpeed = 0;
-     d->maxReadSpeed = 0;
+-#ifndef __NETBSD__
++#ifndef Q_OS_NETBSD
+     d->blockDevice = dev.as<Solid::Block>()->device();
+ #else
+     if (gi->propertyExists("block.netbsd.raw_device"))
diff --git a/sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp
index 5a0c06b8821..b2a49ef524f 100644
--- a/sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp
+++ b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp
@@ -1,21 +1,26 @@
-$NetBSD: patch-libk3bdevice_k3bdevicemanager.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
+$NetBSD: patch-libk3bdevice_k3bdevicemanager.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $
 
---- libk3bdevice/k3bdevicemanager.cpp.orig	2011-01-15 20:47:29.000000000 +0000
+--- libk3bdevice/k3bdevicemanager.cpp.orig	2014-11-04 18:37:31.000000000 +0000
 +++ libk3bdevice/k3bdevicemanager.cpp
-@@ -39,6 +39,7 @@
+@@ -39,7 +39,7 @@
  #include <Solid/OpticalDrive>
  #include <Solid/Block>
  #include <Solid/Device>
-+#include <Solid/GenericInterface>
+-#ifdef __NETBSD__
++#ifdef Q_OS_NETBSD
+ #include <Solid/GenericInterface>
+ #endif
  
- #include <iostream>
- #include <limits.h>
-@@ -356,7 +357,7 @@ bool K3b::Device::DeviceManager::saveCon
+@@ -359,10 +359,10 @@ bool K3b::Device::DeviceManager::saveCon
  K3b::Device::Device* K3b::Device::DeviceManager::addDevice( const Solid::Device& solidDevice )
  {
      if( const Solid::Block* blockDevice = solidDevice.as<Solid::Block>() ) {
--        if( !findDevice( blockDevice->device() ) )
+-#ifndef __NETBSD__
++#ifndef Q_OS_NETBSD
+         if( !findDevice( blockDevice->device() ) )
+ #else
+-        if( !findDevice( solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") ? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() : blockDevice->device() ) );
 +        if( !findDevice( solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") ? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() : blockDevice->device() ) )
+ #endif
              return addDevice( new K3b::Device::Device( solidDevice ) );
          else
-             kDebug() << "(K3b::Device::DeviceManager) dev " << blockDevice->device()  << " already found";
diff --git a/sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp b/sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp
deleted file mode 100644
index c2dc4c28f2c..00000000000
--- a/sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libk3bdevice_k3bscsicommand_netbsd.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
-
---- libk3bdevice/k3bscsicommand_netbsd.cpp.orig	2009-04-04 04:27:24.000000000 +1300
-+++ libk3bdevice/k3bscsicommand_netbsd.cpp
-@@ -53,7 +53,7 @@ int K3b::Device::ScsiCommand::transport(
-                                          size_t len )
- {
-     bool needToClose = false;
--    int deviceHandler = -1;
-+    int deviceHandle = -1;
-     if( m_device ) {
-         m_device->usageLock();
-         if( !m_device->isOpen() ) {
diff --git a/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp b/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp
deleted file mode 100644
index 8cfac587d7b..00000000000
--- a/sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp,v 1.2 2012/11/11 18:32:24 markd Exp $
-
-commit 61ca30beb978f68e72257408777c6433f33129bd
-Author: Michal Malek <michalm@jabster.pl>
-Date:   Sun Aug 28 20:18:53 2011 +0200
-
-    Fixed compilation with new FFMPEG
-    
-    BUG: 274817
-    FIXED-IN: 2.0.3
-
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 0ad59fc..0c5f366 100644
---- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -88,7 +88,7 @@
-     close();
- 
-     // open the file
--    int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
-+    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
-     if( err < 0 ) {
-         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
-         return false;
-@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
- #else
-     ::AVCodecContext* codecContext =  d->formatContext->streams[0]->codec;
- #endif
--    if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
-+    if( codecContext->codec_type != 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        AVMEDIA_TYPE_AUDIO)
-+#else
-+        CODEC_TYPE_AUDIO)
-+#endif
-+    {
-         kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
-         return false;
-     }
-@@ -137,7 +143,7 @@
-     }
- 
-     // dump some debugging info
--    ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-+    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
- 
-     return true;
- }
-@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
- QString K3bFFMpegFile::title() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->title[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->title );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
- QString K3bFFMpegFile::author() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->author[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->author );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
- QString K3bFFMpegFile::comment() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->comment[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->comment );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
- #if LIBAVCODEC_VERSION_MAJOR < 52
-         int len = ::avcodec_decode_audio(
- #else
-+   #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        int len = ::avcodec_decode_audio3(
-+   #else
-         int len = ::avcodec_decode_audio2(
-+   #endif
- #endif
-+
- #ifdef FFMPEG_BUILD_PRE_4629
-             &d->formatContext->streams[0]->codec,
- #else
-@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
- #endif
-             (short*)d->alignedOutputBuffer,
-             &d->outputBufferSize,
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            &d->packet );
-+#else
-             d->packetData, d->packetSize );
-+#endif
- 
-         if( d->packetSize <= 0 || len < 0 )
-             ::av_free_packet( &d->packet );