From 2347d29cddd9831d429853e1d9979b1941ce7124 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 11 Jul 2014 11:25:35 +0200 Subject: [PATCH] DISTS/FEDORA: Add (back) mpeg2dec dependency --- dists/redhat/scummvm.spec | 6 ++++-- dists/redhat/scummvm.spec.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 1e3608e9aff4..204d77d353b4 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -18,6 +18,7 @@ Url : http://www.scummvm.org Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 Source2 : faad2-2.7.tar.bz2 +Source3 : mpeg2dec-0.4.1.tar.bz2 BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -46,13 +47,14 @@ games) and many more. See http://www.scummvm.org for a full compatibility list. # install scripts #------------------------------------------------------------------------------ %prep -%setup -q -a 1 -a 2 -n scummvm-%{version} +%setup -q -a 1 -a 2 -a 3 -n scummvm-%{version} mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) (cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release +(cd mpeg2dec-0.4.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in index 5db2807d0e7e..c230400282bc 100644 --- a/dists/redhat/scummvm.spec.in +++ b/dists/redhat/scummvm.spec.in @@ -18,6 +18,7 @@ Url : http://www.scummvm.org Source : %{name}-%{version}.tar.bz2 Source1 : libmad-0.15.1b.tar.bz2 Source2 : faad2-2.7.tar.bz2 +Source3 : mpeg2dec-0.4.1.tar.bz2 BuildRoot : %{_tmppath}/%{name}-%{version}-root BuildRequires: desktop-file-utils @@ -46,13 +47,14 @@ games) and many more. See http://www.scummvm.org for a full compatibility list. # install scripts #------------------------------------------------------------------------------ %prep -%setup -q -a 1 -a 2 -n scummvm-%{version} +%setup -q -a 1 -a 2 -a 3 -n scummvm-%{version} mkdir tmp %build (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) (cd faad2-2.7; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) -./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release +(cd mpeg2dec-0.4.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install) +./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-faad-prefix=%{_builddir}/scummvm-%{version}/tmp --with-mpeg2-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release make %install