summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2003-11-01 22:30:40 +0000
committerDaniel Robbins <drobbins@gentoo.org>2003-11-01 22:30:40 +0000
commit3f59b627728211e9ad4c3f0f3a8f6d989ed64bfb (patch)
tree59bd179fa6ea3c8572db1a9b3da8c50fc76897cc /media-video/xine-ui
parentadding unzip. Closes #32485 (diff)
downloadgentoo-2-3f59b627728211e9ad4c3f0f3a8f6d989ed64bfb.tar.gz
gentoo-2-3f59b627728211e9ad4c3f0f3a8f6d989ed64bfb.tar.bz2
gentoo-2-3f59b627728211e9ad4c3f0f3a8f6d989ed64bfb.zip
preserve-CFLAGS patch for x86
Diffstat (limited to 'media-video/xine-ui')
-rw-r--r--media-video/xine-ui/ChangeLog9
-rw-r--r--media-video/xine-ui/Manifest11
-rw-r--r--media-video/xine-ui/files/preserve-CFLAGS.diff206
-rw-r--r--media-video/xine-ui/xine-ui-0.9.22.ebuild4
4 files changed, 220 insertions, 10 deletions
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index d035a40b601d..5b4ec720abc7 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,10 +1,13 @@
# ChangeLog for media-video/xine-ui
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.38 2003/10/31 15:48:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.39 2003/11/01 22:30:37 drobbins Exp $
+ 01 Nov 2003; Daniel Robbins <drobbins@gentoo.org> xine-ui-0.9.22.ebuild:
+ Added fix to preserve CFLAGS set by user on x86, rather than force (somewhat
+ outdated/non-optimal) hard-coded CFLAGS.
+
31 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.21.ebuild,
- xine-ui-0.9.22.ebuild:
- doesn't work without aalib.
+ xine-ui-0.9.22.ebuild: doesn't work without aalib.
22 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.13.ebuild,
xine-ui-0.9.21.ebuild, xine-ui-0.9.22.ebuild:
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index f2bde718d196..9ca938e2478f 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,10 +1,11 @@
-MD5 2f68b4cc8c8da83749811342c6dfbb9c ChangeLog 6520
+MD5 68e8ec7bad48d92029e0f65b2b1c17e2 xine-ui-0.9.22.ebuild 1397
MD5 a53406bd8c9dd2e05546fb9fa1b59b19 xine-ui-0.9.13.ebuild 1634
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 a863bb645b7751e7918a387e423b4119 xine-ui-0.9.22.ebuild 1400
MD5 cc6ebed67426acf9732eb5b036a09df7 xine-ui-0.9.21.ebuild 1536
+MD5 92c5e83c677099e4b7225f8f543d0d56 ChangeLog 6719
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
MD5 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13 67
MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21 67
-MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
-MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22 67
+MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
+MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500
+MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
diff --git a/media-video/xine-ui/files/preserve-CFLAGS.diff b/media-video/xine-ui/files/preserve-CFLAGS.diff
new file mode 100644
index 000000000000..4374c309c6a8
--- /dev/null
+++ b/media-video/xine-ui/files/preserve-CFLAGS.diff
@@ -0,0 +1,206 @@
+--- xine-ui-0.9.22/configure 2003-08-07 11:40:09.000000000 -0600
++++ xine-ui-0.9.22.new/configure 2003-10-11 20:21:41.000000000 -0600
+@@ -20370,203 +20370,6 @@
+ ;;
+
+ i?86*-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
+- if test "$GCC" = yes; then
+-
+- echo "$as_me:$LINENO: checking if $CC supports \"-mcpu=i386\" flags" >&5
+-echo $ECHO_N "checking if $CC supports \"-mcpu=i386\" flags... $ECHO_C" >&6
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS=""-mcpu=i386""
+- cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_try_cflags_ok=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_try_cflags_ok=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+- CFLAGS="$SAVE_CFLAGS"
+- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+-echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+- sarchopt="-mcpu"
+- else
+- echo "$as_me:$LINENO: checking if $CC supports \"-march=i386\" flags" >&5
+-echo $ECHO_N "checking if $CC supports \"-march=i386\" flags... $ECHO_C" >&6
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS=""-march=i386""
+- cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_try_cflags_ok=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_try_cflags_ok=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+- CFLAGS="$SAVE_CFLAGS"
+- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+-echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+- sarchopt="-march"
+- else
+- echo "$as_me:$LINENO: result: ** no cpu optimization supports **" >&5
+-echo "${ECHO_T}** no cpu optimization supports **" >&6
+- sarchopt=no
+- fi
+- fi
+-
+- echo "$as_me:$LINENO: checking if $CC supports \"$sarchopt=athlon\" flags" >&5
+-echo $ECHO_N "checking if $CC supports \"$sarchopt=athlon\" flags... $ECHO_C" >&6
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS=""$sarchopt=athlon""
+- cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_try_cflags_ok=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_try_cflags_ok=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+- CFLAGS="$SAVE_CFLAGS"
+- echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+-echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+- if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+- k7cpu="athlon"
+- else
+- k7cpu="i686"
+- fi
+-
+- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+-
+-
+- if test x"$sarchopt" != "xno"; then
+-
+- archopt_val=
+-
+- case "$host_alias" in
+- i386-*) # *BSD return this even on a P III #-))
+- archopt_val=i386 ;;
+- i486-*) # oh dear!
+- archopt_val=i486 ;;
+- i586-*)
+- archopt_val=pentium ;;
+- i686-*)
+- archopt_val=pentiumpro
+- if test x"$check_athlon" = "xyes"; then
+- if test -f /proc/cpuinfo; then
+- modelname=`cat /proc/cpuinfo | grep "model\ name\ :" | sed -e 's/ //g' | cut -d':' -f2`
+- case "$modelname" in
+- *Athlon* | *Duron* | *K7*)
+- archopt_val="$k7cpu" ;;
+- esac
+- fi
+- fi
+- ;;
+- k6-*)
+- archopt_val=k6 ;;
+- k7-*)
+- archopt_val=k7 ;;
+- athlon-*)
+- archopt_val=athlon ;;
+- esac
+-
+- if test x"$archopt_val" != x; then
+- CFLAGS="$CFLAGS $sarchopt=$archopt_val"
+- DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
+- fi
+-
+- fi
+-
+- else
+- CFLAGS="$CFLAGS -O"
+- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
+- fi
+-
+-
+ cat >>confdefs.h <<\_ACEOF
+ #define __i386__ 1
+ _ACEOF
diff --git a/media-video/xine-ui/xine-ui-0.9.22.ebuild b/media-video/xine-ui/xine-ui-0.9.22.ebuild
index 1a7511ae1cb5..e73669b04113 100644
--- a/media-video/xine-ui/xine-ui-0.9.22.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.22.ebuild,v 1.6 2003/10/31 15:48:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.22.ebuild,v 1.7 2003/11/01 22:30:37 drobbins Exp $
DESCRIPTION="Skinned front end for Xine movie player."
HOMEPAGE="http://xine.sourceforge.net/"
@@ -31,7 +31,7 @@ src_unpack() {
unpack ${A}
cd ${S}
- #patch -p1 < ${FILESDIR}/xine-ui-configure.patch || die "patch failed"
+ patch -p1 < ${FILESDIR}/preserve-CFLAGS.diff || die "patch failed"
use directfb || ( \
sed -i "s:dfb::" src/Makefile.in