aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dists/redhat/libmad-0.15.1b-fixes-1.patch91
-rw-r--r--dists/redhat/scummvm.spec10
-rw-r--r--dists/redhat/scummvm.spec.in10
3 files changed, 105 insertions, 6 deletions
diff --git a/dists/redhat/libmad-0.15.1b-fixes-1.patch b/dists/redhat/libmad-0.15.1b-fixes-1.patch
new file mode 100644
index 0000000000..aa408816d9
--- /dev/null
+++ b/dists/redhat/libmad-0.15.1b-fixes-1.patch
@@ -0,0 +1,91 @@
+Submitted By: Igor Živković <contact at igor hyphen zivkovic dot from dot hr>
+Date: 2013-07-04
+Initial Package Version: 0.15.1b
+Upstream Status: Reported
+Origin: Arch Linux packages repository
+Description: Fixes compilation on x86-64 and optimization issues.
+
+diff -Naur libmad-0.15.1b.orig/configure.ac libmad-0.15.1b/configure.ac
+--- libmad-0.15.1b.orig/configure.ac 2004-01-23 10:41:32.000000000 +0100
++++ libmad-0.15.1b/configure.ac 2013-07-04 15:55:09.323764417 +0200
+@@ -124,71 +124,7 @@
+
+ if test "$GCC" = yes
+ then
+- if test -z "$arch"
+- then
+- case "$host" in
+- i386-*) ;;
+- i?86-*) arch="-march=i486" ;;
+- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;;
+- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;;
+- powerpc-*) ;;
+- mips*-agenda-*) arch="-mcpu=vr4100" ;;
+- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+- esac
+- fi
+-
+- case "$optimize" in
+- -O|"-O "*)
+- optimize="-O"
+- optimize="$optimize -fforce-mem"
+- optimize="$optimize -fforce-addr"
+- : #x optimize="$optimize -finline-functions"
+- : #- optimize="$optimize -fstrength-reduce"
+- optimize="$optimize -fthread-jumps"
+- optimize="$optimize -fcse-follow-jumps"
+- optimize="$optimize -fcse-skip-blocks"
+- : #x optimize="$optimize -frerun-cse-after-loop"
+- : #x optimize="$optimize -frerun-loop-opt"
+- : #x optimize="$optimize -fgcse"
+- optimize="$optimize -fexpensive-optimizations"
+- optimize="$optimize -fregmove"
+- : #* optimize="$optimize -fdelayed-branch"
+- : #x optimize="$optimize -fschedule-insns"
+- optimize="$optimize -fschedule-insns2"
+- : #? optimize="$optimize -ffunction-sections"
+- : #? optimize="$optimize -fcaller-saves"
+- : #> optimize="$optimize -funroll-loops"
+- : #> optimize="$optimize -funroll-all-loops"
+- : #x optimize="$optimize -fmove-all-movables"
+- : #x optimize="$optimize -freduce-all-givs"
+- : #? optimize="$optimize -fstrict-aliasing"
+- : #* optimize="$optimize -fstructure-noalias"
+-
+- case "$host" in
+- arm*-*)
+- optimize="$optimize -fstrength-reduce"
+- ;;
+- mips*-*)
+- optimize="$optimize -fstrength-reduce"
+- optimize="$optimize -finline-functions"
+- ;;
+- i?86-*)
+- optimize="$optimize -fstrength-reduce"
+- ;;
+- powerpc-apple-*)
+- # this triggers an internal compiler error with gcc2
+- : #optimize="$optimize -fstrength-reduce"
+-
+- # this is really only beneficial with gcc3
+- : #optimize="$optimize -finline-functions"
+- ;;
+- *)
+- # this sometimes provokes bugs in gcc 2.95.2
+- : #optimize="$optimize -fstrength-reduce"
+- ;;
+- esac
+- ;;
+- esac
++ optimize="-O2"
+ fi
+
+ case "$host" in
+@@ -297,6 +233,7 @@
+ then
+ case "$host" in
+ i?86-*) FPM="INTEL" ;;
++ x86_64*) FPM="64BIT" ;;
+ arm*-*) FPM="ARM" ;;
+ mips*-*) FPM="MIPS" ;;
+ sparc*-*) FPM="SPARC" ;;
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index a4f2fd09c4..9e4b134876 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -18,7 +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
+Source3 : mpeg2dec-0.5.1.tar.bz2
Patch0 : libmad-0.15.1b-fixes-1.patch
BuildRoot : %{_tmppath}/%{name}-%{version}-root
@@ -28,8 +28,12 @@ BuildRequires: libvorbis-devel
BuildRequires: flac-devel
BuildRequires: zlib-devel
BuildRequires: nasm
-BuildRequires: SDL-devel >= 1.2.2
+BuildRequires: SDL2-devel
BuildRequires: freetype-devel
+BuildRequires: fluidsynth-devel
+BuildRequires: libtheora-devel
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-turbo-devel
#------------------------------------------------------------------------------
# Description
@@ -55,7 +59,7 @@ 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)
-(cd mpeg2dec-0.4.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
+(cd mpeg2dec-0.5.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
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index b8694793b8..eac39eb179 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -18,7 +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
+Source3 : mpeg2dec-0.5.1.tar.bz2
Patch0 : libmad-0.15.1b-fixes-1.patch
BuildRoot : %{_tmppath}/%{name}-%{version}-root
@@ -28,8 +28,12 @@ BuildRequires: libvorbis-devel
BuildRequires: flac-devel
BuildRequires: zlib-devel
BuildRequires: nasm
-BuildRequires: SDL-devel >= 1.2.2
+BuildRequires: SDL2-devel
BuildRequires: freetype-devel
+BuildRequires: fluidsynth-devel
+BuildRequires: libtheora-devel
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-turbo-devel
#------------------------------------------------------------------------------
# Description
@@ -55,7 +59,7 @@ 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)
-(cd mpeg2dec-0.4.1; ./configure --enable-static --disable-shared --prefix=%{_builddir}/scummvm-%{version}/tmp; make; make install)
+(cd mpeg2dec-0.5.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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 17:04:42 +0000