pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/k3b Update k3b to 2.0.3a



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9a8c4802069
branches:  trunk
changeset: 641694:d9a8c4802069
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Nov 15 03:35:26 2014 +0000

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

diffstat:

 sysutils/k3b/Makefile                                                  |   13 +-
 sysutils/k3b/PLIST                                                     |   81 ++++++-
 sysutils/k3b/distinfo                                                  |   18 +-
 sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp          |   17 +-
 sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp           |   80 ++----
 sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp                  |   33 +-
 sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp           |   23 +-
 sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp      |   13 -
 sysutils/k3b/patches/patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp |  116 ----------
 9 files changed, 166 insertions(+), 228 deletions(-)

diffs (truncated from 596 to 300 lines):

diff -r 7dbb773f4eb1 -r d9a8c4802069 sysutils/k3b/Makefile
--- a/sysutils/k3b/Makefile     Sat Nov 15 03:02:27 2014 +0000
+++ b/sysutils/k3b/Makefile     Sat Nov 15 03:35:26 2014 +0000
@@ -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@localhost
 HOMEPAGE=              http://www.k3b.org/
@@ -30,6 +29,8 @@
 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 @@
 .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 -r 7dbb773f4eb1 -r d9a8c4802069 sysutils/k3b/PLIST
--- a/sysutils/k3b/PLIST        Sat Nov 15 03:02:27 2014 +0000
+++ b/sysutils/k3b/PLIST        Sat Nov 15 03:35:26 2014 +0000
@@ -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 @@
 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/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/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/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/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/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/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/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/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/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/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/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/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 -r 7dbb773f4eb1 -r d9a8c4802069 sysutils/k3b/distinfo
--- a/sysutils/k3b/distinfo     Sat Nov 15 03:02:27 2014 +0000
+++ b/sysutils/k3b/distinfo     Sat Nov 15 03:35:26 2014 +0000
@@ -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 -r 7dbb773f4eb1 -r d9a8c4802069 sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp
--- a/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp     Sat Nov 15 03:02:27 2014 +0000
+++ b/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp     Sat Nov 15 03:35:26 2014 +0000
@@ -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 -r 7dbb773f4eb1 -r d9a8c4802069 sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp
--- a/sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp      Sat Nov 15 03:02:27 2014 +0000
+++ b/sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp      Sat Nov 15 03:35:26 2014 +0000
@@ -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"



Home | Main Index | Thread Index | Old Index