summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2005-05-09 15:42:55 +0000
committerLuca Barbato <lu_zero@gentoo.org>2005-05-09 15:42:55 +0000
commitfaa778c41a638eb0071ecc9d131f4968c4bf97b8 (patch)
treeb901510928e4911031baa35c7c0a118a8ce9ae34 /media-video/mplayer
parentAdded to ~ppc (diff)
downloadgentoo-2-faa778c41a638eb0071ecc9d131f4968c4bf97b8.tar.gz
gentoo-2-faa778c41a638eb0071ecc9d131f4968c4bf97b8.tar.bz2
gentoo-2-faa778c41a638eb0071ecc9d131f4968c4bf97b8.zip
gcc_detection updated
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/files/mplayer-gcc_detection.patch22
2 files changed, 14 insertions, 14 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 5ba923e02e85..8c39a225730c 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.309 2005/05/09 15:24:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.310 2005/05/09 15:42:55 lu_zero Exp $
+
+ 09 May 2005; Luca Barbato <lu_zero@gentoo.org>
+ files/mplayer-gcc_detection.patch:
+ Simpler gcc_detection patch, update from Diego Biurrun
09 May 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre6-r6.ebuild,
mplayer-1.0_pre7.ebuild:
diff --git a/media-video/mplayer/files/mplayer-gcc_detection.patch b/media-video/mplayer/files/mplayer-gcc_detection.patch
index d9aa82b03ff3..acf88660aa59 100644
--- a/media-video/mplayer/files/mplayer-gcc_detection.patch
+++ b/media-video/mplayer/files/mplayer-gcc_detection.patch
@@ -1,20 +1,16 @@
---- configure.old 2005-02-19 13:11:58.000000000 +0900
-+++ configure 2005-02-19 13:20:22.538154224 +0900
-@@ -586,7 +586,7 @@
- echocheck "$_cc version"
- cc_vendor=gnu
- cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
-- cc_version=`( $_cc -dumpversion ) 2>&1`
-+ cc_version=`( $_cc -dumpversion | cut -f1,2 -d.) 2>&1`
- if test "$?" -gt 0; then
- cc_version="not found"
- fi
-@@ -595,7 +595,7 @@
+Index: configure
+===================================================================
+RCS file: /cvsroot/mplayer/main/configure,v
+retrieving revision 1.991
+diff -u -r1.991 configure
+--- configure 4 May 2005 17:02:14 -0000 1.991
++++ configure 9 May 2005 11:22:59 -0000
+@@ -608,7 +608,7 @@
cc_version="v. ?.??, bad"
cc_verc_fail=yes
;;
- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
-+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9][-.]*|3.[0-9].[0-9][-.]*)
++ 2.95.[2-9]|2.95.[2-9][-.]*|[3-4].*)
_cc_major=`echo $cc_version | cut -d '.' -f 1`
_cc_minor=`echo $cc_version | cut -d '.' -f 2`
_cc_mini=`echo $cc_version | cut -d '.' -f 3`