[packages/gmerlin-encoders] - added am patch (fixes build with automake 1.13) - updated BR versions

[qboosh]

commit 8249ffc0a2fa203df766b38162e517b540484ab9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Mar 19 15:33:12 2013 +0100

    - added am patch (fixes build with automake 1.13)
    - updated BR versions

 gmerlin-encoders-am.patch | 11 +++++++++++
 gmerlin-encoders.spec     | 17 ++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/gmerlin-encoders.spec b/gmerlin-encoders.spec
index 343e3d4..268b31f 100644
--- a/gmerlin-encoders.spec
+++ b/gmerlin-encoders.spec
@@ -8,33 +8,35 @@ License:	GPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/gmerlin/%{name}-%{version}.tar.gz
 # Source0-md5:	db401732dde0c27702ad3303956cb158
+Patch0:		%{name}-am.patch
 Patch1:		%{name}-link.patch
 URL:		http://gmerlin.sourceforge.net/avdec_frame.html
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	ffmpeg-devel >= 0.7
 BuildRequires:	faac-devel >= 1.24
-BuildRequires:	flac-devel >= 1.1.0
+# avcodec build >= 3412992, libpostproc >= 51.0.0, libswscale >= 0.5.0
+BuildRequires:	ffmpeg-devel >= 0.7
+BuildRequires:	flac-devel >= 1.2.0
 BuildRequires:	gettext-devel
 BuildRequires:	gmerlin-devel >= 1.2.0
 BuildRequires:	lame-libs-devel >= 3.93
-BuildRequires:	libogg-devel >= 1.0
+BuildRequires:	libogg-devel >= 1:1.1
 BuildRequires:	libshout-devel >= 2.2.2
 BuildRequires:	libtheora-devel >= 1.0.0
 BuildRequires:	libtool
-BuildRequires:	libvorbis-devel >= 1.0
+BuildRequires:	libvorbis-devel >= 1:1.0
 BuildRequires:	mjpegtools-devel >= 1.9.0
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	speex-devel >= 1.0.4
 Requires:	faac >= 1.24
 Requires:	ffmpeg-libs >= 0.7
-Requires:	flac >= 1.1.0
+Requires:	flac >= 1.2.0
 Requires:	gmerlin >= 1.2.0
 Requires:	lame-libs >= 3.93
-Requires:	libogg >= 1.0
+Requires:	libogg >= 1:1.1
 Requires:	libshout >= 2.2.2
 Requires:	libtheora >= 1.0.0
-Requires:	libvorbis >= 1.0
+Requires:	libvorbis >= 1:1.0
 Requires:	mjpegtools >= 1.9.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,6 +53,7 @@ liczby formatów plików.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 # evil, sets CFLAGS basing on /proc/cpuinfo, overrides our optflags
diff --git a/gmerlin-encoders-am.patch b/gmerlin-encoders-am.patch
new file mode 100644
index 0000000..97877ef
--- /dev/null
+++ b/gmerlin-encoders-am.patch
@@ -0,0 +1,11 @@
+--- gmerlin-encoders-1.2.0/configure.ac.orig	2013-03-17 20:43:54.862490957 +0100
++++ gmerlin-encoders-1.2.0/configure.ac	2013-03-17 21:21:47.469110244 +0100
+@@ -1,7 +1,7 @@
+ AC_INIT
+ AC_CONFIG_SRCDIR([include/gmerlin_encoders.h])
+ 
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADERS(include/config.h)
+ AM_INIT_AUTOMAKE(gmerlin-encoders, 1.2.0)
+ 
+ SAVE_CFLAGS=$CFLAGS
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gmerlin-encoders.git/commitdiff/8249ffc0a2fa203df766b38162e517b540484ab9