[packages/gtatool] - fix build with ffmpeg2 - rel 2

baggins baggins at pld-linux.org
Thu Aug 29 17:49:11 CEST 2013


commit 3d11a131026741f921393c2c73e12d396cfb24b9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Aug 29 17:49:01 2013 +0200

    - fix build with ffmpeg2
    - rel 2

 ffmpeg2.patch | 12 ++++++++++++
 gtatool.spec  |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/gtatool.spec b/gtatool.spec
index 8a94045..5342c65 100644
--- a/gtatool.spec
+++ b/gtatool.spec
@@ -21,11 +21,12 @@ Summary:	Tools to manipulate Generic Tagged Array (GTA) files
 Summary(pl.UTF-8):	Narzędzia do obróbki plików GTA (ogólnych tablic etykietowanych)
 Name:		gtatool
 Version:	1.5.2
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/File
 Source0:	http://download.savannah.gnu.org/releases/gta/%{name}-%{version}.tar.xz
 # Source0-md5:	1f899e0872d0d706878844bb7f48bc7e
+Patch0:		ffmpeg2.patch
 URL:		http://gta.nongnu.org/gtatool.html
 %{?with_magick:BuildRequires:	ImageMagick-c++-devel}
 %{?with_openexr:BuildRequires:	OpenEXR-devel}
@@ -264,6 +265,7 @@ Bashowe uzupełnianie parametrów programu gtatool.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
diff --git a/ffmpeg2.patch b/ffmpeg2.patch
new file mode 100644
index 0000000..db3a3b8
--- /dev/null
+++ b/ffmpeg2.patch
@@ -0,0 +1,12 @@
+--- gtatool-1.5.2/src/conv-ffmpeg/media_object.cpp~	2013-04-28 20:24:13.884124701 +0200
++++ gtatool-1.5.2/src/conv-ffmpeg/media_object.cpp	2013-08-29 17:43:44.081721565 +0200
+@@ -149,6 +149,9 @@
+ 
+ // Hide the FFmpeg stuff so that their messy header files cannot cause problems
+ // in other source files.
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++#endif
+ 
+ static const size_t audio_tmpbuf_size = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtatool.git/commitdiff/3d11a131026741f921393c2c73e12d396cfb24b9



More information about the pld-cvs-commit mailing list