From 0f9d6fa4099d4ee7e02c170f6d6d19dbfa2a93f4 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Feb 2009 15:19:46 +0100
Subject: ogre-egl: fix packaging

---
 packages/ogre/ogre-egl_svn.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/ogre/ogre-egl_svn.bb b/packages/ogre/ogre-egl_svn.bb
index 8cecf56a7d..61d2429945 100644
--- a/packages/ogre/ogre-egl_svn.bb
+++ b/packages/ogre/ogre-egl_svn.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-orien
 LICENSE = "LGPL"
 DEPENDS = "zziplib boost freeimage freetype virtual/libx11 virtual/egl"
 
+PR = "r1"
+
 SRCREV = "8310"
 PV = "1.6.1+svnr${SRCREV}"
 
@@ -25,5 +27,5 @@ do_configure_prepend() {
 
 FILES_${PN}-dbg += "${libdir}/OGRE/.debug"
 FILES_${PN}-dev += "${libdir}/OGRE/*.la"
-FILES_${PN} += "${libdir}/OGRE/*.so"
+FILES_${PN} += "${libdir}/libOgreMain-*.so ${libdir}/OGRE/*.so"
 
-- 
cgit v1.2.3


From c4191523521757d878671b5eb3bcaf474f608ad3 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Feb 2009 15:20:06 +0100
Subject: webkit-gtk: switch to libsoup backend (segfaults are gone) to get
 cookies working with midori * runtime tested on beagleboard

---
 packages/webkit/webkit-gtk/GNUmakefile.am |  14 +-
 packages/webkit/webkit-gtk/acinclude.m4   | 359 ------------------------------
 packages/webkit/webkit-gtk/autogen.sh     |  10 +-
 packages/webkit/webkit-gtk/configure.ac   | 160 +++----------
 packages/webkit/webkit-gtk_svn.bb         |  10 +-
 5 files changed, 49 insertions(+), 504 deletions(-)

(limited to 'packages')

diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am
index 7aec061bd2..c74e1fa428 100644
--- a/packages/webkit/webkit-gtk/GNUmakefile.am
+++ b/packages/webkit/webkit-gtk/GNUmakefile.am
@@ -77,7 +77,7 @@ no_undefined = -no-undefined
 endif
 
 if OS_GNU
-version_script = -Wl,--version-script,$(srcdir)/symbols.filter
+version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
 endif
 
 # Shared libraries
@@ -121,7 +121,7 @@ libJavaScriptCore_la_SOURCES = \
 
 libJavaScriptCore_la_LIBADD = \
 	$(UNICODE_LIBS) \
-	$(GLOBALDEPS_LIBS) \
+	$(GLIB_LIBS) \
 	-lpthread
 
 libJavaScriptCore_la_CXXFLAGS = \
@@ -132,7 +132,7 @@ libJavaScriptCore_la_CFLAGS = \
 	-fstrict-aliasing \
 	-O3 \
 	$(global_cflags) \
-	$(GLOBALDEPS_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(UNICODE_CFLAGS)
 
 libJavaScriptCore_la_CPPFLAGS = \
@@ -167,7 +167,7 @@ libWebCore_la_CXXFLAGS = \
 libWebCore_la_CFLAGS = \
 	-fno-strict-aliasing \
 	$(global_cflags) \
-	$(GLOBALDEPS_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(UNICODE_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(CAIRO_CFLAGS) \
@@ -181,7 +181,8 @@ libWebCore_la_CFLAGS = \
 	$(GSTREAMER_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
-	$(HILDON_CFLAGS)
+	$(HILDON_CFLAGS) \
+	$(GEOCLUE_CFLAGS)
 
 libWebCore_la_CPPFLAGS = \
 	$(global_cppflags) \
@@ -194,7 +195,7 @@ libWebCore_la_LIBADD = \
 	libJavaScriptCore.la \
 	libWebCoreJS.la \
 	$(webcore_libadd) \
-	$(GLOBALDEPS_LIBS) \
+	$(GLIB_LIBS) \
 	$(LIBXML_LIBS) \
 	$(CAIRO_LIBS) \
 	$(PANGO_LIBS) \
@@ -210,6 +211,7 @@ libWebCore_la_LIBADD = \
 	$(HILDON_LIBS) \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
+	$(GEOCLUE_LIBS) \
 	-lpthread
 
 # WebKit
diff --git a/packages/webkit/webkit-gtk/acinclude.m4 b/packages/webkit/webkit-gtk/acinclude.m4
index 5353429010..e69de29bb2 100644
--- a/packages/webkit/webkit-gtk/acinclude.m4
+++ b/packages/webkit/webkit-gtk/acinclude.m4
@@ -1,359 +0,0 @@
-dnl dolt, a replacement for libtool
-dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org>
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-dnl
-dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
-dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
-dnl installed when running autoconf on your project.
-
-AC_DEFUN([DOLT], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-# dolt, a replacement for libtool
-# Josh Triplett <josh@freedesktop.org>
-AC_PATH_PROG(DOLT_BASH, bash)
-AC_MSG_CHECKING([if dolt supports this host])
-dolt_supported=yes
-if test x$DOLT_BASH = x; then
-    dolt_supported=no
-fi
-if test x$GCC != xyes; then
-    dolt_supported=no
-fi
-case $host in
-i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
-|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
-    pic_options='-fPIC'
-    ;;
-i?86-apple-darwin*)
-    pic_options='-fno-common'
-    ;;
-*mingw32*)
-    pic_options='-DDLL_EXPORT'
-    ;;
-*)
-    dolt_supported=no
-    ;;
-esac
-if test x$dolt_supported = xno ; then
-    AC_MSG_RESULT([no, falling back to libtool])
-    LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
-    LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
-else
-    AC_MSG_RESULT([yes, replacing libtool])
-
-dnl Start writing out doltcompile.
-    cat <<__DOLTCOMPILE__EOF__ >doltcompile
-#!$DOLT_BASH
-__DOLTCOMPILE__EOF__
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-args=("$[]@")
-for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
-    if test x"${args@<:@$arg@:>@}" = x-o ; then
-        objarg=$((arg+1))
-        break
-    fi
-done
-if test x$objarg = x ; then
-    echo 'Error: no -o on compiler command line' 1>&2
-    exit 1
-fi
-lo="${args@<:@$objarg@:>@}"
-obj="${lo%.lo}"
-if test x"$lo" = x"$obj" ; then
-    echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
-    exit 1
-fi
-objbase="${obj##*/}"
-__DOLTCOMPILE__EOF__
-
-dnl Write out shared compilation code.
-    if test x$enable_shared = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-libobjdir="${obj%$objbase}.libs"
-if test ! -d "$libobjdir" ; then
-    mkdir_out="$(mkdir "$libobjdir" 2>&1)"
-    mkdir_ret=$?
-    if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
-	echo "$mkdir_out" 1>&2
-        exit $mkdir_ret
-    fi
-fi
-pic_object="$libobjdir/$objbase.o"
-args@<:@$objarg@:>@="$pic_object"
-__DOLTCOMPILE__EOF__
-    cat <<__DOLTCOMPILE__EOF__ >>doltcompile
-"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$?
-__DOLTCOMPILE__EOF__
-    fi
-
-dnl Write out static compilation code.
-dnl Avoid duplicate compiler output if also building shared objects.
-    if test x$enable_static = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-non_pic_object="$obj.o"
-args@<:@$objarg@:>@="$non_pic_object"
-__DOLTCOMPILE__EOF__
-        if test x$enable_shared = xyes; then
-            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $?
-__DOLTCOMPILE__EOF__
-        else
-            cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-"${args@<:@@@:>@}" || exit $?
-__DOLTCOMPILE__EOF__
-        fi
-    fi
-
-dnl Write out the code to write the .lo file.
-dnl The second line of the .lo file must match "^# Generated by .*libtool"
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-{
-echo "# $lo - a libtool object file"
-echo "# Generated by doltcompile, not libtool"
-__DOLTCOMPILE__EOF__
-
-    if test x$enable_shared = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "pic_object='.libs/${objbase}.o'"
-__DOLTCOMPILE__EOF__
-    else
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo pic_object=none
-__DOLTCOMPILE__EOF__
-    fi
-
-    if test x$enable_static = xyes; then
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo "non_pic_object='${objbase}.o'"
-__DOLTCOMPILE__EOF__
-    else
-        cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-echo non_pic_object=none
-__DOLTCOMPILE__EOF__
-    fi
-
-    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
-} > "$lo"
-__DOLTCOMPILE__EOF__
-
-dnl Done writing out doltcompile; substitute it for libtool compilation.
-    chmod +x doltcompile
-    LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
-    LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
-
-dnl automake ignores LTCOMPILE and LTCXXCOMPILE when it has separate CFLAGS for
-dnl a target, so write out a libtool wrapper to handle that case.
-dnl Note that doltlibtool does not handle inferred tags or option arguments
-dnl without '=', because automake does not use them.
-    cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
-#!$DOLT_BASH
-__DOLTLIBTOOL__EOF__
-    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
-top_builddir_slash="${0%%doltlibtool}"
-: ${top_builddir_slash:=./}
-args=()
-modeok=false
-tagok=false
-for arg in "$[]@"; do
-    case "$arg" in
-        --mode=compile) modeok=true ;;
-        --tag=CC|--tag=CXX) tagok=true ;;
-        *) args@<:@${#args[@]}@:>@="$arg" ;;
-    esac
-done
-if $modeok && $tagok ; then
-    . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
-else
-    exec ${top_builddir_slash}libtool "$[]@"
-fi
-__DOLTLIBTOOL__EOF__
-
-dnl Done writing out doltlibtool; substitute it for libtool.
-    chmod +x doltlibtool
-    LIBTOOL='$(top_builddir)/doltlibtool'
-fi
-AC_SUBST(LTCOMPILE)
-AC_SUBST(LTCXXCOMPILE)
-# end dolt
-])
-
-# ===========================================================================
-#           http://autoconf-archive.cryp.to/ax_compare_version.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-#
-# DESCRIPTION
-#
-#   This macro compares two version strings. Due to the various number of
-#   minor-version numbers that can exist, and the fact that string
-#   comparisons are not compatible with numeric comparisons, this is not
-#   necessarily trivial to do in a autoconf script. This macro makes doing
-#   these comparisons easy.
-#
-#   The six basic comparisons are available, as well as checking equality
-#   limited to a certain number of minor-version levels.
-#
-#   The operator OP determines what type of comparison to do, and can be one
-#   of:
-#
-#    eq  - equal (test A == B)
-#    ne  - not equal (test A != B)
-#    le  - less than or equal (test A <= B)
-#    ge  - greater than or equal (test A >= B)
-#    lt  - less than (test A < B)
-#    gt  - greater than (test A > B)
-#
-#   Additionally, the eq and ne operator can have a number after it to limit
-#   the test to that number of minor versions.
-#
-#    eq0 - equal up to the length of the shorter version
-#    ne0 - not equal up to the length of the shorter version
-#    eqN - equal up to N sub-version levels
-#    neN - not equal up to N sub-version levels
-#
-#   When the condition is true, shell commands ACTION-IF-TRUE are run,
-#   otherwise shell commands ACTION-IF-FALSE are run. The environment
-#   variable 'ax_compare_version' is always set to either 'true' or 'false'
-#   as well.
-#
-#   Examples:
-#
-#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
-#
-#   would both be true.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
-#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
-#
-#   would both be false.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
-#
-#   would be true because it is only comparing two minor versions.
-#
-#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
-#
-#   would be true because it is only comparing the lesser number of minor
-#   versions of the two values.
-#
-#   Note: The characters that separate the version numbers do not matter. An
-#   empty string is the same as version 0. OP is evaluated by autoconf, not
-#   configure, so must be a string, not a variable.
-#
-#   The author would like to acknowledge Guido Draheim whose advice about
-#   the m4_case and m4_ifvaln functions make this macro only include the
-#   portions necessary to perform the specific comparison specified by the
-#   OP argument in the final configure script.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-dnl #########################################################################
-AC_DEFUN([AX_COMPARE_VERSION], [
-  AC_PROG_AWK
-
-  # Used to indicate true or false condition
-  ax_compare_version=false
-
-  # Convert the two version strings to be compared into a format that
-  # allows a simple string comparison.  The end result is that a version
-  # string of the form 1.12.5-r617 will be converted to the form
-  # 0001001200050617.  In other words, each number is zero padded to four
-  # digits, and non digits are removed.
-  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
-  A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
-  B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
-                     -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
-                     -e 's/[[^0-9]]//g'`
-
-  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
-  dnl # then the first line is used to determine if the condition is true.
-  dnl # The sed right after the echo is to remove any indented white space.
-  m4_case(m4_tolower($2),
-  [lt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [gt],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
-  ],
-  [le],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],
-  [ge],[
-    ax_compare_version=`echo "x$A
-x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
-  ],[
-    dnl Split the operator from the subversion count if present.
-    m4_bmatch(m4_substr($2,2),
-    [0],[
-      # A count of zero means use the length of the shorter version.
-      # Determine the number of characters in A and B.
-      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
-      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
-
-      # Set A to no more than B's length and B to no more than A's length.
-      A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
-    ],
-    [[0-9]+],[
-      # A count greater than zero means use only that many subversions
-      A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-      B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
-    ],
-    [.+],[
-      AC_WARNING(
-        [illegal OP numeric parameter: $2])
-    ],[])
-
-    # Pad zeros at end of numbers to make same length.
-    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
-    B="$B`echo $A | sed 's/./0/g'`"
-    A="$ax_compare_version_tmp_A"
-
-    # Check for equality or inequality as necessary.
-    m4_case(m4_tolower(m4_substr($2,0,2)),
-    [eq],[
-      test "x$A" = "x$B" && ax_compare_version=true
-    ],
-    [ne],[
-      test "x$A" != "x$B" && ax_compare_version=true
-    ],[
-      AC_WARNING([illegal OP parameter: $2])
-    ])
-  ])
-
-  AS_VAR_POPDEF([A])dnl
-  AS_VAR_POPDEF([B])dnl
-
-  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
-  if test "$ax_compare_version" = "true" ; then
-    m4_ifvaln([$4],[$4],[:])dnl
-    m4_ifvaln([$5],[else $5])dnl
-  fi
-]) dnl AX_COMPARE_VERSION
diff --git a/packages/webkit/webkit-gtk/autogen.sh b/packages/webkit/webkit-gtk/autogen.sh
index a929538d20..f87238cf92 100644
--- a/packages/webkit/webkit-gtk/autogen.sh
+++ b/packages/webkit/webkit-gtk/autogen.sh
@@ -8,6 +8,10 @@ test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd $srcdir
 
