[arch-commits] Commit in k3b/repos (5 files)

[Antonio Rojas]

Date: Saturday, March 25, 2017 @ 01:08:24
  Author: arojas
Revision: 291411

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  k3b/repos/kde-unstable-x86_64/
  k3b/repos/kde-unstable-x86_64/PKGBUILD
(from rev 291410, k3b/kde-unstable/PKGBUILD)
  k3b/repos/kde-unstable-x86_64/k3b-ffmpeg3.patch
(from rev 291410, k3b/kde-unstable/k3b-ffmpeg3.patch)
  k3b/repos/kde-unstable-x86_64/k3b-gcc6.patch
(from rev 291410, k3b/kde-unstable/k3b-gcc6.patch)
  k3b/repos/kde-unstable-x86_64/k3b-no-webkit.patch
(from rev 291410, k3b/kde-unstable/k3b-no-webkit.patch)

-+
 PKGBUILD|   43 +++
 k3b-ffmpeg3.patch   |  138 ++
 k3b-gcc6.patch  |   73 ++
 k3b-no-webkit.patch |   52 ++
 4 files changed, 306 insertions(+)

Copied: k3b/repos/kde-unstable-x86_64/PKGBUILD (from rev 291410, 
k3b/kde-unstable/PKGBUILD)
===
--- kde-unstable-x86_64/PKGBUILD(rev 0)
+++ kde-unstable-x86_64/PKGBUILD2017-03-25 01:08:24 UTC (rev 291411)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+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 

+
+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/k3b-ffmpeg3.patch (from rev 291410, 
k3b/kde-unstable/k3b-ffmpeg3.patch)
===
--- kde-unstable-x86_64/k3b-ffmpeg3.patch   (rev 0)
+++ kde-unstable-x86_64/k3b-ffmpeg3.patch   2017-03-25 01:08:24 UTC (rev 
291411)
@@ -0,0 +1,138 @@
+From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= 
+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 
+---
+ 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(>outputBuffer) & 0xf);
+ d->alignedOutputBuffer = >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(>frame);
++#  endif
++#endif
+ delete d;
+ }
+ 
+@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer()
+ return 0;
+ }
+ 
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++int 

[arch-commits] Commit in k3b/repos (5 files)

[Ionut Biru]

Date: Saturday, November 5, 2011 @ 07:37:46
  Author: ibiru
Revision: 142144

db-move: moved k3b from [staging] to [testing] (i686)

Added:
  k3b/repos/testing-i686/
  k3b/repos/testing-i686/PKGBUILD
(from rev 142117, k3b/repos/staging-i686/PKGBUILD)
  k3b/repos/testing-i686/k3b-2.0.2-ffmpeg.patch
(from rev 142117, k3b/repos/staging-i686/k3b-2.0.2-ffmpeg.patch)
  k3b/repos/testing-i686/k3b.install
(from rev 142117, k3b/repos/staging-i686/k3b.install)
Deleted:
  k3b/repos/staging-i686/

+
 PKGBUILD   |   40 +++
 k3b-2.0.2-ffmpeg.patch |   96 +++
 k3b.install|   13 ++
 3 files changed, 149 insertions(+)

Copied: k3b/repos/testing-i686/PKGBUILD (from rev 142117, 
k3b/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-11-05 11:37:46 UTC (rev 142144)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+# Contributor: damir da...@archlinux.org
+
+pkgname=k3b
+pkgver=2.0.2
+pkgrel=3
+pkgdesc=Feature-rich and easy to handle CD burning application
+arch=('i686' 'x86_64')
+url=http://k3b.org/;
+license=('GPL')
+depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
+ 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft')
+makedepends=('cmake' 'automoc4' 'docbook-xml')
+optdepends=('dvd+rw-tools: for dvd burning support'
+'vcdimager: for vcd burning support'
+'transcode: for advanced mpeg conversion support'
+'emovix: for bootable multimedia cd/dvd support')
+options=('!libtool')
+install=k3b.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 \
+k3b-2.0.2-ffmpeg.patch)
+sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
+  '8120c0e22e6c41ea285ca6060be13723ed91c52b')
+
+build() {
+  cd ${srcdir}
+  (cd ${pkgname}-${pkgver}; patch -p1 -i ${srcdir}/k3b-2.0.2-ffmpeg.patch)
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}

