Attachment #160199 for bug #202561

View | Details | Raw Unified | Return to bug 202561
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	k3b
PORTVERSION=	2.0.3
PORTREVISION=	23
CATEGORIES=	sysutils multimedia kde
MASTER_SITES=	http://download.kde.org/stable/${PORTNAME}/
DISTFILES=	${DISTNAME}a${EXTRACT_SUFX}

MAINTAINER=	kde@FreeBSD.org
COMMENT=	KDE CD/DVD writing suite

RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools

USES=		cmake gettext pkgconfig shared-mime-info tar:xz
CMAKE_ARGS=	-DK3B_BUILD_K3BSETUP:BOOL=OFF \
		-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb

Lines 1-2 Link Here

(-)sysutils/k3b-kde4/distinfo (-2 / +2 lines)
1	SHA256 (k3b-2.0.2.tar.bz2) = af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd	1	SHA256 (k3b-2.0.3a.tar.xz) = 2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081
2	SIZE (k3b-2.0.2.tar.bz2) = 12833321	2	SIZE (k3b-2.0.3a.tar.xz) = 9864468




--- CMakeLists.txt.orig	2014-11-04 18:43:47 UTC
+++ CMakeLists.txt
@@ -106,10 +106,10 @@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN)
     include(CMakePushCheckState)
     cmake_push_check_state()
 
-    if(CMAKE_COMPILER_IS_GNUCC)
+    if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") 
       # FindKDE4Internal.cmake screws things up
       set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c99)
-    endif(CMAKE_COMPILER_IS_GNUCC)
+    endif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang") 
 
     if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
       set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FFMPEG_INCLUDE_DIR_OLD_STYLE})

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-cmake_modules_FindMuse.cmake (-2 / +2 lines)
1	--- cmake/modules/FindMuse.cmake.orig 2011-01-15 20:47:29.000000000 +0000	1	--- cmake/modules/FindMuse.cmake.orig 2014-11-04 18:37:31 UTC
2	+++ cmake/modules/FindMuse.cmake	2	+++ cmake/modules/FindMuse.cmake
3	@@ -15,13 +15,10 @@ if( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES	3	@@ -15,13 +15,10 @@ if( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES
4	endif( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES )	4	endif( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES )
5		5
6	include(CheckIncludeFiles)	6	include(CheckIncludeFiles)




https://bugs.gentoo.org/show_bug.cgi?id=476494

A better patch using avcodec_decode_audio4 will be needed but for now this
fixes the problem.

Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
===================================================================
--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig
+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -37,6 +37,9 @@ extern "C" {
 
 #include <klocale.h>
 
+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4)
+#endif
 
 #if LIBAVFORMAT_BUILD < 4629
 #define FFMPEG_BUILD_PRE_4629

Lines 1-11 Link Here

(-)sysutils/k3b-kde4/files/patch-ffmpeg27 (-11 lines)
1	--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2011-01-15 21:47:29.000000000 +0100
2	+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2015-07-04 07:21:54.284708677 +0200
3	@@ -159,7 +159,7 @@ void K3bFFMpegFile::close()
4	}
5
6	if( d->formatContext ) {
7	- ::av_close_input_file( d->formatContext );
8	+ ::avformat_close_input( &d->formatContext );
9	d->formatContext = 0;
10	}
11	}




commit 2f845b34badb614882b7e38ac38b00041ac2832d
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
@@ -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;
     }
@@ -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 );




commit 6f34e14b28d2f9103151c6ba08b3bb40448ffe46
Author: Alex Merry <kde@randomguy3.me.uk>
Date:   Thu Aug 23 23:45:34 2012 +0100

    Fix K3B to build with recent FFMPEG versions
    
    FFMPEG 0.11 (shipped on ArchLinux, for example) has renamed some
    functions.
    
    The exact versions in the #ifdefs are taken from the Mobile Robot
    Programming Toolkit.
    
    BUG: 300731

diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index 0c5f366..024c18c 100644
--- ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -88,7 +88,11 @@ bool K3bFFMpegFile::open()
     close();
 
     // open the file
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
+    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, 0 );
+#else
     int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
+#endif
     if( err < 0 ) {
         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
         return false;
@@ -143,7 +147,11 @@ bool K3bFFMpegFile::open()
     }
 
     // dump some debugging info
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
+    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+#else
     ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+#endif
 
     return true;
 }




commit 79cd49cac3a6b7031556aae53ce3ecff8c360cb9
Author: Pino Toscano <pino@kde.org>
Date:   Sun Jul 8 22:20:15 2012 +0200

    fix sox detection with sox >= 14.4.0
    
    sox 1.14.0 changed the string that is printed out on --version, breaking the simply string matching done;
    add a new case to cover also this new version
    
    BUG: 301544

diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index 3559d5d..af5b013 100644
--- ./plugins/encoder/sox/k3bsoxencoder.cpp
+++ ./plugins/encoder/sox/k3bsoxencoder.cpp
@@ -69,6 +69,9 @@ public:
             if ( pos >= 0 ) {
                 pos += 17;
             }
+            else if ( ( pos = out.indexOf( "sox:      SoX v" ) ) >= 0 ) {
+                pos += 15;
+            }
             else if ( ( pos = out.indexOf( "sox: SoX v" ) ) >= 0 ) {
                 pos += 10;
             }




commit 8d33a486082cd9eaa857d6042b1b8870e4bf532b
Author: Rex Dieter <rdieter@fedoraproject.org>
Date:   Sat Feb 11 08:34:04 2012 -0600

    fix for newer (kde-4.7+) FindFFMPEG.cmake
    which sets ${FFMPEG_INCLUDE_DIRS} instead of ${FFMPEG_INCLUDE_DIR}

diff --git a/plugins/decoder/ffmpeg/CMakeLists.txt b/plugins/decoder/ffmpeg/CMakeLists.txt
index d7e25eb..d420a3c 100644
--- ./plugins/decoder/ffmpeg/CMakeLists.txt
+++ ./plugins/decoder/ffmpeg/CMakeLists.txt
@@ -9,7 +9,7 @@ if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
 else(FFMPEG_INCLUDE_DIR_OLD_STYLE)
     message(STATUS "found new ffmpegcodecpath")
     add_definitions(-DNEWFFMPEGAVCODECPATH)
-    include_directories (${FFMPEG_INCLUDE_DIR})
+    include_directories (${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS})
 endif(FFMPEG_INCLUDE_DIR_OLD_STYLE)
 
 set(k3bffmpegdecoder_PART_SRCS k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp )




From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
Date: Sat, 14 Feb 2015 15:31:07 +0100
Subject: [PATCH] Fixed compilation with newer ffmpeg/libav.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
---
 plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 60 ++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index 5451fd3..2f80fd6 100644
--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -86,8 +86,12 @@ public:
     K3b::Msf length;
 
     // for decoding. ffmpeg requires 16-byte alignment.
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+    ::AVFrame* frame;
+#else
     char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
     char* alignedOutputBuffer;
+#endif
     char* outputBufferPos;
     int outputBufferSize;
     ::AVPacket packet;
@@ -102,14 +106,29 @@ K3bFFMpegFile::K3bFFMpegFile( const QString& filename )
     d = new Private;
     d->formatContext = 0;
     d->codec = 0;
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+#  if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
+    d->frame = avcodec_alloc_frame();
+#  else
+    d->frame = av_frame_alloc();
+#  endif
+#else
     int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf);
     d->alignedOutputBuffer = &d->outputBuffer[offset];
+#endif
 }
 
 
 K3bFFMpegFile::~K3bFFMpegFile()
 {
     close();
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+#  if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
+    av_free(d->frame);
+#  else
+    av_frame_free(&d->frame);
+#  endif
+#endif
     delete d;
 }
 
@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer()
             return 0;
         }
 
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+        int gotFrame = 0;
+        int len = ::avcodec_decode_audio4(
+#else
         d->outputBufferPos = d->alignedOutputBuffer;
         d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-
-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
         int len = ::avcodec_decode_audio3(
-#else
-#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
-        int len = ::avcodec_decode_audio2(
 #  else
+#    ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
+        int len = ::avcodec_decode_audio2(
+#    else
         int len = ::avcodec_decode_audio(
+#    endif
 #  endif
 #endif
 
             FFMPEG_CODEC(d->formatContext->streams[0]),
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+            d->frame,
+            &gotFrame,
+            &d->packet );
+#else
             (short*)d->alignedOutputBuffer,
             &d->outputBufferSize,
-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
             &d->packet );
-#else
+#  else
             d->packetData, d->packetSize );
+#  endif
 #endif
 
         if( d->packetSize <= 0 || len < 0 )
@@ -355,6 +384,17 @@ int K3bFFMpegFile::fillOutputBuffer()
             return -1;
         }
 
+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
+        if ( gotFrame ) {
+            d->outputBufferSize = ::av_samples_get_buffer_size(
+                NULL,
+                FFMPEG_CODEC(d->formatContext->streams[0])->channels,
+                d->frame->nb_samples,
+                FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt,
+                1 );
+            d->outputBufferPos = reinterpret_cast<char*>( d->frame->data[0] );
+        }
+#endif
         d->packetSize -= len;
         d->packetData += len;
     }
@@ -420,9 +460,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const
         // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
         // its thing.
         //
-        if( file->type() == CODEC_ID_WMAV1 ||
-            file->type() == CODEC_ID_WMAV2 ||
-            file->type() == CODEC_ID_AAC )
+        if( file->type() == AV_CODEC_ID_WMAV1 ||
+            file->type() == AV_CODEC_ID_WMAV2 ||
+            file->type() == AV_CODEC_ID_AAC )
 #endif
             return file;
     }
