Author: pebender
Date: Wed Jun 17 23:25:30 2009
New Revision: 4970
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
Log:
- Worked around bug the appeared as a result of mplayer-svn being compiled
with gcc 4.4.0.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Jun 17
23:25:30 2009
@@ -44,6 +44,8 @@
redirects.
- Fixed web server settings so the files in /var/log, /usr/versions and
/usr/local/versions are served as text files.
+ - Worked around bug the appeared as a result of mplayer-svn being
compiled
+ with gcc 4.4.0.
Fixed build system
- Patched legacy NVIDIA drivers so that they build with kernel 2.6.30.
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile Wed Jun 17
23:25:30 2009
@@ -4,6 +4,7 @@
MASTER_SITES = svn://svn.mplayerhq.hu/mplayer/trunk/
SOURCEPKG = lib/ffmpeg lib/libdvdnav lib/libdvdread
DISTFILES = $(DISTNAME).tar.bz2
+PATCHFILES = $(GARNAME)-gcc_4.4.0_hack.patch
LICENSE = mplayer
mplayer_LICENSE_TEXT = $(WORKSRC)/Copyright
Added: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Wed Jun
17
23:25:30 2009
@@ -0,0 +1 @@
+4a7fe8933479c1485f1c2ed8db5cc3d7 download/MPlayer-gcc_4.4.0_hack.patch
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-gcc_4.4.0_hack.patch
Wed Jun 17 23:25:30 2009
@@ -0,0 +1,32 @@
+diff -Naur MPlayer-29352-old/configure MPlayer-29352-new/configure
+--- MPlayer-29352-old/configure 2009-06-11 03:15:35.000000000 -0700
++++ MPlayer-29352-new/configure 2009-06-17 23:20:53.000000000 -0700
+@@ -2393,8 +2393,8 @@
+ __attribute__((noinline)) static int foo3(int i1, int i2, int i3) {
return i3; }
+ int main(void) { return foo3(1,2,3) == 3 ? 0 : 1; }
+ EOF
+- cc_check -O4 -mstackrealign && tmp_run &&
cflags_stackrealign=-mstackrealign
+- test -z "$cflags_stackrealign" && cc_check -O4 -mstackrealign
-fno-unit-at-a-time \
++ cc_check -O2 -mstackrealign && tmp_run &&
cflags_stackrealign=-mstackrealign
++ test -z "$cflags_stackrealign" && cc_check -O2 -mstackrealign
-fno-unit-at-a-time \
+ && tmp_run && cflags_stackrealign="-mstackrealign -fno-unit-at-a-time"
+ test -n "$cflags_stackrealign" && echores "yes" || echores "no"
+ fi # if darwin && test "$cc_vendor" = "gnu" ; then
+@@ -2411,7 +2411,7 @@
+ elif test "$cc_vendor" != "gnu" ; then
+ CFLAGS="-O2 $_march $_mcpu $_pipe"
+ else
+- CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4
$_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
++ CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O2
$_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
+ extra_ldflags="$extra_ldflags -ffast-math"
+ fi
+ else
+@@ -6537,7 +6537,7 @@
+ EOF
+ _faac=no
+ for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do
+- cc_check -O4 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder
$_ld_faac" && _faac=yes && break
++ cc_check -O2 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder
$_ld_faac" && _faac=yes && break
+ done
+ fi
+ if test "$_faac" = yes ; then
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
