removed xsetbg in electricsheep-2.6.3-r2 bug #116536 thanks to Chet McNeill. Version bump to 2.6.4 - fixed bug #116557 thanks to Carsten Lohrke

(Portage version: 2.1_pre3)

8 files changed, 730 insertions, 8 deletions

diff --git a/x11-misc/electricsheep/ChangeLog b/x11-misc/electricsheep/ChangeLog
index 9afa04da5b3d..1b56b81c090e 100644
--- a/x11-misc/electricsheep/ChangeLog
+++ b/x11-misc/electricsheep/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-misc/electricsheep
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.30 2005/12/20 22:24:27 spyderous Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/ChangeLog,v 1.31 2006/01/04 22:29:39 dragonheart Exp $
+
+*electricsheep-2.6.4 (04 Jan 2006)
+*electricsheep-2.6.3-r2 (04 Jan 2006)
+
+  04 Jan 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/electricsheep-2.6.3-xloadimg.patch,
+  +files/electricsheep-2.6.4-cflagsfix.patch,
+  -electricsheep-2.6.3-r1.ebuild, +electricsheep-2.6.3-r2.ebuild,
+  +electricsheep-2.6.4.ebuild:
+  removed xsetbg in electricsheep-2.6.3-r2 bug #116536 thanks to Chet McNeill.
+  Version bump to 2.6.4 - fixed bug #116557 thanks to Carsten Lohrke
 
   20 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   electricsheep-2.6.3-r1.ebuild:
diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest
index 485c69d6494a..6aea5959503b 100644
--- a/x11-misc/electricsheep/Manifest
+++ b/x11-misc/electricsheep/Manifest
@@ -1,6 +1,10 @@
-MD5 f1d1fd0f49ffb7cbb347d3f083b2dade ChangeLog 4662
-MD5 3ae7aab21c41e69a06b3d46e40509b02 electricsheep-2.6.3-r1.ebuild 2129
-MD5 d74dadadc142bec28238e9e3994fc179 files/digest-electricsheep-2.6.3-r1 72
+MD5 574ded43bd34f846dc75eeafe291632f ChangeLog 5126
+MD5 4e813c7992346ffb0866e431752110f4 electricsheep-2.6.3-r2.ebuild 2147
+MD5 22d9e13ace45935f9c97f989a5eaba34 electricsheep-2.6.4.ebuild 2108
+MD5 d74dadadc142bec28238e9e3994fc179 files/digest-electricsheep-2.6.3-r2 72
+MD5 98c39f556a932b59addaf35ba7e16268 files/digest-electricsheep-2.6.4 72
 MD5 8573de509811af15cb08905c91a05864 files/electricsheep-2.6.3-cflagsfix.patch 16890
+MD5 022c0e46046b916c0cff67c0be5dc1d3 files/electricsheep-2.6.3-xloadimg.patch 810
+MD5 188a0eed95226cf2419172bb60d586e0 files/electricsheep-2.6.4-cflagsfix.patch 17080
 MD5 cf3d6d65b467f83063fea471d22e2f37 files/electricsheep.desktop 3973
 MD5 f84d0865990260d30b1b5180364dd6a8 metadata.xml 319
diff --git a/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild b/x11-misc/electricsheep/electricsheep-2.6.3-r2.ebuild
index 23df3551e6af..fb9c206b5487 100644
--- a/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild
+++ b/x11-misc/electricsheep/electricsheep-2.6.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.3-r1.ebuild,v 1.3 2005/12/20 22:24:27 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.3-r2.ebuild,v 1.1 2006/01/04 22:29:39 dragonheart Exp $
 
 inherit eutils flag-o-matic kde-functions
 
@@ -20,7 +20,6 @@ RDEPEND="|| ( ( x11-libs/libXv
 	)
 	dev-libs/expat
 	net-misc/curl
-	media-gfx/xloadimage
 	media-libs/jpeg
 	media-libs/libpng
 	media-libs/libsdl
@@ -47,6 +46,7 @@ src_unpack() {
 	# macro PIC.
 	sed -i -e 's/def PIC/def __PIC__/' ${S}/mpeg2dec/src/cpu_accel.c
 	epatch ${FILESDIR}/${P}-cflagsfix.patch
+	epatch ${FILESDIR}/${P}-xloadimg.patch
 }
 
 # Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
