Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=bc08cc4103ed79eba4c56f7828e96021c95755a8
commit bc08cc4103ed79eba4c56f7828e96021c95755a8 Author: kikadf <[email protected]> Date: Sat Jan 3 10:18:51 2015 +0100 gejengel-0.1.4-11-x86_64 * Rebuild with ffmpeg-2.5.2 diff --git a/source/xmultimedia-extra/gejengel/FrugalBuild b/source/xmultimedia-extra/gejengel/FrugalBuild index c66679b..adbd4a0 100644 --- a/source/xmultimedia-extra/gejengel/FrugalBuild +++ b/source/xmultimedia-extra/gejengel/FrugalBuild @@ -7,9 +7,9 @@ options+=('asneeded') pkgname=gejengel pkgver=0.1.4 -pkgrel=10 +pkgrel=11 pkgdesc="An audio player which focuses on performance and simplicity" -depends=('ffmpeg>=1.0' 'alsa-lib' 'sqlite3' 'taglib' 'lastfmlib' \ +depends=('ffmpeg>=2.5.1' 'alsa-lib' 'sqlite3' 'taglib' 'lastfmlib' \ 'imagemagick>=6.8.9' 'libuuid' 'libtool' 'flac' 'libmad' 'libxdg-basedir' \ 'gtkmm2' 'libpulse>=5.0-4') makedepends=('intltool') @@ -17,7 +17,15 @@ options=('scriptlet') groups=('xmultimedia-extra') archs=('i686' 'x86_64') Finclude googlecode -source=(${source[@]} ffmpeg.patch) +source=(${source[@]} ffmpeg-2.5.x.patch) sha1sums=('c45b0d0b09592f21f9be7a8a1f8c13b4a1ebe9da' \ - 'b4439524e0125ea70b4710c2811b9476020d3e5c') + 'd01e6a1fc0282217c735395fe330bb52a255fbcf') unset MAKEFLAGS + +build() +{ + Fcd + echo "#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000" >> src/AudioDecoder/ffmpegdecoder.h || Fdie + Fbuild +} + diff --git a/source/xmultimedia-extra/gejengel/ffmpeg.patch b/source/xmultimedia-extra/gejengel/ffmpeg-2.5.x.patch similarity index 68% rename from source/xmultimedia-extra/gejengel/ffmpeg.patch rename to source/xmultimedia-extra/gejengel/ffmpeg-2.5.x.patch index d1b034e..38e8a86 100644 --- a/source/xmultimedia-extra/gejengel/ffmpeg.patch +++ b/source/xmultimedia-extra/gejengel/ffmpeg-2.5.x.patch @@ -1,6 +1,6 @@ -diff -ur a/src/AudioDecoder/ffmpegdecoder.cpp b/src/AudioDecoder/ffmpegdecoder.cpp ---- a/src/AudioDecoder/ffmpegdecoder.cpp 2012-10-28 16:39:15.414128154 -0500 -+++ b/src/AudioDecoder/ffmpegdecoder.cpp 2012-10-29 02:52:01.827024300 -0500 +diff -Naur gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp gejengel-0.1.4.new/src/AudioDecoder/ffmpegdecoder.cpp +--- gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp 2010-03-19 15:31:43.000000000 +0100 ++++ gejengel-0.1.4.new/src/AudioDecoder/ffmpegdecoder.cpp 2015-01-03 10:00:05.062571381 +0100 @@ -71,7 +71,7 @@ if (m_pFormatContext) @@ -34,6 +34,15 @@ diff -ur a/src/AudioDecoder/ffmpegdecoder.cpp b/src/AudioDecoder/ffmpegdecoder.c { m_pAudioStream = m_pFormatContext->streams[i]; m_AudioStream = i; +@@ -134,7 +134,7 @@ + m_pFormatContext->flags |= AVFMT_FLAG_GENPTS; + m_pFormatContext->streams[m_AudioStream]->discard = AVDISCARD_DEFAULT; + +- if (avcodec_open(m_pAudioCodecContext, m_pAudioCodec) < 0) ++ if (avcodec_open2(m_pAudioCodecContext, m_pAudioCodec, NULL) < 0) + { + throw logic_error("Could not open audio codec for " + m_Filepath); + } @@ -309,13 +309,13 @@ switch(m_pAudioCodecContext->sample_fmt) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
