diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-31 18:53:33 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-31 18:53:33 +0000 |
commit | 9e7ecaf7ea39cacc014b533517a95c8abc838fd1 (patch) | |
tree | a8ba8986d94a59768edddfaa8513e0c8e6dbc32c /x11-misc/electricsheep/files | |
parent | x86 stable, bug #298735 (diff) | |
download | gentoo-2-9e7ecaf7ea39cacc014b533517a95c8abc838fd1.tar.gz gentoo-2-9e7ecaf7ea39cacc014b533517a95c8abc838fd1.tar.bz2 gentoo-2-9e7ecaf7ea39cacc014b533517a95c8abc838fd1.zip |
Remove versions that inherit deprecated kde-functions.eclass
(Portage version: 2.2_rc61/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'x11-misc/electricsheep/files')
5 files changed, 0 insertions, 930 deletions
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.7-cflagsfix.patch b/x11-misc/electricsheep/files/electricsheep-2.6.7-cflagsfix.patch deleted file mode 100644 index 75b2edb6cbbf..000000000000 --- a/x11-misc/electricsheep/files/electricsheep-2.6.7-cflagsfix.patch +++ /dev/null @@ -1,591 +0,0 @@ ---- electricsheep-2.6.7/mpeg2dec/configure.in.orig 2005-07-20 16:19:40.000000000 +1000 -+++ electricsheep-2.6.7/mpeg2dec/configure.in 2006-06-06 10:55:02.000000000 +1000 -@@ -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 ---- electricsheep-2.6.7/mpeg2dec/configure.orig 2005-07-20 16:24:34.000000000 +1000 -+++ electricsheep-2.6.7/mpeg2dec/configure 2006-06-06 10:55:02.000000000 +1000 -@@ -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 --git a/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch b/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch deleted file mode 100644 index 8f41e1f296c5..000000000000 --- a/x11-misc/electricsheep/files/electricsheep-2.6.7-libpng-1.2.10.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- electricsheep/client/flam3/png.c 2005/07/20 06:06:16 1.8 -+++ electricsheep/client/flam3/png.c 2006/06/26 19:36:49 1.9 -@@ -14,6 +14,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <png.h> -+#include <setjmp.h> - - #include "img.h" - -@@ -67,7 +68,7 @@ - unsigned char sig_buf [SIG_CHECK_SIZE]; - png_struct *png_ptr; - png_info *info_ptr; -- png_byte **png_image; -+ png_byte **png_image = NULL; - int linesize, x, y; - unsigned char *p, *q; - -@@ -85,6 +86,16 @@ - fprintf (stderr, "cannot allocate LIBPNG structure\n"); - return 0; - } -+ if (setjmp(png_jmpbuf(png_ptr))) { -+ if (png_image) { -+ for (y = 0 ; y < info_ptr->height ; y++) -+ free (png_image[y]); -+ free (png_image); -+ } -+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); -+ perror("reading file"); -+ return; -+ } - info_ptr = png_create_info_struct (png_ptr); - if (info_ptr == NULL) { - png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL); -@@ -155,9 +166,7 @@ - for (y = 0 ; y < info_ptr->height ; y++) - free (png_image[y]); - free (png_image); -- png_read_destroy (png_ptr, info_ptr, (png_info *)0); -- free (png_ptr); -- free (info_ptr); -+ png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL); - - return q; - } ---- electricsheep/client/mpeg2dec/libvo/video_out_x11.c 2005/07/20 03:03:00 1.6 -+++ electricsheep/client/mpeg2dec/libvo/video_out_x11.c 2006/06/26 19:36:49 1.7 -@@ -39,6 +39,8 @@ - #include <X11/extensions/XShm.h> - #include <inttypes.h> - #include <sys/time.h> -+#include <png.h> -+#include <setjmp.h> - - #include "vroot.h" - #include <sys/types.h> -@@ -124,8 +126,6 @@ - tv_rate = tv_end; - } - --#include <png.h> -- - static char *overlay_luma = NULL; - static char *overlay_alpha = NULL; - static int overlay_width; -@@ -165,7 +165,7 @@ - unsigned char sig_buf [SIG_CHECK_SIZE]; - png_struct *png_ptr; - png_info *info_ptr; -- png_byte **png_image; -+ png_byte **png_image = NULL; - int linesize, x, y; - unsigned char *p, *q; - -@@ -183,6 +183,16 @@ - fprintf (stderr, "cannot allocate LIBPNG structure\n"); - return; - } -+ if (setjmp(png_jmpbuf(png_ptr))) { -+ if (png_image) { -+ for (y = 0 ; y < info_ptr->height ; y++) -+ free (png_image[y]); -+ free (png_image); -+ } -+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); -+ perror("reading file"); -+ return; -+ } - info_ptr = png_create_info_struct (png_ptr); - if (info_ptr == NULL) { - png_destroy_read_struct (&png_ptr, (png_infopp)NULL, (png_infopp)NULL); -@@ -271,10 +281,7 @@ - for (y = 0 ; y < info_ptr->height ; y++) - free (png_image[y]); - free (png_image); -- png_read_destroy (png_ptr, info_ptr, (png_info *)0); -- free (png_ptr); -- free (info_ptr); -- -+ png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL); - } - - static void overlay_read_ppm(FILE *fin) -@@ -535,6 +542,8 @@ - instance->corner_x = (w - instance->width)/2; - instance->corner_y = (h - instance->height)/2; - } else if (window_id == -1) { -+ XTextProperty xname; -+ char *nm = "Electric Sheep"; - /* create a window the same size as the video */ - instance->window = - XCreateWindow (instance->display, -@@ -544,6 +553,8 @@ - InputOutput, instance->vinfo.visual, - (CWBackPixmap | CWBackingStore | CWBorderPixel | - CWEventMask | CWColormap), &attr); -+ XStringListToTextProperty(&nm, 1, &xname); -+ XSetWMName(instance->display, instance->window, &xname); - } else { - /* zoomed to fit the window specified on the command line */ - XWindowAttributes xgwa; diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.8-cflagsfix.patch b/x11-misc/electricsheep/files/electricsheep-2.6.8-cflagsfix.patch deleted file mode 100644 index d07b0d9b7a8d..000000000000 --- a/x11-misc/electricsheep/files/electricsheep-2.6.8-cflagsfix.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- electricsheep-2.6.8/mpeg2dec/configure.in.orig 2005-07-20 16:19:40.000000000 +1000 -+++ electricsheep-2.6.8/mpeg2dec/configure.in 2006-06-06 10:55:02.000000000 +1000 -@@ -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 diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.8-multihead.patch b/x11-misc/electricsheep/files/electricsheep-2.6.8-multihead.patch deleted file mode 100644 index e355f824bd8d..000000000000 --- a/x11-misc/electricsheep/files/electricsheep-2.6.8-multihead.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- electricsheep-2.6.8/electricsheep.c 2006-07-25 16:45:56.000000000 -0400 -+++ electricsheep-2.6.8-xinerama/electricsheep.c 2007-01-21 13:11:52.000000000 -0500 -@@ -2124,7 +2124,7 @@ - strcat(curl_cmd, " --show-error"); - } - -- srandom(time(0)); -+ srandom(time(0) + getpid()); - - not_playing(); - ---- electricsheep-2.6.8/mpeg2dec/libvo/video_out_x11.c 2006-06-26 15:28:08.000000000 -0400 -+++ electricsheep-2.6.8-xinerama/mpeg2dec/libvo/video_out_x11.c 2007-01-21 01:44:45.000000000 -0500 -@@ -531,14 +531,18 @@ - if (window_id == -3) { - /* display zoomed on the (virtual) root window */ - instance->window = DefaultRootWindow (instance->display); -- instance->displaywidth = DisplayWidth(instance->display, DefaultScreen (instance->display)); -- instance->displayheight = DisplayHeight(instance->display, DefaultScreen (instance->display)); -+ XWindowAttributes xgwa; -+ XGetWindowAttributes (instance->display, instance->window, &xgwa); -+ instance->displaywidth = xgwa.width; -+ instance->displayheight = xgwa.height; - } else if (window_id == -2) { - /* display non-zoomed on the (virtual) root window */ - int w, h; -- w = DisplayWidth(instance->display, DefaultScreen (instance->display)); -- h = DisplayHeight(instance->display, DefaultScreen (instance->display)); - instance->window = DefaultRootWindow (instance->display); -+ XWindowAttributes xgwa; -+ XGetWindowAttributes (instance->display, instance->window, &xgwa); -+ w = xgwa.width; -+ h = xgwa.height; - instance->corner_x = (w - instance->width)/2; - instance->corner_y = (h - instance->height)/2; - } else if (window_id == -1) { diff --git a/x11-misc/electricsheep/files/electricsheep.desktop b/x11-misc/electricsheep/files/electricsheep.desktop deleted file mode 100644 index 1ef106f22e8a..000000000000 --- a/x11-misc/electricsheep/files/electricsheep.desktop +++ /dev/null @@ -1,107 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=electricsheep -Icon=kscreensaver -Type=Application -Actions=InWindow;Root -X-KDE-Category=Fractals -X-KDE-Type=OpenGL -Name=ElectricSheep - -[Desktop Action InWindow] -Exec=electricsheep -window-id %w -Name=Display in specified window -Name[af]=Vertoon in gespesifiseer venster -Name[bg]=Стартиране в избран прозорец -Name[br]=Diskwel er prenestr spisaet -Name[bs]=Prikaži u navedenom prozoru -Name[ca]=Mostra a la finestra especificada -Name[cs]=Zobrazit v určeném okně -Name[cy]=Dangos mewn ffenestr penodol -Name[da]=Visning i angivet vindue -Name[de]=In vorgegebenem Fenster anzeigen -Name[el]=Προβολή στο καθορισμένο παράθυρο -Name[eo]=Montru en indikita fenestro -Name[es]=Mostrar en la pantalla especificada -Name[et]=Määratud aknas näitamine -Name[fi]=Näytä määrätyssä ikkunassa -Name[fo]=Vís í givin gluggi -Name[fr]=Affichage dans la fenêtre spécifiée -Name[he]=הצג בחלון המצויין -Name[hu]=Megjelenítés a megadott ablakban -Name[is]=Birta í völdum glugga -Name[it]=Mostra nella finestra specificata -Name[ja]=特定のウィンドウで表示 -Name[lv]=Rādīt norādītajā logā -Name[mt]=Uri f'window speċifika -Name[nb]=Vis i angitt vindu -Name[nl]=In een gedefinieerd venster weergeven -Name[nn]=Vis i oppgitt vindauge -Name[nso]=Bontsha kago di-window tseo di bontshitswego -Name[pl]=Wyświetl w zadanym oknie -Name[pt]=Mostrar na janela especificada -Name[pt_BR]=Mostrar em janela especificada -Name[ro]=Afişează în fereastra specificată -Name[ru]=Отображать в указанном окне -Name[sk]=Zobraziť v zadanom okne -Name[sl]=Prikaz v določenemu oknu -Name[sr]=Прикажи у задатом прозору -Name[sv]=Visa i angivet fönster -Name[th]=แสดงในหน้าต่างที่กำหนด -Name[tr]=Belirtilen pencerede göster -Name[uk]=Відобразити у вказаному вікні -Name[ven]=Sumbedzani kha windo dzo bulwaho fhedzi -Name[xh]=Bonisa kwi window ekhankanyiweyo -Name[xx]=xxDisplay in specified windowxx -Name[zh_CN]=在指定的窗口中显示 -Name[zh_TW]=在指定的視窗中顯示 -Name[zu]=Veza kwi-window ecacisiwe -NoDisplay=true - -[Desktop Action Root] -Exec=electricsheep --root 1 --zoom 1 -Name=Display in root window -Name[af]=Vertoon in root venster -Name[bg]=Стартиране в главния прозорец -Name[bs]=Prikaži u korijenskom prozoru -Name[ca]=Mostra a la finestra arrel -Name[cs]=Zobrazit na pozadí plochy -Name[cy]=Dangos mewn ffenestr gwraidd -Name[da]=Visning i root-vindue -Name[de]=In Hintergrundfenster anzeigen -Name[el]=Προβολή στο βασικό παράθυρο -Name[eo]=Montru en radika fenestro -Name[es]=Mostrar en la ventana raíz -Name[et]=Juuraknas näitamine -Name[fi]=Näytä root-ikkunassa -Name[fo]=Vís á bakgrundini -Name[fr]=Affichage dans la fenêtre racine -Name[he]=הצג בחלון השורש -Name[hu]=Megjelenítés a gyökérablakban -Name[is]=Birta í bakgrunni skjáborðs -Name[it]=Mostra sullo sfondo -Name[ja]=ルートウィンドウで表示 -Name[lv]=Rādīt saknes logā -Name[mt]=Uri fuq l-isfond -Name[nb]=Vis i root-vindu -Name[nl]=In hoofdvenster weergeven -Name[nn]=Vis i rotvindauget -Name[nso]=Bontsha kago window ya modu -Name[pl]=Wyświetl w oknie pierwotnym -Name[pt]=Mostrar na janela de fundo -Name[pt_BR]=Mostrar na janela-raiz -Name[ru]=Отображать в корневом окне -Name[sk]=Zobraziť v koreňovom okne -Name[sl]=Prikaz v korenskem oknu -Name[sr]=Прикажи у главном (root) прозору -Name[sv]=Visa i rotfönstret -Name[th]=แสดงในหน้าต่างหลัก -Name[tr]=Kök pencerede göster -Name[uk]=Відобразити на тлі екрана -Name[ven]=Sumbedzani kha windo ya mudzi -Name[xh]=Bonisa kwingcambu ye window -Name[xx]=xxDisplay in root windowxx -Name[zh_CN]=在根窗口中显示 -Name[zh_TW]=在根視窗中顯示 -Name[zu]=Veza kwimpande ye-window -NoDisplay=true |