-- 
2.0.5





Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
===================================================================
--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig	2013-04-22 17:46:13.523959500 +0200
+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2013-04-22 18:40:49.890007513 +0200
@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
     }
 
     // analyze the streams
-    ::av_find_stream_info( d->formatContext );
+    ::avformat_find_stream_info( d->formatContext, 0 );
 
     // we only handle files containing one audio stream
     if( d->formatContext->nb_streams != 1 ) {
@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
 
     // open the codec on our context
     kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
-    if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
+    if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
         kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
         return false;
     }

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3b-core-k3bglobals.cpp (-3 / +3 lines)
1	--- libk3b/core/k3bglobals.cpp.orig 2010-07-30 06:36:01.794731453 +0000	1	--- libk3b/core/k3bglobals.cpp.orig 2014-11-04 18:37:31 UTC
2	+++ libk3b/core/k3bglobals.cpp 2010-07-30 06:37:34.104075238 +0000	2	+++ libk3b/core/k3bglobals.cpp
3	@@ -321,6 +321,13 @@	3	@@ -322,6 +322,13 @@ QString K3b::externalBinDeviceParameter(
4	}	4	}
5		5
6		6

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3b-core-k3bglobals.h (-3 / +3 lines)
1	--- libk3b/core/k3bglobals.h.orig 2010-07-30 06:40:13.000000000 +0200	1	--- libk3b/core/k3bglobals.h.orig 2014-11-04 18:37:31 UTC
2	+++ libk3b/core/k3bglobals.h 2010-07-30 06:41:05.000000000 +0200	2	+++ libk3b/core/k3bglobals.h
3	@@ -230,6 +230,7 @@	3	@@ -231,6 +231,7 @@ namespace K3b {
4	* Takes care of SCSI and ATAPI.	4	* Takes care of SCSI and ATAPI.
5	*/	5	*/
6	LIBK3B_EXPORT QString externalBinDeviceParameter( Device::Device* dev, const ExternalBin* );	6	LIBK3B_EXPORT QString externalBinDeviceParameter( Device::Device* dev, const ExternalBin* );

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3b-projects-k3bcdrecordwriter.cpp (-3 / +3 lines)
1	--- libk3b/projects/k3bcdrecordwriter.cpp.orig 2010-06-06 20:49:38.000000000 +0200	1	--- libk3b/projects/k3bcdrecordwriter.cpp.orig 2014-11-04 18:37:31 UTC
2	+++ libk3b/projects/k3bcdrecordwriter.cpp 2010-07-30 06:43:53.000000000 +0200	2	+++ libk3b/projects/k3bcdrecordwriter.cpp
3	@@ -228,7 +228,11 @@	3	@@ -228,7 +228,11 @@ bool K3b::CdrecordWriter::prepareProcess
4	d->process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?)	4	d->process << "gracetime=2"; // 2 is the lowest allowed value (Joerg, why do you do this to us?)
5		5
6	// Again we assume the device to be set!	6	// Again we assume the device to be set!

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3b__CMakeLists.txt (-3 / +3 lines)
1	--- ./libk3b/CMakeLists.txt.orig 2009-04-21 21:54:02.000000000 +0400	1	--- libk3b/CMakeLists.txt.orig 2014-11-04 18:37:31 UTC
2	+++ ./libk3b/CMakeLists.txt 2010-01-30 03:22:10.208943627 +0300	2	+++ libk3b/CMakeLists.txt
3	@@ -230,12 +230,8 @@	3	@@ -230,12 +230,8 @@ target_link_libraries(k3b
4	${KCDDB_LIBRARIES}	4	${KCDDB_LIBRARIES}
5	${SAMPLERATE_LIBRARIES}	5	${SAMPLERATE_LIBRARIES}
6	k3bdevice	6	k3bdevice

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3bdevice-k3bdevice.cpp (-4 / +4 lines)
1	--- libk3bdevice/k3bdevice.cpp.orig 2010-06-06 15:32:49.000000000 +0200	1	--- libk3bdevice/k3bdevice.cpp.orig 2014-11-04 18:37:31 UTC
2	+++ libk3bdevice/k3bdevice.cpp 2010-07-30 06:44:02.000000000 +0200	2	+++ libk3bdevice/k3bdevice.cpp
3	@@ -309,6 +309,12 @@	3	@@ -322,6 +322,12 @@ QString K3b::Device::Device::blockDevice
4	}	4	}
5		5
6		6
Lines 13-19 Link Here
13	int K3b::Device::Device::maxWriteSpeed() const	13	int K3b::Device::Device::maxWriteSpeed() const
14	{	14	{
15	return d->maxWriteSpeed;	15	return d->maxWriteSpeed;
16	@@ -363,6 +369,14 @@	16	@@ -376,6 +382,14 @@ bool K3b::Device::Device::init( bool bCh
17	if( !open() )	17	if( !open() )
18	return false;	18	return false;
19		19

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3bdevice-k3bdevice.h (-3 / +3 lines)
1	--- libk3bdevice/k3bdevice.h.orig 2010-07-30 06:33:55.000000000 +0200	1	--- libk3bdevice/k3bdevice.h.orig 2014-11-04 18:37:31 UTC
2	+++ libk3bdevice/k3bdevice.h 2010-07-30 06:35:35.000000000 +0200	2	+++ libk3bdevice/k3bdevice.h
3	@@ -222,6 +222,11 @@	3	@@ -222,6 +222,11 @@ namespace K3b {
4	*/	4	*/
5	QString blockDeviceName() const;	5	QString blockDeviceName() const;
6		6




diff --git a/libk3bdevice/k3bscsicommand_bsd.cpp b/libk3bdevice/k3bscsicommand_bsd.cpp
index ce6508e..63a8fd5 100644
--- ./libk3bdevice/k3bscsicommand_bsd.cpp
+++ ./libk3bdevice/k3bscsicommand_bsd.cpp
@@ -1,6 +1,7 @@
 /*
  *
  * Copyright (C) 2003-2009 Sebastian Trueg <trueg@k3b.org>
+ * Copyright (C) 2011 Andriy Gapon <avg@FreeBSD.org>
  *
  * This file is part of the K3b project.
  * Copyright (C) 1998-2009 Sebastian Trueg <trueg@k3b.org>
@@ -23,41 +24,43 @@
 #include <cam/scsi/scsi_message.h>
 #include <cam/scsi/scsi_pass.h>
 
-#define ERRCODE(s)	((((s)[2]&0x0F)<<16)|((s)[12]<<8)|((s)[13]))
-#define EMEDIUMTYPE	EINVAL
-#define	ENOMEDIUM	ENODEV
-#define CREAM_ON_ERRNO(s)	do {                    \
-        switch ((s)[12])                            \
-        {	case 0x04:	errno=EAGAIN;	break;		\
-        case 0x20:	errno=ENODEV;	break;          \
-        case 0x21:	if ((s)[13]==0)	errno=ENOSPC;	\
-			else		errno=EINVAL;               \
-			break;                                  \
-        case 0x30:	errno=EMEDIUMTYPE;  break;      \
-        case 0x3A:	errno=ENOMEDIUM;    break;      \
-        }                                           \
-    } while(0)
-
+namespace /*anonymous*/
+{
+    inline int sense_to_err( const struct scsi_sense_data& s )
+    {
+        int errorCode, senseKey, addSenseCode, addSenseCodeQual;
+        scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode,
+                            &senseKey, &addSenseCode, &addSenseCodeQual );
+        return (errorCode << 24) | (senseKey << 16) |
+	       (addSenseCode << 8) | addSenseCodeQual;
+    }
+}
 
 
 class K3b::Device::ScsiCommand::Private
 {
+    typedef union ccb CCB;
+
 public:
-    union ccb ccb;
+    Private();
+    int transport( const Device* device, TransportDirection dir, void* data, size_t len );
+    unsigned char& operator[]( size_t i );
+    void clear();
+    const CCB& get_ccb() { return ccb; }
+
+private:
+    CCB ccb;
 };
 
 
 void K3b::Device::ScsiCommand::clear()
 {
-    memset (&d->ccb,0,sizeof(ccb));
+    d->clear();
 }
 
-
 unsigned char& K3b::Device::ScsiCommand::operator[]( size_t i )
 {
-    if( d->ccb.csio.cdb_len < i+1 )
-        d->ccb.csio.cdb_len = i+1;
-    return d->ccb.csio.cdb_io.cdb_bytes[i];
+    return (*d)[i];
 }
 
 int K3b::Device::ScsiCommand::transport( TransportDirection dir,
@@ -78,130 +81,102 @@ int K3b::Device::ScsiCommand::transport( TransportDirection dir,
         m_device->usageUnlock();
         return -1;
     }
-    d->ccb.ccb_h.path_id    = m_device->handle()->path_id;
-    d->ccb.ccb_h.target_id  = m_device->handle()->target_id;
-    d->ccb.ccb_h.target_lun = m_device->handle()->target_lun;
 
-    kDebug() << "(K3b::Device::ScsiCommand) transport command " << QString::number((int)d->ccb.csio.cdb_io.cdb_bytes[0], 16) << ", length: " << (int)d->ccb.csio.cdb_len;
-    int ret=0;
-    int direction = CAM_DEV_QFRZDIS;
-    if (!len)
-        direction |= CAM_DIR_NONE;
-    else
-        direction |= (dir & TR_DIR_READ)?CAM_DIR_IN : CAM_DIR_OUT;
-    cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL */, direction, MSG_SIMPLE_Q_TAG, (u_int8_t *)data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000);
-    unsigned char * sense = (unsigned char *)&d->ccb.csio.sense_data;
+    int ret = d->transport( m_device, dir, data, len );
+    if( ret != 0 ) {
+        const struct scsi_sense_data& s = d->get_ccb().csio.sense_data;
+        int errorCode, senseKey, addSenseCode, addSenseCodeQual;
+        scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode, &senseKey,
+                            &addSenseCode, &addSenseCodeQual );
+        debugError( d->get_ccb().csio.cdb_io.cdb_bytes[0],
+                    errorCode,
+                    senseKey,
+                    addSenseCode,
+                    addSenseCodeQual );
+    }
 
-    ret = cam_send_ccb(m_device->handle(), &d->ccb);
+    if( needToClose )
+        m_device->close();
+    m_device->usageUnlock();
 
-    if (ret < 0) {
-        kDebug() << "(K3b::Device::ScsiCommand) transport failed: " << ret;
+    return ret;
+}
 
-        if( needToClose )
-            m_device->close();
+K3b::Device::ScsiCommand::Private::Private()
+{
+    clear();
+}
 
-        m_device->usageUnlock();
+void K3b::Device::ScsiCommand::Private::clear()
+{
+    memset( &ccb, 0, sizeof(ccb) );
+}
 
-        struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
-        debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
-                    senset->error_code & SSD_ERRCODE,
-                    senset->flags & SSD_KEY,
-                    senset->add_sense_code,
-                    senset->add_sense_code_qual );
+unsigned char& K3b::Device::ScsiCommand::Private::operator[]( size_t i )
+{
+    if( ccb.csio.cdb_len < i + 1 )
+        ccb.csio.cdb_len = i + 1;
+    return ccb.csio.cdb_io.cdb_bytes[i];
+}
 
-        int result = (((senset->error_code & SSD_ERRCODE)<<24) & 0xF000 |
-                      ((senset->flags & SSD_KEY)<<16)          & 0x0F00 |
-                      (senset->add_sense_code<<8)              & 0x00F0 |
-                      (senset->add_sense_code_qual)            & 0x000F );
+int K3b::Device::ScsiCommand::Private::transport( const Device* device, TransportDirection dir, void* data, size_t len )
+{
+    ccb.ccb_h.path_id    = device->handle()->path_id;
+    ccb.ccb_h.target_id  = device->handle()->target_id;
+    ccb.ccb_h.target_lun = device->handle()->target_lun;
 
-        return result ? result : ret;
+    kDebug() << "(K3b::Device::ScsiCommand) transport command " << commandString(ccb.csio.cdb_io.cdb_bytes[0])
+             << " (" << QString::number((int)ccb.csio.cdb_io.cdb_bytes[0], 16) << "), length: " << (int)ccb.csio.cdb_len;
+    int direction = CAM_DEV_QFRZDIS;
+    if (!len)
+        direction |= CAM_DIR_NONE;
+    else
+        direction |= (dir & TR_DIR_READ) ? CAM_DIR_IN : CAM_DIR_OUT;
+
+    cam_fill_csio( &(ccb.csio), 1, NULL, direction, MSG_SIMPLE_Q_TAG, (uint8_t*)data, len, sizeof(ccb.csio.sense_data), ccb.csio.cdb_len, 30*1000 );
+    int ret = cam_send_ccb( device->handle(), &ccb );
+    if( ret < 0 ) {
+        kError() << "(K3b::Device::ScsiCommand) transport cam_send_ccb failed: ret = " << ret
+                 << ", errno = " << errno << ", cam_errbuf = " << cam_errbuf;
+        return 1;
     }
-
-    else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
-        if( needToClose )
-            m_device->close();
-        m_device->usageUnlock();
+    else if( (ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP ) {
+        kDebug() << "(K3b::Device::ScsiCommand) transport succeeded";
         return 0;
     }
 
-    errno = EIO;
-    // FreeBSD 5-CURRENT since 2003-08-24, including 5.2 fails to
-    // pull sense data automatically, at least for ATAPI transport,
-    // so I reach for it myself...
-    if ((d->ccb.csio.scsi_status==SCSI_STATUS_CHECK_COND) &&
-        !(d->ccb.ccb_h.status&CAM_AUTOSNS_VALID))
-    {
-        u_int8_t  _sense[18];
-        u_int32_t resid=d->ccb.csio.resid;
-
-        memset(_sense,0,sizeof(_sense));
+    kDebug() << "(K3b::Device::ScsiCommand) transport command failed: scsi_status = " << QString::number(ccb.csio.scsi_status, 16);
 
-        operator[](0)      = 0x03;	// REQUEST SENSE
-        d->ccb.csio.cdb_io.cdb_bytes[4] = sizeof(_sense);
-        d->ccb.csio.cdb_len   = 6;
-        d->ccb.csio.ccb_h.flags |= CAM_DIR_IN|CAM_DIS_AUTOSENSE;
-        d->ccb.csio.data_ptr  = _sense;
-        d->ccb.csio.dxfer_len = sizeof(_sense);
-        d->ccb.csio.sense_len = 0;
+    if( ccb.csio.scsi_status == SCSI_STATUS_CHECK_COND &&
+        !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) &&
+        ccb.csio.cdb_io.cdb_bytes[0] != MMC_REQUEST_SENSE )
+    {
+        kDebug() << "(K3b::Device::ScsiCommand) transport requesting sense data";
 
-        ret = cam_send_ccb(m_device->handle(), &d->ccb);
+        struct scsi_sense_data sense;
+        ScsiCommand::Private cmd;
+        cmd[0] = MMC_REQUEST_SENSE;
+        cmd[4] = SSD_MIN_SIZE;
+        cmd[5] = 0; // Necessary to set the proper command length
 
-        d->ccb.csio.resid = resid;
-        if (ret<0)
-        {
-            kDebug() << "(K3b::Device::ScsiCommand) transport failed (2): " << ret;
-            ret = -1;
-            struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
-            debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
-                        senset->error_code & SSD_ERRCODE,
-                        senset->flags & SSD_KEY,
-                        senset->add_sense_code,
-                        senset->add_sense_code_qual );
-
-            if( needToClose )
-                m_device->close();
-            m_device->usageUnlock();
-
-            return -1;
-        }
-        if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_REQ_CMP)
+        memset( &sense, 0, sizeof(sense) );
+        ret = cmd.transport( device, TR_DIR_READ, &sense, SSD_MIN_SIZE );
+        if( ret < 0 )
         {
-            kDebug() << "(K3b::Device::ScsiCommand) transport failed (3): " << ret;
-            errno=EIO,-1;
-            ret = -1;
-            struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
-            debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
-                        senset->error_code & SSD_ERRCODE,
-                        senset->flags & SSD_KEY,
-                        senset->add_sense_code,
-                        senset->add_sense_code_qual );
-
-            if( needToClose )
-                m_device->close();
-            m_device->usageUnlock();
-
-            return -1;
+            kWarning() << "(K3b::Device::ScsiCommand) transport getting sense data failed: " << ret;
+            return 1;
         }
 
-        memcpy(sense,_sense,sizeof(_sense));
+        ccb.csio.sense_data = sense;
+        ccb.ccb_h.status |= CAM_AUTOSNS_VALID;
     }
 
