jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

k3b: update to 17.08.2

Browse source
This commit is contained in:
Daniel James 2017-10-25 22:55:55 -04:00 committed by Enno Boland
parent 0e2c486710
commit e709a770eb
6 changed files with 23 additions and 262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/shlibs
View file

@ -1965,9 +1965,10 @@ libdmtx.so.0 libdmtx-0.7.4_1
libdbus-c++-1.so.0 libdbus-c++-0.9.0_1
libdbus-c++-glib-1.so.0 libdbus-c++-0.9.0_1
libpagemaker-0.0.so.0 libpagemaker-0.0.2_1
libkcddb.so.4 libkcddb-14.12.3_1
libk3bdevice.so.6 k3b-2.0.3a_1
libk3blib.so.6 k3b-2.0.3a_1
libKF5CddbWidgets.so.5 libkcddb-17.08.2_1
libKF5Cddb.so.5 libkcddb-17.08.2_1
libk3bdevice.so.7 k3b-17.08.2_1
libk3blib.so.7 k3b-17.08.2_1
libsndio.so.6.1 sndio-1.1.0_1
libopenconnect.so.5 openconnect-7.05_1
libusbredirparser.so.1 usbredir-0.7_1

138
srcpkgs/k3b/patches/ffmpeg3.patch
View file

@ -1,138 +0,0 @@
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 plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 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

76
srcpkgs/k3b/patches/fix-gcc6-narrowing.patch
View file

@ -1,76 +0,0 @@
Use characters instead of numeric constants to avoid the
gcc6 narrowing warning.
--- libk3b/tools/k3bwavefilewriter.cpp 2014-11-04 19:37:31.000000000 +0100
+++ libk3b/tools/k3bwavefilewriter.cpp 2016-09-22 18:26:13.443173213 +0200
@@ -111,17 +111,17 @@
{
static const char riffHeader[] =
{
- 0x52, 0x49, 0x46, 0x46, // 0 "RIFF"
- 0x00, 0x00, 0x00, 0x00, // 4 wavSize
- 0x57, 0x41, 0x56, 0x45, // 8 "WAVE"
- 0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
- 0x10, 0x00, 0x00, 0x00, // 16
- 0x01, 0x00, 0x02, 0x00, // 20
- 0x44, 0xac, 0x00, 0x00, // 24
- 0x10, 0xb1, 0x02, 0x00, // 28
- 0x04, 0x00, 0x10, 0x00, // 32
- 0x64, 0x61, 0x74, 0x61, // 36 "data"
- 0x00, 0x00, 0x00, 0x00 // 40 byteCount
+ '\x52', '\x49', '\x46', '\x46', // 0 "RIFF"
+ '\x00', '\x00', '\x00', '\x00', // 4 wavSize
+ '\x57', '\x41', '\x56', '\x45', // 8 "WAVE"
+ '\x66', '\x6d', '\x74', '\x20', // 12 "fmt "
+ '\x10', '\x00', '\x00', '\x00', // 16
+ '\x01', '\x00', '\x02', '\x00', // 20
+ '\x44', '\xac', '\x00', '\x00', // 24
+ '\x10', '\xb1', '\x02', '\x00', // 28
+ '\x04', '\x00', '\x10', '\x00', // 32
+ '\x64', '\x61', '\x74', '\x61', // 36 "data"
+ '\x00', '\x00', '\x00', '\x00' // 40 byteCount
};
m_outputStream.writeRawData( riffHeader, 44 );
--- libk3b/projects/k3bcdrdaowriter.cpp 2014-11-04 19:37:31.000000000 +0100
+++ libk3b/projects/k3bcdrdaowriter.cpp 2016-09-22 18:30:15.231271203 +0200
@@ -908,7 +908,7 @@
void K3b::CdrdaoWriter::parseCdrdaoMessage()
{
- static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 };
+ static const char msgSync[] = { '\xff', '\x00', '\xff', '\x00' };
unsigned int avail = m_comSock->bytesAvailable();
unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize );
unsigned int count = 0;
--- plugins/encoder/external/k3bexternalencoder.cpp 2014-11-04 19:37:31.000000000 +0100
+++ plugins/encoder/external/k3bexternalencoder.cpp 2016-09-22 18:33:15.300347286 +0200
@@ -39,17 +39,17 @@
static const char s_riffHeader[] =
{
- 0x52, 0x49, 0x46, 0x46, // 0 "RIFF"
- 0x00, 0x00, 0x00, 0x00, // 4 wavSize
- 0x57, 0x41, 0x56, 0x45, // 8 "WAVE"
- 0x66, 0x6d, 0x74, 0x20, // 12 "fmt "
- 0x10, 0x00, 0x00, 0x00, // 16
- 0x01, 0x00, 0x02, 0x00, // 20
- 0x44, 0xac, 0x00, 0x00, // 24
- 0x10, 0xb1, 0x02, 0x00, // 28
- 0x04, 0x00, 0x10, 0x00, // 32
- 0x64, 0x61, 0x74, 0x61, // 36 "data"
- 0x00, 0x00, 0x00, 0x00 // 40 byteCount
+ '\x52', '\x49', '\x46', '\x46', // 0 "RIFF"
+ '\x00', '\x00', '\x00', '\x00', // 4 wavSize
+ '\x57', '\x41', '\x56', '\x45', // 8 "WAVE"
+ '\x66', '\x6d', '\x74', '\x20', // 12 "fmt "
+ '\x10', '\x00', '\x00', '\x00', // 16
+ '\x01', '\x00', '\x02', '\x00', // 20
+ '\x44', '\xac', '\x00', '\x00', // 24
+ '\x10', '\xb1', '\x02', '\x00', // 28
+ '\x04', '\x00', '\x10', '\x00', // 32
+ '\x64', '\x61', '\x74', '\x61', // 36 "data"
+ '\x00', '\x00', '\x00', '\x00' // 40 byteCount
};

