head 1.3; access; symbols pkgsrc-2019Q3:1.2.0.42 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.40 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.38 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.36 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.34 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.32 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.30 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.28 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.26 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.22 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.20 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.18 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.16 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.14 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.12 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.10 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.8 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.6 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.4 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.2 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.1.0.8 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.6 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.4 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.2 pkgsrc-2013Q4-base:1.1; locks; strict; comment @// @; 1.3 date 2019.12.02.09.38.10; author markd; state dead; branches; next 1.2; commitid e9PZ3A3StDXv97NB; 1.2 date 2014.11.15.03.35.26; author markd; state Exp; branches; next 1.1; commitid qTJggaetZ7TPneYx; 1.1 date 2013.11.09.22.20.36; author markd; state Exp; branches; next ; commitid kcRP9CdTtbZaxEcx; desc @@ 1.3 log @k3b: update to 19.08.3 qt5/kf5 version @ text @$NetBSD: patch-libk3b_tools_k3bcdparanoialib.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $ --- libk3b/tools/k3bcdparanoialib.cpp.orig 2014-11-04 18:37:31.000000000 +0000 +++ libk3b/tools/k3bcdparanoialib.cpp @@@@ -68,7 +68,7 @@@@ typedef short int int16_t; #define LIBCDIO_CDDA "cdio_cdda.dll" #define LIBCDIO_PARANOIA "cdio_paranoia.dll" #else -#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:: #ifndef Q_OS_WIN32 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 @@@@ -581,7 +581,7 @@@@ K3b::CdparanoiaLib* K3b::CdparanoiaLib:: #ifndef Q_OS_WIN32 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 ) @ 1.2 log @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 @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @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. Fixes PR pkg/48369 and pkg/48371. Bump PKGREVISION @ text @d3 1 a3 5 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 d5 2 a6 1 @@@@ -69,7 +69,7 @@@@ typedef short int int16_t; d9 6 a14 4 #define LIBCDIO_CDDA "libcdio_cdda.so" -#define LIBCDIO_PARANOIA "libcdio_paranoia.so.0" +#define LIBCDIO_PARANOIA "libcdio_paranoia.so" #endif a15 4 static bool s_haveLibCdio = false; @@@@ -532,11 +532,11 @@@@ K3b::CdparanoiaLib* K3b::CdparanoiaLib:: if( s_libInterface == 0 ) { s_haveLibCdio = false; d17 14 a30 7 - 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 ); d32 1 a32 5 // try the new cdio lib if( s_libInterface == 0 ) { @@@@ -550,11 +550,11 @@@@ K3b::CdparanoiaLib* K3b::CdparanoiaLib:: } d34 7 a40 19 - 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; } @