-    ret = ERRCODE(sense);
-    kDebug() << "(K3b::Device::ScsiCommand) transport failed (4): " << ret;
-    if (ret == 0)
-        ret = -1;
-    else
-        CREAM_ON_ERRNO(((unsigned char *)&d->ccb.csio.sense_data));
-    struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
-    debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
-                senset->error_code & SSD_ERRCODE,
-                senset->flags & SSD_KEY,
-                senset->add_sense_code,
-                senset->add_sense_code_qual );
-
-    if( needToClose )
-        m_device->close();
-    m_device->usageUnlock();
+    if( !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) )
+        kDebug() << "(K3b::Device::ScsiCommand) sense data is not available";
 
+    ret = sense_to_err(ccb.csio.sense_data);
+    if( ret == 0 )
+        ret = 1;
+    kDebug() << "(K3b::Device::ScsiCommand) transport failed: " << ret;
     return ret;
 }

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3bdevice__CMakeLists.txt (-4 / +4 lines)
1	--- ./libk3bdevice/CMakeLists.txt.orig 2009-04-06 14:13:39.000000000 -0400	1	--- libk3bdevice/CMakeLists.txt.orig 2014-11-04 18:37:31 UTC
2	+++ ./libk3bdevice/CMakeLists.txt 2009-10-19 10:55:39.000000000 -0400	2	+++ libk3bdevice/CMakeLists.txt
3	@@ -27,6 +27,7 @@	3	@@ -27,6 +27,7 @@ kde4_add_library(k3bdevice SHARED ${k3bd
4	target_link_libraries(k3bdevice	4	target_link_libraries(k3bdevice
5	${KDE4_KDECORE_LIBS}	5	${KDE4_KDECORE_LIBS}
6	${KDE4_SOLID_LIBS}	6	${KDE4_SOLID_LIBS}
Lines 7-10 Link Here
7	+ cam	7	+ cam
8	)	8	)
9		9
10	set_target_properties(k3bdevice PROPERTIES VERSION ${K3B_LIB_VERSION_MAJOR}.${K3B_LIB_VERSION_MINOR}.${K3B_LIB_VERSION_RELEASE} SOVERSION ${K3B_LIB_VERSION_MAJOR})	10	if (CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")

Lines 1-6 Link Here

(-)sysutils/k3b-kde4/files/patch-plugins__encoder__lame__CMakeLists.txt (-3 / +3 lines)
1	--- ./plugins/encoder/lame/CMakeLists.txt.orig 2008-08-28 10:41:55.000000000 -0400	1	--- plugins/encoder/lame/CMakeLists.txt.orig 2014-11-04 18:37:31 UTC
2	+++ ./plugins/encoder/lame/CMakeLists.txt 2009-10-19 10:55:39.000000000 -0400	2	+++ plugins/encoder/lame/CMakeLists.txt
3	@@ -26,7 +26,7 @@	3	@@ -26,7 +26,7 @@ kde4_add_plugin(k3blameencoder
4	target_link_libraries(k3blameencoder	4	target_link_libraries(k3blameencoder
5	${KDE4_KDECORE_LIBS}	5	${KDE4_KDECORE_LIBS}
6	k3b k3bdevice	6	k3b k3bdevice

Lines 299-304 Link Here

(-)sysutils/k3b-kde4/pkg-plist (+79 lines)
299	share/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop	299	share/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop
300	share/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop	300	share/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop
301	%%LIBDVDREAD%%share/apps/solid/actions/k3b_videodvd_rip.desktop	301	%%LIBDVDREAD%%share/apps/solid/actions/k3b_videodvd_rip.desktop
		302	share/doc/HTML/ca/k3b/K3bAddButton.png
		303	share/doc/HTML/ca/k3b/K3bAdvancedSettings.png
		304	share/doc/HTML/ca/k3b/K3bDiskChoice.png
		305	share/doc/HTML/ca/k3b/K3bMoreActions.png
		306	share/doc/HTML/ca/k3b/K3bSetVerify.png
		307	share/doc/HTML/ca/k3b/K3bsetup.png
		308	share/doc/HTML/ca/k3b/common
		309	share/doc/HTML/ca/k3b/index.cache.bz2
		310	share/doc/HTML/ca/k3b/index.docbook
		311	share/doc/HTML/de/k3b/common
		312	share/doc/HTML/de/k3b/index.cache.bz2
		313	share/doc/HTML/de/k3b/index.docbook
302	share/doc/HTML/en/k3b/K3bAddButton.png	314	share/doc/HTML/en/k3b/K3bAddButton.png
303	share/doc/HTML/en/k3b/K3bAdvancedSettings.png	315	share/doc/HTML/en/k3b/K3bAdvancedSettings.png
304	share/doc/HTML/en/k3b/K3bDiskChoice.png	316	share/doc/HTML/en/k3b/K3bDiskChoice.png
Lines 308-313 Link Here
308	share/doc/HTML/en/k3b/common	320	share/doc/HTML/en/k3b/common
309	share/doc/HTML/en/k3b/index.cache.bz2	321	share/doc/HTML/en/k3b/index.cache.bz2
310	share/doc/HTML/en/k3b/index.docbook	322	share/doc/HTML/en/k3b/index.docbook
		323	share/doc/HTML/es/k3b/common
		324	share/doc/HTML/es/k3b/index.cache.bz2
		325	share/doc/HTML/es/k3b/index.docbook
		326	share/doc/HTML/et/k3b/common
		327	share/doc/HTML/et/k3b/index.cache.bz2
		328	share/doc/HTML/et/k3b/index.docbook
		329	share/doc/HTML/fr/k3b/K3bAddButton.png
		330	share/doc/HTML/fr/k3b/K3bAdvancedSettings.png
		331	share/doc/HTML/fr/k3b/K3bDiskChoice.png
		332	share/doc/HTML/fr/k3b/K3bMoreActions.png
		333	share/doc/HTML/fr/k3b/K3bsetup.png
		334	share/doc/HTML/fr/k3b/common
		335	share/doc/HTML/fr/k3b/index.cache.bz2
		336	share/doc/HTML/fr/k3b/index.docbook
		337	share/doc/HTML/fr/k3b/k3bSetVerify.png
		338	share/doc/HTML/it/k3b/common
		339	share/doc/HTML/it/k3b/index.cache.bz2
		340	share/doc/HTML/it/k3b/index.docbook
		341	share/doc/HTML/nl/k3b/common
		342	share/doc/HTML/nl/k3b/index.cache.bz2
		343	share/doc/HTML/nl/k3b/index.docbook
		344	share/doc/HTML/pt/k3b/common
		345	share/doc/HTML/pt/k3b/index.cache.bz2
		346	share/doc/HTML/pt/k3b/index.docbook
		347	share/doc/HTML/pt_BR/k3b/common
		348	share/doc/HTML/pt_BR/k3b/index.cache.bz2
		349	share/doc/HTML/pt_BR/k3b/index.docbook
		350	share/doc/HTML/uk/k3b/K3bAddButton.png
		351	share/doc/HTML/uk/k3b/K3bAdvancedSettings.png
		352	share/doc/HTML/uk/k3b/K3bDiskChoice.png
		353	share/doc/HTML/uk/k3b/K3bMoreActions.png
		354	share/doc/HTML/uk/k3b/K3bSetVerify.png
		355	share/doc/HTML/uk/k3b/K3bsetup.png
		356	share/doc/HTML/uk/k3b/common
		357	share/doc/HTML/uk/k3b/index.cache.bz2
		358	share/doc/HTML/uk/k3b/index.docbook
311	share/icons/hicolor/128x128/apps/k3b.png	359	share/icons/hicolor/128x128/apps/k3b.png
312	share/icons/hicolor/16x16/apps/k3b.png	360	share/icons/hicolor/16x16/apps/k3b.png
313	share/icons/hicolor/22x22/apps/k3b.png	361	share/icons/hicolor/22x22/apps/k3b.png
Lines 352-357 Link Here
352	share/locale/bg/LC_MESSAGES/k3bsetup.mo	400	share/locale/bg/LC_MESSAGES/k3bsetup.mo
353	share/locale/bg/LC_MESSAGES/libk3b.mo	401	share/locale/bg/LC_MESSAGES/libk3b.mo
354	share/locale/bg/LC_MESSAGES/libk3bdevice.mo	402	share/locale/bg/LC_MESSAGES/libk3bdevice.mo
		403	share/locale/bs/LC_MESSAGES/k3b.mo
		404	share/locale/bs/LC_MESSAGES/k3bsetup.mo
		405	share/locale/bs/LC_MESSAGES/kio_videodvd.mo
		406	share/locale/bs/LC_MESSAGES/libk3b.mo
		407	share/locale/bs/LC_MESSAGES/libk3bdevice.mo
355	share/locale/ca/LC_MESSAGES/k3b.mo	408	share/locale/ca/LC_MESSAGES/k3b.mo
356	share/locale/ca/LC_MESSAGES/k3bsetup.mo	409	share/locale/ca/LC_MESSAGES/k3bsetup.mo
357	share/locale/ca/LC_MESSAGES/kio_videodvd.mo	410	share/locale/ca/LC_MESSAGES/kio_videodvd.mo
Lines 381-386 Link Here
381	share/locale/de/LC_MESSAGES/libk3bdevice.mo	434	share/locale/de/LC_MESSAGES/libk3bdevice.mo
382	share/locale/el/LC_MESSAGES/k3b.mo	435	share/locale/el/LC_MESSAGES/k3b.mo
383	share/locale/el/LC_MESSAGES/k3bsetup.mo	436	share/locale/el/LC_MESSAGES/k3bsetup.mo
		437	share/locale/el/LC_MESSAGES/kio_videodvd.mo
384	share/locale/el/LC_MESSAGES/libk3b.mo	438	share/locale/el/LC_MESSAGES/libk3b.mo
385	share/locale/el/LC_MESSAGES/libk3bdevice.mo	439	share/locale/el/LC_MESSAGES/libk3bdevice.mo
386	share/locale/en_GB/LC_MESSAGES/k3b.mo	440	share/locale/en_GB/LC_MESSAGES/k3b.mo
Lines 408-417 Link Here
408	share/locale/eu/LC_MESSAGES/libk3bdevice.mo	462	share/locale/eu/LC_MESSAGES/libk3bdevice.mo
409	share/locale/fi/LC_MESSAGES/k3b.mo	463	share/locale/fi/LC_MESSAGES/k3b.mo
410	share/locale/fi/LC_MESSAGES/k3bsetup.mo	464	share/locale/fi/LC_MESSAGES/k3bsetup.mo
		465	share/locale/fi/LC_MESSAGES/kio_videodvd.mo
411	share/locale/fi/LC_MESSAGES/libk3b.mo	466	share/locale/fi/LC_MESSAGES/libk3b.mo
412	share/locale/fi/LC_MESSAGES/libk3bdevice.mo	467	share/locale/fi/LC_MESSAGES/libk3bdevice.mo
413	share/locale/fr/LC_MESSAGES/k3b.mo	468	share/locale/fr/LC_MESSAGES/k3b.mo
414	share/locale/fr/LC_MESSAGES/k3bsetup.mo	469	share/locale/fr/LC_MESSAGES/k3bsetup.mo
		470	share/locale/fr/LC_MESSAGES/kio_videodvd.mo
415	share/locale/fr/LC_MESSAGES/libk3b.mo	471	share/locale/fr/LC_MESSAGES/libk3b.mo
416	share/locale/fr/LC_MESSAGES/libk3bdevice.mo	472	share/locale/fr/LC_MESSAGES/libk3bdevice.mo
417	share/locale/ga/LC_MESSAGES/k3b.mo	473	share/locale/ga/LC_MESSAGES/k3b.mo
Lines 421-426 Link Here
421	share/locale/ga/LC_MESSAGES/libk3bdevice.mo	477	share/locale/ga/LC_MESSAGES/libk3bdevice.mo
422	share/locale/gl/LC_MESSAGES/k3b.mo	478	share/locale/gl/LC_MESSAGES/k3b.mo
423	share/locale/gl/LC_MESSAGES/k3bsetup.mo	479	share/locale/gl/LC_MESSAGES/k3bsetup.mo
		480	share/locale/gl/LC_MESSAGES/kio_videodvd.mo
424	share/locale/gl/LC_MESSAGES/libk3b.mo	481	share/locale/gl/LC_MESSAGES/libk3b.mo
425	share/locale/gl/LC_MESSAGES/libk3bdevice.mo	482	share/locale/gl/LC_MESSAGES/libk3bdevice.mo
426	share/locale/he/LC_MESSAGES/k3b.mo	483	share/locale/he/LC_MESSAGES/k3b.mo
Lines 452-457 Link Here
452	share/locale/is/LC_MESSAGES/libk3bdevice.mo	509	share/locale/is/LC_MESSAGES/libk3bdevice.mo
453	share/locale/it/LC_MESSAGES/k3b.mo	510	share/locale/it/LC_MESSAGES/k3b.mo
454	share/locale/it/LC_MESSAGES/k3bsetup.mo	511	share/locale/it/LC_MESSAGES/k3bsetup.mo
		512	share/locale/it/LC_MESSAGES/kio_videodvd.mo
455	share/locale/it/LC_MESSAGES/libk3b.mo	513	share/locale/it/LC_MESSAGES/libk3b.mo
456	share/locale/it/LC_MESSAGES/libk3bdevice.mo	514	share/locale/it/LC_MESSAGES/libk3bdevice.mo
457	share/locale/ja/LC_MESSAGES/k3b.mo	515	share/locale/ja/LC_MESSAGES/k3b.mo
Lines 459-470 Link Here
459	share/locale/ja/LC_MESSAGES/kio_videodvd.mo	517	share/locale/ja/LC_MESSAGES/kio_videodvd.mo
460	share/locale/ja/LC_MESSAGES/libk3b.mo	518	share/locale/ja/LC_MESSAGES/libk3b.mo
461	share/locale/ja/LC_MESSAGES/libk3bdevice.mo	519	share/locale/ja/LC_MESSAGES/libk3bdevice.mo
		520	share/locale/kk/LC_MESSAGES/k3b.mo
		521	share/locale/kk/LC_MESSAGES/k3bsetup.mo
		522	share/locale/kk/LC_MESSAGES/kio_videodvd.mo
		523	share/locale/kk/LC_MESSAGES/libk3b.mo
		524	share/locale/kk/LC_MESSAGES/libk3bdevice.mo
462	share/locale/km/LC_MESSAGES/k3b.mo	525	share/locale/km/LC_MESSAGES/k3b.mo
463	share/locale/km/LC_MESSAGES/k3bsetup.mo	526	share/locale/km/LC_MESSAGES/k3bsetup.mo
		527	share/locale/km/LC_MESSAGES/kio_videodvd.mo
464	share/locale/km/LC_MESSAGES/libk3b.mo	528	share/locale/km/LC_MESSAGES/libk3b.mo
465	share/locale/km/LC_MESSAGES/libk3bdevice.mo	529	share/locale/km/LC_MESSAGES/libk3bdevice.mo
466	share/locale/ko/LC_MESSAGES/k3b.mo	530	share/locale/ko/LC_MESSAGES/k3b.mo
467	share/locale/ko/LC_MESSAGES/k3bsetup.mo	531	share/locale/ko/LC_MESSAGES/k3bsetup.mo
		532	share/locale/ko/LC_MESSAGES/kio_videodvd.mo
468	share/locale/ko/LC_MESSAGES/libk3b.mo	533	share/locale/ko/LC_MESSAGES/libk3b.mo
469	share/locale/ko/LC_MESSAGES/libk3bdevice.mo	534	share/locale/ko/LC_MESSAGES/libk3bdevice.mo
470	share/locale/ku/LC_MESSAGES/k3b.mo	535	share/locale/ku/LC_MESSAGES/k3b.mo
Lines 473-483 Link Here
473	share/locale/lt/LC_MESSAGES/kio_videodvd.mo	538	share/locale/lt/LC_MESSAGES/kio_videodvd.mo
474	share/locale/lt/LC_MESSAGES/libk3b.mo	539	share/locale/lt/LC_MESSAGES/libk3b.mo
475	share/locale/lt/LC_MESSAGES/libk3bdevice.mo	540	share/locale/lt/LC_MESSAGES/libk3bdevice.mo
		541	share/locale/lv/LC_MESSAGES/k3b.mo
476	share/locale/lv/LC_MESSAGES/k3bsetup.mo	542	share/locale/lv/LC_MESSAGES/k3bsetup.mo
477	share/locale/lv/LC_MESSAGES/libk3b.mo	543	share/locale/lv/LC_MESSAGES/libk3b.mo
478	share/locale/lv/LC_MESSAGES/libk3bdevice.mo	544	share/locale/lv/LC_MESSAGES/libk3bdevice.mo
479	share/locale/mai/LC_MESSAGES/k3b.mo	545	share/locale/mai/LC_MESSAGES/k3b.mo
480	share/locale/mai/LC_MESSAGES/libk3b.mo	546	share/locale/mai/LC_MESSAGES/libk3b.mo
		547	share/locale/mr/LC_MESSAGES/k3b.mo
		548	share/locale/mr/LC_MESSAGES/k3bsetup.mo
		549	share/locale/mr/LC_MESSAGES/kio_videodvd.mo
		550	share/locale/mr/LC_MESSAGES/libk3b.mo
		551	share/locale/mr/LC_MESSAGES/libk3bdevice.mo
481	share/locale/ms/LC_MESSAGES/k3b.mo	552	share/locale/ms/LC_MESSAGES/k3b.mo
482	share/locale/ms/LC_MESSAGES/k3bsetup.mo	553	share/locale/ms/LC_MESSAGES/k3bsetup.mo
483	share/locale/ms/LC_MESSAGES/kio_videodvd.mo	554	share/locale/ms/LC_MESSAGES/kio_videodvd.mo
Lines 513-518 Link Here
513	share/locale/pa/LC_MESSAGES/libk3bdevice.mo	584	share/locale/pa/LC_MESSAGES/libk3bdevice.mo
514	share/locale/pl/LC_MESSAGES/k3b.mo	585	share/locale/pl/LC_MESSAGES/k3b.mo
515	share/locale/pl/LC_MESSAGES/k3bsetup.mo	586	share/locale/pl/LC_MESSAGES/k3bsetup.mo
		587	share/locale/pl/LC_MESSAGES/kio_videodvd.mo
516	share/locale/pl/LC_MESSAGES/libk3b.mo	588	share/locale/pl/LC_MESSAGES/libk3b.mo
517	share/locale/pl/LC_MESSAGES/libk3bdevice.mo	589	share/locale/pl/LC_MESSAGES/libk3bdevice.mo
518	share/locale/pt/LC_MESSAGES/k3b.mo	590	share/locale/pt/LC_MESSAGES/k3b.mo
Lines 527-532 Link Here
527	share/locale/pt_BR/LC_MESSAGES/libk3bdevice.mo	599	share/locale/pt_BR/LC_MESSAGES/libk3bdevice.mo
528	share/locale/ro/LC_MESSAGES/k3b.mo	600	share/locale/ro/LC_MESSAGES/k3b.mo
529	share/locale/ro/LC_MESSAGES/k3bsetup.mo	601	share/locale/ro/LC_MESSAGES/k3bsetup.mo
		602	share/locale/ro/LC_MESSAGES/kio_videodvd.mo
530	share/locale/ro/LC_MESSAGES/libk3b.mo	603	share/locale/ro/LC_MESSAGES/libk3b.mo
531	share/locale/ro/LC_MESSAGES/libk3bdevice.mo	604	share/locale/ro/LC_MESSAGES/libk3bdevice.mo
532	share/locale/ru/LC_MESSAGES/k3b.mo	605	share/locale/ru/LC_MESSAGES/k3b.mo
Lines 545-550 Link Here
545	share/locale/sk/LC_MESSAGES/libk3bdevice.mo	618	share/locale/sk/LC_MESSAGES/libk3bdevice.mo
546	share/locale/sl/LC_MESSAGES/k3b.mo	619	share/locale/sl/LC_MESSAGES/k3b.mo
547	share/locale/sl/LC_MESSAGES/k3bsetup.mo	620	share/locale/sl/LC_MESSAGES/k3bsetup.mo
		621	share/locale/sl/LC_MESSAGES/kio_videodvd.mo
548	share/locale/sl/LC_MESSAGES/libk3b.mo	622	share/locale/sl/LC_MESSAGES/libk3b.mo
549	share/locale/sl/LC_MESSAGES/libk3bdevice.mo	623	share/locale/sl/LC_MESSAGES/libk3bdevice.mo
550	share/locale/sr/LC_MESSAGES/k3b.mo	624	share/locale/sr/LC_MESSAGES/k3b.mo
Lines 581-586 Link Here
581	share/locale/tr/LC_MESSAGES/kio_videodvd.mo	655	share/locale/tr/LC_MESSAGES/kio_videodvd.mo
582	share/locale/tr/LC_MESSAGES/libk3b.mo	656	share/locale/tr/LC_MESSAGES/libk3b.mo
583	share/locale/tr/LC_MESSAGES/libk3bdevice.mo	657	share/locale/tr/LC_MESSAGES/libk3bdevice.mo
		658	share/locale/ug/LC_MESSAGES/k3b.mo
		659	share/locale/ug/LC_MESSAGES/k3bsetup.mo
		660	share/locale/ug/LC_MESSAGES/kio_videodvd.mo
		661	share/locale/ug/LC_MESSAGES/libk3b.mo
		662	share/locale/ug/LC_MESSAGES/libk3bdevice.mo
584	share/locale/uk/LC_MESSAGES/k3b.mo	663	share/locale/uk/LC_MESSAGES/k3b.mo
585	share/locale/uk/LC_MESSAGES/k3bsetup.mo	664	share/locale/uk/LC_MESSAGES/k3bsetup.mo
586	share/locale/uk/LC_MESSAGES/kio_videodvd.mo	665	share/locale/uk/LC_MESSAGES/kio_videodvd.mo

Return to bug 202561

Lines 2-11 Link Here

(-)sysutils/k3b-kde4/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= k3b	4	PORTNAME= k3b
5	PORTVERSION= 2.0.2	5	PORTVERSION= 2.0.3
6	PORTREVISION= 23
7	CATEGORIES= sysutils multimedia kde	6	CATEGORIES= sysutils multimedia kde
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= http://download.kde.org/stable/${PORTNAME}/
		8	DISTFILES= ${DISTNAME}a${EXTRACT_SUFX}
9		9
10	MAINTAINER= kde@FreeBSD.org	10	MAINTAINER= kde@FreeBSD.org
11	COMMENT= KDE CD/DVD writing suite	11	COMMENT= KDE CD/DVD writing suite
Lines 15-21 Link Here
15	RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools	15	RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
16	BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools	16	BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
17		17
18	USES= cmake gettext pkgconfig shared-mime-info tar:bzip2	18	USES= cmake gettext pkgconfig shared-mime-info tar:xz
19	CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \	19	CMAKE_ARGS= -DK3B_BUILD_K3BSETUP:BOOL=OFF \
20	-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF	20	-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
21	USE_KDE4= automoc4 kdeprefix kdelibs libkcddb	21	USE_KDE4= automoc4 kdeprefix kdelibs libkcddb

Line 0 Link Here

(-)sysutils/k3b-kde4/files/patch-CMakeLists.txt (+15 lines)
	1	--- CMakeLists.txt.orig 2014-11-04 18:43:47 UTC
	2	+++ CMakeLists.txt
	3	@@ -106,10 +106,10 @@ if(K3B_BUILD_FFMPEG_DECODER_PLUGIN)
	4	include(CMakePushCheckState)
	5	cmake_push_check_state()
	6
	7	- if(CMAKE_COMPILER_IS_GNUCC)
	8	+ if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
	9	# FindKDE4Internal.cmake screws things up
	10	set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c99)
	11	- endif(CMAKE_COMPILER_IS_GNUCC)
	12	+ endif(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
	13
	14	if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
	15	set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${FFMPEG_INCLUDE_DIR_OLD_STYLE})

Lines 1-19 Link Here

(-)sysutils/k3b-kde4/files/patch-ffmpeg2 (-19 lines)
1	https://bugs.gentoo.org/show_bug.cgi?id=476494
2
3	A better patch using avcodec_decode_audio4 will be needed but for now this
4	fixes the problem.
5
6	Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
7	===================================================================
8	--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig
9	+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
10	@@ -37,6 +37,9 @@ extern "C" {
11
12	#include <klocale.h>
13
14	+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
15	+#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4)
16	+#endif
17
18	#if LIBAVFORMAT_BUILD < 4629
19	#define FFMPEG_BUILD_PRE_4629

Lines 1-96 Link Here

(-)sysutils/k3b-kde4/files/patch-git2f845b34 (-96 lines)
1	commit 2f845b34badb614882b7e38ac38b00041ac2832d
2	Author: Michal Malek <michalm@jabster.pl>
3	Date: Sun Aug 28 20:18:53 2011 +0200
4
5	Fixed compilation with new FFMPEG
6
7	BUG: 274817
8	FIXED-IN: 2.0.3
9
10	diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
11	index 0ad59fc..0c5f366 100644
12	--- ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
13	+++ ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
14	@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
15	#else
16	::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
17	#endif
18	- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
19	+ if( codecContext->codec_type !=
20	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
21	+ AVMEDIA_TYPE_AUDIO)
22	+#else
23	+ CODEC_TYPE_AUDIO)
24	+#endif
25	+ {
26	kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
27	return false;
28	}
29	@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
30	QString K3bFFMpegFile::title() const
31	{
32	// FIXME: is this UTF8 or something??
33	- if( d->formatContext->title[0] != '\0' )
34	- return QString::fromLocal8Bit( d->formatContext->title );
35	+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
36	+ if( ade == NULL )
37	+ return QString();
38	+ if( ade->value != '\0' )
39	+ return QString::fromLocal8Bit( ade->value );
40	else
41	return QString();
42	}
43	@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
44	QString K3bFFMpegFile::author() const
45	{
46	// FIXME: is this UTF8 or something??
47	- if( d->formatContext->author[0] != '\0' )
48	- return QString::fromLocal8Bit( d->formatContext->author );
49	+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
50	+ if( ade == NULL )
51	+ return QString();
52	+ if( ade->value != '\0' )
53	+ return QString::fromLocal8Bit( ade->value );
54	else
55	return QString();
56	}
57	@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
58	QString K3bFFMpegFile::comment() const
59	{
60	// FIXME: is this UTF8 or something??
61	- if( d->formatContext->comment[0] != '\0' )
62	- return QString::fromLocal8Bit( d->formatContext->comment );
63	+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
64	+ if( ade == NULL )
65	+ return QString();
66	+ if( ade->value != '\0' )
67	+ return QString::fromLocal8Bit( ade->value );
68	else
69	return QString();
70	}
71	@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
72	#if LIBAVCODEC_VERSION_MAJOR < 52
73	int len = ::avcodec_decode_audio(
74	#else
75	+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
76	+ int len = ::avcodec_decode_audio3(
77	+ #else
78	int len = ::avcodec_decode_audio2(
79	+ #endif
80	#endif
81	+
82	#ifdef FFMPEG_BUILD_PRE_4629
83	&d->formatContext->streams[0]->codec,
84	#else
85	@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
86	#endif
87	(short*)d->alignedOutputBuffer,
88	&d->outputBufferSize,
89	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
90	+ &d->packet );
91	+#else
92	d->packetData, d->packetSize );
93	+#endif
94
95	if( d->packetSize <= 0 \|\| len < 0 )
96	::av_free_packet( &d->packet );

Lines 1-42 Link Here

(-)sysutils/k3b-kde4/files/patch-git6f34e14b (-42 lines)
1	commit 6f34e14b28d2f9103151c6ba08b3bb40448ffe46
2	Author: Alex Merry <kde@randomguy3.me.uk>
3	Date: Thu Aug 23 23:45:34 2012 +0100
4
5	Fix K3B to build with recent FFMPEG versions
6
7	FFMPEG 0.11 (shipped on ArchLinux, for example) has renamed some
8	functions.
9
10	The exact versions in the #ifdefs are taken from the Mobile Robot
11	Programming Toolkit.
12
13	BUG: 300731
14
15	diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
16	index 0c5f366..024c18c 100644
17	--- ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
18	+++ ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
19	@@ -88,7 +88,11 @@ bool K3bFFMpegFile::open()
20	close();
21
22	// open the file
23	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
24	+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, 0 );
25	+#else
26	int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
27	+#endif
28	if( err < 0 ) {
29	kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
30	return false;
31	@@ -143,7 +147,11 @@ bool K3bFFMpegFile::open()
32	}
33
34	// dump some debugging info
35	+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,2,0)
36	+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
37	+#else
38	::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
39	+#endif
40
41	return true;
42	}

Lines 1-25 Link Here

(-)sysutils/k3b-kde4/files/patch-git79cd49ca (-25 lines)
1	commit 79cd49cac3a6b7031556aae53ce3ecff8c360cb9
2	Author: Pino Toscano <pino@kde.org>
3	Date: Sun Jul 8 22:20:15 2012 +0200
4
5	fix sox detection with sox >= 14.4.0
6
7	sox 1.14.0 changed the string that is printed out on --version, breaking the simply string matching done;
8	add a new case to cover also this new version
9
10	BUG: 301544
11
12	diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
13	index 3559d5d..af5b013 100644
14	--- ./plugins/encoder/sox/k3bsoxencoder.cpp
15	+++ ./plugins/encoder/sox/k3bsoxencoder.cpp
16	@@ -69,6 +69,9 @@ public:
17	if ( pos >= 0 ) {
18	pos += 17;
19	}
20	+ else if ( ( pos = out.indexOf( "sox: SoX v" ) ) >= 0 ) {
21	+ pos += 15;
22	+ }
23	else if ( ( pos = out.indexOf( "sox: SoX v" ) ) >= 0 ) {
24	pos += 10;
25	}

Lines 1-20 Link Here

(-)sysutils/k3b-kde4/files/patch-git8d33a486 (-20 lines)
1	commit 8d33a486082cd9eaa857d6042b1b8870e4bf532b
2	Author: Rex Dieter <rdieter@fedoraproject.org>
3	Date: Sat Feb 11 08:34:04 2012 -0600
4
5	fix for newer (kde-4.7+) FindFFMPEG.cmake
6	which sets ${FFMPEG_INCLUDE_DIRS} instead of ${FFMPEG_INCLUDE_DIR}
7
8	diff --git a/plugins/decoder/ffmpeg/CMakeLists.txt b/plugins/decoder/ffmpeg/CMakeLists.txt
9	index d7e25eb..d420a3c 100644
10	--- ./plugins/decoder/ffmpeg/CMakeLists.txt
11	+++ ./plugins/decoder/ffmpeg/CMakeLists.txt
12	@@ -9,7 +9,7 @@ if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
13	else(FFMPEG_INCLUDE_DIR_OLD_STYLE)
14	message(STATUS "found new ffmpegcodecpath")
15	add_definitions(-DNEWFFMPEGAVCODECPATH)
16	- include_directories (${FFMPEG_INCLUDE_DIR})
17	+ include_directories (${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS})
18	endif(FFMPEG_INCLUDE_DIR_OLD_STYLE)
19
20	set(k3bffmpegdecoder_PART_SRCS k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp )

Line 0 Link Here

(-)sysutils/k3b-kde4/files/patch-libav11 (+138 lines)
		1	From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001
		2	From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
		3	Date: Sat, 14 Feb 2015 15:31:07 +0100
		4	Subject: [PATCH] Fixed compilation with newer ffmpeg/libav.
		5	MIME-Version: 1.0
		6	Content-Type: text/plain; charset=UTF-8
		7	Content-Transfer-Encoding: 8bit
		8
		9	Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
		10	---
		11	plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp \| 60 ++++++++++++++++++++++++-----
		12	1 file changed, 50 insertions(+), 10 deletions(-)
		13
		14	diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
		15	index 5451fd3..2f80fd6 100644
		16	--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
		17	+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
		18	@@ -86,8 +86,12 @@ public:
		19	K3b::Msf length;
		20
		21	// for decoding. ffmpeg requires 16-byte alignment.
		22	+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
		23	+ ::AVFrame* frame;
		24	+#else
		25	char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
		26	char* alignedOutputBuffer;
		27	+#endif
		28	char* outputBufferPos;
		29	int outputBufferSize;
		30	::AVPacket packet;
		31	@@ -102,14 +106,29 @@ K3bFFMpegFile::K3bFFMpegFile( const QString& filename )
		32	d = new Private;
		33	d->formatContext = 0;
		34	d->codec = 0;
		35	+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
		36	+# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
		37	+ d->frame = avcodec_alloc_frame();
		38	+# else
		39	+ d->frame = av_frame_alloc();
		40	+# endif
		41	+#else
		42	int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf);
		43	d->alignedOutputBuffer = &d->outputBuffer[offset];
		44	+#endif
		45	}
		46
		47
		48	K3bFFMpegFile::~K3bFFMpegFile()
		49	{
		50	close();
		51	+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
		52	+# if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
		53	+ av_free(d->frame);
		54	+# else
		55	+ av_frame_free(&d->frame);
		56	+# endif
		57	+#endif
		58	delete d;
		59	}
		60
		61	@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer()
		62	return 0;
		63	}
		64
