Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=037ad357223fcb2c9a1fa4d1a0b66b328615b1b5
commit 037ad357223fcb2c9a1fa4d1a0b66b328615b1b5 Author: James Buren <[email protected]> Date: Mon Oct 29 02:59:44 2012 -0500 gejengel-0.1.4-6-x86_64 * rebuild with ffmpeg diff --git a/source/xmultimedia-extra/gejengel/FrugalBuild b/source/xmultimedia-extra/gejengel/FrugalBuild index a13390d..785b642 100644 --- a/source/xmultimedia-extra/gejengel/FrugalBuild +++ b/source/xmultimedia-extra/gejengel/FrugalBuild @@ -4,15 +4,17 @@ pkgname=gejengel pkgver=0.1.4 -pkgrel=5 +pkgrel=6 pkgdesc="An audio player which focuses on performance and simplicity" -depends=('ffmpeg-0.6' 'alsa-lib' 'sqlite3' 'taglib' 'lastfmlib' \ +depends=('ffmpeg>=1.0' 'alsa-lib' 'sqlite3' 'taglib' 'lastfmlib' \ 'imagemagick>=6.7.9_2-1' 'libuuid' 'libtool' 'flac' 'libmad' 'libxdg-basedir' \ 'gtkmm2') -makedepends=('intltool' 'ffmpeg-0.6-compiletime') +makedepends=('intltool') options=('scriptlet') groups=('xmultimedia-extra') archs=('i686' 'x86_64') Finclude googlecode -sha1sums=('c45b0d0b09592f21f9be7a8a1f8c13b4a1ebe9da') +source=(${source[@]} ffmpeg.patch) +sha1sums=('c45b0d0b09592f21f9be7a8a1f8c13b4a1ebe9da' \ + 'b4439524e0125ea70b4710c2811b9476020d3e5c') unset MAKEFLAGS diff --git a/source/xmultimedia-extra/gejengel/ffmpeg.patch b/source/xmultimedia-extra/gejengel/ffmpeg.patch new file mode 100644 index 0000000..d1b034e --- /dev/null +++ b/source/xmultimedia-extra/gejengel/ffmpeg.patch @@ -0,0 +1,53 @@ +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 +@@ -71,7 +71,7 @@ + + if (m_pFormatContext) + { +- av_close_input_file(m_pFormatContext); ++ avformat_close_input(&m_pFormatContext); + m_pFormatContext = NULL; + } + +@@ -83,12 +83,12 @@ + avcodec_register_all(); + av_register_all(); + +- if (av_open_input_file(&m_pFormatContext, m_Filepath.c_str(), NULL, 0, NULL) != 0) ++ if (avformat_open_input(&m_pFormatContext, m_Filepath.c_str(), NULL, NULL) != 0) + { + throw logic_error("Could not open input file: " + m_Filepath); + } + +- if (av_find_stream_info(m_pFormatContext) < 0) ++ if (avformat_find_stream_info(m_pFormatContext,NULL) < 0) + { + throw logic_error("Could not find stream information in " + m_Filepath); + } +@@ -104,7 +104,7 @@ + { + for(uint32_t i = 0; i < m_pFormatContext->nb_streams; ++i) + { +- if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++ if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) + { + m_pAudioStream = m_pFormatContext->streams[i]; + m_AudioStream = i; +@@ -309,13 +309,13 @@ + + switch(m_pAudioCodecContext->sample_fmt) + { +- case SAMPLE_FMT_U8: ++ case AV_SAMPLE_FMT_U8: + format.bits = 8; + break; +- case SAMPLE_FMT_S16: ++ case AV_SAMPLE_FMT_S16: + format.bits = 16; + break; +- case SAMPLE_FMT_S32: ++ case AV_SAMPLE_FMT_S32: + format.bits = 32; + break; + default: _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