+LIBTOOLIZE_FLAGS="--force --automake"
+ACLOCAL_FLAGS="-I autotools"
+AUTOMAKE_FLAGS="--foreign --add-missing"
+
 DIE=0
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
@@ -46,10 +50,10 @@ rm -rf $top_srcdir/autom4te.cache
 
 touch README INSTALL
 
-aclocal || exit $?
-$LIBTOOLIZE --force || exit $?
+aclocal $ACLOCAL_FLAGS || exit $?
+$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $?
 autoheader || exit $?
-automake --foreign --add-missing || exit $?
+automake $AUTOMAKE_FLAGS || exit $?
 autoconf || exit $?
 
 cd $ORIGDIR || exit 1
diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac
index 7b451efe96..c7ed988329 100644
--- a/packages/webkit/webkit-gtk/configure.ac
+++ b/packages/webkit/webkit-gtk/configure.ac
@@ -6,6 +6,10 @@ m4_define([webkit_micro_version], [0])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
+AC_CONFIG_MACRO_DIR([autotools])
+AC_CONFIG_AUX_DIR([autotools])
+AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
+
 AC_CONFIG_HEADERS([autotoolsconfig.h])
 AC_CANONICAL_SYSTEM
 
@@ -23,10 +27,13 @@ dnl # see http://www.gnu.org/software/libtool/manual.html#Versioning
 LIBWEBKITGTK_VERSION=1:0:0
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
+# Recent libtool+automake don't assume you want C++, explicitly enable it
+AC_PROG_CXX
+
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
 
 # host checking - inspired by the GTK+ configure.in
-# TODO: os_mac, os_bsd
+# TODO: move these to webkit.m4?
 AC_MSG_CHECKING([for native Win32])
 case "$host" in
      *-*-mingw*)