Copied: k3b/repos/testing-i686/k3b-2.0.2-ffmpeg.patch (from rev 142117, 
k3b/repos/staging-i686/k3b-2.0.2-ffmpeg.patch)
===
--- testing-i686/k3b-2.0.2-ffmpeg.patch (rev 0)
+++ testing-i686/k3b-2.0.2-ffmpeg.patch 2011-11-05 11:37:46 UTC (rev 142144)
@@ -0,0 +1,96 @@
+commit 61ca30beb978f68e72257408777c6433f33129bd
+Author: Michal Malek mich...@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
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
 b/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( 

[arch-commits] Commit in k3b/repos (5 files)

[Ionut Biru]

Date: Saturday, November 5, 2011 @ 07:37:47
  Author: ibiru
Revision: 142145

db-move: moved k3b from [staging] to [testing] (x86_64)

Added:
  k3b/repos/testing-x86_64/
  k3b/repos/testing-x86_64/PKGBUILD
(from rev 142117, k3b/repos/staging-x86_64/PKGBUILD)
  k3b/repos/testing-x86_64/k3b-2.0.2-ffmpeg.patch
(from rev 142117, k3b/repos/staging-x86_64/k3b-2.0.2-ffmpeg.patch)
  k3b/repos/testing-x86_64/k3b.install
(from rev 142117, k3b/repos/staging-x86_64/k3b.install)
Deleted:
  k3b/repos/staging-x86_64/

+
 PKGBUILD   |   40 +++
 k3b-2.0.2-ffmpeg.patch |   96 +++
 k3b.install|   13 ++
 3 files changed, 149 insertions(+)

Copied: k3b/repos/testing-x86_64/PKGBUILD (from rev 142117, 
k3b/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2011-11-05 11:37:47 UTC (rev 142145)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger e...@archlinux.org
+# Contributor: damir da...@archlinux.org
+
+pkgname=k3b
+pkgver=2.0.2
+pkgrel=3
+pkgdesc=Feature-rich and easy to handle CD burning application
+arch=('i686' 'x86_64')
+url=http://k3b.org/;
+license=('GPL')
+depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 
+ 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft')
+makedepends=('cmake' 'automoc4' 'docbook-xml')
+optdepends=('dvd+rw-tools: for dvd burning support'
+'vcdimager: for vcd burning support'
+'transcode: for advanced mpeg conversion support'
+'emovix: for bootable multimedia cd/dvd support')
+options=('!libtool')
+install=k3b.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 \
+k3b-2.0.2-ffmpeg.patch)
+sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
+  '8120c0e22e6c41ea285ca6060be13723ed91c52b')
+
+build() {
+  cd ${srcdir}
+  (cd ${pkgname}-${pkgver}; patch -p1 -i ${srcdir}/k3b-2.0.2-ffmpeg.patch)
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}

Copied: k3b/repos/testing-x86_64/k3b-2.0.2-ffmpeg.patch (from rev 142117, 
k3b/repos/staging-x86_64/k3b-2.0.2-ffmpeg.patch)
===
--- testing-x86_64/k3b-2.0.2-ffmpeg.patch   (rev 0)
+++ testing-x86_64/k3b-2.0.2-ffmpeg.patch   2011-11-05 11:37:47 UTC (rev 
142145)
@@ -0,0 +1,96 @@
+commit 61ca30beb978f68e72257408777c6433f33129bd
+Author: Michal Malek mich...@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
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
 b/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 );
++