rev 16246 - in kde-extras/k3b/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Wed Nov 11 18:32:00 UTC 2009


Author: fabo
Date: 2009-11-11 18:32:00 +0000 (Wed, 11 Nov 2009)
New Revision: 16246

Added:
   kde-extras/k3b/trunk/debian/README.source
   kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff
   kde-extras/k3b/trunk/debian/patches/114_new_libmpcdec_api.diff
Removed:
   kde-extras/k3b/trunk/debian/patches/113_desktop_encoding.diff
Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/control
   kde-extras/k3b/trunk/debian/copyright
   kde-extras/k3b/trunk/debian/k3b-data.install
   kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
   kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff
   kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff
   kde-extras/k3b/trunk/debian/patches/series
   kde-extras/k3b/trunk/debian/rules
Log:
* New upstream release.
* Add 113_add_kfreebsd_support.diff patch. Thanks to Petr Salinger.
  (Closes: #545958)
* Add 114_new_libmpcdec_api.diff patch:
  - k3b port attempt to the new libmpcdec API.
    Thanks to Yavor Doganov. (Closes: #476379)
* Refresh 107_iso_cue_mimetypes.diff patch.
* Update debian/control:
  - Bump build dependencies version: debhelper, pkg-kde-tools and
    kdelibs5-dev.
  - Restrict cdrdao dependency to linux architectures only.
  - Add libcam-dev build dependency for kfreebsd only.
* Bump Standards-Version to 3.8.3 (no changes needed).
* Update debian/copyright: add Micha?\197?\130 Ma?\197?\130ek.
* Update debian/k3b-data.install: add k3bplugin.desktop file.
* Update debian/rules: use 'kde' dh sequence addon.


Added: kde-extras/k3b/trunk/debian/README.source
===================================================================
--- kde-extras/k3b/trunk/debian/README.source	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/README.source	2009-11-11 18:32:00 UTC (rev 16246)
@@ -0,0 +1,6 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.

Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/changelog	2009-11-11 18:32:00 UTC (rev 16246)
@@ -1,3 +1,24 @@
+k3b (1.68.0~alpha3-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add 113_add_kfreebsd_support.diff patch. Thanks to Petr Salinger.
+    (Closes: #545958)
+  * Add 114_new_libmpcdec_api.diff patch:
+    - k3b port attempt to the new libmpcdec API.
+      Thanks to Yavor Doganov. (Closes: #476379)
+  * Refresh 107_iso_cue_mimetypes.diff patch.
+  * Update debian/control:
+    - Bump build dependencies version: debhelper, pkg-kde-tools and
+      kdelibs5-dev.
+    - Restrict cdrdao dependency to linux architectures only.
+    - Add libcam-dev build dependency for kfreebsd only.
+  * Bump Standards-Version to 3.8.3 (no changes needed).
+  * Update debian/copyright: add Michał Małek.
+  * Update debian/k3b-data.install: add k3bplugin.desktop file.
+  * Update debian/rules: use 'kde' dh sequence addon.
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 11 Nov 2009 16:36:12 +0100
+
 k3b (1.66.0~alpha2-1) experimental; urgency=low
 
   * New upstream release (KDE 4 version).
@@ -137,7 +158,7 @@
 k3b (1.0.4-3) unstable; urgency=low
 
   * Fix watch file (closes: #453529)
-  * Add call to dh_desktop in debian/rules 
+  * Add call to dh_desktop in debian/rules
   * Bump Standards-Version up to 3.7.3 (no other changes)
 
  -- Francois Marier <francois at debian.org>  Wed, 12 Dec 2007 13:24:42 +1300
@@ -182,7 +203,7 @@
   * New upstream release:
     - allow burning of files larger than 4 GB (closes: #444856)
     - work-around for the "disabled DMA bug" (closes: #439264)
-    - only reload medium before verification if necessary 
+    - only reload medium before verification if necessary
       (closes: #446196, #420674, #438865)
     - don't use -dvd-compat on DVD+RW (closes: #378051)
     - unmount drive before formatting (closes: #446471)
@@ -376,7 +397,7 @@
 
 k3b (1.0-0ubuntu1) feisty; urgency=low
 
-  * New upstream release 
+  * New upstream release
   * debian/control: Change Maintainer/XSBC-Original-Maintainer field.
   * debian/patches/kubuntu_106_no_splash.diff: drop patch, will be done
     in kubuntu-default-settings
@@ -478,7 +499,7 @@
   * Remove the cdrecord and cdrdao warnings (closes: #390083)
   * Support DEB_BUILD_OPTIONS="noopt" properly (via CXXFLAGS,
     not just CFLAGS) thanks to Modestas Vainius! (closes: #394276)
-  * Fix a crash when changing the default for the last external 
+  * Fix a crash when changing the default for the last external
     application, thanks to Pier Luigi Pau! (closes: #386688)
   * Fix the watch file to use qa.debian.org
 
@@ -487,7 +508,7 @@
 k3b (0.12.17-2) unstable; urgency=low
 
   * Update transcode apt source (closes: #386080), thanks Eric!
-  * Switch from cdrecord to wodim (closes: #386327), thanks Sune! 
+  * Switch from cdrecord to wodim (closes: #386327), thanks Sune!
   * Fix the calls to dpkg-statoverride (closes: #381170), thanks Dirk!
 
  -- Francois Marier <francois at debian.org>  Wed,  6 Sep 2006 16:50:03 -0400
@@ -625,7 +646,7 @@
 
 k3b (0.12.11-1) unstable; urgency=low
 
-  * New upstream release (closes: #348929) 
+  * New upstream release (closes: #348929)
   * Fix the watch file (.gz -> .bz2)
   * Merge Ubuntu patch (kubuntu_01_hide_k3bsetup)
 
@@ -660,7 +681,7 @@
 
 k3b (0.12.14-0ubuntu7) dapper; urgency=low
 
-  * Run gettext in build target not install target, needed 
+  * Run gettext in build target not install target, needed
     earlier by pkgstriptranslations
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 May 2006 18:38:37 +0100
@@ -674,7 +695,7 @@
 
 k3b (0.12.14-0ubuntu5) dapper; urgency=low
 
-  * Alter debian/rules to mark .po files as UTF-8 
+  * Alter debian/rules to mark .po files as UTF-8
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 27 Apr 2006 19:13:50 +0100
 
@@ -791,7 +812,7 @@
       some perfectly valid mp3 files.
   * Updated README.Debian with a section about running k3b as root (thanks to
     Ross Boylan for the suggestion)
- 
+
  -- Francois Marier <francois at debian.org>  Fri, 25 Nov 2005 12:02:49 -0500
 
 k3b (0.12.7-1ubuntu1) dapper; urgency=low
@@ -886,7 +907,7 @@
   * Upgrade build dependancy on dbus-qt-1-dev to build with a C++
     transitioned version. (closes: #322084)
 
- -- Jean-Michel Kelbert <kelbert at debian.org>  Tue, 30 Aug 2005 22:54:44 +0200 
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue, 30 Aug 2005 22:54:44 +0200
 
 k3b (0.12.1-2) unstable; urgency=low
 
@@ -904,9 +925,9 @@
 
 k3b (0.12.1-1ubuntu2) breezy; urgency=low
 
-  * Removed flac patch and added flac as Build-Depend 
+  * Removed flac patch and added flac as Build-Depend
     (oversight in previous package)
-  * Add kubuntu_01_hide_k3bsetup.diff to hide k3bsetup 
+  * Add kubuntu_01_hide_k3bsetup.diff to hide k3bsetup
     from menu
   * Add kubuntu_02_no_require_cdrdao.diff to stop it warning
     if cdrdao is not installed
@@ -949,7 +970,7 @@
 
 k3b (0.11.23-0ubuntu3) hoary; urgency=low
 
-  * Replaced libmad, libmad-dev  
+  * Replaced libmad, libmad-dev
   * Changed cdrdao as a suggests
   * configure runs now with k3bsetup=no
 
@@ -1009,7 +1030,7 @@
 
 k3b (0.11.20-0ubuntu1) hoary; urgency=low
 
-  * New upstream release 
+  * New upstream release
   * removed debian-patch, upstream fixed it now.
 
  -- Andreas Mueller <amu at ubuntu.com>  Sat, 12 Feb 2005 20:45:59 +0100
@@ -1045,7 +1066,7 @@
 
 k3b (0.11.18-1ubuntu1) hoary; urgency=low
 
-  * New upstream release 
+  * New upstream release
   * added missing build-depend
 
  -- Andreas Mueller <amu at canonical.com>  Wed,  5 Jan 2005 17:03:27 +0100
@@ -1115,7 +1136,7 @@
   * Suggests normalize and toolame.
   (closes: #240770)
   * Correct typos in description.
-  (closes: #232004) 
+  (closes: #232004)
   * Remove references to wrong documentation in the manpage.
   (closes: #225758)
 
@@ -1193,13 +1214,13 @@
   * Add kdelibs-data to Depends since
     usr/share/mimelnk/application/x-iso.desktop and
     usr/share/mimelnk/application/x-cue.desktop which where conflicting with
-    arson package are now included in it. 
+    arson package are now included in it.
   (closes: #204532)
-  * Add a patch for solving a syntax problem in some German entries. 
+  * Add a patch for solving a syntax problem in some German entries.
   (closes: #212238)
   * Add the patch provided by Chris Cheney to clean debian/rules. Adapt the
     resulting debian/rules to k3b.(Thanks to Chris)
-  (closes: #214509)  
+  (closes: #214509)
 
  -- Jean-Michel Kelbert <kelbert at debian.org>  Fri, 10 Oct 2003 22:47:29 +0200
 
@@ -1224,7 +1245,7 @@
 
   * Add a patch for changing dlopen() libcdda_interface.so.0 instead of
     libcdda_interface.so. The patch concerns src/tools/k3bcdparanoialib.cpp.
-  (closes: #199819) 
+  (closes: #199819)
 
  -- Jean-Michel Kelbert <kelbert at debian.org>  Sun,  3 Aug 2003 11:06:25 +0200
 
@@ -1249,7 +1270,7 @@
 k3b (0.8.1-2) unstable; urgency=low
 
   * Added a line debian/rules to change the date of admin/config.guess, so
-    that the package will compile from sources. 
+    that the package will compile from sources.
 
  -- Jean-Michel Kelbert <kelbert at debian.org>  Thu, 13 Mar 2003 22:43:17 -0500
 

Modified: kde-extras/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/trunk/debian/control	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/control	2009-11-11 18:32:00 UTC (rev 16246)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.3), cmake, quilt, pkg-kde-tools (>= 0.4.11),
- kdelibs5-dev (>= 4:4.3.0), libavformat-dev, libdvdread-dev, libflac++-dev,
+Build-Depends: debhelper (>= 7.3.16), cmake, quilt, pkg-kde-tools (>= 0.5),
+ kdelibs5-dev (>= 4:4.3.2), libavformat-dev, libdvdread-dev, libflac++-dev,
  libflac-dev, libkcddb-dev, libmad0-dev, libmpcdec-dev, libmusicbrainz4-dev,
  libpolkit-qt-dev, libsamplerate0-dev, libsndfile1-dev, libtag1-dev,
- libvorbis-dev
-Standards-Version: 3.8.2
+ libvorbis-dev, libcam-dev [kfreebsd-i386 kfreebsd-amd64]
+Standards-Version: 3.8.3
 Homepage: http://www.k3b.org
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/k3b/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/k3b/trunk/
@@ -17,7 +17,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  k3b-data (= ${source:Version}), libk3b6 (= ${binary:Version}),
- wodim | cdrskin, cdparanoia, cdrdao, genisoimage
+ wodim | cdrskin, cdparanoia, cdrdao [linux-any], genisoimage
 Recommends: libk3b6-extracodecs, dvd+rw-tools, vcdimager
 Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2
 Replaces: k3b-data (<< 1.66.0~alpha2-1)
@@ -79,7 +79,7 @@
 Section: debug
 Architecture: any
 Priority: extra
-Depends: k3b (= ${binary:Version})
+Depends: k3b (= ${binary:Version}), ${misc:Depends}
 Description: A sophisticated CD/DVD burning application - debugging symbols
  K3b provides a comfortable user interface to perform most CD/DVD burning
  tasks. While the experienced user can take influence in all steps

Modified: kde-extras/k3b/trunk/debian/copyright
===================================================================
--- kde-extras/k3b/trunk/debian/copyright	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/copyright	2009-11-11 18:32:00 UTC (rev 16246)
@@ -12,10 +12,12 @@
     Thomas Froescher <tfroescher at k3b.org>
     Christian Kvasny <chris at k3b.org>
     Klaus-Dieter Krannich <kd at k3b.org>
+    Michał Małek <michalm at jabster.pl>
 
 Copyright:
 
-    Copyright (C) 2001-2008 Sebastian Trueg
+    Copyright (C) 2001-2009 Sebastian Trueg
+    Copyright (C) 2009 Michał Małek
 
 License:
 
@@ -41,5 +43,5 @@
     Copyright (C) 2005-2008 Francois Marier <francois at debian.org>
     Copyright (C) 2003-2005 Jean-Michel Kelbert <kelbert at debian.org>
 
-and is licensed under the GPL version 2, 
+and is licensed under the GPL version 2,
 see `/usr/share/common-licenses/GPL-2'.

Modified: kde-extras/k3b/trunk/debian/k3b-data.install
===================================================================
--- kde-extras/k3b/trunk/debian/k3b-data.install	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/k3b-data.install	2009-11-11 18:32:00 UTC (rev 16246)
@@ -207,6 +207,7 @@
 usr/share/kde4/services/kcm_k3bexternalencoder.desktop
 usr/share/kde4/services/kcm_k3boggvorbisencoder.desktop
 usr/share/kde4/services/videodvd.protocol
+usr/share/kde4/servicetypes/k3bplugin.desktop
 usr/share/sounds/k3b_error1.wav
 usr/share/sounds/k3b_success1.wav
 usr/share/sounds/k3b_wait_media1.wav

Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff	2009-11-11 18:32:00 UTC (rev 16246)
@@ -5,7 +5,7 @@
 
 --- a/libk3b/core/k3bdefaultexternalprograms.cpp
 +++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -388,7 +388,7 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
+@@ -389,7 +389,7 @@ K3b::VcdbuilderProgram::VcdbuilderProgra
  
  
  K3b::NormalizeProgram::NormalizeProgram()

Modified: kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/patches/102_rename_dvd+rw-tools.diff	2009-11-11 18:32:00 UTC (rev 16246)
@@ -1,6 +1,6 @@
 --- a/libk3b/core/k3bdefaultexternalprograms.cpp
 +++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -431,7 +431,7 @@ K3b::Version K3b::DvdformatProgram::pars
+@@ -432,7 +432,7 @@ K3b::Version K3b::DvdformatProgram::pars
  {
      // different locales make searching for the +- char difficult
      // so we simply ignore it.

Modified: kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/patches/107_iso_cue_mimetypes.diff	2009-11-11 18:32:00 UTC (rev 16246)
@@ -1,9 +1,9 @@
 --- a/src/k3b.desktop
 +++ b/src/k3b.desktop
-@@ -94,8 +94,8 @@ Name[hi]=के3बी
- Name[hne]=के3बी
- Name[ne]=केथ्रीबी
+@@ -144,8 +144,8 @@ Name[uk]=K3b
  Name[x-test]=xxK3bxx
+ Name[zh_CN]=K3b
+ Name[zh_TW]=K3b
 -MimeType=application/x-k3b;
 +MimeType=application/x-k3b;application/x-iso;application/x-cue
  X-KDE-StartupNotify=true

Added: kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff	2009-11-11 18:32:00 UTC (rev 16246)
@@ -0,0 +1,16 @@
+author: Petr Salinger <Petr.Salinger at seznam.cz>
+
+--- a/libk3bdevice/k3bdevice.h
++++ b/libk3bdevice/k3bdevice.h
+@@ -25,6 +25,11 @@
+ #include "k3bmsf.h"
+ #include "k3bdevice_export.h"
+ 
++#if defined(__FreeBSD_kernel__)
++#undef Q_OS_LINUX
++#define Q_OS_FREEBSD 1
++#endif
++
+ #ifdef Q_OS_FREEBSD
+ struct cam_device;
+ #endif

Added: kde-extras/k3b/trunk/debian/patches/114_new_libmpcdec_api.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/114_new_libmpcdec_api.diff	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/114_new_libmpcdec_api.diff	2009-11-11 18:32:00 UTC (rev 16246)
@@ -0,0 +1,197 @@
+author: Yavor Doganov <yavor at gnu.org>
+
+See http://bugs.debian.org/476379
+
+--- a/cmake/modules/FindMuse.cmake
++++ b/cmake/modules/FindMuse.cmake
+@@ -16,15 +16,21 @@ if ( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES
+ endif ( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES )
+ 
+ 
+-FIND_PATH(MUSE_INCLUDE_DIR NAMES mpcdec/mpcdec.h
++FIND_PATH(MUSE_INCLUDE_DIR NAMES mpc/mpcdec.h
+ )
+ 
+ if(MUSE_INCLUDE_DIR)
+   FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdec)
++  set(MPC_HEADER_FILE "<mpc/mpcdec.h>")
++else(MUSE_INCLUDE_DIR)
++  FIND_PATH(MUSE_INCLUDE_DIR NAMES mpcdec/mpcdec.h)
++  FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdec)
+   set(MPC_HEADER_FILE "<mpcdec/mpcdec.h>")
++  set(MPC_OLD_API 1)
+ else(MUSE_INCLUDE_DIR)
+   FIND_PATH(MUSE_INCLUDE_DIR NAMES musepack/musepack.h)
+   set(MPC_HEADER_FILE "<musepack/musepack.h>")
++  set(MPC_OLD_API 1)
+   FIND_LIBRARY(MUSE_LIBRARIES NAMES musepack )
+ endif(MUSE_INCLUDE_DIR)
+ 
+--- a/plugins/decoder/musepack/k3bmpcwrapper.cpp
++++ b/plugins/decoder/musepack/k3bmpcwrapper.cpp
+@@ -19,32 +19,60 @@
+ #include <qfile.h>
+ 
+ 
++#ifdef MPC_OLD_API
+ mpc_int32_t read_impl( void* data, void* ptr, mpc_int32_t size )
+ {
+   QFile* input = static_cast<QFile*>( data );
++#else
++mpc_int32_t read_impl( mpc_reader* data, void* ptr, mpc_int32_t size )
++{
++  QFile* input = static_cast<QFile*>( data->data );
++#endif
+   return input->read( (char*)ptr, size );
+ }
+ 
+ 
++#ifdef MPC_OLD_API
+ mpc_bool_t seek_impl( void* data, mpc_int32_t offset )
+ {
+   QFile* input = static_cast<QFile*>( data );
++#else
++mpc_bool_t seek_impl( mpc_reader* data, mpc_int32_t offset )
++{
++  QFile* input = static_cast<QFile*>( data->data );
++#endif
+   return input->seek( offset );
+ }
+ 
++#ifdef MPC_OLD_API
+ mpc_int32_t tell_impl( void* data )
+ {
+   QFile* input = static_cast<QFile*>( data );
++#else
++mpc_int32_t tell_impl( mpc_reader* data )
++{
++  QFile* input = static_cast<QFile*>( data->data );
++#endif
+   return input->pos();
+ }
+ 
++#ifdef MPC_OLD_API
+ mpc_int32_t get_size_impl( void* data )
+ {
+   QFile* input = static_cast<QFile*>( data );
++#else
++mpc_int32_t get_size_impl( mpc_reader* data )
++{
++  QFile* input = static_cast<QFile*>( data->data );
++#endif
+   return input->size();
+ }
+ 
++#ifdef MPC_OLD_API
+ mpc_bool_t canseek_impl( void* )
++#else
++mpc_bool_t canseek_impl( mpc_reader* )
++#endif
+ {
+   return true;
+ }
+@@ -74,7 +102,9 @@ K3bMpcWrapper::K3bMpcWrapper()
+   m_reader->canseek  = canseek_impl;
+   m_reader->data     = m_input;
+ 
++#ifdef MPC_OLD_API
+   m_decoder          = new mpc_decoder;
++#endif
+ 
+   m_info             = new mpc_streaminfo;
+ }
+@@ -85,7 +115,12 @@ K3bMpcWrapper::~K3bMpcWrapper()
+   close();
+ 
+   delete m_reader;
++#ifdef MPC_OLD_API
+   delete m_decoder;
++#else
++  if( m_decoder )
++    mpc_demux_exit( m_decoder );
++#endif
+   delete m_info;
+   delete m_input;
+ }
+@@ -98,6 +133,7 @@ bool K3bMpcWrapper::open( const QString&
+   m_input->setFileName( filename );
+ 
+   if( m_input->open( QIODevice::ReadOnly ) ) {
++#ifdef MPC_OLD_API
+     mpc_streaminfo_init( m_info );
+     if( mpc_streaminfo_read( m_info, m_reader ) != ERROR_CODE_OK ) {
+       kDebug() << "(K3bMpcWrapper) Not a valid musepack file: \"" << filename << "\"";
+@@ -106,16 +142,25 @@ bool K3bMpcWrapper::open( const QString&
+     else {
+       mpc_decoder_setup( m_decoder, m_reader );
+       if( !mpc_decoder_initialize( m_decoder, m_info ) ) {
++#else
++      m_decoder = mpc_demux_init( m_reader );
++      if( !m_decoder ) {
++#endif
+ 	kDebug() << "(K3bMpcWrapper) failed to initialize the Musepack decoder.";
+ 	close();
+ 	return false;
+       }
+       else {
++#ifndef MPC_OLD_API
++	mpc_demux_get_info( m_decoder, m_info );
++#endif
+ 	kDebug() << "(K3bMpcWrapper) valid musepack file. " 
+ 		  << channels() << " Channels and Samplerate: " << samplerate() << endl;
+ 	return true;
+       }
++#ifdef MPC_OLD_API
+     }
++#endif
+   }
+   else
+     return false;
+@@ -133,7 +178,16 @@ int K3bMpcWrapper::decode( char* data, i
+   // FIXME: make this a member variable
+   MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH];
+ 
++#ifdef MPC_OLD_API
+   unsigned int samples = mpc_decoder_decode( m_decoder, sample_buffer, 0, 0 );
++#else
++  unsigned int samples;
++  mpc_frame_info frame;
++
++  frame.buffer = sample_buffer;
++  mpc_demux_decode( m_decoder, &frame );
++  samples = frame.samples;
++#endif
+ 
+   if( samples*channels()*2 > (unsigned int)max ) {
+     kDebug() << "(K3bMpcWrapper) buffer not big enough.";
+@@ -170,7 +224,11 @@ int K3bMpcWrapper::decode( char* data, i
+ 
+ bool K3bMpcWrapper::seek( const K3b::Msf& msf )
+ {
++#ifdef MPC_OLD_API
+   return mpc_decoder_seek_seconds( m_decoder, (double)msf.totalFrames()/75.0 );
++#else
++  return mpc_demux_seek_second( m_decoder, (double)msf.totalFrames()/75.0 );
++#endif
+ }
+ 
+ 
+--- a/plugins/decoder/musepack/k3bmpcwrapper.h
++++ b/plugins/decoder/musepack/k3bmpcwrapper.h
+@@ -49,7 +49,11 @@ class K3bMpcWrapper
+  private:
+   QFile* m_input;
+   mpc_reader* m_reader;
++#ifdef MPC_OLD_API
+   mpc_decoder* m_decoder;
++#else
++  mpc_demux* m_decoder;
++#endif
+   mpc_streaminfo* m_info;
+ };
+ 
+--- a/plugins/decoder/musepack/k3bmpc_config.h.cmake
++++ b/plugins/decoder/musepack/k3bmpc_config.h.cmake
+@@ -1 +1,2 @@
+ #define MPC_HEADER_FILE ${MPC_HEADER_FILE}
++#cmakedefine MPC_OLD_API

Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/patches/series	2009-11-11 18:32:00 UTC (rev 16246)
@@ -6,3 +6,5 @@
 110_disable_no_problems_found_popup.diff
 111_advice_debian_libk3b3-extracodes.diff
 112_dont_require_mp3.diff
+113_add_kfreebsd_support.diff
+114_new_libmpcdec_api.diff

Modified: kde-extras/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/trunk/debian/rules	2009-11-11 16:44:26 UTC (rev 16245)
+++ kde-extras/k3b/trunk/debian/rules	2009-11-11 18:32:00 UTC (rev 16246)
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
-
 #DEB_CMAKE_CUSTOM_FLAGS += -DK3B_BUILD_K3BSETUP=OFF
 
 %:
-	dh --with quilt --dbg-package=k3b-dbg $@
+	dh --dbg-package=k3b-dbg --list-missing --with quilt,kde  $@
 
 .PHONY: override_dh_auto_test




More information about the pkg-kde-commits mailing list