@@ -59,57 +66,14 @@ case "$host_os" in
        ;;
 esac
 
-# If CXXFLAGS and CFLAGS are unset, default to empty.
-# This is to tell automake not to include '-g' if CXXFLAGS is not set
-# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler
-if test -z "$CXXFLAGS"; then
-   CXXFLAGS=""
-fi
-if test -z "$CFLAGS"; then
-   CFLAGS=""
-fi
-
-AM_PROG_CC_STDC
-AM_PROG_CC_C_O
-AC_PROG_CXX
-AC_PROG_INSTALL
+# initialize webkit options
+WEBKIT_INIT
 AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
-AC_SYS_LARGEFILE
+# use dolt to speedup the build
 DOLT
 
-# check for -fvisibility=hidden compiler support (GCC >= 4)
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden])
-AC_COMPILE_IFELSE([char foo;],
-      [ AC_MSG_RESULT([yes])
-        SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ],
-        AC_MSG_RESULT([no]))
-CFLAGS="$saved_CFLAGS"
-AC_SUBST(SYMBOL_VISIBILITY)
-AC_SUBST(SYMBOL_VISIBILITY_INLINES)
-
-AC_PATH_PROG(PERL, perl)
-if test -z "$PERL"; then
-   AC_MSG_ERROR([You need 'perl' to compile WebKit])
-fi
-
-AC_PATH_PROG(BISON, bison)
-if test -z "$BISON"; then
-   AC_MSG_ERROR([You need the 'bison' parser generator to compile WebKit])
-else
-    case "$target_cpu" in
-        arm)
-            BISON_VERSION=`$BISON --version | head -n1 | sed 's,.*\ \([0-9]*\.[0-9]*\)$,\1,'`
-            AX_COMPARE_VERSION([2.2],[gt],[$BISON_VERSION],
-                echo "Autoconf say: I'm broken, ignore me")
-        ;;
-        *) ;;
-    esac
-fi
-
 AC_PATH_PROG(FLEX, flex)
 if test -z "$FLEX"; then
    AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit])
@@ -124,34 +88,6 @@ if test -z "$GPERF"; then
    AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit])
 fi
 
-AC_PATH_PROG(MV, mv)
-if test -z "$MV"; then
-   AC_MSG_ERROR([You need 'mv' to compile WebKit])
-fi
-
-# GTK+ port only
-# Check for glib-genmarshal and glib-mkenums
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then
-   AC_MSG_ERROR([You need the GLib dev tools in your path])
-fi
-
-# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
-# doesn't exist)
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])])
-AC_LANG_POP([C++])
-
-# C/C++ Language Features
-AC_C_CONST
-AC_C_INLINE
-AC_C_VOLATILE
-
-# C/C++ Headers
-AC_HEADER_STDC
-AC_HEADER_STDBOOL
-
 # pthread (not needed on Windows)
 if test "$os_win32" = "no"; then
 AC_CHECK_HEADERS([pthread.h],
@@ -183,12 +119,6 @@ if test "$jpeg_ok" = yes; then
 fi
 AC_SUBST([JPEG_LIBS])
 
-# check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "$PKG_CONFIG" = "no"; then
-   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed in your PATH])
-fi
-
 # Check for libpng the way Gtk+ does it
 AC_MSG_CHECKING(for libpng12)
 if $PKG_CONFIG --exists libpng12 ; then
@@ -219,44 +149,6 @@ else
 fi
 AC_SUBST([PNG_LIBS])
 
-# determine the Unicode backend
-AC_MSG_CHECKING([the Unicode backend to use])
-AC_ARG_WITH(unicode_backend,
-            AC_HELP_STRING([--with-unicode-backend=@<:@icu@:>@],
-                           [Select Unicode backend [default=icu]]),
-            [],[unicode_backend="icu"])
-
-case "$unicode_backend" in
-     icu) ;;
-     *) AC_MSG_ERROR([Invalid Unicode backend: must be icu.]) ;;
-esac
-
-AC_MSG_RESULT([$unicode_backend])
-
-if test "$unicode_backend" = "icu"; then
-	AC_PATH_PROG(icu_config, icu-config, no)
-	if test "$icu_config" = "no"; then
-		if test "$os_darwin" = "yes"; then
-			UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
-			UNICODE_LIBS="-licucore"
-		elif test "$os_win32" = "yes"; then
-			UNICODE_CFLAGS=""
-			UNICODE_LIBS="-licuin -licuuc"
-		else
-			AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.])
-		fi
-	else
-		# We don't use --cflags as this gives us a lot of things that we don't
-		# necessarily want, like debugging and optimization flags
-		# See man (1) icu-config for more info.
-		UNICODE_CFLAGS=`$icu_config --cppflags`
-		UNICODE_LIBS=`$icu_config --ldflags`
-	fi
-fi
-
-AC_SUBST([UNICODE_CFLAGS])
-AC_SUBST([UNICODE_LIBS])
-
 # determine the GDK/GTK+ target
 AC_MSG_CHECKING([the target windowing system])
 AC_ARG_WITH(target,
@@ -307,9 +199,6 @@ FREETYPE2_REQUIRED_VERSION=9.0
 LIBXML_REQUIRED_VERSION=2.6
 
 # minimum GTK+ base dependencies
-GLIB_REQUIRED_VERSION=2.0
-GOBJECT_REQUIRED_VERSION=2.0
-GTHREAD_REQUIRED_VERSION=2.0
 PANGO_REQUIRED_VERSION=1.0
 GTK_REQUIRED_VERSION=2.8
 
@@ -320,13 +209,14 @@ LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
 
-PKG_CHECK_MODULES([GLOBALDEPS],
-                  [glib-2.0 >= $GLIB_REQUIRED_VERSION
-                  gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
-                  gthread-2.0 >= $GTHREAD_REQUIRED_VERSION])
-AC_SUBST([GLOBALDEPS_CFLAGS])
-AC_SUBST([GLOBALDEPS_LIBS])
-
+# Available modules
+#
+# glib - glib and includes gthread
+# unicode - check and identify which unicode backend to use
+#
+# todo: webcore gtk
+WEBKIT_CHECK_DEPENDENCIES([glib unicode])
+                          
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
@@ -456,8 +346,8 @@ AC_MSG_RESULT([$enable_xslt])
 AC_MSG_CHECKING([whether to enable geolocation support])
 AC_ARG_ENABLE(geolocation,
               AC_HELP_STRING([--enable-geolocation],
-                             [enable support for geolocation [default=yes]]),
-              [],[enable_geolocation="yes"])
+                             [enable support for geolocation [default=no]]),
+              [],[enable_geolocation="no"])
 AC_MSG_RESULT([$enable_geolocation])
 
 # check whether to enable SVG support
@@ -676,6 +566,14 @@ if test "$enable_xslt" = "yes"; then
    AC_SUBST([LIBXSLT_LIBS])
 fi
 