29
srcpkgs/k3b/patches/musl-no_fstab_h.patch
View file

@ -1,29 +0,0 @@
In musl libc there is no fstab.h
--- src/k3bsystemproblemdialog.cpp 2014-11-04 19:37:31.000000000 +0100
+++ src/k3bsystemproblemdialog.cpp 2016-09-22 17:06:44.365902832 +0200
@@ -53,7 +53,7 @@
#include <langinfo.h>
#endif
-#ifndef Q_OS_WIN32
+#if !defined(Q_OS_WIN32) && defined(__GLIBC__)
#include <fstab.h>
#endif
#include <unistd.h>
@@ -651,6 +651,7 @@
QList<K3b::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting()
{
QList<K3b::Device::Device *> l;
+#if defined(__GLIBC__)
::setfsent();
struct fstab * mountInfo = 0;
@@ -676,6 +677,7 @@
} // while mountInfo
::endfsent();
+#endif
return l;
}
#endif

21
srcpkgs/k3b/template
View file

@ -1,18 +1,17 @@
# Template file for 'k3b'
pkgname=k3b
_realversion=2.0.3
version=${_realversion}a
revision=6
version=17.08.2
revision=1
build_style=cmake
hostmakedepends="qt-qmake automoc4 pkg-config"
makedepends="kde-runtime-devel libcddb-devel libsamplerate-devel libmad-devel
ffmpeg-devel taglib-devel libmpcdec-devel libdvdread-devel libXft-devel qt-webkit-devel
kdelibs-devel phonon-devel libmusicbrainz5-devel lame-devel libkcddb-devel"
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake"
makedepends="ffmpeg-devel kcmutils-devel kcoreaddons-devel kfilemetadata5-devel
kio-devel knewstuff-devel knotifyconfig-devel lame-devel libcddb-devel
libdvdread-devel libkcddb-devel libmad-devel libmpcdec-devel libmusicbrainz5-devel
libsamplerate-devel libXft-devel qt5-devel taglib-devel"
short_desc="CD/DVD Kreator for Linux"
depends="cdrtools cdrdao dvd+rw-tools"
maintainer="Enno Boland <gottox@voidlinux.eu>"
license="GPL-2"
homepage="http://www.k3b.org/"
distfiles="http://download.kde.org/stable/k3b/k3b-${version}.tar.xz"
checksum=2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081
wrksrc="${pkgname}-${_realversion}"
homepage="https://github.com/KDE/k3b"
distfiles="https://github.com/KDE/${pkgname}/archive/v${version}.tar.gz"
checksum=c4d48a492a6ec4b6685d1d5e6737ed7e74e2c45912b103ce5a300b852fe1bbc6

14
srcpkgs/libkcddb/template
View file

@ -1,16 +1,20 @@
# Template file for 'libkcddb'
pkgname=libkcddb
version=16.08.2
version=17.08.2
revision=1
build_style=cmake
hostmakedepends="automoc4 qt-qmake"
makedepends="kdelibs-devel phonon-devel libmusicbrainz5-devel"
hostmakedepends="extra-cmake-modules qt5-qmake"
makedepends="kcodecs-devel kdoctools-devel kio-devel kwidgetsaddons-devel libmusicbrainz5-devel qt5-devel"
short_desc="KDE CDDB library"
maintainer="Enno Boland <gottox@voidlinux.eu>"
license="GPL-2, LGPL-2, BSD, GFDL"
homepage="https://projects.kde.org/projects/kde/kdemultimedia/libkcddb"
distfiles="http://download.kde.org/stable/applications/${version}/src/${pkgname}-${version}.tar.xz"
checksum=4206b558d7e74a3dcb1c4438922d7345e1aedc3c3db4b857012a406304a17043
checksum=6548328b5c8cc2e490bf781cf3db885dad036fb907abea4c42f35a26c0109342
post_install() {
vlicense COPYING
}
libkcddb-devel_package() {
depends="libkcddb>=${version}_${revision}"
@ -21,4 +25,4 @@ libkcddb-devel_package() {
vmove usr/include
vmove "usr/lib/*.so"
}
}
}