[oe-commits] org.oe.dev merge of '4bbce1b1f23b34445cc85ab8c7fa08737f26602a'
crofton commit
openembedded-commits at lists.openembedded.org
Fri Aug 3 17:20:33 UTC 2007
merge of '4bbce1b1f23b34445cc85ab8c7fa08737f26602a'
and '582846d2ab5b93f2ea68455a2d13d90c4ca2fe12'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 6897ab6243e36c667763f309198c961dba118378
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6897ab6243e36c667763f309198c961dba118378
Files:
1
packages/libtool/libtool-1.5.24
packages/libtool/libtool-1.5.24/autotools.patch
packages/libtool/libtool-1.5.24/install-path-check.patch
packages/libtool/libtool-1.5.24/libdir-la.patch
packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch
packages/libtool/libtool-1.5.24/prefix.patch
packages/libtool/libtool-1.5.24/tag.patch
packages/libtool/libtool-1.5.24/tag1.patch
packages/libtool/libtool-1.5.24/uclibc.patch
packages/libtool/libtool-cross_1.5.24.bb
packages/libtool/libtool-native_1.5.24.bb
packages/libtool/libtool_1.5.24.bb
packages/lsof/lsof_4.77.bb
packages/lsof/lsof_4.78.bb
packages/psplash/files/fic-gta01
packages/psplash/files/configurability.patch
packages/psplash/files/fic-gta01/psplash-bar-img.h
packages/psplash/files/fic-gta01/psplash-hand-img.h
packages/psplash/psplash_svn.bb
packages/tasks/task-openmoko.bb
Diffs:
#
# mt diff -r4bbce1b1f23b34445cc85ab8c7fa08737f26602a -r6897ab6243e36c667763f309198c961dba118378
#
#
#
# add_dir "packages/libtool/libtool-1.5.24"
#
# add_file "packages/libtool/libtool-1.5.24/autotools.patch"
# content [0bdcb8d07a1b7084551fcd631089b69e4e22ce7b]
#
# add_file "packages/libtool/libtool-1.5.24/install-path-check.patch"
# content [4089d7b0164ca9d91e007bbf673998c4f9895e78]
#
# add_file "packages/libtool/libtool-1.5.24/libdir-la.patch"
# content [ee21cc70eb11182a9dfd74e74ee16f49f597480b]
#
# add_file "packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch"
# content [5d0a3a8d792d3cb959e1011de6ac1faf5badc74b]
#
# add_file "packages/libtool/libtool-1.5.24/prefix.patch"
# content [53c76f2e8648b5c01ff70412733188edc14b2348]
#
# add_file "packages/libtool/libtool-1.5.24/tag.patch"
# content [01bffeea01b729891b9c2f28312779438f264007]
#
# add_file "packages/libtool/libtool-1.5.24/tag1.patch"
# content [1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b]
#
# add_file "packages/libtool/libtool-1.5.24/uclibc.patch"
# content [619de2dd82aee33cef8c4c31831c88e8beac4688]
#
# add_file "packages/libtool/libtool-cross_1.5.24.bb"
# content [34200c17a03fc06dac7b8aafb40ed9f470813ac1]
#
# add_file "packages/libtool/libtool-native_1.5.24.bb"
# content [ce5d46716493d32c4426e47b7af6630ecd852160]
#
# add_file "packages/libtool/libtool_1.5.24.bb"
# content [03734fc19f12b14137a60a7931de6638b49fdbae]
#
============================================================
--- packages/libtool/libtool-1.5.24/autotools.patch 0bdcb8d07a1b7084551fcd631089b69e4e22ce7b
+++ packages/libtool/libtool-1.5.24/autotools.patch 0bdcb8d07a1b7084551fcd631089b69e4e22ce7b
@@ -0,0 +1,127 @@
+diff -urNd -urNd libtool-1.5/cdemo/configure.ac libtool-1.5.ac/cdemo/configure.ac
+--- libtool-1.5/cdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/cdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([cdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([main.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/demo/configure.ac libtool-1.5.ac/demo/configure.ac
+--- libtool-1.5/demo/configure.ac 2002-03-02 22:19:55.000000000 -0500
++++ libtool-1.5.ac/demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([demo], [1.0], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([hello.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/demo/Makefile.am libtool-1.5.ac/demo/Makefile.am
+--- libtool-1.5/demo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
++++ libtool-1.5.ac/demo/Makefile.am 2004-05-05 17:17:34.000000000 -0400
+@@ -121,17 +121,16 @@
+
+ # This is one of the essential tests for deplibs_check_method=pass_all.
+ # If this one passes with pass_all, it is likely that pass_all works
+-EXTRA_LIBRARIES = libhell0.a
+-libhell0_a_SOURCES = hello.c foo.c
+-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
++EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
++libhell0_la_SOURCES = hello.c foo.c
+ libhell1_la_SOURCES = hell1.c
+ libhell1_la_LIBADD = -L. -lhell0
+ libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell1_la_DEPENDENCIES = libhell0.a
++libhell1_la_DEPENDENCIES = libhell0.la
+ libhell2_la_SOURCES = hell2.c
+ libhell2_la_LIBADD = -L. -lhell0
+ libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell2_la_DEPENDENCIES = libhell0.a
++libhell2_la_DEPENDENCIES = libhell0.la
+ EXTRA_PROGRAMS = hell0
+ hell0_SOURCES = main.c
+ hell0_LDADD = libhell1.la libhell2.la $(LIBM)
+diff -urNd -urNd libtool-1.5/depdemo/configure.ac libtool-1.5.ac/depdemo/configure.ac
+--- libtool-1.5/depdemo/configure.ac 2002-10-22 15:29:28.000000000 -0400
++++ libtool-1.5.ac/depdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([depdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([main.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/f77demo/configure.ac libtool-1.5.ac/f77demo/configure.ac
+--- libtool-1.5/f77demo/configure.ac 2003-03-22 01:34:27.000000000 -0500
++++ libtool-1.5.ac/f77demo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -23,6 +23,7 @@
+ ## ------------------------ ##
+ AC_INIT([f77demo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([foof.f])dnl
++AC_CONFIG_AUX_DIR([..])
+
+ ## ------------------------ ##
+ ## Automake Initialisation. ##
+diff -urNd -urNd libtool-1.5/mdemo/configure.ac libtool-1.5.ac/mdemo/configure.ac
+--- libtool-1.5/mdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/mdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([mdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([main.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/pdemo/configure.ac libtool-1.5.ac/pdemo/configure.ac
+--- libtool-1.5/pdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/pdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([pdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([longer_file_name_hello.c])
++AC_CONFIG_AUX_DIR([..])
+
+
+ ## ------------------------ ##
+diff -urNd -urNd libtool-1.5/pdemo/Makefile.am libtool-1.5.ac/pdemo/Makefile.am
+--- libtool-1.5/pdemo/Makefile.am 2002-11-19 04:42:39.000000000 -0500
++++ libtool-1.5.ac/pdemo/Makefile.am 2004-05-05 17:17:59.000000000 -0400
+@@ -121,17 +121,16 @@
+
+ # This is one of the essential tests for deplibs_check_method=pass_all.
+ # If this one passes with pass_all, it is likely that pass_all works
+-EXTRA_LIBRARIES = libhell0.a
+-libhell0_a_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
+-EXTRA_LTLIBRARIES = libhell1.la libhell2.la
++libhell0_la_SOURCES = longer_file_name_hello.c longer_file_name_foo.c
++EXTRA_LTLIBRARIES = libhell0.la libhell1.la libhell2.la
+ libhell1_la_SOURCES = longer_file_name_hell1.c
+ libhell1_la_LIBADD = -L. -lhell0
+ libhell1_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell1_la_DEPENDENCIES = libhell0.a
++libhell1_la_DEPENDENCIES = libhell0.la
+ libhell2_la_SOURCES = longer_file_name_hell2.c
+ libhell2_la_LIBADD = -L. -lhell0
+ libhell2_la_LDFLAGS = -no-undefined -rpath $(libdir)
+-libhell2_la_DEPENDENCIES = libhell0.a
++libhell2_la_DEPENDENCIES = libhell0.la
+ EXTRA_PROGRAMS = hell0
+ hell0_SOURCES = longer_file_name_main.c
+ hell0_LDADD = libhell1.la libhell2.la $(LIBM)
+diff -urNd -urNd libtool-1.5/tagdemo/configure.ac libtool-1.5.ac/tagdemo/configure.ac
+--- libtool-1.5/tagdemo/configure.ac 2001-10-06 11:35:17.000000000 -0400
++++ libtool-1.5.ac/tagdemo/configure.ac 2004-05-05 17:16:17.000000000 -0400
+@@ -24,6 +24,7 @@
+ ## ------------------------ ##
+ AC_INIT([tagdemo], [0.1], [bug-libtool at gnu.org])
+ AC_CONFIG_SRCDIR([foo.cpp])
++AC_CONFIG_AUX_DIR([..])
+
+ AC_CANONICAL_TARGET
+
============================================================
--- packages/libtool/libtool-1.5.24/install-path-check.patch 4089d7b0164ca9d91e007bbf673998c4f9895e78
+++ packages/libtool/libtool-1.5.24/install-path-check.patch 4089d7b0164ca9d91e007bbf673998c4f9895e78
@@ -0,0 +1,25 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libtool-1.5.6/ltmain.in~install-path-check 2004-05-14 22:56:19.000000000 -0500
++++ libtool-1.5.6/ltmain.in 2004-05-14 22:57:48.000000000 -0500
+@@ -5503,10 +5503,13 @@
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+- if test "$inst_prefix_dir" = "$destdir"; then
+- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit $EXIT_FAILURE
+- fi
++ #
++ # This breaks install into our staging area. -PB
++ #
++ # if test "$inst_prefix_dir" = "$destdir"; then
++ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++ # exit $EXIT_FAILURE
++ # fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
============================================================
--- packages/libtool/libtool-1.5.24/libdir-la.patch ee21cc70eb11182a9dfd74e74ee16f49f597480b
+++ packages/libtool/libtool-1.5.24/libdir-la.patch ee21cc70eb11182a9dfd74e74ee16f49f597480b
@@ -0,0 +1,52 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600
++++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500
+@@ -2147,8 +2147,14 @@
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+- dir="$libdir"
+- absdir="$libdir"
++ # Adding 'libdir' from the .la file to our library search paths
++ # breaks crosscompilation horribly. We cheat here and don't add
++ # it, instead adding the path where we found the .la. -CL
++ dir="$abs_ladir"
++ absdir="$abs_ladir"
++ libdir="$abs_ladir"
++ #dir="$libdir"
++ #absdir="$libdir"
+ fi
+ else
+ dir="$ladir/$objdir"
+@@ -2615,6 +2621,16 @@
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+ path="$absdir/$objdir"
++# This interferes with crosscompilation. -CL
++# else
++# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++# if test -z "$libdir"; then
++# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
++# exit 1
++# fi
++# if test "$absdir" != "$libdir"; then
++# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++# fi
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+@@ -5165,6 +5181,10 @@
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
++ # Replacing uninstalled with installed can easily break crosscompilation,
++ # since the installed path is generally the wrong architecture. -CL
++ newdependency_libs="$newdependency_libs $deplib"
++ continue
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
============================================================
--- packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch 5d0a3a8d792d3cb959e1011de6ac1faf5badc74b
+++ packages/libtool/libtool-1.5.24/never-ever-do-rpath.patch 5d0a3a8d792d3cb959e1011de6ac1faf5badc74b
@@ -0,0 +1,32 @@
+Well, brute force to disable rpath.
+
+Only
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++#hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+
+should be necessary....
+
+Index: libtool-1.5.10/libtool.m4
+===================================================================
+--- libtool-1.5.10.orig/libtool.m4 2007-05-27 23:31:51.000000000 +0200
++++ libtool-1.5.10/libtool.m4 2007-05-27 23:50:26.000000000 +0200
+@@ -4244,16 +4244,16 @@
+ hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+
+ # Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++hardcode_into_libs=no
+
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++hardcode_libdir_flag_spec=
+
+ # If ld is used when linking, flag to hardcode \$libdir into
+ # a binary during linking. This must work even if \$libdir does
+ # not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++hardcode_libdir_flag_spec_ld=
+
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
============================================================
--- packages/libtool/libtool-1.5.24/prefix.patch 53c76f2e8648b5c01ff70412733188edc14b2348
+++ packages/libtool/libtool-1.5.24/prefix.patch 53c76f2e8648b5c01ff70412733188edc14b2348
@@ -0,0 +1,44 @@
+diff -aur libtool-1.5.22.orig/libtool.m4 libtool-1.5.22/libtool.m4
+--- libtool-1.5.22.orig/libtool.m4 2005-12-18 16:53:17.000000000 -0500
++++ libtool-1.5.22/libtool.m4 2007-05-05 15:47:41.000000000 -0400
+@@ -67,7 +67,8 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) $(top_builddir)'
++LIBTOOL="$LIBTOOL/$host_alias-libtool"
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+@@ -134,7 +135,7 @@
+ rm="rm -f"
+
+ # Global variables:
+-default_ofile=libtool
++default_ofile=${host_alias}-libtool
+ can_build_shared=yes
+
+ # All known linkers require a `.a' archive for static linking (except MSVC,
+Only in libtool-1.5.22: libtool.m4.orig
+diff -aur libtool-1.5.22.orig/Makefile.am libtool-1.5.22/Makefile.am
+--- libtool-1.5.22.orig/Makefile.am 2005-08-12 13:21:09.000000000 -0400
++++ libtool-1.5.22/Makefile.am 2007-05-05 15:49:25.000000000 -0400
+@@ -30,7 +30,7 @@
+ aclocal_DATA = $(aclocal_macros)
+
+ # The standalone libtool script, and the libtool distributor.
+-bin_SCRIPTS = libtool libtoolize
++bin_SCRIPTS = $(host_alias)-libtool libtoolize
+
+ ## These are installed as a subdirectory of pkgdatadir so that
+ ## libtoolize --ltdl can find them later:
+@@ -55,7 +55,7 @@
+ libltdl/configure \
+ libltdl/config-h.in
+
+-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
++$(host_alias)-libtool: $(srcdir)/ltmain.sh $(top_builddir)/configure.ac
+ $(SHELL) $(top_builddir)/config.status --recheck
+ chmod +x $@
+
============================================================
--- packages/libtool/libtool-1.5.24/tag.patch 01bffeea01b729891b9c2f28312779438f264007
+++ packages/libtool/libtool-1.5.24/tag.patch 01bffeea01b729891b9c2f28312779438f264007
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- libtool-1.5.6/ltmain.in~tag 2004-05-15 05:14:32.000000000 -0400
++++ libtool-1.5.6/ltmain.in 2004-05-15 05:18:01.000000000 -0400
+@@ -226,8 +226,9 @@
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit $EXIT_FAILURE
++ $echo "$modename: defaulting to \`CC'"
++ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
++# exit $EXIT_FAILURE
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
============================================================
--- packages/libtool/libtool-1.5.24/tag1.patch 1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b
+++ packages/libtool/libtool-1.5.24/tag1.patch 1f5908bde1ad558ae2c7229ec733edcf4f2a6d9b
@@ -0,0 +1,13 @@
+Index: libtool-1.5.10/libltdl/ltmain.sh
+===================================================================
+--- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100
++++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100
+@@ -232,7 +232,7 @@
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+ $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit $EXIT_FAILURE
++# exit $EXIT_FAILURE
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
============================================================
--- packages/libtool/libtool-1.5.24/uclibc.patch 619de2dd82aee33cef8c4c31831c88e8beac4688
+++ packages/libtool/libtool-1.5.24/uclibc.patch 619de2dd82aee33cef8c4c31831c88e8beac4688
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libtool-1.5.8/libtool.m4~uclibc
++++ libtool-1.5.8/libtool.m4
+@@ -2221,6 +2221,11 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++linux-uclibc*)
++ lt_cv_deplibs_check_method=pass_all
++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++ ;;
++
+ netbsd*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
============================================================
--%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r582846d2ab5b93f2ea68455a2d13d90c4ca2fe12 -r6897ab6243e36c667763f309198c961dba118378
#
#
#
# rename "packages/lsof/lsof_4.77.bb"
# to "packages/lsof/lsof_4.78.bb"
#
# add_dir "packages/psplash/files/fic-gta01"
#
# add_file "packages/psplash/files/configurability.patch"
# content [62ed2328f8bd83a1609058709ddf254ee396d33d]
#
# add_file "packages/psplash/files/fic-gta01/psplash-bar-img.h"
# content [a5a1e99a9370f213300b5cbe8050a3348618fd62]
#
# add_file "packages/psplash/files/fic-gta01/psplash-hand-img.h"
# content [25a42f01e78dbfcd0ceb7f5b3bb71cf0a0d8f0e2]
#
# patch "packages/lsof/lsof_4.78.bb"
# from [d83ffc12ec468935a31c8aa0c42efa67310e90ac]
# to [640af5049a67188f7b6dc3cf7e6d8f5278cbf90c]
#
# patch "packages/psplash/psplash_svn.bb"
# from [8d16d46a864427dd7047c62819b842812bb29747]
# to [f04098f3adc195f405ebb9fd80276fb254aff8de]
#
# patch "packages/tasks/task-openmoko.bb"
# from [05641f0d6e74840050984ae4d28d5508734476f3]
# to [d268c3cc077fe92e490a25cbde7cac22df2d2334]
#
============================================================
--- packages/psplash/files/configurability.patch 62ed2328f8bd83a1609058709ddf254ee396d33d
+++ packages/psplash/files/configurability.patch 62ed2328f8bd83a1609058709ddf254ee396d33d
@@ -0,0 +1,292 @@
+Index: psplash/psplash.c
+===================================================================
+--- psplash.orig/psplash.c
++++ psplash/psplash.c
+@@ -44,17 +44,17 @@ psplash_draw_msg (PSplashFB *fb, const c
+
+ /* Clear */
+
+- psplash_fb_draw_rect (fb,
+- 0,
+- fb->height - (fb->height/6) - h,
++ psplash_fb_draw_rect (fb,
++ 0,
++ fb->height - (fb->height/PSPLASH_TEXT_DIVIDER) - h,
+ fb->width,
+ h,
+- 0xec, 0xec, 0xe1);
++ PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+
+ psplash_fb_draw_text (fb,
+- (fb->width-w)/2,
+- fb->height - (fb->height/6) - h,
+- 0x6d, 0x6d, 0x70,
++ (fb->width-w)/2,
++ fb->height - (fb->height/PSPLASH_TEXT_DIVIDER) - h,
++ PSPLASH_TEXT_COLOR_R, PSPLASH_TEXT_COLOR_G, PSPLASH_TEXT_COLOR_B,
+ &radeon_font,
+ msg);
+ }
+@@ -66,36 +66,36 @@ psplash_draw_progress (PSplashFB *fb, in
+
+ /* 4 pix border */
+ x = ((fb->width - BAR_IMG_WIDTH)/2) + 4 ;
+- y = fb->height - (fb->height/6) + 4;
+- width = BAR_IMG_WIDTH - 8;
++ y = fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER) + 4;
++ width = BAR_IMG_WIDTH - 8;
+ height = BAR_IMG_HEIGHT - 8;
+
+ if (value > 0)
+ {
+ barwidth = (CLAMP(value,0,100) * width) / 100;
+- psplash_fb_draw_rect (fb, x + barwidth, y,
++ psplash_fb_draw_rect (fb, x + barwidth, y,
+ width - barwidth, height,
+- 0xec, 0xec, 0xe1);
++ PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+ psplash_fb_draw_rect (fb, x, y, barwidth,
+- height, 0x6d, 0x6d, 0x70);
++ height, PSPLASH_PROGRESS_COLOR_R, PSPLASH_PROGRESS_COLOR_G, PSPLASH_PROGRESS_COLOR_B);
+ }
+ else
+ {
+ barwidth = (CLAMP(-value,0,100) * width) / 100;
+- psplash_fb_draw_rect (fb, x, y,
++ psplash_fb_draw_rect (fb, x, y,
+ width - barwidth, height,
+- 0xec, 0xec, 0xe1);
++ PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+ psplash_fb_draw_rect (fb, x + width - barwidth,
+ y, barwidth, height,
+- 0x6d, 0x6d, 0x70);
++ PSPLASH_PROGRESS_COLOR_R, PSPLASH_PROGRESS_COLOR_G, PSPLASH_PROGRESS_COLOR_B);
+ }
+
+- DBG("value: %i, width: %i, barwidth :%i\n", value,
++ DBG("value: %i, width: %i, barwidth :%i\n", value,
+ width, barwidth);
+ }
+
+-static int
+-parse_command (PSplashFB *fb, char *string, int length)
++static int
++parse_command (PSplashFB *fb, char *string, int length)
+ {
+ char *command;
+ int parsed=0;
+@@ -103,21 +103,21 @@ parse_command (PSplashFB *fb, char *stri
+ parsed = strlen(string)+1;
+
+ DBG("got cmd %s", string);
+-
++
+ if (strcmp(string,"QUIT") == 0)
+ return 1;
+
+ command = strtok(string," ");
+
+- if (!strcmp(command,"PROGRESS"))
++ if (!strcmp(command,"PROGRESS"))
+ {
+ psplash_draw_progress (fb, atoi(strtok(NULL,"\0")));
+- }
+- else if (!strcmp(command,"MSG"))
++ }
++ else if (!strcmp(command,"MSG"))
+ {
+ psplash_draw_msg (fb, strtok(NULL,"\0"));
+- }
+- else if (!strcmp(command,"QUIT"))
++ }
++ else if (!strcmp(command,"QUIT"))
+ {
+ return 1;
+ }
+@@ -125,8 +125,8 @@ parse_command (PSplashFB *fb, char *stri
+ return 0;
+ }
+
+-void
+-psplash_main (PSplashFB *fb, int pipe_fd, int timeout)
++void
++psplash_main (PSplashFB *fb, int pipe_fd, int timeout)
+ {
+ int err;
+ ssize_t length = 0;
+@@ -143,14 +143,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+
+ end = command;
+
+- while (1)
++ while (1)
+ {
+- if (timeout != 0)
++ if (timeout != 0)
+ err = select(pipe_fd+1, &descriptors, NULL, NULL, &tv);
+ else
+ err = select(pipe_fd+1, &descriptors, NULL, NULL, NULL);
+-
+- if (err <= 0)
++
++ if (err <= 0)
+ {
+ /*
+ if (errno == EINTR)
+@@ -158,29 +158,29 @@ psplash_main (PSplashFB *fb, int pipe_fd
+ */
+ return;
+ }
+-
++
+ length += read (pipe_fd, end, sizeof(command) - (end - command));
+
+- if (length == 0)
++ if (length == 0)
+ {
+ /* Reopen to see if there's anything more for us */
+ close(pipe_fd);
+ pipe_fd = open(PSPLASH_FIFO,O_RDONLY|O_NONBLOCK);
+ goto out;
+ }
+-
+- if (command[length-1] == '\0')
++
++ if (command[length-1] == '\0')
+ {
+- if (parse_command(fb, command, strlen(command)))
++ if (parse_command(fb, command, strlen(command)))
+ return;
+ length = 0;
+- }
++ }
+ out:
+ end = &command[length];
+-
++
+ tv.tv_sec = timeout;
+ tv.tv_usec = 0;
+-
++
+ FD_ZERO(&descriptors);
+ FD_SET(pipe_fd,&descriptors);
+ }
+@@ -188,14 +188,14 @@ psplash_main (PSplashFB *fb, int pipe_fd
+ return;
+ }
+
+-int
+-main (int argc, char** argv)
++int
++main (int argc, char** argv)
+ {
+ char *tmpdir;
+ int pipe_fd, i = 0, angle = 0;
+ PSplashFB *fb;
+ bool disable_console_switch = FALSE;
+-
++
+ signal(SIGHUP, psplash_exit);
+ signal(SIGINT, psplash_exit);
+ signal(SIGQUIT, psplash_exit);
+@@ -214,10 +214,10 @@ main (int argc, char** argv)
+ angle = atoi(argv[i]);
+ continue;
+ }
+-
++
+ fail:
+- fprintf(stderr,
+- "Usage: %s [-n|--no-console-switch][-a|--angle <0|90|180|270>]\n",
++ fprintf(stderr,
++ "Usage: %s [-n|--no-console-switch][-a|--angle <0|90|180|270>]\n",
+ argv[0]);
+ exit(-1);
+ }
+@@ -231,7 +231,7 @@ main (int argc, char** argv)
+
+ if (mkfifo(PSPLASH_FIFO, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP))
+ {
+- if (errno!=EEXIST)
++ if (errno!=EEXIST)
+ {
+ perror("mkfifo");
+ exit(-1);
+@@ -239,8 +239,8 @@ main (int argc, char** argv)
+ }
+
+ pipe_fd = open (PSPLASH_FIFO,O_RDONLY|O_NONBLOCK);
+-
+- if (pipe_fd==-1)
++
++ if (pipe_fd==-1)
+ {
+ perror("pipe open");
+ exit(-2);
+@@ -252,30 +252,30 @@ main (int argc, char** argv)
+ if ((fb = psplash_fb_new(angle)) == NULL)
+ exit(-1);
+
+- /* Clear the background with #ecece1 */
+- psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, 0xec, 0xec, 0xe1);
++ /* Clear the background */
++ psplash_fb_draw_rect (fb, 0, 0, fb->width, fb->height, PSPLASH_BACKGROUND_COLOR_R, PSPLASH_BACKGROUND_COLOR_G, PSPLASH_BACKGROUND_COLOR_B);
+
+ /* Draw the OH logo */
+- psplash_fb_draw_image (fb,
+- (fb->width - HAND_IMG_WIDTH)/2,
+- (fb->height - HAND_IMG_HEIGHT)/2,
++ psplash_fb_draw_image (fb,
++ (fb->width - HAND_IMG_WIDTH)/2,
++ (fb->height - HAND_IMG_HEIGHT)/2,
+ HAND_IMG_WIDTH,
+ HAND_IMG_HEIGHT,
+ HAND_IMG_BYTES_PER_PIXEL,
+ HAND_IMG_RLE_PIXEL_DATA);
+
+ /* Draw progress bar border */
+- psplash_fb_draw_image (fb,
+- (fb->width - BAR_IMG_WIDTH)/2,
+- fb->height - (fb->height/6),
++ psplash_fb_draw_image (fb,
++ (fb->width - BAR_IMG_WIDTH)/2,
++ fb->height - (fb->height/PSPLASH_PROGRESS_DIVIDER),
+ BAR_IMG_WIDTH,
+ BAR_IMG_HEIGHT,
+ BAR_IMG_BYTES_PER_PIXEL,
+ BAR_IMG_RLE_PIXEL_DATA);
+
+- psplash_draw_progress (fb, 0);
++ psplash_draw_progress (fb, 0); /* draw initial progress */
+
+- psplash_draw_msg (fb, MSG);
++ if (strlen(MSG)) psplash_draw_msg (fb, MSG);
+
+ psplash_main (fb, pipe_fd, 0);
+
+Index: psplash/psplash.h
+===================================================================
+--- psplash.orig/psplash.h
++++ psplash/psplash.h
+@@ -54,6 +54,21 @@ typedef int bool;
+ #define TRUE 1
+ #endif
+
++#define PSPLASH_BACKGROUND_COLOR_R 0x00
++#define PSPLASH_BACKGROUND_COLOR_G 0x00
++#define PSPLASH_BACKGROUND_COLOR_B 0x00
++
++#define PSPLASH_PROGRESS_COLOR_R 0xe3
++#define PSPLASH_PROGRESS_COLOR_G 0x71
++#define PSPLASH_PROGRESS_COLOR_B 0x00
++
++#define PSPLASH_TEXT_COLOR_R 0xff
++#define PSPLASH_TEXT_COLOR_G 0xff
++#define PSPLASH_TEXT_COLOR_B 0xff
++
++#define PSPLASH_PROGRESS_DIVIDER 3
++#define PSPLASH_TEXT_DIVIDER 3
++
+ #define PSPLASH_FIFO "psplash_fifo"
+
+ #define CLAMP(x, low, high) \
============================================================
--- packages/psplash/files/fic-gta01/psplash-bar-img.h a5a1e99a9370f213300b5cbe8050a3348618fd62
+++ packages/psplash/files/fic-gta01/psplash-bar-img.h a5a1e99a9370f213300b5cbe8050a3348618fd62
@@ -0,0 +1,35 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#define BAR_IMG_ROWSTRIDE (920)
+#define BAR_IMG_WIDTH (230)
+#define BAR_IMG_HEIGHT (28)
+#define BAR_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define BAR_IMG_RLE_PIXEL_DATA ((uint8*) \
+ "\203\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377\377h" \
+ "lp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310\377\205" \
+ "\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250\377" \
+ "\203\0\0\0\377\1\260\260\250\377\377hlp\377\343hlp\377\4\260\260\250" \
+ "\377\0\0\0\377\345\345\337\377ppp\377\377hlp\377\343hlp\377\3ppp\377" \
+ "\220\220\212\377\240\244\240\377\203hlp\377\377\0\0\0\377\337\0\0\0\377" \
+ "\203hlp\377\2\240\244\240\377\210\210\210\377\203hlp\377\377\0\0\0\377" \
+ "\337\0\0\0\377\203hlp\377\2\210\210\210\377ppp\377\203hlp\377\377\0\0" \
+ "\0\377\337\0\0\0\377\203hlp\377\1ppp\377\204hlp\377\377\0\0\0\377\337" \
+ "\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0" \
+ "\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377" \
+ "\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210" \
+ "hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0" \
+ "\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377" \
+ "\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210hlp\377\377" \
+ "\0\0\0\377\337\0\0\0\377\210hlp\377\377\0\0\0\377\337\0\0\0\377\210h" \
+ "lp\377\377\0\0\0\377\337\0\0\0\377\204hlp\377\1ppp\377\203hlp\377\377" \
+ "\0\0\0\377\337\0\0\0\377\203hlp\377\2ppp\377\210\210\210\377\203hlp\377" \
+ "\377\0\0\0\377\337\0\0\0\377\203hlp\377\2\210\210\210\377\240\244\240" \
+ "\377\203hlp\377\377\0\0\0\377\337\0\0\0\377\203hlp\377\3\240\244\240" \
+ "\377\220\220\212\377ppp\377\377hlp\377\343hlp\377\4ppp\377\220\220\212" \
+ "\377\0\0\0\377\260\260\250\377\377hlp\377\343hlp\377\1\260\260\250\377" \
+ "\203\0\0\0\377\1\260\260\250\377\377hlp\377\341hlp\377\1\260\260\250" \
+ "\377\205\0\0\0\377\3\320\324\310\377\230\234\230\377\200\200\200\377" \
+ "\377hlp\377\333hlp\377\3\200\200\200\377\230\234\230\377\320\324\310" \
+ "\377\203\0\0\0\377")
+
+
============================================================
--- packages/psplash/files/fic-gta01/psplash-hand-img.h 25a42f01e78dbfcd0ceb7f5b3bb71cf0a0d8f0e2
+++ packages/psplash/files/fic-gta01/psplash-hand-img.h 25a42f01e78dbfcd0ceb7f5b3bb71cf0a0d8f0e2
@@ -0,0 +1,5377 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#define HAND_IMG_ROWSTRIDE (1920)
+#define HAND_IMG_WIDTH (480)
+#define HAND_IMG_HEIGHT (640)
+#define HAND_IMG_BYTES_PER_PIXEL (4) /* 3:RGB, 4:RGBA */
+#define HAND_IMG_RLE_PIXEL_DATA ((uint8*) \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377\377\0\0\0\377" \
+ "\377\0%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list