[Scummvm-cvs-logs] scummvm master -> 1aa5608de643cff79bea81132bc18b3a163ccbdb

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1aa5608de6 DISTS/FEDORA: Build against libfaad2


Commit: 1aa5608de643cff79bea81132bc18b3a163ccbdb
    https://github.com/scummvm/scummvm/commit/1aa5608de643cff79bea81132bc18b3a163ccbdb
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-29T10:34:56-08:00

Commit Message:
DISTS/FEDORA: Build against libfaad2

Changed paths:
    dists/redhat/scummvm.spec
    dists/redhat/scummvm.spec.in



diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 7457ddd..2ccccae 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -17,6 +17,7 @@ Url             : http://www.scummvm.org
 
 Source		: %{name}-%{version}.tar.bz2
 Source1		: libmad-0.15.1b.tar.bz2
+Source2		: faad2-2.7.tar.bz2
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -44,12 +45,13 @@ games) and many more. See http://www.scummvm.org for a full compatibility list.
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -a 1 -n scummvm-%{version}
+%setup -q -a 1 -a 2 -n scummvm-%{version}
 mkdir tmp
 
 %build
 (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release
+(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
 make
 
 %install
@@ -115,6 +117,8 @@ fi
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
+* Thu Dec 29 2011 (1.4.0-2)
+  - include libfaad2
 * Fri Sep 17 2010 (1.2.0)
   - include png/svg icons
   - remove libmpeg2
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index 56e165c..3beef2f 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -17,6 +17,7 @@ Url             : http://www.scummvm.org
 
 Source		: %{name}-%{version}.tar.bz2
 Source1		: libmad-0.15.1b.tar.bz2
+Source2		: faad2-2.7.tar.bz2
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -44,12 +45,13 @@ games) and many more. See http://www.scummvm.org for a full compatibility list.
 #   install scripts
 #------------------------------------------------------------------------------
 %prep
-%setup -q -a 1 -n scummvm-%{version}
+%setup -q -a 1 -a 2 -n scummvm-%{version}
 mkdir tmp
 
 %build
 (cd libmad-0.15.1b; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
-./configure --with-mad-prefix=%{_builddir}/scummvm-%{version}/tmp --prefix=%{_prefix} --enable-release
+(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
 make
 
 %install
@@ -115,6 +117,8 @@ fi
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
+* Thu Dec 29 2011 (1.4.0-2)
+  - include libfaad2
 * Fri Sep 17 2010 (1.2.0)
   - include png/svg icons
   - remove libmpeg2