diff --git a/x11-misc/electricsheep/electricsheep-2.6.4.ebuild b/x11-misc/electricsheep/electricsheep-2.6.4.ebuild
new file mode 100644
index 000000000000..d37180faebb8
--- /dev/null
+++ b/x11-misc/electricsheep/electricsheep-2.6.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.4.ebuild,v 1.1 2006/01/04 22:29:39 dragonheart Exp $
+
+inherit eutils flag-o-matic kde-functions
+
+DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
+HOMEPAGE="http://electricsheep.org/"
+SRC_URI="http://electricsheep.org/${P}.tar.gz"
+IUSE="kde"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libXv
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+		virtual/x11
+	)
+	dev-libs/expat
+	net-misc/curl
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/libsdl
+	virtual/libc
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-libs/libXt
+		)
+		virtual/x11
+	)
+	sys-apps/groff
+	dev-lang/perl
+	>=sys-apps/sed-4
+	media-libs/libmpeg2
+	sys-apps/gawk
+	sys-apps/grep
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	# Detect PIC requirement from direct from compiler instead of
+	# macro PIC.
+	sed -i -e 's/def PIC/def __PIC__/' ${S}/mpeg2dec/src/cpu_accel.c
+	epatch ${FILESDIR}/${P}-cflagsfix.patch
+}
+
+# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
+# if they exist on the user machine although these aren't deps.
+
+src_install() {
+
+
+	# prevent writing for xscreensaver
+	sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
+		Makefile || die "sed Makefile failed"
+
+	# install the xscreensaver config file
+	insinto /usr/share/xscreensaver/config
+	doins electricsheep.xml
+
+	make install DESTDIR=${D} || die "make install failed"
+
+	dodir /usr/share/electricsheep
+	if [ ! -f ${ROOT}/usr/share/electricsheep/electricsheep-uniqueid ]
+	then
+		${D}/usr/bin/uniqueid > ${D}/usr/share/electricsheep/electricsheep-uniqueid
+	fi
+
+	if use kde;
+	then
+		set-kdedir
+		insinto /usr/share/applications
+		doins ${FILESDIR}/${PN}.desktop
+		insinto ${KDEDIR}//share/applnk/System/ScreenSavers
+		doins ${FILESDIR}/${PN}.desktop
+	fi
+
+	# remove header files that are installed over libmpeg2
+	rm -rf ${D}/usr/include
+}
diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r1 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r2
index 6b459cf6101e..6b459cf6101e 100644
--- a/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r1
+++ b/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r2
diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.4 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.4
new file mode 100644
index 000000000000..f16918e543dc
--- /dev/null
+++ b/x11-misc/electricsheep/files/digest-electricsheep-2.6.4
@@ -0,0 +1 @@
+MD5 59834e2b6a13280e9e6313533c7ff6cf electricsheep-2.6.4.tar.gz 1387634
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.3-xloadimg.patch b/x11-misc/electricsheep/files/electricsheep-2.6.3-xloadimg.patch
new file mode 100644
index 000000000000..3c2230bdead2
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.6.3-xloadimg.patch
@@ -0,0 +1,29 @@
+--- electricsheep-2.6.3-orig/electricsheep.c	2005-07-24 17:18:38.000000000 -0600
++++ electricsheep-2.6.3/electricsheep.c	2005-12-23 13:35:48.000000000 -0700
+@@ -505,11 +505,13 @@
+     else
+       qbuf[0] = 0;
+ 
++    /* Commented out due to critical xloadimage bug
+     sprintf(pbuf, "xsetbg %s "
+ 	    "-border black -at 0,0 %s-splash-0.tif " 
+ 	    "-merge -center %s-splash-1.tif %s",
+ 	    qbuf, splash_prefix, splash_prefix, ob);
+     mysystem2(pbuf, "splash0");
++    */
+ }
+ 
+ #define max_plays 1000
+@@ -1539,10 +1541,12 @@
+   else
+     qbuf[0] = 0;
+   
++  /* Commented out due to critical xloadimage bug
+   sprintf(pbuf, "xsetbg %s -at 0,0 %s-splash-1.tif",
+ 	  qbuf, splash_prefix);
+   mysystem2(pbuf, "logo");
+   while (1) sleep(60);
++  */
+ }
+ 
+ /* set the number of threads by reading /proc/cpuinfo */
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.4-cflagsfix.patch b/x11-misc/electricsheep/files/electricsheep-2.6.4-cflagsfix.patch
new file mode 100644
index 000000000000..16671fa6bcd2
--- /dev/null
+++ b/x11-misc/electricsheep/files/electricsheep-2.6.4-cflagsfix.patch
@@ -0,0 +1,593 @@
+diff -ru electricsheep-2.6.4.orig/mpeg2dec/configure electricsheep-2.6.4/mpeg2dec/configure
+--- electricsheep-2.6.4.orig/mpeg2dec/configure	2005-07-20 16:24:34.000000000 +1000
++++ electricsheep-2.6.4/mpeg2dec/configure	2006-01-05 09:19:51.000000000 +1100
+@@ -3245,515 +3245,6 @@
+ fi
+ 
+ 
+-if test x"$CC" = x"checkergcc"; then
+-    enable_sdl=no
+-elif test x"$GCC" = x"yes"; then
+-
+-
+-
+-    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
+-
+-    OPT_CFLAGS="$OPT_CFLAGS -O3"
+-    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS
+-    else
+-	:
+-    fi
+-
+-        OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
+-    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS
+-    else
+-	:
+-    fi
+-
+-        case "$host_alias" in
+-    i?86-* | k?-*)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define ARCH_X86
+-_ACEOF
+-
+-	case "$host_alias" in
+-	i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
+-	i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
+-	i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
+-	i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
+-	k6-*)   OPT_CFLAGS="$CFLAGS -march=k6";;
+-	esac
+-	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS
+-    else
+-	:
+-    fi;;
+-    ppc-* | powerpc-*)
+-	OPT_CFLAGS="$CFLAGS -Wa,-m7400"
+-	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS;
+-cat >>confdefs.h <<\_ACEOF
+-#define ARCH_PPC
+-_ACEOF
+-
+-    else
+-	:
+-    fi;;
+-    sparc-* | sparc64-*)
+-	OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
+-	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS
+-    else
+-	:
+-    fi;;
+-    mips-sgi-irix6.*)		OPT_CFLAGS="$CFLAGS -mabi=64"
+-	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS
+-    else
+-	:
+-    fi;;
+-    esac
+-elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
+-        TENDRA=yes
+-    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
+-    enable_mlib=no
+-    no_x=yes
+-    enable_sdl=no
+-elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
+-        CFLAGS="-g -O3 -unroll -ip"
+-else
+-        case "$host_alias" in
+-    mips-sgi-irix6.*)
+-	OPT_CFLAGS="$CFLAGS -64"
+-	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS
+-    else
+-	:
+-    fi;;
+-    sparc-sun-solaris*)
+-	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
+-	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
+-echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$OPT_CFLAGS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* 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>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (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); }; } &&
+-	 { 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.err 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
+-	CFLAGS=$OPT_CFLAGS
+-    else
+-	:
+-    fi;;
+-    esac
+-fi
+-
+ # Check whether --enable-shared or --disable-shared was given.
+ if test "${enable_shared+set}" = set; then
+   enableval="$enable_shared"
+diff -ru electricsheep-2.6.4.orig/mpeg2dec/configure.in electricsheep-2.6.4/mpeg2dec/configure.in
+--- electricsheep-2.6.4.orig/mpeg2dec/configure.in	2005-07-20 16:19:40.000000000 +1000
++++ electricsheep-2.6.4/mpeg2dec/configure.in	2006-01-05 09:19:51.000000000 +1100
+@@ -15,70 +15,6 @@
+ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ 
+-dnl CC-specific flags
+-if test x"$CC" = x"checkergcc"; then
+-    enable_sdl=no
+-elif test x"$GCC" = x"yes"; then
+-
+-    dnl GCC-specific flags
+-    dnl -Wall -Werror moved to the end to not disturb the configure script
+-
+-    dnl -O3
+-    changequote(<<,>>)
+-    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
+-    changequote([,])
+-    OPT_CFLAGS="$OPT_CFLAGS -O3"
+-    AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
+-
+-    dnl -fomit-frame-pointer
+-    OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
+-    AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
+-
+-    dnl arch-specific flags
+-    case "$host_alias" in
+-    i?86-* | k?-*)
+-	AC_DEFINE([ARCH_X86],,[x86 architecture])
+-	case "$host_alias" in
+-	i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
+-	i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
+-	i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
+-	i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
+-	k6-*)   OPT_CFLAGS="$CFLAGS -march=k6";;
+-	esac
+-	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
+-    ppc-* | powerpc-*)
+-	OPT_CFLAGS="$CFLAGS -Wa,-m7400"
+-	AC_TRY_CFLAGS([$OPT_CFLAGS],
+-	    [CFLAGS=$OPT_CFLAGS; AC_DEFINE([ARCH_PPC],,[ppc architecture])]);;
+-    sparc-* | sparc64-*)
+-	OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
+-	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
+-    mips-sgi-irix6.*)	dnl do we need to be that specific ?
+-	OPT_CFLAGS="$CFLAGS -mabi=64"
+-	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
+-    esac
+-elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
+-    dnl TenDRA portability checking compiler
+-    TENDRA=yes
+-    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
+-    enable_mlib=no
+-    no_x=yes
+-    enable_sdl=no
+-elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
+-    dnl Intel C++ compiler
+-    CFLAGS="-g -O3 -unroll -ip"
+-else
+-    dnl non-gcc flags - we probably need exact configuration triplets here.
+-    case "$host_alias" in
+-    mips-sgi-irix6.*)
+-	OPT_CFLAGS="$CFLAGS -64"
+-	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
+-    sparc-sun-solaris*)
+-	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
+-	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
+-    esac
+-fi
+-
+ dnl Checks for libtool - this must be done after we set cflags
+ AC_DISABLE_SHARED
+ AC_LIBTOOL_WIN32_DLL