[Scummvm-cvs-logs] scummvm master -> bdf3c4948939c4a6f98c299d14791eae9dc97d43

wjp wjp at usecode.org
Fri Jul 11 12:09:53 CEST 2014


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

Summary:
39cfc2c655 DISTS/FEDORA: Add (back) mpeg2dec dependency
54b6f52cb7 DISTS/FEDORA: Package wintermute.zip
bdf3c49489 DISTS/REDHAT: Add libmad build patch


Commit: 39cfc2c655cbb93b687d3d0810c1a9ae88086c2e
    https://github.com/scummvm/scummvm/commit/39cfc2c655cbb93b687d3d0810c1a9ae88086c2e
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-07-11T12:08:33+02:00

Commit Message:
DISTS/FEDORA: Add (back) mpeg2dec dependency

(cherry picked from commit 2347d29cddd9831d429853e1d9979b1941ce7124)

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



diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 2770642..f8a22ce 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 5db2807..c230400 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


Commit: 54b6f52cb73ca31348228d1a70a0da22409a311f
    https://github.com/scummvm/scummvm/commit/54b6f52cb73ca31348228d1a70a0da22409a311f
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-07-11T12:08:34+02:00

Commit Message:
DISTS/FEDORA: Package wintermute.zip

(cherry picked from commit 02c371397d5a2b81d3f5f4bb0f47f362f43b821d)

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



diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index f8a22ce..2cce902 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -76,6 +76,7 @@ install -m644 -D dists/engine-data/teenagent.dat %{buildroot}%{_datadir}/scummvm
 install -m644 -D dists/engine-data/hugo.dat %{buildroot}%{_datadir}/scummvm/hugo.dat
 install -m644 -D dists/engine-data/tony.dat %{buildroot}%{_datadir}/scummvm/tony.dat
 install -m644 -D dists/engine-data/toon.dat %{buildroot}%{_datadir}/scummvm/toon.dat
+install -m644 -D dists/engine-data/wintermute.zip %{buildroot}%{_datadir}/scummvm/wintermute.zip
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -116,6 +117,7 @@ fi
 %{_datadir}/scummvm/hugo.dat
 %{_datadir}/scummvm/tony.dat
 %{_datadir}/scummvm/toon.dat
+%{_datadir}/scummvm/wintermute.zip
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index c230400..28b988e 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -76,6 +76,7 @@ install -m644 -D dists/engine-data/teenagent.dat %{buildroot}%{_datadir}/scummvm
 install -m644 -D dists/engine-data/hugo.dat %{buildroot}%{_datadir}/scummvm/hugo.dat
 install -m644 -D dists/engine-data/tony.dat %{buildroot}%{_datadir}/scummvm/tony.dat
 install -m644 -D dists/engine-data/toon.dat %{buildroot}%{_datadir}/scummvm/toon.dat
+install -m644 -D dists/engine-data/wintermute.zip %{buildroot}%{_datadir}/scummvm/wintermute.zip
 desktop-file-install --vendor scummvm --dir=%{buildroot}/%{_datadir}/applications dists/scummvm.desktop
 
 %clean
@@ -116,6 +117,7 @@ fi
 %{_datadir}/scummvm/hugo.dat
 %{_datadir}/scummvm/tony.dat
 %{_datadir}/scummvm/toon.dat
+%{_datadir}/scummvm/wintermute.zip
 %{_mandir}/man6/scummvm.6*
 
 #------------------------------------------------------------------------------


Commit: bdf3c4948939c4a6f98c299d14791eae9dc97d43
    https://github.com/scummvm/scummvm/commit/bdf3c4948939c4a6f98c299d14791eae9dc97d43
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2014-07-11T12:08:37+02:00

Commit Message:
DISTS/REDHAT: Add libmad build patch

>From LinuxFromScratch

(cherry picked from commit cf8017e768783bae94a984763c89535ec9c6a056)

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



diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 2cce902..83e176c 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -19,6 +19,7 @@ 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
+Patch0		: libmad-0.15.1b-fixes-1.patch
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -48,6 +49,7 @@ games) and many more. See http://www.scummvm.org for a full compatibility list.
 #------------------------------------------------------------------------------
 %prep
 %setup -q -a 1 -a 2 -a 3 -n scummvm-%{version}
+%patch0 -p0
 mkdir tmp
 
 %build
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index 28b988e..73efeb6 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -19,6 +19,7 @@ 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
+Patch0		: libmad-0.15.1b-fixes-1.patch
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: desktop-file-utils
@@ -48,6 +49,7 @@ games) and many more. See http://www.scummvm.org for a full compatibility list.
 #------------------------------------------------------------------------------
 %prep
 %setup -q -a 1 -a 2 -a 3 -n scummvm-%{version}
+%patch0 -p0
 mkdir tmp
 
 %build






More information about the Scummvm-git-logs mailing list