+# check if geoclue is available
+if test "$enable_geolocation" = "yes"; then
+    PKG_CHECK_MODULES([GEOCLUE], [geoclue])
+    AC_SUBST([GEOCLUE_CFLAGS])
+    AC_SUBST([GEOCLUE_LIBS])
+fi
+
+
 # check if gstreamer is available
 if test "$enable_video" = "yes"; then
    PKG_CHECK_MODULES([GSTREAMER],
diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb
index 96ef562e75..98926727fe 100644
--- a/packages/webkit/webkit-gtk_svn.bb
+++ b/packages/webkit/webkit-gtk_svn.bb
@@ -1,11 +1,11 @@
 DESCRIPTION = "WebKit browser engine, GTK+ edition"
-DEPENDS = "curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3"
+DEPENDS = "libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3"
 
 SRCREV_FORMAT = "webcore-rwebkit"
 
 # Yes, this is wrong...
 PV = "0.1+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -14,7 +14,7 @@ SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
   svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
-  file://acinclude.m4 \
+  svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \
   file://Makefile \
   file://Makefile.shared \
   file://autogen.sh \
@@ -29,13 +29,13 @@ inherit autotools pkgconfig lib_package
 
 export BISON="${STAGING_BINDIR_NATIVE}/bison"
 ARM_INSTRUCTION_SET = "arm"
-# FIXME: Segfaulting without --with-http-backend=curl
 EXTRA_OECONF = "\
                 --enable-debug=no \
                 --enable-svg \
                 --enable-icon-database=yes \
-		--with-http-backend=curl \
+		--with-http-backend=soup \
                "
+EXTRA_AUTORECONF = " -I autotools "
 
 # Dolt gets used on x86 and ppc and hardcodes 'libtool'
 do_configure_append() {
-- 
cgit v1.2.3


From fe5b2fc48d2b9f1f91b95048b0f4e11205e5ddae Mon Sep 17 00:00:00 2001
From: Tim 'timtim' Ellis <tim.ellis@foonas.org>
Date: Tue, 10 Feb 2009 15:01:46 +0000
Subject: perl: Add some extra perl modules (needed for zoneminder): -
 date-manip - dbd-mysql - dbi - device-serialport - email-date-format -
 html-parser - html-tagset - mime-lite - module-load - php-serialization - x10

---
 packages/perl/libdate-manip-perl-native_5.54.bb         |  5 +++++
 packages/perl/libdate-manip-perl_5.54.bb                | 14 ++++++++++++++
 packages/perl/libdbd-mysql-perl-native_4.010.bb         |  8 ++++++++
 packages/perl/libdbd-mysql-perl.inc                     | 10 ++++++++++
 packages/perl/libdbd-mysql-perl_4.010.bb                | 13 +++++++++++++
 packages/perl/libdbi-perl-native_1.607.bb               |  5 +++++
 packages/perl/libdbi-perl_1.607.bb                      | 15 +++++++++++++++
 packages/perl/libdevice-serialport-perl-native_1.04.bb  |  5 +++++
 packages/perl/libemail-date-format-perl-native_1.002.bb |  5 +++++
 packages/perl/libemail-date-format-perl_1.002.bb        | 13 +++++++++++++
 packages/perl/libhtml-parser-perl_3.60.bb               | 15 +++++++++++++++
 packages/perl/libhtml-tagset-perl_3.20.bb               | 10 ++++++++++
 packages/perl/libmime-lite-perl-native_3.024.bb         |  5 +++++
 packages/perl/libmime-lite-perl_3.024.bb                | 15 +++++++++++++++
 packages/perl/libmodule-load-perl-native_0.16.bb        |  5 +++++
 packages/perl/libmodule-load-perl_0.16.bb               | 12 ++++++++++++
 packages/perl/libphp-serialization-perl-native_0.30.bb  |  5 +++++
 packages/perl/libphp-serialization-perl_0.30.bb         | 10 ++++++++++
 packages/perl/libx10-perl-native_0.03.bb                |  5 +++++
 packages/perl/libx10-perl_0.03.bb                       | 10 ++++++++++
 20 files changed, 185 insertions(+)
 create mode 100644 packages/perl/libdate-manip-perl-native_5.54.bb
 create mode 100644 packages/perl/libdate-manip-perl_5.54.bb
 create mode 100644 packages/perl/libdbd-mysql-perl-native_4.010.bb
 create mode 100644 packages/perl/libdbd-mysql-perl.inc
 create mode 100644 packages/perl/libdbd-mysql-perl_4.010.bb
 create mode 100644 packages/perl/libdbi-perl-native_1.607.bb
 create mode 100644 packages/perl/libdbi-perl_1.607.bb
 create mode 100644 packages/perl/libdevice-serialport-perl-native_1.04.bb
 create mode 100644 packages/perl/libemail-date-format-perl-native_1.002.bb
 create mode 100644 packages/perl/libemail-date-format-perl_1.002.bb
 create mode 100644 packages/perl/libhtml-parser-perl_3.60.bb
 create mode 100644 packages/perl/libhtml-tagset-perl_3.20.bb
 create mode 100644 packages/perl/libmime-lite-perl-native_3.024.bb
 create mode 100644 packages/perl/libmime-lite-perl_3.024.bb
 create mode 100644 packages/perl/libmodule-load-perl-native_0.16.bb
 create mode 100644 packages/perl/libmodule-load-perl_0.16.bb
 create mode 100644 packages/perl/libphp-serialization-perl-native_0.30.bb
 create mode 100644 packages/perl/libphp-serialization-perl_0.30.bb
 create mode 100644 packages/perl/libx10-perl-native_0.03.bb
 create mode 100644 packages/perl/libx10-perl_0.03.bb

(limited to 'packages')

diff --git a/packages/perl/libdate-manip-perl-native_5.54.bb b/packages/perl/libdate-manip-perl-native_5.54.bb
new file mode 100644
index 0000000000..7199d9f8c5
--- /dev/null
+++ b/packages/perl/libdate-manip-perl-native_5.54.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libdate-manip-perl_${PV}.bb
diff --git a/packages/perl/libdate-manip-perl_5.54.bb b/packages/perl/libdate-manip-perl_5.54.bb
new file mode 100644
index 0000000000..9097ce39c6
--- /dev/null
+++ b/packages/perl/libdate-manip-perl_5.54.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Date and time manipulation routines."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+RDEPENDS = "perl-module-test-more \
+            perl-module-io-file \
+            perl-module-carp"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SB/SBECK/Date-Manip-${PV}.tar.gz"
+
+S = "${WORKDIR}/Date-Manip-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libdbd-mysql-perl-native_4.010.bb b/packages/perl/libdbd-mysql-perl-native_4.010.bb
new file mode 100644
index 0000000000..180d1d0b13
--- /dev/null
+++ b/packages/perl/libdbd-mysql-perl-native_4.010.bb
@@ -0,0 +1,8 @@
+require libdbd-mysql-perl.inc
+
+DEPENDS = "libdbi-perl-native mysql-native"
+
+EXTRA_OECONF = "    --mysql_config=${STAGING_BINDIR_NATIVE}"
+
+inherit native
+
diff --git a/packages/perl/libdbd-mysql-perl.inc b/packages/perl/libdbd-mysql-perl.inc
new file mode 100644
index 0000000000..6200c2844a
--- /dev/null
+++ b/packages/perl/libdbd-mysql-perl.inc
@@ -0,0 +1,10 @@
+DESCRIPTION = "The database interface driver for the MySQL database."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/DBD-mysql-${PV}.tar.gz"
+
+S = "${WORKDIR}/DBD-mysql-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libdbd-mysql-perl_4.010.bb b/packages/perl/libdbd-mysql-perl_4.010.bb
new file mode 100644
index 0000000000..95aa53b14b
--- /dev/null
+++ b/packages/perl/libdbd-mysql-perl_4.010.bb
@@ -0,0 +1,13 @@
+require libdbd-mysql-perl.inc
+
+DEPENDS = "libdbi-perl mysql"
+RDEPENDS = "perl-module-data-dumper \
+            libdbi-perl \
+            perl-module-scalar-util \
+            perl-module-file-spec \
+            perl-module-storable \
+            perl-module-test-simple"
+
+EXTRA_OECONF = "    --mysql_config=${STAGING_BINDIR_CROSS}/mysql_config"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/mysql"
diff --git a/packages/perl/libdbi-perl-native_1.607.bb b/packages/perl/libdbi-perl-native_1.607.bb
new file mode 100644
index 0000000000..c5e3b1dea7
--- /dev/null
+++ b/packages/perl/libdbi-perl-native_1.607.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libdbi-perl_${PV}.bb
diff --git a/packages/perl/libdbi-perl_1.607.bb b/packages/perl/libdbi-perl_1.607.bb
new file mode 100644
index 0000000000..af6853544c
--- /dev/null
+++ b/packages/perl/libdbi-perl_1.607.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Various MIME modules."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+RDEPENDS = "perl-module-scalar-util \
+            perl-module-file-spec \
+            perl-module-storable \
+            perl-module-test-simple"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.607.tar.gz"
+
+S = "${WORKDIR}/DBI-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libdevice-serialport-perl-native_1.04.bb b/packages/perl/libdevice-serialport-perl-native_1.04.bb
new file mode 100644
index 0000000000..af3b2dfeec
--- /dev/null
+++ b/packages/perl/libdevice-serialport-perl-native_1.04.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libdevice-serialport-perl_${PV}.bb
diff --git a/packages/perl/libemail-date-format-perl-native_1.002.bb b/packages/perl/libemail-date-format-perl-native_1.002.bb
new file mode 100644
index 0000000000..ebae345876
--- /dev/null
+++ b/packages/perl/libemail-date-format-perl-native_1.002.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libemail-date-format-perl_${PV}.bb
diff --git a/packages/perl/libemail-date-format-perl_1.002.bb b/packages/perl/libemail-date-format-perl_1.002.bb
new file mode 100644
index 0000000000..d83dac00bd
--- /dev/null
+++ b/packages/perl/libemail-date-format-perl_1.002.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Various MIME modules."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+RDEPENDS = "perl-module-test-more \
+            perl-module-time-local"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Email-Date-Format-${PV}.tar.gz"
+
+S = "${WORKDIR}/Email-Date-Format-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libhtml-parser-perl_3.60.bb b/packages/perl/libhtml-parser-perl_3.60.bb
new file mode 100644
index 0000000000..08525331db
--- /dev/null
+++ b/packages/perl/libhtml-parser-perl_3.60.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "HTML Parser bits."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+RDEPENDS = "perl-module-test-more \
+            perl-module-xsloader \
+            perl-module-test-simple \
+            libhtml-tagset-perl"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.60.tar.gz"
+
+S = "${WORKDIR}/HTML-Parser-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libhtml-tagset-perl_3.20.bb b/packages/perl/libhtml-tagset-perl_3.20.bb
new file mode 100644
index 0000000000..788c37e094
--- /dev/null
+++ b/packages/perl/libhtml-tagset-perl_3.20.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "HTML Tagset bits."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz"
+
+S = "${WORKDIR}/HTML-Tagset-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libmime-lite-perl-native_3.024.bb b/packages/perl/libmime-lite-perl-native_3.024.bb
new file mode 100644
index 0000000000..50be9e11ff
--- /dev/null
+++ b/packages/perl/libmime-lite-perl-native_3.024.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libmime-lite-perl_${PV}.bb
diff --git a/packages/perl/libmime-lite-perl_3.024.bb b/packages/perl/libmime-lite-perl_3.024.bb
new file mode 100644
index 0000000000..80de33330f
--- /dev/null
+++ b/packages/perl/libmime-lite-perl_3.024.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Simple standalone module for generating MIME messages."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+RDEPENDS = "perl-module-file-spec \
+            libemail-date-format-perl \
+            perl-module-test-more \
+            perl-module-time-local"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/MIME-Lite-3.024.tar.gz"
+
+S = "${WORKDIR}/MIME-Lite-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libmodule-load-perl-native_0.16.bb b/packages/perl/libmodule-load-perl-native_0.16.bb
new file mode 100644
index 0000000000..f09c3f9741
--- /dev/null
+++ b/packages/perl/libmodule-load-perl-native_0.16.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libmodule-load-perl_${PV}.bb
diff --git a/packages/perl/libmodule-load-perl_0.16.bb b/packages/perl/libmodule-load-perl_0.16.bb
new file mode 100644
index 0000000000..1d5a3ebeab
--- /dev/null
+++ b/packages/perl/libmodule-load-perl_0.16.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A module loading thingy for perl."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+RDEPENDS = "perl-module-test-more"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/K/KA/KANE/Module-Load-0.16.tar.gz"
+
+S = "${WORKDIR}/Module-Load-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libphp-serialization-perl-native_0.30.bb b/packages/perl/libphp-serialization-perl-native_0.30.bb
new file mode 100644
index 0000000000..9f83c5cc5a
--- /dev/null
+++ b/packages/perl/libphp-serialization-perl-native_0.30.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libphp-serialization-perl_${PV}.bb
diff --git a/packages/perl/libphp-serialization-perl_0.30.bb b/packages/perl/libphp-serialization-perl_0.30.bb
new file mode 100644
index 0000000000..07dd7de7e5
--- /dev/null
+++ b/packages/perl/libphp-serialization-perl_0.30.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "The standard database interface module for Perl."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.30.tar.gz"
+
+S = "${WORKDIR}/PHP-Serialization-${PV}"
+
+inherit cpan
diff --git a/packages/perl/libx10-perl-native_0.03.bb b/packages/perl/libx10-perl-native_0.03.bb
new file mode 100644
index 0000000000..bc5702d42f
--- /dev/null
+++ b/packages/perl/libx10-perl-native_0.03.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libx10-perl_${PV}.bb
diff --git a/packages/perl/libx10-perl_0.03.bb b/packages/perl/libx10-perl_0.03.bb
new file mode 100644
index 0000000000..bd76e2060d
--- /dev/null
+++ b/packages/perl/libx10-perl_0.03.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "X10 support for Perl."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz"
+
+S = "${WORKDIR}/X10-${PV}"
+
+inherit cpan
-- 
cgit v1.2.3


From f6310c7558b8ec63f00068a46c9f070b6411161f Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Tue, 10 Feb 2009 03:18:54 +0100
Subject: pyflakes: 0.2.1 -> 0.3.0

---
 packages/python/python-pyflakes_0.2.1.bb | 12 ------------
 packages/python/python-pyflakes_0.3.0.bb | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 packages/python/python-pyflakes_0.2.1.bb
 create mode 100644 packages/python/python-pyflakes_0.3.0.bb

(limited to 'packages')

diff --git a/packages/python/python-pyflakes_0.2.1.bb b/packages/python/python-pyflakes_0.2.1.bb
deleted file mode 100644
index 8be6d54478..0000000000
--- a/packages/python/python-pyflakes_0.2.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Python Source-Code Testing Utility"
-SECTION = "devel/python"
-HOMEPAGE = "http://divmod.org/projects/pyflakes"
-PRIORITY = "optional"
-LICENSE = "BSD"
-SRCNAME = "pyflakes"
-PR = "ml1"
-
-SRC_URI = "http://www.divmod.org/static/projects/pyflakes/pyflakes-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/packages/python/python-pyflakes_0.3.0.bb b/packages/python/python-pyflakes_0.3.0.bb
new file mode 100644
index 0000000000..4a6580ea05
--- /dev/null
+++ b/packages/python/python-pyflakes_0.3.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python Source-Code Testing Utility"
+SECTION = "devel/python"
+HOMEPAGE = "http://divmod.org/projects/pyflakes"
+PRIORITY = "optional"
+LICENSE = "BSD"
+SRCNAME = "pyflakes"
+PR = "ml0"
+
+SRC_URI = "http://pypi.python.org/packages/source/p/pyflakes/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
-- 
cgit v1.2.3


From 760d422b7abd60a5a493a557d331243268100751 Mon Sep 17 00:00:00 2001
From: Tim 'timtim' Ellis <tim.ellis@foonas.org>
Date: Tue, 10 Feb 2009 15:23:06 +0000
Subject: samba: Various updates: - samba-ads depends on netatalk to support
 the netatalk vfs module - 3.2.7 => 3.2.8 for samba and samba-ads - Modify
 config so we can actually write files to the default share - Bump PR on other
 samba-ads build

---
 packages/samba/files/configure-3.2.7.patch | 86 ----------------------------
 packages/samba/files/configure-3.2.8.patch | 92 ++++++++++++++++++++++++++++++
 packages/samba/files/smb.conf              |  2 +-
 packages/samba/samba-ads.inc               |  8 ++-
 packages/samba/samba-ads_3.2.7.bb          | 10 ----
 packages/samba/samba-ads_3.2.8.bb          | 10 ++++
 packages/samba/samba-ads_3.3.0.bb          |  2 +-
 packages/samba/samba_3.2.7.bb              | 24 --------
 packages/samba/samba_3.2.8.bb              | 24 ++++++++
 9 files changed, 133 insertions(+), 125 deletions(-)
 delete mode 100644 packages/samba/files/configure-3.2.7.patch
 create mode 100644 packages/samba/files/configure-3.2.8.patch
 delete mode 100644 packages/samba/samba-ads_3.2.7.bb
 create mode 100644 packages/samba/samba-ads_3.2.8.bb
 delete mode 100644 packages/samba/samba_3.2.7.bb
 create mode 100644 packages/samba/samba_3.2.8.bb

(limited to 'packages')

diff --git a/packages/samba/files/configure-3.2.7.patch b/packages/samba/files/configure-3.2.7.patch
deleted file mode 100644
index 94d684813e..0000000000
--- a/packages/samba/files/configure-3.2.7.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -urN source.old/configure source/configure
---- source.old/configure	2008-11-20 14:45:08.000000000 +0000
-+++ source/configure	2008-11-30 17:53:02.116791281 +0000
-@@ -40777,11 +40777,10 @@
-     *linux*)
-        # glibc <= 2.3.2 has a broken getgrouplist
-        if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+#  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5
-+# echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;}
-+#   { (exit 1); exit 1; }; }
-+linux_getgrouplist_ok=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-diff -urN source.old/configure.in source/configure.in
---- source.old/configure.in	2008-11-18 15:17:17.000000000 +0000
-+++ source/configure.in	2008-11-30 17:33:10.960791551 +0000
-@@ -275,6 +275,8 @@
- fi
- AC_SUBST(BROKEN_CC)
- 
-+AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC]))
-+
- dnl Check if the C compiler understands -Werror
- AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
-  AC_TRY_RUN_STRICT([
-@@ -325,25 +327,11 @@
- # a runtime test is needed here
- AC_SUBST(PIDL_ARGS)
- AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
--    AC_TRY_RUN(
-+    AC_TRY_COMPILE([],
- [
--	#include <stdio.h>
- 	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
--	int main(void) {
--		enum negative_values v1 = NEGATIVE_VALUE;
--		unsigned v2 = NEGATIVE_VALUE;
--
--		if (v1 != 0xFFFFFFFF) {
--			printf("%u != 0xFFFFFFFF\n", v1);
--			return 1;
--		}
--		if (v2 != 0xFFFFFFFF) {
--			printf("%u != 0xFFFFFFFF\n", v2);
--			return 1;
--		}
--
--		return 0;
--	}
-+	(void)sizeof(char[1-2*(            (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]);
-+	(void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]);
- ],
- 	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)])
- if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-@@ -1187,22 +1175,12 @@
- case "$host_os" in
-     *linux*)
-        # glibc <= 2.3.2 has a broken getgrouplist
--       AC_TRY_RUN([
--#include <unistd.h>
-+	AC_TRY_COMPILE([ 
- #include <sys/utsname.h>
--main() {
--       /* glibc up to 2.3 has a broken getgrouplist */
-+],[
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
--       int libc_major = __GLIBC__;
--       int libc_minor = __GLIBC_MINOR__;
--
--       if (libc_major < 2)
--              exit(1);
--       if ((libc_major == 2) && (libc_minor <= 3))
--              exit(1);
-+	(void)sizeof(char[1-2*(__GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)]);
- #endif
--       exit(0);
--}
- ], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-        if test x"$linux_getgrouplist_ok" = x"yes"; then
-           AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
diff --git a/packages/samba/files/configure-3.2.8.patch b/packages/samba/files/configure-3.2.8.patch
new file mode 100644
index 0000000000..2668b9d632
--- /dev/null
+++ b/packages/samba/files/configure-3.2.8.patch
@@ -0,0 +1,92 @@
+diff -urN source.old//configure source//configure
+--- source.old//configure	2009-02-03 16:34:41.000000000 +0000
++++ source//configure	2009-02-06 00:25:49.502205687 +0000
+@@ -43860,13 +43860,14 @@
+     *linux*)
+        # glibc <= 2.3.2 has a broken getgrouplist
+        if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++#  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++#See \`config.log' for more details." >&5
++#$as_echo "$as_me: error: cannot run test program while cross compiling
++#See \`config.log' for more details." >&2;}
++#   { (exit 1); exit 1; }; }; }
++linux_getgrouplist_ok=no
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+diff -urN source.old//configure.in source//configure.in
+--- source.old//configure.in	2009-02-03 16:10:07.000000000 +0000
++++ source//configure.in	2009-02-06 00:23:27.346211236 +0000
+@@ -275,6 +275,8 @@
+ fi
+ AC_SUBST(BROKEN_CC)
+ 
++AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC]))
++
+ dnl Check if the C compiler understands -Werror
+ AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
+  AC_TRY_RUN_STRICT([
+@@ -325,25 +327,11 @@
+ # a runtime test is needed here
+ AC_SUBST(PIDL_ARGS)
+ AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [
+-    AC_TRY_RUN(
++    AC_TRY_COMPILE([],
+ [
+-	#include <stdio.h>
+ 	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
+-	int main(void) {
+-		enum negative_values v1 = NEGATIVE_VALUE;
+-		unsigned v2 = NEGATIVE_VALUE;
+-
+-		if (v1 != 0xFFFFFFFF) {
+-			printf("%u != 0xFFFFFFFF\n", v1);
+-			return 1;
+-		}
+-		if (v2 != 0xFFFFFFFF) {
+-			printf("%u != 0xFFFFFFFF\n", v2);
+-			return 1;
+-		}
+-
+-		return 0;
+-	}
++	(void)sizeof(char[1-2*(            (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]);
++	(void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]);
+ ],
+ 	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)])
+ if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
+@@ -1204,22 +1192,12 @@
+ case "$host_os" in
+     *linux*)
+        # glibc <= 2.3.2 has a broken getgrouplist
+-       AC_TRY_RUN([
+-#include <unistd.h>
++	AC_TRY_COMPILE([ 
+ #include <sys/utsname.h>
+-main() {
+-       /* glibc up to 2.3 has a broken getgrouplist */
++],[
+ #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+-       int libc_major = __GLIBC__;
+-       int libc_minor = __GLIBC_MINOR__;
+-
+-       if (libc_major < 2)
+-              exit(1);
+-       if ((libc_major == 2) && (libc_minor <= 3))
+-              exit(1);
++	(void)sizeof(char[1-2*(__GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)]);
+ #endif
+-       exit(0);
+-}
+ ], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
+        if test x"$linux_getgrouplist_ok" = x"yes"; then
+           AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
diff --git a/packages/samba/files/smb.conf b/packages/samba/files/smb.conf
index 3854621c3e..f07e3e4ec7 100644
--- a/packages/samba/files/smb.conf
+++ b/packages/samba/files/smb.conf
@@ -160,7 +160,7 @@
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories
-   browseable = no
+   browseable = yes
    writable = yes
 
 # Un-comment the following and create the netlogon directory for Domain Logons
diff --git a/packages/samba/samba-ads.inc b/packages/samba/samba-ads.inc
index 1249528fdb..fee61a7a81 100644
--- a/packages/samba/samba-ads.inc
+++ b/packages/samba/samba-ads.inc
@@ -1,4 +1,6 @@
-DEPENDS += " openldap krb5"
+# openldap and kerberos are for active directory support
+# netatalk is needed to support a vfs module
+DEPENDS += " openldap krb5 netatalk"
 
 EXTRA_OECONF += "\
         SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
@@ -26,12 +28,12 @@ RCONFLICTS_cifs-ads-doc = "cifs-doc"
 RCONFLICTS_smbfs-ads = "smbfs"
 RCONFLICTS_swat-ads = "swat"
 
-FILES_cifs-ads= "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
+FILES_cifs-ads = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
 FILES_cifs-ads-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient-ads = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-ads-dev = "${libdir}/libsmbclient.so ${includedir}"
 FILES_smbfs-ads = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb"
-FILES_swat-ads       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
+FILES_swat-ads = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
 
 do_configure() {
         oe_runconf
diff --git a/packages/samba/samba-ads_3.2.7.bb b/packages/samba/samba-ads_3.2.7.bb
deleted file mode 100644
index 83b4416625..0000000000
--- a/packages/samba/samba-ads_3.2.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require samba.inc
-require samba-ads.inc
-
-PR = "r1"
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
-            file://configure-3.2.7.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-	        "
diff --git a/packages/samba/samba-ads_3.2.8.bb b/packages/samba/samba-ads_3.2.8.bb
new file mode 100644
index 0000000000..944fc792e0
--- /dev/null
+++ b/packages/samba/samba-ads_3.2.8.bb
@@ -0,0 +1,10 @@
+require samba.inc
+require samba-ads.inc
+
+PR = "r1"
+SRC_URI += "file://config-lfs.patch;patch=1 \
+            file://quota.patch;patch=1;pnum=0 \
+            file://configure-3.2.8.patch;patch=1 \
+            file://config-h.patch;patch=1 \
+            file://mtab.patch;patch=1 \
+	        "
diff --git a/packages/samba/samba-ads_3.3.0.bb b/packages/samba/samba-ads_3.3.0.bb
index 7688fd6703..a2f2e2c47a 100644
--- a/packages/samba/samba-ads_3.3.0.bb
+++ b/packages/samba/samba-ads_3.3.0.bb
@@ -1,7 +1,7 @@
 require samba.inc
 require samba-ads.inc
 
-PR = "r1"
+PR = "r2"
 SRC_URI += "file://config-lfs.patch;patch=1 \
             file://quota.patch;patch=1;pnum=0 \
             file://configure-3.3.0.patch;patch=1 \
diff --git a/packages/samba/samba_3.2.7.bb b/packages/samba/samba_3.2.7.bb
deleted file mode 100644
index 49ff24a646..0000000000
--- a/packages/samba/samba_3.2.7.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require samba.inc
-require samba-basic.inc
-
-SRC_URI += "file://configure-3.2.7.patch;patch=1 \
-            file://config-h.patch;patch=1 \
-            file://mtab.patch;patch=1 \
-	        "
-
-PR = "r4"
-
-EXTRA_OECONF += "\
-	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
-	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
-	linux_getgrouplist_ok=no \
-	samba_cv_HAVE_BROKEN_GETGROUPS=no \
-	samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
-	samba_cv_have_setresuid=yes \
-	samba_cv_have_setresgid=yes \
-	samba_cv_HAVE_WRFILE_KEYTAB=yes \
-	"
-
-do_configure() {
-	oe_runconf
-}
diff --git a/packages/samba/samba_3.2.8.bb b/packages/samba/samba_3.2.8.bb
new file mode 100644
index 0000000000..57f5753fce
--- /dev/null
+++ b/packages/samba/samba_3.2.8.bb
@@ -0,0 +1,24 @@
+require samba.inc
+require samba-basic.inc
+
+SRC_URI += "file://configure-3.2.8.patch;patch=1 \
+            file://config-h.patch;patch=1 \
+            file://mtab.patch;patch=1 \
+	        "
+
+PR = "r0"
+
+EXTRA_OECONF += "\
+	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
+	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
+	linux_getgrouplist_ok=no \
+	samba_cv_HAVE_BROKEN_GETGROUPS=no \
+	samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
+	samba_cv_have_setresuid=yes \
+	samba_cv_have_setresgid=yes \
+	samba_cv_HAVE_WRFILE_KEYTAB=yes \
+	"
+
+do_configure() {
+	oe_runconf
+}
-- 
cgit v1.2.3


From e822df32b167298c53157562769b1862d79e25cf Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Feb 2009 16:37:34 +0100
Subject: x11 images: remove phone feature hacks

---
 packages/images/x11-gpe-image.bb      | 1 -
 packages/images/x11-gpe-java-image.bb | 1 -
 packages/images/x11-office-image.bb   | 1 -
 packages/images/x11-pimlico-image.bb  | 1 -
 4 files changed, 4 deletions(-)

(limited to 'packages')

diff --git a/packages/images/x11-gpe-image.bb b/packages/images/x11-gpe-image.bb
index 86f4cd838c..7b272f60a1 100644
--- a/packages/images/x11-gpe-image.bb
+++ b/packages/images/x11-gpe-image.bb
@@ -1,7 +1,6 @@
 #Angstrom X11 image, with apps and kernel modules included
 
 ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
 XSERVER ?= "xserver-kdrive-fbdev"
 
diff --git a/packages/images/x11-gpe-java-image.bb b/packages/images/x11-gpe-java-image.bb
index 72b04ec2bc..fcc022c7a0 100644
--- a/packages/images/x11-gpe-java-image.bb
+++ b/packages/images/x11-gpe-java-image.bb
@@ -1,7 +1,6 @@
 #Angstrom X11 image, with apps and kernel modules included
 
 ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
 XSERVER ?= "xserver-kdrive-fbdev"
 
diff --git a/packages/images/x11-office-image.bb b/packages/images/x11-office-image.bb
index 47a8fae71f..48799d8998 100644
--- a/packages/images/x11-office-image.bb
+++ b/packages/images/x11-office-image.bb
@@ -1,7 +1,6 @@
 #Angstrom X11 image, with apps and kernel modules included
 
 ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
 XSERVER ?= "xserver-kdrive-fbdev"
 
diff --git a/packages/images/x11-pimlico-image.bb b/packages/images/x11-pimlico-image.bb
index 3c93bfbd1b..79dcacce6e 100644
--- a/packages/images/x11-pimlico-image.bb
+++ b/packages/images/x11-pimlico-image.bb
@@ -1,7 +1,6 @@
 #Angstrom X11 image, with apps and kernel modules included
 
 ANGSTROM_EXTRA_INSTALL += " \
-                           ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-- 
cgit v1.2.3


From 6e9834d8e277920614c907bfa17df302ac773f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Tue, 10 Feb 2009 16:54:20 +0100
Subject: u-boot-1.3.2: update patches for boc01

---
 .../u-boot/u-boot-1.3.2/boc01/001-090205-SPI.patch | 94 ++++++++++++++++++++++
 .../u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch | 24 +++---
 .../013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch  | 29 +++++++
 .../boc01/014-081211-BOOT_RESCUE.patch             | 14 +++-
 .../u-boot/u-boot-1.3.2/boc01/015-090205-EMC.patch | 31 +++++++
 .../u-boot/u-boot-1.3.2/boc01/016-090209-PM.patch  | 56 +++++++++++++
 packages/u-boot/u-boot_1.3.2.bb                    |  8 +-
 7 files changed, 235 insertions(+), 21 deletions(-)
 create mode 100644 packages/u-boot/u-boot-1.3.2/boc01/001-090205-SPI.patch
 create mode 100644 packages/u-boot/u-boot-1.3.2/boc01/013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch
 create mode 100644 packages/u-boot/u-boot-1.3.2/boc01/015-090205-EMC.patch
 create mode 100644 packages/u-boot/u-boot-1.3.2/boc01/016-090209-PM.patch

(limited to 'packages')

diff --git a/packages/u-boot/u-boot-1.3.2/boc01/001-090205-SPI.patch b/packages/u-boot/u-boot-1.3.2/boc01/001-090205-SPI.patch
new file mode 100644
index 0000000000..6c0ed5c36a
--- /dev/null
+++ b/packages/u-boot/u-boot-1.3.2/boc01/001-090205-SPI.patch
@@ -0,0 +1,94 @@
+Index: u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c
+===================================================================
+--- u-boot-1.3.2.orig/board/freescale/mpc8313erdb/mpc8313erdb.c
++++ u-boot-1.3.2/board/freescale/mpc8313erdb/mpc8313erdb.c
+@@ -28,6 +28,7 @@
+ #endif
+ #include <pci.h>
+ #include <mpc83xx.h>
++#include <spi.h>
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+@@ -107,3 +108,33 @@ void ft_board_setup(void *blob, bd_t *bd
+ #endif
+ }
+ #endif
++
++
++/*
++ * The following are used to control the SPI chip selects for the SPI command.
++ */
++#ifdef CONFIG_HARD_SPI
++
++#define SPI_CS_MASK	0x80000000
++
++void spi_eeprom_chipsel(int cs)
++{
++	volatile gpio83xx_t *iopd = &((immap_t *)CFG_IMMR)->gpio[0];
++
++	if (cs)
++		iopd->dat &= ~SPI_CS_MASK;
++	else
++		iopd->dat |=  SPI_CS_MASK;
++}
++
++/*
++ * The SPI command uses this table of functions for controlling the SPI
++ * chip selects.
++ */
++spi_chipsel_type spi_chipsel[] = {
++	spi_eeprom_chipsel,
++};
++int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
++
++#endif /* CONFIG_HARD_SPI */
++
+Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
+===================================================================
+--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h
++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h
+@@ -369,6 +369,7 @@
+ #define CONFIG_CMD_PCI
+ #define CONFIG_CMD_NAND
+ #define CONFIG_CMD_JFFS2
++#define CONFIG_CMD_SPI
+ 
+ #if defined(CFG_RAMBOOT)
+     #undef CONFIG_CMD_ENV
+@@ -386,6 +387,11 @@
+ #define MTDPARTS_DEFAULT	"mtdparts=physmap-flash.0:384k(uboot),64k(env)"
+ 
+ 
++/* SPI */
++#define CONFIG_MPC8XXX_SPI
++#define CONFIG_HARD_SPI			/* SPI with hardware support */
++#undef CONFIG_SOFT_SPI			/* SPI bit-banged */
++
+ /*
+  * Miscellaneous configurable options
+  */
+Index: u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c
+===================================================================
+--- u-boot-1.3.2.orig/drivers/spi/mpc8xxx_spi.c
++++ u-boot-1.3.2/drivers/spi/mpc8xxx_spi.c
+@@ -34,6 +34,8 @@
+ #define SPI_MODE_REV	(0x80000000 >> 5)	/* Reverse mode - MSB first */
+ #define SPI_MODE_MS	(0x80000000 >> 6)	/* Always master */
+ #define SPI_MODE_EN	(0x80000000 >> 7)	/* Enable interface */
++#define SPI_MODE_DIV16	(0x80000000 >> 4)	/*Divide by 16.   */
++#define SPI_MODE_LEN_8	(0x00700000)		/*0111 8-bit characters*/
+ 
+ #define SPI_TIMEOUT	1000
+ 
+@@ -45,9 +47,7 @@ void spi_init(void)
+ 	 * SPI pins on the MPC83xx are not muxed, so all we do is initialize
+ 	 * some registers
+ 	 */
+-	spi->mode = SPI_MODE_REV | SPI_MODE_MS | SPI_MODE_EN;
+-	spi->mode = (spi->mode & 0xfff0ffff) | (1 << 16); /* Use SYSCLK / 8
+-							     (16.67MHz typ.) */
++	spi->mode = SPI_MODE_DIV16 |SPI_MODE_LEN_8| SPI_MODE_REV | SPI_MODE_MS | SPI_MODE_EN;
+ 	spi->event = 0xffffffff;	/* Clear all SPI events */
+ 	spi->mask = 0x00000000;	/* Mask  all SPI interrupts */
+ 	spi->com = 0;		/* LST bit doesn't do anything, so disregard */
diff --git a/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch b/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch
index 07c7b3840a..33a0c761f9 100644
--- a/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch
+++ b/packages/u-boot/u-boot-1.3.2/boc01/010-081212-LCD.patch
@@ -181,7 +181,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c
 ===================================================================
 --- /dev/null
 +++ u-boot-1.3.2/common/cmd_lcd.c
-@@ -0,0 +1,243 @@
+@@ -0,0 +1,237 @@
 +/*
 + * (C) Copyright 2008
 + * Alexandre Coffignal, CénoSYS, alexandre.coffignal@cenosys.com
@@ -216,13 +216,6 @@ Index: u-boot-1.3.2/common/cmd_lcd.c
 +#define DELAY 1
 +#define AEL 0x0F
 +
-+static void NT7506_init_lcd(char ael);
-+static void NT7506_print_splash(char * Picture,char width,char height);
-+static void NT7506_set_xaddr(unsigned char x);
-+static void NT7506_set_yaddr(unsigned char y);
-+static void NT7506_writeb_data(unsigned char value);
-+static void NT7506_writeb_ctl(unsigned char value);
-+static void iowrite16(unsigned short value);
 +
 +static void iowrite16(unsigned short value)
 +{
@@ -269,7 +262,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c
 +	NT7506_writeb_ctl(NT_COL_LSB | (x & 0x0F) ); 	//Send low nibble
 +}
 +
-+static void ImageRota(char * src,char * dest, int w ,int h)
++static void ImageRota(unsigned char *src, unsigned char *dest, int w ,int h)
 +{
 +	int i,j,bit,IndexRead;
 +	char mask=0;
@@ -290,14 +283,13 @@ Index: u-boot-1.3.2/common/cmd_lcd.c
 +}
 +
 +
-+static void NT7506_print_splash(char * picture,char width,char height)
++static void NT7506_print_splash(unsigned char *picture, char width, char height)
 +{
 +	int i;
-+	char value;
-+	char imagerota[2048];
++	unsigned char imagerota[2048];
 +	int indeximage=0;
 +
-+	int x,y,xfb,yfb,Index;
++	int x,y,xfb,yfb;
 +	char src[2048];
 +	if(width>128)
 +		width=128;
@@ -379,7 +371,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c
 +
 +
 +/**************************************************/
-+void do_lcd(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++int do_lcd(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 +{
 +	char lcd_ael=AEL;
 +	if(argc>1)
@@ -390,6 +382,8 @@ Index: u-boot-1.3.2/common/cmd_lcd.c
 +
 +	NT7506_init_lcd(lcd_ael);
 +	NT7506_print_splash(Bollore_bits,Bollore_width,Bollore_height);
++
++	return 0;
 +}
 +
 +U_BOOT_CMD(
@@ -398,7 +392,7 @@ Index: u-boot-1.3.2/common/cmd_lcd.c
 +	  "lcd\n"
 +);
 +
-+void do_backlight(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
++int do_backlight(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 +{
 +	if (!strncmp(argv[1], "on", 7))
 +	{
diff --git a/packages/u-boot/u-boot-1.3.2/boc01/013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch b/packages/u-boot/u-boot-1.3.2/boc01/013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch
new file mode 100644
index 0000000000..803b46d8e9
--- /dev/null
+++ b/packages/u-boot/u-boot-1.3.2/boc01/013-090206-FIX_OOB_8BITS_LARGEPAGE_NAND.patch
@@ -0,0 +1,29 @@
+Index: u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c
+===================================================================
+--- u-boot-1.3.2.orig/drivers/mtd/nand/nand_bbt.c	2008-03-09 16:20:02.000000000 +0100
++++ u-boot-1.3.2/drivers/mtd/nand/nand_bbt.c	2009-02-06 14:50:35.000000000 +0100
+@@ -914,10 +914,11 @@
+ 	.pattern = scan_ff_pattern
+ };
+ 
++//Samsung makes sure that either the 1st or 2nd page of every initial invalid block has non-FFh data at the column address of 2048.
+ static struct nand_bbt_descr largepage_memorybased = {
+ 	.options = 0,
+ 	.offs = 0,
+-	.len = 2,
++	.len = 1,
+ 	.pattern = scan_ff_pattern
+ };
+ 
+Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
+===================================================================
+--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h	2009-02-06 15:42:07.000000000 +0100
++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h	2009-02-06 15:42:45.000000000 +0100
+@@ -205,6 +205,7 @@
+ 				| BR_MS_FCM		/* MSEL = FCM */ \
+ 				| BR_V )		/* valid */
+ #define CFG_OR1_PRELIM		( 0xFFFF8000		/* length 32K */ \
++				| OR_FCM_PGS \
+ 				| OR_FCM_CSCT \
+ 				| OR_FCM_CST \
+ 				| OR_FCM_CHT \
diff --git a/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch b/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch
index e18055e64c..d2ebdef772 100644
--- a/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch
+++ b/packages/u-boot/u-boot-1.3.2/boc01/014-081211-BOOT_RESCUE.patch
@@ -2,7 +2,15 @@ Index: u-boot-1.3.2/common/main.c
 ===================================================================
 --- u-boot-1.3.2.orig/common/main.c
 +++ u-boot-1.3.2/common/main.c
-@@ -377,6 +377,15 @@ void main_loop (void)
+@@ -39,6 +39,7 @@
+ #endif
+ 
+ #include <post.h>
++#include <gpio.h>
+ 
+ #ifdef CONFIG_SILENT_CONSOLE
+ DECLARE_GLOBAL_DATA_PTR;
+@@ -377,6 +378,15 @@ void main_loop (void)
  	}
  	else
  #endif /* CONFIG_BOOTCOUNT_LIMIT */
@@ -22,7 +30,7 @@ Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
 ===================================================================
 --- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h
 +++ u-boot-1.3.2/include/configs/MPC8313ERDB.h
-@@ -405,6 +405,7 @@
+@@ -406,6 +406,7 @@
  #define PRE_INIT_GPIO	0x28
  #define INIT_GPIO	0x08
  #define	MAX_GPIO_OUT 	7
@@ -30,7 +38,7 @@ Index: u-boot-1.3.2/include/configs/MPC8313ERDB.h
  
  /* Digital Thermometer and Thermostat */
  #define CONFIG_DTT_LM73		1
-@@ -558,6 +559,7 @@
+@@ -559,6 +560,7 @@
   * Environment Conf