version bump to 0.99.2

4 files changed, 370 insertions, 1 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index d1d3ab42c044..8bcd1baf5676 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.61 2004/07/14 20:53:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.62 2004/07/14 22:02:31 chriswhite Exp $
+
+  15 Jul 2004; Chris White <chriswhite@gentoo.org> :
+  Version bump to 0.99.2.  Added Diego Petten's updated CFLAGS preserve patch.
 
   15 Jul 2004; Chris White <chriswhite@gentoo.org> metadata.xml:
   Changing herd to media-video.  Added myself as mantainer.
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.2 b/media-video/xine-ui/files/digest-xine-ui-0.99.2
new file mode 100644
index 000000000000..ffe18d8861a9
--- /dev/null
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.2
@@ -0,0 +1 @@
+MD5 4a4cf5cc68bf65e6845f501ea87fdf94 xine-ui-0.99.2.tar.gz 2374176
diff --git a/media-video/xine-ui/files/preserve-CFLAGS-0.99.2.diff b/media-video/xine-ui/files/preserve-CFLAGS-0.99.2.diff
new file mode 100644
index 000000000000..34775f2933b7
--- /dev/null
+++ b/media-video/xine-ui/files/preserve-CFLAGS-0.99.2.diff
@@ -0,0 +1,310 @@
+diff -ur xine-ui-0.99.2/configure xine-ui-0.99.2-patched/configure
+--- xine-ui-0.99.2/configure	2004-07-04 18:26:08.000000000 +0200
++++ xine-ui-0.99.2-patched/configure	2004-07-09 12:19:19.595146120 +0200
+@@ -28788,306 +28788,6 @@
+     ;;
+ 
+   i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-* | pentium*)
+-    if test "$GCC" = yes -o "${CC##*/}x" = "iccx" ; then
+-
+-      if test "$GCC" = yes ; then
+-		echo "$as_me:$LINENO: checking if $CC supports \"-mtune=i386\" flags" >&5
+-echo $ECHO_N "checking if $CC supports \"-mtune=i386\" flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS=""-mtune=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="-mtune"
+-    else
+-        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
+-
+-    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="-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 $CFLAGS"
+-
+-	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+-
+-	if test x"$sarchopt" != "xno"; then
+-
+-	    archopt_val=
+-
+-	    case "$host_or_hostalias" in
+-	    i386-*) # *BSD return this even on a P III #-))
+-		archopt_val="i386" ;;
+-	    i486-*) # oh dear!
+-		archopt_val="i486" ;;
+-	    i586-*)
+-		archopt_val="pentium"
+-                ;;
+-	    pentium-mmx-*)
+-		archopt_val="pentium-mmx"
+-		;;
+-	    pentiumpro-* | pentium2-* | 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"
+-			    ;;
+-			VIAEzra)
+-			    archopt_val="c3"
+-			    ;;
+-			esac
+-		    fi
+-		fi
+-		;;
+-	    k6-2-* | k6-3-*)
+-		archopt_val="k6-2"
+-		;;
+-	    k6-*)
+-		archopt_val="k6"
+-		;;
+-	    pentium3-*)
+-		archopt_val="pentium3"
+-		;;
+-	    pentium4-*)
+-		archopt_val="pentium4"
+-		;;
+-	    athlon-4-* | athlon-xp-* | athlon-mp-*)
+-		archopt_val="athlon-4"
+-		;;
+-	    k7-* | athlon-tbird-* | athlon-*)
+-		archopt_val="athlon"
+-		;;
+-
+-	    esac
+-	    if test x"$archopt_val" != x; then
+-		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
+-		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
+-	    fi
+-
+-	fi
+-      else
+-		CFLAGS="-unroll -ipo -ipo_obj -O3 $CFLAGS"
+-	PASS1_CFLAGS="-prof_genx -prof_dir \$(PWD)/\$(top_builddir)/ $PASS1_CFLAGS"
+-	PASS2_CFLAGS="-prof_use -prof_dir \$(PWD)/\$(top_builddir)/ $PASS2_CFLAGS"
+-
+-
+-      fi
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define ARCH_X86
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define FPM_INTEL 1
+-_ACEOF
+-
+-	enable_ffmmx="yes"
+-	enable_w32dll="yes"
+-
+-        case "$host_or_hostalias" in
+-	*-*-cygwin)
+-          enable_w32dll="no"
+-	  LDFLAGS="-no-undefined @INTLLIBS@ $LDFLAGS"
+-	  ;;
+-	esac
+-    else
+-		CFLAGS="-O $CFLAGS"
+-	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+-
+-cat >>confdefs.h <<_ACEOF
+-#define FPM_64BIT
+-_ACEOF
+-
+-    fi
+-
+-
+ cat >>confdefs.h <<\_ACEOF
+ #define __i386__ 1
+ _ACEOF
diff --git a/media-video/xine-ui/xine-ui-0.99.2.ebuild b/media-video/xine-ui/xine-ui-0.99.2.ebuild
new file mode 100644
index 000000000000..33bab568417f
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.2.ebuild,v 1.1 2004/07/14 22:02:31 chriswhite Exp $
+
+inherit eutils
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X gnome nls directfb lirc aalib"
+
+DEPEND="media-libs/libpng
+	>=media-libs/xine-lib-1_rc3
+	>=net-misc/curl-7.10.2
+	lirc? ( app-misc/lirc )
+	X? ( virtual/x11 )
+	aalib? ( media-libs/aalib )
+	gnome? ( gnome-base/ORBit )
+	directfb? ( media-libs/aalib
+		>=dev-libs/DirectFB-0.9.9 )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
+	epatch ${FILESDIR}/true-false.patch
+	use directfb || sed -i "s:dfb::" src/Makefile.in
+	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
+}
+
+src_compile() {
+	rm misc/xine-bugreport
+	local myconf=""
+	use X || myconf="${myconf} --disable-x11 --disable-xv"
+	use nls || myconf="${myconf} --disable-nls"
+	use lirc || myconf="${myconf} --disable-lirc"
+	use aalib || sed -e 's:no_aalib="":no_aalib="yes":g' \
+			-i configure || die "could not disable aalib"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}