mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-23 18:14:51 +08:00
ffmpeg group
This commit is contained in:
AlmAck
parent
640019fabe
commit
413e57b3ad
@ -3,7 +3,7 @@
|
||||
pkgname=amarok
|
||||
replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
|
||||
pkgver=2.8.0
|
||||
pkgrel=9
|
||||
pkgrel=10
|
||||
pkgdesc="A media player for KDE"
|
||||
arch=('x86_64')
|
||||
url="http://amarok.kde.org"
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
# Contributions from Arch: https://www.archlinux.org/packages/community/x86_64/blender/
|
||||
|
||||
pkgname=blender
|
||||
pkgver=2.77a
|
||||
pkgver=2.78c
|
||||
_gittag=v${pkgver}
|
||||
#_gitcommit=c6b042be
|
||||
[[ -n ${_gitcommit} ]] && pkgver=${pkgver}.git1.${_gitcommit}
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
epoch=2
|
||||
pkgdesc="A fully integrated 3D graphics creation suite"
|
||||
arch=('x86_64')
|
||||
@ -24,6 +24,7 @@ install=blender.install
|
||||
source=("git://git.blender.org/blender-addons.git"
|
||||
"git://git.blender.org/blender-addons-contrib.git"
|
||||
"git://git.blender.org/blender-translations.git"
|
||||
"git://git.blender.org/blender-dev-tools.git"
|
||||
"git://git.blender.org/scons.git")
|
||||
if [[ -n $_gittag ]]; then
|
||||
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
|
||||
@ -31,6 +32,9 @@ else
|
||||
source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}")
|
||||
fi
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP')
|
||||
|
||||
@ -41,6 +45,7 @@ prepare() {
|
||||
git config submodule."release/scripts/addons".url "${srcdir}/blender-addons"
|
||||
git config submodule."release/scripts/addons_contrib".url "${srcdir}/blender-addons-contrib"
|
||||
git config submodule."release/datafiles/locale".url "${srcdir}/blender-translations"
|
||||
git config submodule."source/tools".url ${srcdir}/blender-dev-tools
|
||||
git config submodule."scons".url "${srcdir}/scons"
|
||||
git submodule update
|
||||
}
|
||||
@ -50,28 +55,20 @@ build() {
|
||||
|
||||
mkdir -p build && cd build
|
||||
|
||||
cmake -C../build_files/cmake/config/blender_full.cmake .. \
|
||||
cmake -C../build_files/cmake/config/blender_release.cmake .. \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DWITH_INSTALL_PORTABLE=OFF \
|
||||
-DWITH_PYTHON_INSTALL=OFF \
|
||||
-DWITH_SYSTEM_OPENJPEG=ON \
|
||||
-DOPENIMAGEIO_ROOT_DIR=/usr \
|
||||
-DWITH_GAMEENGINE=ON \
|
||||
-DWITH_JACK=ON \
|
||||
-DWITH_PLAYER=ON \
|
||||
-DWITH_CODEC_FFMPEG=ON \
|
||||
-DWITH_CODEC_SNDFILE=ON \
|
||||
-DWITH_CYCLES_OSL=ON \
|
||||
-DWITH_CYCLES_CUDA_BINARIES=ON \
|
||||
-DWITH_CYCLES_PTEX=ON \
|
||||
-DWITH_OPENSUBDIV=ON \
|
||||
-DWITH_SYSTEM_OPENJPEG=ON \
|
||||
-DWITH_GL_PROFILE_CORE=OFF \
|
||||
-DWITH_GL_PROFILE_ES20=OFF \
|
||||
-DWITH_LLVM=ON \
|
||||
-DLLVM_VERSION=3.5 \
|
||||
-DLLVM_VERSION=3.9 \
|
||||
-DLLVM_STATIC=OFF \
|
||||
-DWITH_FFTW3=ON \
|
||||
-DWITH_MOD_OCEANSIM=ON \
|
||||
-DWITH_OPENCOLLADA=ON \
|
||||
-DWITH_CYCLES_CUDA_BINARIES=ON \
|
||||
-DWITH_CYCLES_PTEX=OFF \
|
||||
-DPYTHON_VERSION=3.5 \
|
||||
-DPYTHON_LIBPATH=/usr/lib \
|
||||
-DPYTHON_LIBRARY=python3.5m \
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=clipgrab
|
||||
pkgver=3.6.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='A video downloader and converter for YouTube, Vimeo, DailyMotion, MyVideo and many other'
|
||||
arch=('x86_64')
|
||||
url='https://clipgrab.org/'
|
||||
|
||||
@ -2,7 +2,7 @@ pkgname=corsix-th
|
||||
_pkgname=CorsixTH
|
||||
pkgver=0.60
|
||||
_pkgver=$pkgver
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc='Reimplementation of the game engine of Theme Hospital.'
|
||||
arch=('x86_64')
|
||||
url='https://github.com/CorsixTH/CorsixTH'
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=dolphin-emu
|
||||
pkgver=5.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='A GameCube / Wii / Triforce emulator'
|
||||
arch=('x86_64')
|
||||
url='http://www.dolphin-emu.org/'
|
||||
|
||||
@ -2,7 +2,7 @@ source ../kdeapps.conf
|
||||
|
||||
pkgname=ffmpegthumbs
|
||||
pkgver=${_kdever}
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='FFmpeg-based thumbnail creator for video files'
|
||||
url='https://projects.kde.org/ffmpegthumbs'
|
||||
arch=(x86_64)
|
||||
|
||||
@ -1,35 +1,36 @@
|
||||
|
||||
pkgname=freerdp
|
||||
pkgver=1.0.2
|
||||
pkgrel=3
|
||||
pkgver=1.2.0_20170201
|
||||
_commit=6001cb710dc67eb8811362b7bf383754257a902b
|
||||
_pkgver=${pkgver/_/-}
|
||||
_pkgver=${_pkgver/+/-}
|
||||
pkgrel=1
|
||||
pkgdesc="Free RDP client"
|
||||
arch=('x86_64')
|
||||
url="http://freerdp.sourceforge.net"
|
||||
license=('GPL')
|
||||
depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
|
||||
'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv' 'libpulse')
|
||||
makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
|
||||
conflicts=('freerdp-git')
|
||||
source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
|
||||
'ffmpeg2.0.patch')
|
||||
md5sums=('c260051a94caff590def5caa4fcf59d6'
|
||||
'1260eecf01ea5212e2db8ac9c5e7fa6d')
|
||||
|
||||
prepare() {
|
||||
cd $srcdir/FreeRDP-$pkgver
|
||||
patch -Np1 -i ../ffmpeg2.0.patch
|
||||
}
|
||||
makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl' 'git')
|
||||
source=("FreeRDP-${_pkgver}::git://github.com/FreeRDP/FreeRDP.git#commit=${_commit}")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
build() {
|
||||
cd $srcdir/FreeRDP-$pkgver
|
||||
cd "$srcdir"/FreeRDP-${_pkgver}
|
||||
cmake \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||
-DWITH_PULSEAUDIO=ON \
|
||||
-DWITH_PULSE=ON \
|
||||
-DWITH_CUPS=ON \
|
||||
-DWITH_CHANNELS=ON \
|
||||
-DWITH_CLIENT_CHANNELS=ON \
|
||||
-DWITH_SERVER_CHANNELS=ON \
|
||||
-DWITH_WAYLAND=ON \
|
||||
.
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $srcdir/FreeRDP-$pkgver
|
||||
cd "$srcdir"/FreeRDP-${_pkgver}
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
diff -rupN a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
|
||||
--- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-01-02 22:46:59.000000000 +0100
|
||||
+++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c 2013-07-22 18:12:18.001576713 +0200
|
||||
@@ -28,6 +28,8 @@
|
||||
#include "tsmf_constants.h"
|
||||
#include "tsmf_decoder.h"
|
||||
|
||||
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
|
||||
+
|
||||
/* Compatibility with older FFmpeg */
|
||||
#if LIBAVUTIL_VERSION_MAJOR < 50
|
||||
#define AVMEDIA_TYPE_VIDEO 0
|
||||
@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder
|
||||
ITSMFDecoder iface;
|
||||
|
||||
int media_type;
|
||||
- enum CodecID codec_id;
|
||||
+ enum AVCodecID codec_id;
|
||||
AVCodecContext* codec_context;
|
||||
AVCodec* codec;
|
||||
AVFrame* frame;
|
||||
@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context(
|
||||
{
|
||||
TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
|
||||
|
||||
- mdecoder->codec_context = avcodec_alloc_context();
|
||||
+ mdecoder->codec_context = avcodec_alloc_context3(NULL);
|
||||
if (!mdecoder->codec_context)
|
||||
{
|
||||
DEBUG_WARN("avcodec_alloc_context failed.");
|
||||
@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st
|
||||
mdecoder->codec_context->channels = media_type->Channels;
|
||||
mdecoder->codec_context->block_align = media_type->BlockAlign;
|
||||
|
||||
-#ifdef AV_CPU_FLAG_SSE2
|
||||
- mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
|
||||
-#else
|
||||
-#if LIBAVCODEC_VERSION_MAJOR < 53
|
||||
- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
|
||||
-#else
|
||||
- mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
|
||||
-#endif
|
||||
-#endif
|
||||
-
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF
|
||||
{
|
||||
TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
|
||||
|
||||
- if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
|
||||
+ if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
|
||||
{
|
||||
DEBUG_WARN("avcodec_open failed.");
|
||||
return false;
|
||||
@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio(
|
||||
av_init_packet(&pkt);
|
||||
pkt.data = (uint8*) src;
|
||||
pkt.size = src_size;
|
||||
- len = avcodec_decode_audio3(mdecoder->codec_context,
|
||||
- (int16_t*) dst, &frame_size, &pkt);
|
||||
+ AVFrame * frame = avcodec_alloc_frame ();
|
||||
+ len = avcodec_decode_audio4(mdecoder->codec_context,
|
||||
+ frame, &frame_size, &pkt);
|
||||
}
|
||||
#endif
|
||||
if (len <= 0 || frame_size <= 0)
|
||||
@@ -499,7 +492,6 @@ TSMFDecoderEntry(void)
|
||||
|
||||
if (!initialized)
|
||||
{
|
||||
- avcodec_init();
|
||||
avcodec_register_all();
|
||||
initialized = true;
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=goldendict
|
||||
pkgver=1.5.0rc2
|
||||
pkgrel=7
|
||||
pkgrel=8
|
||||
pkgdesc="Feature-rich dictionary lookup program"
|
||||
arch=('x86_64')
|
||||
url="http://goldendict.berlios.de/"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=handbrake-cli
|
||||
pkgver=1.0.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Multithreaded video transcoder (CLI)"
|
||||
arch=('x86_64')
|
||||
url="http://handbrake.fr/"
|
||||
|
||||
16
k3b/PKGBUILD
16
k3b/PKGBUILD
@ -4,14 +4,14 @@
|
||||
|
||||
pkgname=k3b
|
||||
pkgver=2.0.3.a
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="Feature-rich and easy to handle CD burning application"
|
||||
arch=("x86_64")
|
||||
url="http://sourceforge.net/projects/k3b/"
|
||||
license=('GPL')
|
||||
depends=('kdebase-runtime' 'libkcddb4' 'libsamplerate' 'libmad'
|
||||
'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft')
|
||||
makedepends=('cmake' 'automoc4' 'docbook-xml')
|
||||
makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl')
|
||||
optdepends=('dvd+rw-tools: for dvd burning support'
|
||||
'vcdimager: for vcd burning support'
|
||||
'transcode: for advanced mpeg conversion support'
|
||||
@ -20,13 +20,21 @@ optdepends=('dvd+rw-tools: for dvd burning support'
|
||||
'cdparanoia: for cd ripping support')
|
||||
categories=('multimedia')
|
||||
install=$pkgname.install
|
||||
source=("http://download.kde.org/stable/${pkgname}/${pkgname}-2.0.3a.tar.xz")
|
||||
sha256sums=('2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081')
|
||||
source=("http://download.kde.org/stable/${pkgname}/${pkgname}-2.0.3a.tar.xz"
|
||||
k3b-ffmpeg3.patch
|
||||
k3b-no-webkit.patch)
|
||||
sha1sums=('f1001db3b5b32ef6bdb827742f1ca357c82b216f'
|
||||
'8ee47b04e92499d484c49e33dd33dabdf53025c9'
|
||||
'21a4446673ad48b326aaa010fdab539faaefcc51')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-2.0.3
|
||||
# Workaround build failure with cmake 3.4
|
||||
sed -e "s|^cmake_minimum_required|#cmake_minimum_required|" -i CMakeLists.txt
|
||||
# Fix build with ffmpeg 3.0 (Gentoo)
|
||||
patch -p1 -i ../k3b-ffmpeg3.patch
|
||||
# Remove qtwebkit usage (Fedora)
|
||||
patch -p1 -i ../k3b-no-webkit.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
138
k3b/k3b-ffmpeg3.patch
Normal file
138
k3b/k3b-ffmpeg3.patch
Normal file
@ -0,0 +1,138 @@
|
||||
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
|
||||
--- 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
|
||||
|
||||
52
k3b/k3b-no-webkit.patch
Normal file
52
k3b/k3b-no-webkit.patch
Normal file
@ -0,0 +1,52 @@
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=kid3
|
||||
pkgver=3.4.5
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
|
||||
arch=('x86_64')
|
||||
url="http://kid3.sourceforge.net/"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
pkgname=kradio
|
||||
_pkgname=kradio4
|
||||
pkgver=4.0.8
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
arch=('x86_64')
|
||||
license=('GPL2')
|
||||
pkgdesc="KRadio is a comfortable KDE radio application."
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
pkgname=krita
|
||||
pkgver=3.1.2.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Edit and paint images"
|
||||
arch=('x86_64')
|
||||
url="http://krita.org"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=libopenshot
|
||||
pkgver=0.1.2
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A high quality, open-source video editing, animation, and playback library for C++, Python, and Ruby."
|
||||
arch=('x86_64')
|
||||
url="http://openshot.org/"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
pkgname=linphone
|
||||
pkgver=3.9.1
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="A Voice-over-IP phone - cli version"
|
||||
arch=('x86_64')
|
||||
url="http://www.linphone.org/index.php/eng"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=mediastreamer
|
||||
pkgver=2.12.1
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="A library written in C that allows you to create and run audio and video streams."
|
||||
arch=('x86_64')
|
||||
url="http://www.linphone.org"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=mpd
|
||||
pkgver=0.20.6
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Flexible, powerful, server-side application for playing music'
|
||||
url='https://www.musicpd.org/'
|
||||
license=('GPL')
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=mpv
|
||||
pkgver=0.22.0
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="A movie player and encoder for linux, based on MPlayer/mplayer2"
|
||||
arch=('x86_64')
|
||||
license=('LGPL3')
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
pkgbase=natron
|
||||
pkgname=('natron' 'openfx-io' 'openfx-misc')
|
||||
pkgver=2.2.5
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
url="http://natron.fr/"
|
||||
license=("GPL")
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=obs-studio
|
||||
pkgver=18.0.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Free and open source software for video recording and live streaming."
|
||||
arch=('x86_64')
|
||||
url="https://github.com/jp9000/obs-studio"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=opendvdproducer
|
||||
pkgver=16.11
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A modern, open source cross platform software to produce DVD images."
|
||||
url='http://opendvdproducer.jonata.org'
|
||||
arch=('x86_64')
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=openimageio
|
||||
pkgver=1.6.16
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
|
||||
arch=('x86_64')
|
||||
url="http://www.openimageio.org/"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=performous
|
||||
pkgver=1.1
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc='A free game like Singstar™, Rockband™ or Stepmania™'
|
||||
arch=('x86_64')
|
||||
url="http://$pkgname.org/"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
pkgname=picard
|
||||
pkgver=1.3.2
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="MusicBrainz tagging application"
|
||||
arch=('x86_64')
|
||||
url="http://musicbrainz.org"
|
||||
@ -13,7 +13,7 @@ optdepends=('libdiscid: CD-Lookup feature'
|
||||
'chromaprint: fingerprinting')
|
||||
source=("http://ftp.musicbrainz.org/pub/musicbrainz/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
replaces=('picard-plugins')
|
||||
md5sums=('5038eea573dffd5c6587a226691e1714')
|
||||
md5sums=('0df8899ba834b2c9ac59165122256257')
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-release-$pkgver"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
pkgname=qtav
|
||||
pkgver=1.11.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A cross-platform multimedia playback framework based on Qt and FFmpeg"
|
||||
arch=('x86_64')
|
||||
url="http://www.qtav.org/"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=qwinff
|
||||
pkgver=0.2.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Another Qt frontend for ffmpeg"
|
||||
arch=('x86_64')
|
||||
url="http://qwinff.github.io/"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=vokoscreen
|
||||
pkgver=2.5.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='An easy to use screencast creator to record educational videos, live recordings of browser, installation, videoconferences, etc'
|
||||
arch=('x86_64')
|
||||
url='http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html'
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
pkgname=winff
|
||||
pkgver=1.5.4
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="WinFF is a GUI for the command line video converter, FFMPEG. It will convert most any video file that FFmpeg will convert. WinFF does multiple files in multiple formats at one time."
|
||||
arch=('x86_64')
|
||||
url="http://winff.org/"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user