[arch-commits] Commit in k3b/repos/kde-unstable-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Fri Apr 7 20:49:03 UTC 2017
Date: Friday, April 7, 2017 @ 20:49:02
Author: arojas
Revision: 292422
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
k3b/repos/kde-unstable-x86_64/PKGBUILD
(from rev 292421, k3b/kde-unstable/PKGBUILD)
Deleted:
k3b/repos/kde-unstable-x86_64/PKGBUILD
k3b/repos/kde-unstable-x86_64/k3b-ffmpeg3.patch
k3b/repos/kde-unstable-x86_64/k3b-gcc6.patch
k3b/repos/kde-unstable-x86_64/k3b-no-webkit.patch
---------------------+
PKGBUILD | 86 +++++++++++++++----------------
k3b-ffmpeg3.patch | 138 --------------------------------------------------
k3b-gcc6.patch | 73 --------------------------
k3b-no-webkit.patch | 52 ------------------
4 files changed, 43 insertions(+), 306 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-04-07 20:48:49 UTC (rev 292421)
+++ PKGBUILD 2017-04-07 20:49:02 UTC (rev 292422)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=k3b
-pkgver=17.03.80
-pkgrel=1
-epoch=1
-pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/k3b/"
-license=('GPL')
-depends=('libkcddb' 'kcmutils' 'knotifyconfig' 'libmad' 'kfilemetadata' 'knewstuff'
- 'libmpcdec' 'libdvdread' 'cdrtools' 'qt5-webkit' 'hicolor-icon-theme')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python')
-optdepends=('dvd+rw-tools: for dvd burning support'
- 'vcdimager: for vcd burning support'
- 'emovix: for bootable multimedia cd/dvd support'
- 'cdrdao: for disk-at-once (DAO) mode support'
- 'cdparanoia: for cd ripping support')
-groups=(kde-applications kdemultimedia)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('90e9b33ac6683e5d0f02caf984bb956d516e699dc9d5c275134089412ae141e8'
- 'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE_INSTALL_LIBDIR=lib \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: k3b/repos/kde-unstable-x86_64/PKGBUILD (from rev 292421, k3b/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-04-07 20:49:02 UTC (rev 292422)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=k3b
+pkgver=17.03.90
+pkgrel=1
+epoch=1
+pkgdesc="Feature-rich and easy to handle CD burning application"
+arch=('i686' 'x86_64')
+url="https://userbase.kde.org/K3b"
+license=('GPL')
+depends=('libkcddb' 'kcmutils' 'knotifyconfig' 'libmad' 'kfilemetadata' 'knewstuff'
+ 'libmpcdec' 'libdvdread' 'cdrtools' 'qt5-webkit' 'hicolor-icon-theme')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+optdepends=('dvd+rw-tools: for dvd burning support'
+ 'vcdimager: for vcd burning support'
+ 'emovix: for bootable multimedia cd/dvd support'
+ 'cdrdao: for disk-at-once (DAO) mode support'
+ 'cdparanoia: for cd ripping support')
+groups=(kde-applications kdemultimedia)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('f63796730d713338227a1a29d443b6f33b8017f8987a4e7ef32ccc4068c1888b'
+ 'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: k3b-ffmpeg3.patch
===================================================================
--- k3b-ffmpeg3.patch 2017-04-07 20:48:49 UTC (rev 292421)
+++ k3b-ffmpeg3.patch 2017-04-07 20:49:02 UTC (rev 292422)
@@ -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 at 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 at 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
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ b/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
-
Deleted: k3b-gcc6.patch
===================================================================
--- k3b-gcc6.patch 2017-04-07 20:48:49 UTC (rev 292421)
+++ k3b-gcc6.patch 2017-04-07 20:49:02 UTC (rev 292422)
@@ -1,73 +0,0 @@
---- k3b-2.0.3/libk3b/tools/k3bwavefilewriter.cpp.old 2016-05-14 12:33:15.000000000 -0400
-+++ k3b-2.0.3/libk3b/tools/k3bwavefilewriter.cpp 2016-05-14 12:34:35.218389226 -0400
-@@ -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
-+ (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF"
-+ (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize
-+ (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE"
-+ (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
-+ (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
-+ (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
-+ (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
-+ (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
-+ (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
-+ (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
-+ (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount
- };
-
- m_outputStream.writeRawData( riffHeader, 44 );
---- k3b-2.0.3/libk3b/projects/k3bcdrdaowriter.cpp.old 2014-11-04 13:37:31.000000000 -0500
-+++ k3b-2.0.3/libk3b/projects/k3bcdrdaowriter.cpp 2016-05-14 12:41:13.769135417 -0400
-@@ -908,7 +908,7 @@
-
- void K3b::CdrdaoWriter::parseCdrdaoMessage()
- {
-- static const char msgSync[] = { 0xff, 0x00, 0xff, 0x00 };
-+ static const char msgSync[] = { (char)0xff, (char)0x00, (char)0xff, (char)0x00 };
- unsigned int avail = m_comSock->bytesAvailable();
- unsigned int msgs = avail / ( sizeof(msgSync)+d->progressMsgSize );
- unsigned int count = 0;
---- k3b-2.0.3/plugins/encoder/external/k3bexternalencoder.cpp.old 2014-11-04 13:37:31.000000000 -0500
-+++ k3b-2.0.3/plugins/encoder/external/k3bexternalencoder.cpp 2016-05-14 12:45:57.967902413 -0400
-@@ -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
-+ (char)0x52, (char)0x49, (char)0x46, (char)0x46, // 0 "RIFF"
-+ (char)0x00, (char)0x00, (char)0x00, (char)0x00, // 4 wavSize
-+ (char)0x57, (char)0x41, (char)0x56, (char)0x45, // 8 "WAVE"
-+ (char)0x66, (char)0x6d, (char)0x74, (char)0x20, // 12 "fmt "
-+ (char)0x10, (char)0x00, (char)0x00, (char)0x00, // 16
-+ (char)0x01, (char)0x00, (char)0x02, (char)0x00, // 20
-+ (char)0x44, (char)0xac, (char)0x00, (char)0x00, // 24
-+ (char)0x10, (char)0xb1, (char)0x02, (char)0x00, // 28
-+ (char)0x04, (char)0x00, (char)0x10, (char)0x00, // 32
-+ (char)0x64, (char)0x61, (char)0x74, (char)0x61, // 36 "data"
-+ (char)0x00, (char)0x00, (char)0x00, (char)0x00 // 40 byteCount
- };
-
-
Deleted: k3b-no-webkit.patch
===================================================================
--- k3b-no-webkit.patch 2017-04-07 20:48:49 UTC (rev 292421)
+++ k3b-no-webkit.patch 2017-04-07 20:49:02 UTC (rev 292422)
@@ -1,52 +0,0 @@
-diff -up k3b-2.0.2/src/CMakeLists.txt.no-webkit k3b-2.0.2/src/CMakeLists.txt
---- k3b-2.0.2/src/CMakeLists.txt.no-webkit 2012-05-04 12:30:46.634241618 +0200
-+++ k3b-2.0.2/src/CMakeLists.txt 2012-05-04 12:30:56.980516383 +0200
-@@ -287,7 +287,6 @@ target_link_libraries(k3b_bin
- ${KDE4_KUTILS_LIBS}
- ${KDE4_KDE3SUPPORT_LIBS}
- ${KDE4_SOLID_LIBS}
-- ${QT_QTWEBKIT_LIBRARY}
- ${X11_LIBRARIES}
- )
-
-diff -up k3b-2.0.2/src/k3bdiskinfoview.cpp.no-webkit k3b-2.0.2/src/k3bdiskinfoview.cpp
---- k3b-2.0.2/src/k3bdiskinfoview.cpp.no-webkit 2012-05-04 12:29:13.994781781 +0200
-+++ k3b-2.0.2/src/k3bdiskinfoview.cpp 2012-05-04 13:10:07.748401670 +0200
-@@ -34,7 +34,6 @@
- #include <qpalette.h>
- #include <qpixmap.h>
- #include <QtGui/QTextBrowser>
--#include <QtWebKit/QWebView>
-
- #include <klocale.h>
- #include <kstandarddirs.h>
-@@ -61,7 +60,7 @@ K3b::DiskInfoView::DiskInfoView( QWidget
- Device::STATE_ALL|Device::STATE_NO_MEDIA|Device::STATE_UNKNOWN,
- parent )
- {
-- m_infoView = new QWebView( this );
-+ m_infoView = new QTextBrowser( this );
- setMainWidget( m_infoView );
- }
-
-diff -up k3b-2.0.2/src/k3bdiskinfoview.h.no-webkit k3b-2.0.2/src/k3bdiskinfoview.h
---- k3b-2.0.2/src/k3bdiskinfoview.h.no-webkit 2012-05-04 12:50:25.753604831 +0200
-+++ k3b-2.0.2/src/k3bdiskinfoview.h 2012-05-04 13:09:15.232985545 +0200
-@@ -19,7 +19,7 @@
-
- #include "k3bmediacontentsview.h"
-
--class QWebView;
-+class QTextBrowser;
-
- namespace K3b {
- class DiskInfoView : public MediaContentsView
-@@ -38,7 +38,7 @@ private:
- QString createIso9660InfoItems( const Iso9660SimplePrimaryDescriptor& iso );
- QString createTrackItems( const Medium& medium );
-
-- QWebView* m_infoView;
-+ QTextBrowser* m_infoView;
- };
- }
-
More information about the arch-commits
mailing list