65	+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
66	+ int gotFrame = 0;
67	+ int len = ::avcodec_decode_audio4(
68	+#else
69	d->outputBufferPos = d->alignedOutputBuffer;
70	d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
71	-
72	-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
73	+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
74	int len = ::avcodec_decode_audio3(
75	-#else
76	-# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
77	- int len = ::avcodec_decode_audio2(
78	# else
79	+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
80	+ int len = ::avcodec_decode_audio2(
81	+# else
82	int len = ::avcodec_decode_audio(
83	+# endif
84	# endif
85	#endif
86
87	FFMPEG_CODEC(d->formatContext->streams[0]),
88	+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
89	+ d->frame,
90	+ &gotFrame,
91	+ &d->packet );
92	+#else
93	(short*)d->alignedOutputBuffer,
94	&d->outputBufferSize,
95	-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
96	+# ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
97	&d->packet );
98	-#else
99	+# else
100	d->packetData, d->packetSize );
101	+# endif
102	#endif
103
104	if( d->packetSize <= 0 \|\| len < 0 )
105	@@ -355,6 +384,17 @@ int K3bFFMpegFile::fillOutputBuffer()
106	return -1;
107	}
108
109	+#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
110	+ if ( gotFrame ) {
111	+ d->outputBufferSize = ::av_samples_get_buffer_size(
112	+ NULL,
113	+ FFMPEG_CODEC(d->formatContext->streams[0])->channels,
114	+ d->frame->nb_samples,
115	+ FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt,
116	+ 1 );
117	+ d->outputBufferPos = reinterpret_cast<char*>( d->frame->data[0] );
118	+ }
119	+#endif
120	d->packetSize -= len;
121	d->packetData += len;
122	}
123	@@ -420,9 +460,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const
124	// mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
125	// its thing.
126	//
127	- if( file->type() == CODEC_ID_WMAV1 \|\|
128	- file->type() == CODEC_ID_WMAV2 \|\|
129	- file->type() == CODEC_ID_AAC )
130	+ if( file->type() == AV_CODEC_ID_WMAV1 \|\|
131	+ file->type() == AV_CODEC_ID_WMAV2 \|\|
132	+ file->type() == AV_CODEC_ID_AAC )
133	#endif
134	return file;
135	}
136	--
137	2.0.5
138

Lines 1-22 Link Here

(-)sysutils/k3b-kde4/files/patch-libav9 (-22 lines)
1	Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
2	===================================================================
3	--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2013-04-22 17:46:13.523959500 +0200
4	+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200
5	@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open()
6	}
7
8	// analyze the streams
9	- ::av_find_stream_info( d->formatContext );
10	+ ::avformat_find_stream_info( d->formatContext, 0 );
11
12	// we only handle files containing one audio stream
13	if( d->formatContext->nb_streams != 1 ) {
14	@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open()
15
16	// open the codec on our context
17	kDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
18	- if( ::avcodec_open( codecContext, d->codec ) < 0 ) {
19	+ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) {
20	kDebug() << "(K3bFFMpegDecoderFactory) could not open codec.";
21	return false;
22	}

Lines 1-284 Link Here

(-)sysutils/k3b-kde4/files/patch-libk3bdevice-k3bscsicommandbsd.cpp (-284 lines)
1	diff --git a/libk3bdevice/k3bscsicommand_bsd.cpp b/libk3bdevice/k3bscsicommand_bsd.cpp
2	index ce6508e..63a8fd5 100644
3	--- ./libk3bdevice/k3bscsicommand_bsd.cpp
4	+++ ./libk3bdevice/k3bscsicommand_bsd.cpp
5	@@ -1,6 +1,7 @@
6	/*
7	*
8	* Copyright (C) 2003-2009 Sebastian Trueg <trueg@k3b.org>
9	+ * Copyright (C) 2011 Andriy Gapon <avg@FreeBSD.org>
10	*
11	* This file is part of the K3b project.
12	* Copyright (C) 1998-2009 Sebastian Trueg <trueg@k3b.org>
13	@@ -23,41 +24,43 @@
14	#include <cam/scsi/scsi_message.h>
15	#include <cam/scsi/scsi_pass.h>
16
17	-#define ERRCODE(s) ((((s)[2]&0x0F)<<16)\|((s)[12]<<8)\|((s)[13]))
18	-#define EMEDIUMTYPE EINVAL
19	-#define ENOMEDIUM ENODEV
20	-#define CREAM_ON_ERRNO(s) do { \
21	- switch ((s)[12]) \
22	- { case 0x04: errno=EAGAIN; break; \
23	- case 0x20: errno=ENODEV; break; \
24	- case 0x21: if ((s)[13]==0) errno=ENOSPC; \
25	- else errno=EINVAL; \
26	- break; \
27	- case 0x30: errno=EMEDIUMTYPE; break; \
28	- case 0x3A: errno=ENOMEDIUM; break; \
29	- } \
30	- } while(0)
31	-
32	+namespace /anonymous/
33	+{
34	+ inline int sense_to_err( const struct scsi_sense_data& s )
35	+ {
36	+ int errorCode, senseKey, addSenseCode, addSenseCodeQual;
37	+ scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode,
38	+ &senseKey, &addSenseCode, &addSenseCodeQual );
39	+ return (errorCode << 24) \| (senseKey << 16) \|
40	+ (addSenseCode << 8) \| addSenseCodeQual;
41	+ }
42	+}
43
44
45	class K3b::Device::ScsiCommand::Private
46	{
47	+ typedef union ccb CCB;
48	+
49	public:
50	- union ccb ccb;
51	+ Private();
52	+ int transport( const Device* device, TransportDirection dir, void* data, size_t len );
53	+ unsigned char& operator[]( size_t i );
54	+ void clear();
55	+ const CCB& get_ccb() { return ccb; }
56	+
57	+private:
58	+ CCB ccb;
59	};
60
61
62	void K3b::Device::ScsiCommand::clear()
63	{
64	- memset (&d->ccb,0,sizeof(ccb));
65	+ d->clear();
66	}
67
68	-
69	unsigned char& K3b::Device::ScsiCommand::operator[]( size_t i )
70	{
71	- if( d->ccb.csio.cdb_len < i+1 )
72	- d->ccb.csio.cdb_len = i+1;
73	- return d->ccb.csio.cdb_io.cdb_bytes[i];
74	+ return (*d)[i];
75	}
76
77	int K3b::Device::ScsiCommand::transport( TransportDirection dir,
78	@@ -78,130 +81,102 @@ int K3b::Device::ScsiCommand::transport( TransportDirection dir,
79	m_device->usageUnlock();
80	return -1;
81	}
82	- d->ccb.ccb_h.path_id = m_device->handle()->path_id;
83	- d->ccb.ccb_h.target_id = m_device->handle()->target_id;
84	- d->ccb.ccb_h.target_lun = m_device->handle()->target_lun;
85
86	- kDebug() << "(K3b::Device::ScsiCommand) transport command " << QString::number((int)d->ccb.csio.cdb_io.cdb_bytes[0], 16) << ", length: " << (int)d->ccb.csio.cdb_len;
87	- int ret=0;
88	- int direction = CAM_DEV_QFRZDIS;
89	- if (!len)
90	- direction \|= CAM_DIR_NONE;
91	- else
92	- direction \|= (dir & TR_DIR_READ)?CAM_DIR_IN : CAM_DIR_OUT;
93	- cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL /, direction, MSG_SIMPLE_Q_TAG, (u_int8_t )data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000);
94	- unsigned char * sense = (unsigned char *)&d->ccb.csio.sense_data;
95	+ int ret = d->transport( m_device, dir, data, len );
96	+ if( ret != 0 ) {
97	+ const struct scsi_sense_data& s = d->get_ccb().csio.sense_data;
98	+ int errorCode, senseKey, addSenseCode, addSenseCodeQual;
99	+ scsi_extract_sense( (struct scsi_sense_data*) &s, &errorCode, &senseKey,
100	+ &addSenseCode, &addSenseCodeQual );
101	+ debugError( d->get_ccb().csio.cdb_io.cdb_bytes[0],
102	+ errorCode,
103	+ senseKey,
104	+ addSenseCode,
105	+ addSenseCodeQual );
106	+ }
107
108	- ret = cam_send_ccb(m_device->handle(), &d->ccb);
109	+ if( needToClose )
110	+ m_device->close();
111	+ m_device->usageUnlock();
112
113	- if (ret < 0) {
114	- kDebug() << "(K3b::Device::ScsiCommand) transport failed: " << ret;
115	+ return ret;
116	+}
117
118	- if( needToClose )
119	- m_device->close();
120	+K3b::Device::ScsiCommand::Private::Private()
121	+{
122	+ clear();
123	+}
124
125	- m_device->usageUnlock();
126	+void K3b::Device::ScsiCommand::Private::clear()
127	+{
128	+ memset( &ccb, 0, sizeof(ccb) );
129	+}
130
131	- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
132	- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
133	- senset->error_code & SSD_ERRCODE,
134	- senset->flags & SSD_KEY,
135	- senset->add_sense_code,
136	- senset->add_sense_code_qual );
137	+unsigned char& K3b::Device::ScsiCommand::Private::operator[]( size_t i )
138	+{
139	+ if( ccb.csio.cdb_len < i + 1 )
140	+ ccb.csio.cdb_len = i + 1;
141	+ return ccb.csio.cdb_io.cdb_bytes[i];
142	+}
143
144	- int result = (((senset->error_code & SSD_ERRCODE)<<24) & 0xF000 \|
145	- ((senset->flags & SSD_KEY)<<16) & 0x0F00 \|
146	- (senset->add_sense_code<<8) & 0x00F0 \|
147	- (senset->add_sense_code_qual) & 0x000F );
148	+int K3b::Device::ScsiCommand::Private::transport( const Device* device, TransportDirection dir, void* data, size_t len )
149	+{
150	+ ccb.ccb_h.path_id = device->handle()->path_id;
151	+ ccb.ccb_h.target_id = device->handle()->target_id;
152	+ ccb.ccb_h.target_lun = device->handle()->target_lun;
153
154	- return result ? result : ret;
155	+ kDebug() << "(K3b::Device::ScsiCommand) transport command " << commandString(ccb.csio.cdb_io.cdb_bytes[0])
156	+ << " (" << QString::number((int)ccb.csio.cdb_io.cdb_bytes[0], 16) << "), length: " << (int)ccb.csio.cdb_len;
157	+ int direction = CAM_DEV_QFRZDIS;
158	+ if (!len)
159	+ direction \|= CAM_DIR_NONE;
160	+ else
161	+ direction \|= (dir & TR_DIR_READ) ? CAM_DIR_IN : CAM_DIR_OUT;
162	+
163	+ cam_fill_csio( &(ccb.csio), 1, NULL, direction, MSG_SIMPLE_Q_TAG, (uint8_t)data, len, sizeof(ccb.csio.sense_data), ccb.csio.cdb_len, 301000 );
164	+ int ret = cam_send_ccb( device->handle(), &ccb );
165	+ if( ret < 0 ) {
166	+ kError() << "(K3b::Device::ScsiCommand) transport cam_send_ccb failed: ret = " << ret
167	+ << ", errno = " << errno << ", cam_errbuf = " << cam_errbuf;
168	+ return 1;
169	}
170	-
171	- else if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
172	- if( needToClose )
173	- m_device->close();
174	- m_device->usageUnlock();
175	+ else if( (ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP ) {
176	+ kDebug() << "(K3b::Device::ScsiCommand) transport succeeded";
177	return 0;
178	}
179
180	- errno = EIO;
181	- // FreeBSD 5-CURRENT since 2003-08-24, including 5.2 fails to
182	- // pull sense data automatically, at least for ATAPI transport,
183	- // so I reach for it myself...
184	- if ((d->ccb.csio.scsi_status==SCSI_STATUS_CHECK_COND) &&
185	- !(d->ccb.ccb_h.status&CAM_AUTOSNS_VALID))
186	- {
187	- u_int8_t _sense[18];
188	- u_int32_t resid=d->ccb.csio.resid;
189	-
190	- memset(_sense,0,sizeof(_sense));
191	+ kDebug() << "(K3b::Device::ScsiCommand) transport command failed: scsi_status = " << QString::number(ccb.csio.scsi_status, 16);
192
193	- operator[](0) = 0x03; // REQUEST SENSE
194	- d->ccb.csio.cdb_io.cdb_bytes[4] = sizeof(_sense);
195	- d->ccb.csio.cdb_len = 6;
196	- d->ccb.csio.ccb_h.flags \|= CAM_DIR_IN\|CAM_DIS_AUTOSENSE;
197	- d->ccb.csio.data_ptr = _sense;
198	- d->ccb.csio.dxfer_len = sizeof(_sense);
199	- d->ccb.csio.sense_len = 0;
200	+ if( ccb.csio.scsi_status == SCSI_STATUS_CHECK_COND &&
201	+ !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) &&
202	+ ccb.csio.cdb_io.cdb_bytes[0] != MMC_REQUEST_SENSE )
203	+ {
204	+ kDebug() << "(K3b::Device::ScsiCommand) transport requesting sense data";
205
206	- ret = cam_send_ccb(m_device->handle(), &d->ccb);
207	+ struct scsi_sense_data sense;
208	+ ScsiCommand::Private cmd;
209	+ cmd[0] = MMC_REQUEST_SENSE;
210	+ cmd[4] = SSD_MIN_SIZE;
211	+ cmd[5] = 0; // Necessary to set the proper command length
212
213	- d->ccb.csio.resid = resid;
214	- if (ret<0)
215	- {
216	- kDebug() << "(K3b::Device::ScsiCommand) transport failed (2): " << ret;
217	- ret = -1;
218	- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
219	- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
220	- senset->error_code & SSD_ERRCODE,
221	- senset->flags & SSD_KEY,
222	- senset->add_sense_code,
223	- senset->add_sense_code_qual );
224	-
225	- if( needToClose )
226	- m_device->close();
227	- m_device->usageUnlock();
228	-
229	- return -1;
230	- }
231	- if ((d->ccb.ccb_h.status&CAM_STATUS_MASK) != CAM_REQ_CMP)
232	+ memset( &sense, 0, sizeof(sense) );
233	+ ret = cmd.transport( device, TR_DIR_READ, &sense, SSD_MIN_SIZE );
234	+ if( ret < 0 )
235	{
236	- kDebug() << "(K3b::Device::ScsiCommand) transport failed (3): " << ret;
237	- errno=EIO,-1;
238	- ret = -1;
239	- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
240	- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
241	- senset->error_code & SSD_ERRCODE,
242	- senset->flags & SSD_KEY,
243	- senset->add_sense_code,
244	- senset->add_sense_code_qual );
245	-
246	- if( needToClose )
247	- m_device->close();
248	- m_device->usageUnlock();
249	-
250	- return -1;
251	+ kWarning() << "(K3b::Device::ScsiCommand) transport getting sense data failed: " << ret;
252	+ return 1;
253	}
254
255	- memcpy(sense,_sense,sizeof(_sense));
256	+ ccb.csio.sense_data = sense;
257	+ ccb.ccb_h.status \|= CAM_AUTOSNS_VALID;
258	}
259
260	- ret = ERRCODE(sense);
261	- kDebug() << "(K3b::Device::ScsiCommand) transport failed (4): " << ret;
262	- if (ret == 0)
263	- ret = -1;
264	- else
265	- CREAM_ON_ERRNO(((unsigned char *)&d->ccb.csio.sense_data));
266	- struct scsi_sense_data* senset = (struct scsi_sense_data*)sense;
267	- debugError( d->ccb.csio.cdb_io.cdb_bytes[0],
268	- senset->error_code & SSD_ERRCODE,
269	- senset->flags & SSD_KEY,
270	- senset->add_sense_code,
271	- senset->add_sense_code_qual );
272	-
273	- if( needToClose )
274	- m_device->close();
275	- m_device->usageUnlock();
276	+ if( !(ccb.ccb_h.status & CAM_AUTOSNS_VALID) )
277	+ kDebug() << "(K3b::Device::ScsiCommand) sense data is not available";
278
279	+ ret = sense_to_err(ccb.csio.sense_data);
280	+ if( ret == 0 )
281	+ ret = 1;
282	+ kDebug() << "(K3b::Device::ScsiCommand) transport failed: " << ret;
283	return ret;
284	}