[oe-commits] org.oe.dev merge of '01bddb578c9dd04edfbb56d0c1c15f81b4161479'
thebohemian commit
oe at amethyst.openembedded.net
Sun Jul 13 22:49:54 UTC 2008
merge of '01bddb578c9dd04edfbb56d0c1c15f81b4161479'
and '400e8684128097359c7f2556772f3c2e15c3e752'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 3e4f1d60ec11bbaad89ef5f929dbafe80eea8581
ViewMTN: http://monotone.openembedded.org/revision/info/3e4f1d60ec11bbaad89ef5f929dbafe80eea8581
Files:
1
packages/javasqlite
packages/javasqlite/files
packages/miglayout
packages/sqlitejdbc
packages/jamvm/jamvm-native.inc
packages/jamvm/jamvm-native_1.5.1.bb
packages/javasqlite/files/build-fix.patch
packages/javasqlite/javasqlite-mkconst-native_20080130.bb
packages/javasqlite/javasqlite_20080130.bb
packages/sqlite/sqlite-native_2.8.17.bb
packages/sqlite/sqlite3-native.inc
packages/sqlite/sqlite3-native_3.5.6.bb
packages/sqlitejdbc/sqlitejdbc_041.bb
MAINTAINERS
packages/asio
packages/mml-widget/files
packages/abiword/abiword-plugins_2.6.4.bb
packages/abiword/abiword_2.6.4.bb
packages/asio/asio_1.1.1.bb
packages/evince/evince_2.23.4.bb
packages/libwpd/libwpd_0.8.14.bb
packages/mml-widget/files/mathview-gcc43x.diff
packages/mml-widget/gtkmathview_0.8.0.bb
packages/ffmpeg/ffmpeg_git.bb
packages/lcd4linux/files/lcd4linux.init
packages/lcd4linux/lcd4linux_0.10.0.bb
packages/mml-widget/gtkmathview_0.7.6.bb
packages/t1lib/t1lib_5.0.2.bb
packages/u-boot/u-boot-git/beagleboard/base.patch
packages/u-boot/u-boot_git.bb
Diffs:
#
# mt diff -r01bddb578c9dd04edfbb56d0c1c15f81b4161479 -r3e4f1d60ec11bbaad89ef5f929dbafe80eea8581
#
#
#
# add_dir "packages/javasqlite"
#
# add_dir "packages/javasqlite/files"
#
# add_dir "packages/miglayout"
#
# add_dir "packages/sqlitejdbc"
#
# add_file "packages/jamvm/jamvm-native.inc"
# content [6860472b71586e2ce8530c2f408cdc435b89d12e]
#
# add_file "packages/jamvm/jamvm-native_1.5.1.bb"
# content [c3027d0494f5e3f40644beea7b8baa8e0cc90b39]
#
# add_file "packages/javasqlite/files/build-fix.patch"
# content [dcdbc513ca5b58f41d3de2d3c48ed1bb5f715cc9]
#
# add_file "packages/javasqlite/javasqlite-mkconst-native_20080130.bb"
# content [40934f30932a49d6d23cd876f616390b920d9bb7]
#
# add_file "packages/javasqlite/javasqlite_20080130.bb"
# content [8c8178e5422b17d57da6df73ad25e42cd90eb3f9]
#
# add_file "packages/sqlite/sqlite-native_2.8.17.bb"
# content [f14eb2863449924fda968d07fab5d9613e3df742]
#
# add_file "packages/sqlite/sqlite3-native.inc"
# content [e8600a42d40eab90de6f2a9a88a20a4d662f58ea]
#
# add_file "packages/sqlite/sqlite3-native_3.5.6.bb"
# content [3426a2d74a100a05085b2f3706b5a62c3c842f66]
#
# add_file "packages/sqlitejdbc/sqlitejdbc_041.bb"
# content [016d4f047235c72b4e8fc9090fc8a01ef2fbb62d]
#
# patch "MAINTAINERS"
# from [0952dfc25909402fe342c1727a4aa54c98c16a72]
# to [86c3ad4586fdf8bb08b7b9755791703eda5da5bf]
#
============================================================
--- packages/jamvm/jamvm-native.inc 6860472b71586e2ce8530c2f408cdc435b89d12e
+++ packages/jamvm/jamvm-native.inc 6860472b71586e2ce8530c2f408cdc435b89d12e
@@ -0,0 +1,18 @@
+require jamvm.inc
+
+DEPENDS = "zlib-native classpath-native virtual/javac-native"
+
+PROVIDES_jamvm = "virtual/java-native"
+
+RPROVIDES_jamvm = ""
+
+# This uses 32 bit arm, so force the instruction set to arm, not thumb
+ARM_INSTRUCTION_SET = "arm"
+
+inherit native
+
+S = "${WORKDIR}/jamvm-${PV}"
+
+do_install_append() {
+ ln -sf jamvm ${STAGING_BINDIR}/java
+}
============================================================
--- packages/jamvm/jamvm-native_1.5.1.bb c3027d0494f5e3f40644beea7b8baa8e0cc90b39
+++ packages/jamvm/jamvm-native_1.5.1.bb c3027d0494f5e3f40644beea7b8baa8e0cc90b39
@@ -0,0 +1,4 @@
+require jamvm-native.inc
+
+PR = "r0"
+
============================================================
--- packages/javasqlite/files/build-fix.patch dcdbc513ca5b58f41d3de2d3c48ed1bb5f715cc9
+++ packages/javasqlite/files/build-fix.patch dcdbc513ca5b58f41d3de2d3c48ed1bb5f715cc9
@@ -0,0 +1,378 @@
+Index: javasqlite-20080130/configure.in
+===================================================================
+--- javasqlite-20080130.orig/configure.in 2008-01-07 19:21:33.000000000 +0100
++++ javasqlite-20080130/configure.in 2008-07-13 15:54:47.000000000 +0200
+@@ -30,69 +30,25 @@
+ ##########
+ # Find SQLite header file and library
+ #
+-AC_ARG_WITH(sqlite, [ --with-sqlite=DIR use SQLite header/lib from DIR],
+- SQLITE_DIR=$withval)
+-if test ! -n "$SQLITE_DIR" -a -d "$SQLITE_DIR" ; then
+- AC_MSG_WARN([SQLite2 directory $SQLITE_DIR does not exist])
++AC_ARG_WITH(sqlite-incdir, [ --with-sqlite-incdir=DIR use SQLite header from DIR],
++ SQLITE_INCDIR=$withval)
++if test ! -n "$SQLITE_INCDIR" -a -d "$SQLITE_INCDIR" ; then
++ AC_MSG_WARN([SQLite2 directory $SQLITE_INCDIR does not exist])
+ fi
+
+-if test -z "$SQLITE_DIR" ; then
+- SQLITE_DIR="../sqlite /usr /usr/local /opt"
++AC_ARG_WITH(sqlite-libdir, [ --with-sqlite-libdir=DIR use SQLite lib from DIR],
++ SQLITE_LIBDIR=$withval)
++if test ! -n "$SQLITE_LIBDIR" -a -d "$SQLITE_LIBDIR" ; then
++ AC_MSG_WARN([SQLite2 directory $SQLITE_LIBDIR does not exist])
+ fi
+
+-AC_MSG_CHECKING([for SQLite header and library])
+-SQLITE_INC=UNKNOWN
+-SQLITE_LIB=UNKNOWN
+-for i in $SQLITE_DIR ; do
+- if test -r $i/sqlite.h ; then
+- if test -r $i/libsqlite.la ; then
+- SQLITE_INC="$i"
+- SQLITE_LIB="$i/libsqlite.la"
+- SQLITE_LIBDIR="$i"
+- break
+- elif test -r $i/libsqlite.a ; then
+- SQLITE_INC="$i"
+- SQLITE_LIB="$i/libsqlite.a"
+- SQLITE_LIBDIR="$i"
+- break
+- fi
+- elif test -r $i/include/sqlite.h ; then
+- for lib in lib64 lib ; do
+- if test -r $i/$lib/libsqlite.la ; then
+- SQLITE_INC="$i/include"
+- SQLITE_LIB="$i/$lib/libsqlite.la"
+- SQLITE_LIBDIR="$i/$lib"
+- break
+- elif test -r $i/$lib/libsqlite.a ; then
+- SQLITE_INC="$i/include"
+- SQLITE_LIB="$i/$lib/libsqlite.a"
+- SQLITE_LIBDIR="$i/$lib"
+- break
+- elif test -r $i/$lib/libsqlite.so ; then
+- SQLITE_INC="$i/include"
+- SQLITE_LIB="-lsqlite"
+- SQLITE_LIBDIR="$i/$lib"
+- break
+- fi
+- done
+- if test "$SQLITE_LIB" != "UNKNOWN" ; then
+- break
+- fi
+- fi
+-done
+-if test "$SQLITE_INC" = "UNKNOWN" -o "$SQLITE_LIB" = "UNKNOWN" ; then
+- AC_MSG_RESULT(no)
+- AC_MSG_WARN(SQLite2 header files and/or library not found)
+- SQLITE_INC=""
+- SQLITE_LIB=""
+- HAVE_SQLITE2=0
+-else
+- SQLITE_INC="-I${SQLITE_INC}"
+- HAVE_SQLITE2=1
+- AC_MSG_RESULT(yes)
+-fi
++SQLITE_INC="-I$SQLITE_INCDIR"
++SQLITE_LIB="-lsqlite"
++HAVE_SQLITE2=1
++
+ AC_SUBST(SQLITE_INC)
+ AC_SUBST(SQLITE_LIB)
++AC_SUBST(SQLITE_LIBDIR)
+ AC_SUBST(HAVE_SQLITE2)
+
+ ##########
+@@ -127,70 +83,28 @@
+ ##########
+ # Find SQLite3 header file and library
+ #
+-AC_ARG_WITH(sqlite3,
+- [ --with-sqlite3=DIR use SQLite3 header/lib from DIR],
+- SQLITE3_DIR=$withval)
+-if test ! -n "$SQLITE3_DIR" -a -d "$SQLITE3_DIR" ; then
+- AC_MSG_WARN([SQLite3 directory $SQLITE3_DIR does not exist])
++AC_ARG_WITH(sqlite3-incdir,
++ [ --with-sqlite3-incdir=DIR use SQLite3 header from DIR],
++ SQLITE3_INCDIR=$withval)
++if test ! -n "$SQLITE3_INCDIR" -a -d "$SQLITE3_INCDIR" ; then
++ AC_MSG_WARN([SQLite3 directory $SQLITE3_INCDIR does not exist])
+ fi
+
+-if test -z "$SQLITE3_DIR" ; then
+- SQLITE3_DIR="../sqlite /usr /usr/local /opt"
++AC_ARG_WITH(sqlite3-libdir,
++ [ --with-sqlite3-libdir=DIR use SQLite3 lib from DIR],
++ SQLITE3_LIBDIR=$withval)
++if test ! -n "$SQLITE3_LIBDIR" -a -d "$SQLITE3_LIBDIR" ; then
++ AC_MSG_WARN([SQLite3 directory $SQLITE3_LIBDIR does not exist])
+ fi
+
+-AC_MSG_CHECKING([for SQLite3 header and library])
+-SQLITE3_INC=UNKNOWN
+-SQLITE3_LIB=UNKNOWN
+-for i in $SQLITE3_DIR ; do
+- if test -r $i/sqlite3.h ; then
+- if test -r $i/libsqlite3.la ; then
+- SQLITE3_INC="$i"
+- SQLITE3_LIB="$i/libsqlite3.la"
+- SQLITE3_LIBDIR="$i"
+- break
+- elif test -r $i/libsqlite3.a ; then
+- SQLITE3_INC="$i"
+- SQLITE3_LIB="$i/libsqlite3.a"
+- SQLITE3_LIBDIR="$i"
+- break
+- fi
+- elif test -r $i/include/sqlite3.h ; then
+- for lib in lib64 lib ; do
+- if test -r $i/$lib/libsqlite3.la ; then
+- SQLITE3_INC="$i/include"
+- SQLITE3_LIB="$i/$lib/libsqlite3.la"
+- SQLITE3_LIBDIR="$i/$lib"
+- break
+- elif test -r $i/$lib/libsqlite3.a ; then
+- SQLITE3_INC="$i/include"
+- SQLITE3_LIB="$i/$lib/libsqlite3.a"
+- SQLITE3_LIBDIR="$i/$lib"
+- break
+- elif test -r $i/$lib/libsqlite3.so ; then
+- SQLITE3_INC="$i/include"
+- SQLITE3_LIB="-lsqlite3"
+- SQLITE3_LIBDIR="$i/$lib"
+- break
+- fi
+- done
+- if test "$SQLITE3_LIB" != "UNKNOWN" ; then
+- break
+- fi
+- fi
+-done
+-if test "$SQLITE3_INC" = "UNKNOWN" -o "$SQLITE3_LIB" = "UNKNOWN" ; then
+- AC_MSG_RESULT(no)
+- AC_MSG_WARN(SQLite3 header files and/or library not found)
+- SQLITE3_INC=""
+- SQLITE3_LIB=""
+- HAVE_SQLITE3=0
+-else
+- SQLITE3_INC="-I${SQLITE3_INC}"
+- HAVE_SQLITE3=1
+- AC_MSG_RESULT(yes)
+-fi
++SQLITE3_INC="-I$SQLITE3_INCDIR"
++SQLITE3_LIB="-lsqlite3"
++
++HAVE_SQLITE3=1
++
+ AC_SUBST(SQLITE3_INC)
+ AC_SUBST(SQLITE3_LIB)
++AC_SUBST(SQLITE3_LIBDIR)
+ AC_SUBST(HAVE_SQLITE3)
+
+ ##########
+@@ -310,52 +224,45 @@
+ #
+
+ AC_CHECK_PROG([READLINK], [readlink], [readlink], [])
+-AC_ARG_WITH(jdk, [ --with-jdk=DIR use Java top directory DIR],
+- JAVA_HOME=$withval)
+-if test -z "$JAVA_HOME" ; then
+- JAVA_HOME=`which javac`
+- if test -n "$READLINK" ; then
+- while test -L $JAVA_HOME ; do
+- JAVA_HOME=`$READLINK $JAVA_HOME`
+- done
+- fi
+- JAVA_HOME=`dirname $JAVA_HOME`
+- JAVA_HOME=`dirname $JAVA_HOME`
+- if test "x$JAR_DIR_UNSPEC" = "xyes" ; then
+- JAR_DIR=$JAVA_HOME/jre/lib/ext
+- AC_MSG_RESULT([will install sqlite.jar into $JAR_DIR])
+- fi
+- if test "$prefix" = "/usr/local" ; then
+- case "$target_cpu" in
+- [i[3-6]86*])
+- NATIVE_LIB_DIR=$JAVA_HOME/jre/lib/i386
+- ;;
+- *)
+- NATIVE_LIB_DIR=$JAVA_HOME/jre/lib/$target_cpu
+- ;;
+- esac
+- AC_MSG_RESULT([will install libsqlite_jni into $NATIVE_LIB_DIR])
+- fi
+-fi
+-if test ! -d "$JAVA_HOME" ; then
+- AC_MSG_ERROR([JAVA_HOME directory not found, please use --with-jdk=DIR])
+-fi
+
+-if test -n "$JAVA_HOME" ; then
+- JAVA_RUN=$JAVA_HOME/bin/java
+- JAVAC=$JAVA_HOME/bin/javac
+- JAVAH="$JAVA_HOME/bin/javah -jni"
+- JAR=$JAVA_HOME/bin/jar
+- JAVADOC=$JAVA_HOME/bin/javadoc
+-else
+- JAVA_RUN=`which java`
+- JAVAC=`which javac`
+- JAVAH="`which javah` -jni"
+- JAR=`which jar`
+- JAVADOC=`which javadoc`
+- JAVA_HOME=`dirname $JAVAC`
+- JAVA_HOME=`dirname $JAVA_HOME`
+-fi
++AC_ARG_WITH([java],
++ [AS_HELP_STRING([--with-java],
++ [specify Java executable (default: java)])],
++ [],
++ [with_java=java])
++
++AC_ARG_WITH([javac],
++ [AS_HELP_STRING([--with-javac],
++ [specify Java Compiler executable (default: javac)])],
++ [],
++ [with_javac=javac])
++
++AC_ARG_WITH([javah],
++ [AS_HELP_STRING([--with-javah],
++ [specify Java Header generator executable (default: javah)])],
++ [],
++ [with_javah=javah])
++
++AC_ARG_WITH([jar],
++ [AS_HELP_STRING([--with-jar],
++ [specify Jar executable (default: jar)])],
++ [],
++ [with_jar=jar])
++
++AC_ARG_WITH([javadoc],
++ [AS_HELP_STRING([--with-javadoc],
++ [specify Javadoc executable (default: javadoc)])],
++ [],
++ [with_javadoc=javadoc])
++
++JAVA_RUN="$with_java"
++JAVAC="$with_javac $JAVACFLAGS"
++JAVAH="$with_javah -jni"
++JAR=$with_jar
++JAVADOC=$with_javadoc
++
++JAVA_HOME=`dirname $JAVAC`
++JAVA_HOME=`dirname $JAVA_HOME`
+
+ AC_SUBST(JAVAH)
+ AC_SUBST(JAVA_RUN)
+@@ -363,22 +270,14 @@
+ AC_SUBST(JAR)
+ AC_SUBST(JAVADOC)
+
++AC_ARG_WITH([jni-incdir],
++ [AS_HELP_STRING([--with-jni-incdir],
++ [jni.h location (default: $inc/classpath)])],
++ [],
++ [with_jni_incdir=$inc/classpath])
++
+ # Set up the JNI include directory specification
+-case $build_os in
+- solaris*)
+- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
+- ;;
+- linux*)
+- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+- ;;
+- freebsd*)
+- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/freebsd"
+- ;;
+- *)
+- JNIINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${build_os}"
+- AC_MSG_WARN([setting generic JNI include file directives!])
+- ;;
+-esac
++JNIINCLUDE=-I$with_jni_incdir
+ AC_MSG_RESULT([setting JNI include file directives: $JNIINCLUDE])
+
+ # Figure out JDK version
+@@ -398,9 +297,12 @@
+ JAVAC="$JAVAC -nowarn"
+ fi
+
+-if test "x$NATIVE_LIB_DIR" = "x" ; then
+- NATIVE_LIB_DIR=$libdir
+-fi
++AC_ARG_WITH([target-native-libdir],
++ [AS_HELP_STRING([--with-target-native-libdir],
++ [directory for JNI library on target device (default: \$libdir)])],
++ [],
++ [with_target_native_libdir=$libdir])
++NATIVE_LIB_DIR=$with_target_native_libdir
+
+ AC_SUBST(JNIINCLUDE)
+ AC_SUBST(JAR_DIR)
+Index: javasqlite-20080130/Makefile.in
+===================================================================
+--- javasqlite-20080130.orig/Makefile.in 2008-01-07 19:14:29.000000000 +0100
++++ javasqlite-20080130/Makefile.in 2008-07-13 17:03:10.000000000 +0200
+@@ -2,7 +2,12 @@
+
+ prefix = @prefix@
+ CC = @CC@
+-LIBTOOL = ./libtool
++LIBTOOL = wrong-libtool
++LIBTOOL_CC = $(LIBTOOL) --mode=compile --tag=CC
++LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
++LIBTOOL_INSTALL = $(LIBTOOL) --mode=install --tag=CC
++SQLITE_LIBDIR = -L at SQLITE_LIBDIR@
++SQLITE3_LIBDIR = -L at SQLITE_LIBDIR@
+ SQLITE_INC = @SQLITE_INC@
+ SQLITE_LIB = @SQLITE_LIB@
+ SQLITE3_INC = @SQLITE3_INC@
+@@ -119,16 +124,16 @@
+ SQLite.FunctionContext SQLite.Stmt SQLite.Blob
+
+ sqlite_jni.lo: native/sqlite_jni.h native/sqlite_jni.c
+- $(LIBTOOL) $(CC) -c $(CFLAGS) native/sqlite_jni.c
++ $(LIBTOOL_CC) $(CC) -c $(CFLAGS) native/sqlite_jni.c
+
+ libsqlite_jni.la: sqlite_jni.lo
+- $(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \
++ $(LIBTOOL_LINK) $(CC) -o libsqlite_jni.la sqlite_jni.lo \
+ -rpath $(NATIVE_LIB_DIR) $(LIBS)
+
+ native/mkconst: native/mkconst.c
+- $(LIBTOOL) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \
++ $(LIBTOOL_LINK) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \
+ -DHAVE_SQLITE2=@HAVE_SQLITE2@ -DHAVE_SQLITE3=@HAVE_SQLITE3@ \
+- -o native/mkconst native/mkconst.c $(LIBS)
++ -o native/mkconst native/mkconst.c $(LIBS) $(SQLITE_LIBDIR) $(SQLITE3_LIBDIR)
+
+ Makefile: Makefile.in configure config.status
+ ./config.status
+@@ -173,4 +178,4 @@
+ $(INSTALL) -d -m 755 $(DESTDIR)$(JAR_DIR)
+ $(INSTALL) -m 644 sqlite.jar $(DESTDIR)$(JAR_DIR)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(NATIVE_LIB_DIR)
+- $(LIBTOOL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR)
++ $(LIBTOOL_INSTALL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR)
+Index: javasqlite-20080130/SQLite/JDBCDriver.java
+===================================================================
+--- javasqlite-20080130.orig/SQLite/JDBCDriver.java 2008-07-13 17:28:52.000000000 +0200
++++ javasqlite-20080130/SQLite/JDBCDriver.java 2008-07-13 17:53:14.000000000 +0200
+@@ -13,7 +13,7 @@
+
+ static {
+ try {
+- Class connClass = null;
++ Class<? extends Connection> connClass = null;
+ Class args[] = new Class[4];
+ args[0] = Class.forName("java.lang.String");
+ args[1] = args[0];
+@@ -49,7 +49,7 @@
+ }
+ }
+ }
+- connClass = Class.forName(cvers);
++ connClass = (Class<? extends Connection>) Class.forName(cvers);
+ makeConn = connClass.getConstructor(args);
+ java.sql.DriverManager.registerDriver(new JDBCDriver());
+ } catch (java.lang.Exception e) {
============================================================
--- packages/javasqlite/javasqlite-mkconst-native_20080130.bb 40934f30932a49d6d23cd876f616390b920d9bb7
+++ packages/javasqlite/javasqlite-mkconst-native_20080130.bb 40934f30932a49d6d23cd876f616390b920d9bb7
@@ -0,0 +1,52 @@
+DESCRIPTION = "mkcons program needed for javasqlite build"
+HOMEPAGE = "http://www.ch-werner.de/javasqlite"
+LICENSE = "BSD"
+
+DEPENDS = "sqlite-native sqlite3-native"
+
+SRC_URI = "\
+ http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \
+ file://build-fix.patch;patch=1"
+
+S = "${WORKDIR}/javasqlite-${PV}"
+
+inherit autotools native
+
+# Program names are there to fool configure checks
+# because we actually do not need these.
+EXTRA_OECONF = " \
+ --with-sqlite-incdir=${STAGING_INCDIR} \
+ --with-sqlite-libdir=${STAGING_LIBDIR} \
+ --with-sqlite3-incdir=${STAGING_INCDIR} \
+ --with-sqlite3-libdir=${STAGING_LIBDIR} \
+ --with-jardir=${datadir_java} \
+ --with-native-libdir=${libdir_jni} \
+ --with-java='echo version 1.5' \
+ --with-javac=true \
+ --with-jar=true \
+ --with-javah=true \
+ --with-javadoc=true \
+ "
+
+do_configurepre() {
+ sed -i -e "s|wrong-libtool|${BUILD_SYS}-libtool|" Makefile.in
+}
+
+addtask configurepre after do_patch before do_configure
+
+
+do_compile() {
+ oe_runmake native/mkconst
+}
+
+do_install() {
+ :
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 native/.libs/mkconst ${STAGING_BINDIR}/javasqlite-mkconst-${PV}
+}
+
+PACKAGES = ""
+
============================================================
--- packages/javasqlite/javasqlite_20080130.bb 8c8178e5422b17d57da6df73ad25e42cd90eb3f9
+++ packages/javasqlite/javasqlite_20080130.bb 8c8178e5422b17d57da6df73ad25e42cd90eb3f9
@@ -0,0 +1,46 @@
+DESCRIPTION = "JDBC driver for sqlite and sqlite3"
+HOMEPAGE = "http://www.ch-werner.de/%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r400e8684128097359c7f2556772f3c2e15c3e752 -r3e4f1d60ec11bbaad89ef5f929dbafe80eea8581
#
#
#
# add_dir "packages/asio"
#
# add_dir "packages/mml-widget/files"
#
# add_file "packages/abiword/abiword-plugins_2.6.4.bb"
# content [d1fd52759d17edfde1c883a1c63346c786ba9807]
#
# add_file "packages/abiword/abiword_2.6.4.bb"
# content [c206e4f1553666d98b19e12fbdb0b78763839f22]
#
# add_file "packages/asio/asio_1.1.1.bb"
# content [94c47ccdb0586b145409ff7b5a40cb1849191568]
#
# add_file "packages/evince/evince_2.23.4.bb"
# content [5f5e5c4d137be729191614e2f6a498f062401264]
#
# add_file "packages/libwpd/libwpd_0.8.14.bb"
# content [d94ab8003d42c654cd7c798c1f66c7232b8316fb]
#
# add_file "packages/mml-widget/files/mathview-gcc43x.diff"
# content [606a7ab8b8033a24ef72e432cb8604978a4538aa]
#
# add_file "packages/mml-widget/gtkmathview_0.8.0.bb"
# content [6722b48e3fb9faefeef745d321ccd2fb22122a38]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [6595b7db30a4c0aa450baa53b7c03f70acc8211b]
# to [ca93a225f546068e1e43b3ca41b56423d06c7b75]
#
# patch "packages/lcd4linux/files/lcd4linux.init"
# from [83848ea064a0946e3a7921d51cfea062858be9e2]
# to [491daa80397dc689b2de379e45f1d1012eeff65b]
#
# patch "packages/lcd4linux/lcd4linux_0.10.0.bb"
# from [88dad79f87ed32ec0895aa8c75781aea20ad1307]
# to [5d3cf9afec0757a742e933264ff87db21986d225]
#
# patch "packages/mml-widget/gtkmathview_0.7.6.bb"
# from [5ff90d604ced3e24dba96dc592a79f9c2a5ad971]
# to [2daa6a30825798dbe1bbb6118251caf2b9af965a]
#
# patch "packages/t1lib/t1lib_5.0.2.bb"
# from [c42e341a911838b8d58aaf7c0aa1d3d900719030]
# to [7ebaa9fd120c1d2222ab4a6e1a6ca782c998cc5a]
#
# patch "packages/u-boot/u-boot-git/beagleboard/base.patch"
# from [1135185807d979f189a4aa922827442a60400f0c]
# to [131ee68f67adb38f32a5f4ecfe1ab25729e8939b]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [a76a67d588b4bc029e9a3d3fd1f8d255af4ccc2c]
# to [91095d5509af9328f8d193b5251d464b08333d06]
#
============================================================
--- packages/abiword/abiword-plugins_2.6.4.bb d1fd52759d17edfde1c883a1c63346c786ba9807
+++ packages/abiword/abiword-plugins_2.6.4.bb d1fd52759d17edfde1c883a1c63346c786ba9807
@@ -0,0 +1,45 @@
+DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"
+HOMEPAGE = "http://www.abiword.org"
+SECTION = "x11/office"
+LICENSE = "GPLv2"
+DEPENDS = "asio boost loudmouth libwpd librsvg goffice poppler libglade"
+RDEPENDS = "abiword"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \
+ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+# file://abiword-cxx-for-ld-fix.patch;patch=1 \
+ "
+
+DEFAULT_PREFERENCE = "2"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+#export LDFLAGS += " -lstdc++ "
+
+EXTRA_OECONF = " --enable-shared=yes \
+ --enable-static \
+ --without-libwmf \
+ --without-inter7eps \
+ --with-abiword=${WORKDIR}/abiword-${PV} \
+ --with-boost=${STAGING_DIR_HOST} \
+ --with-boost-thread=boost_thread-mt \
+ "
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+ abiword_libdir = bb.data.expand('${libdir}/abiword-2.6/plugins', d)
+ do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+ do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='')
+}
+
+
+PACKAGES =+ "abiword-plugin-collab-glade"
+
+FILES_abiword-plugin-collab-glade += "${datadir}"
+RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab"
+
+FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug"
+
============================================================
--- packages/abiword/abiword_2.6.4.bb c206e4f1553666d98b19e12fbdb0b78763839f22
+++ packages/abiword/abiword_2.6.4.bb c206e4f1553666d98b19e12fbdb0b78763839f22
@@ -0,0 +1,10 @@
+require abiword-2.5.inc
+
+PR = "r1"
+
+RCONFLICTS = "abiword-embedded"
+
+FILES_${PN} += "${datadir}/mime-info"
+FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings"
+FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*"
+
============================================================
--- packages/asio/asio_1.1.1.bb 94c47ccdb0586b145409ff7b5a40cb1849191568
+++ packages/asio/asio_1.1.1.bb 94c47ccdb0586b145409ff7b5a40cb1849191568
@@ -0,0 +1,14 @@
+DESCRIPTION = "Asio"
+HOMEPAGE = "http://asio.sf.net/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Boost Software License"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/evince/evince_2.23.4.bb 5f5e5c4d137be729191614e2f6a498f062401264
+++ packages/evince/evince_2.23.4.bb 5f5e5c4d137be729191614e2f6a498f062401264
@@ -0,0 +1,19 @@
+DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu."
+LICENSE = "GPL"
+SECTION = "x11/office"
+DEPENDS = "gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring "
+RDEPENDS = "espgs gnome-icon-theme"
+RRECOMMENDS = "gnome-vfs-plugin-file"
+PR = "r2"
+
+inherit gnome pkgconfig gtk-icon-cache
+
+SRC_URI += " file://no-help-dir.patch;patch=1"
+
+EXTRA_OECONF = " --without-libgnome \
+ --disable-thumbnailer \
+ --disable-scrollkeeper \
+ --enable-djvu \
+ "
+FILES_${PN}-dbg = "${libdir}/evince/backends/.debug"
+
============================================================
--- packages/libwpd/libwpd_0.8.14.bb d94ab8003d42c654cd7c798c1f66c7232b8316fb
+++ packages/libwpd/libwpd_0.8.14.bb d94ab8003d42c654cd7c798c1f66c7232b8316fb
@@ -0,0 +1,12 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents."
+HOMEPAGE = "http://libwpd.sourceforge.net/index.html"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz"
+DEPENDS = "libgsf"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/mml-widget/files/mathview-gcc43x.diff 606a7ab8b8033a24ef72e432cb8604978a4538aa
+++ packages/mml-widget/files/mathview-gcc43x.diff 606a7ab8b8033a24ef72e432cb8604978a4538aa
@@ -0,0 +1,53 @@
+--- /tmp/mathVariantAux.cc 2008-07-13 15:56:56.000000000 +0200
++++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-13 15:57:46.893198000 +0200
+@@ -20,6 +20,8 @@
+
+ #include <cassert>
+
++#include <string.h>
++
+ #include "mathVariantAux.hh"
+
+ static MathVariantAttributes vattr[] = {
+--- /tmp/T1_FontDataBase.cc 2008-07-13 16:25:24.000000000 +0200
++++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-13 16:25:47.123198000 +0200
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #include <map>
+ #include <string>
++#include <string.h>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+--- /tmp/SMS.cc 2008-07-13 16:27:23.000000000 +0200
++++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-13 16:27:41.543198000 +0200
+@@ -19,6 +19,7 @@
+ #include <config.h>
+
+ #include <sstream>
++#include <string.h>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+ #include "ValueConversion.hh"
+--- /tmp/main.cc 2008-07-13 16:29:11.000000000 +0200
++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-13 16:29:28.813198000 +0200
+@@ -20,7 +20,7 @@
+
+ #include <cassert>
+ #include <fstream>
+-
++#include <string.h>
+ #include <popt.h>
+
+ // needed for old versions of GCC, must come before String.hh!
+--- /tmp/main.cc 2008-07-13 16:30:11.000000000 +0200
++++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-13 16:30:33.183198000 +0200
+@@ -20,7 +20,7 @@
+
+ #include <cassert>
+ #include <fstream>
+-
++#include <string.h>
+ #include <popt.h>
+
+ // needed for old versions of GCC, must come before String.hh!
============================================================
--- packages/mml-widget/gtkmathview_0.8.0.bb 6722b48e3fb9faefeef745d321ccd2fb22122a38
+++ packages/mml-widget/gtkmathview_0.8.0.bb 6722b48e3fb9faefeef745d321ccd2fb22122a38
@@ -0,0 +1,24 @@
+LICENSE = "GPL"
+HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
+DEPENDS = "t1lib gtk+ popt libxslt libxml2"
+
+SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \
+ file://mathview-gcc43x.diff;patch=1 \
+ "
+
+inherit autotools
+AUTOTOOLS_STAGE_PKGCONFIG = 1
+
+EXTRA_OECONF = "--disable-binreloc"
+
+do_configure_prepend() {
+ sed -i -e s:AM_BINRELOC::g ${S}/configure.ac
+}
+
+do_stage() {
+ autotools_stage_all
+ for i in ${PKG_CONFIG_DIR}/*math*.pc ; do
+ sed -i -e s:${STAGING_INCDIR}:'${libdir}':g $i
+ done
+}
+
============================================================
--- packages/ffmpeg/ffmpeg_git.bb 6595b7db30a4c0aa450baa53b7c03f70acc8211b
+++ packages/ffmpeg/ffmpeg_git.bb ca93a225f546068e1e43b3ca41b56423d06c7b75
@@ -3,7 +3,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r12"
+PR = "r13"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ SRCREV = "1e8300e71f79963eacdad6b180d9a1
FFBRANCH ?= "master"
SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d"
-SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9"
+SRCREV_arm = "d0e4a018bb80814e4aee450ddf9b4f6d3cb97064"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
============================================================
--- packages/lcd4linux/files/lcd4linux.init 83848ea064a0946e3a7921d51cfea062858be9e2
+++ packages/lcd4linux/files/lcd4linux.init 491daa80397dc689b2de379e45f1d1012eeff65b
@@ -13,7 +13,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbi
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/lcd4linux
+DAEMON=/usr/bin/lcd4linux
NAME=lcd4linux
DESC=lcd4linux
============================================================
--- packages/lcd4linux/lcd4linux_0.10.0.bb 88dad79f87ed32ec0895aa8c75781aea20ad1307
+++ packages/lcd4linux/lcd4linux_0.10.0.bb 5d3cf9afec0757a742e933264ff87db21986d225
@@ -4,7 +4,7 @@ PV = "0.10.0+0.10.1-RC2"
DEPENDS = "libusb-compat ncurses readline virtual/libx11"
PV = "0.10.0+0.10.1-RC2"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \
file://libusb-compat.diff;patch=1 \
============================================================
--- packages/mml-widget/gtkmathview_0.7.6.bb 5ff90d604ced3e24dba96dc592a79f9c2a5ad971
+++ packages/mml-widget/gtkmathview_0.7.6.bb 2daa6a30825798dbe1bbb6118251caf2b9af965a
@@ -9,10 +9,10 @@ do_configure() {
EXTRA_OECONF = "--disable-binreloc"
do_configure() {
-oe_runconf
+ oe_runconf
}
do_stage() {
-autotools_stage_all
+ autotools_stage_all
}
============================================================
--- packages/t1lib/t1lib_5.0.2.bb c42e341a911838b8d58aaf7c0aa1d3d900719030
+++ packages/t1lib/t1lib_5.0.2.bb 7ebaa9fd120c1d2222ab4a6e1a6ca782c998cc5a
@@ -1,7 +1,8 @@ PRIORITY = "optional"
DESCRIPTION = "A Type1 Font Rastering Library"
SECTION = "libs"
PRIORITY = "optional"
-PR = "r3"
+DEPENDS = "virtual/libx11"
+PR = "r4"
LICENSE = "LGPL GPL"
SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
file://configure.patch;patch=1 \
@@ -10,7 +11,7 @@ inherit autotools
inherit autotools
-EXTRA_OECONF = "--without-x --without-athena"
+EXTRA_OECONF = "--with-x --without-athena"
EXTRA_OEMAKE = "without_doc"
do_configure() {
@@ -19,9 +20,7 @@ do_stage() {
}
do_stage() {
- oe_libinstall -so -C lib libt1 ${STAGING_LIBDIR}
- install lib/t1lib/t1lib.h ${STAGING_INCDIR}/
- install lib/t1lib/t1libx.h ${STAGING_INCDIR}/
+ autotools_stage_all
}
FILES_${PN} = "${bindir}/* ${libdir}/*.so* ${datadir}/t1lib/t1lib.config"
============================================================
--- packages/u-boot/u-boot-git/beagleboard/base.patch 1135185807d979f189a4aa922827442a60400f0c
+++ packages/u-boot/u-boot-git/beagleboard/base.patch 131ee68f67adb38f32a5f4ecfe1ab25729e8939b
@@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile
diff --git a/Makefile b/Makefile
-index 8bfc891..e9bf61a 100644
+index e557d0d..3eac691 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ ifeq ($(ARCH),ppc)
@@ -11,7 +11,7 @@ index 8bfc891..e9bf61a 100644
endif
ifeq ($(ARCH),i386)
CROSS_COMPILE = i386-linux-
-@@ -252,7 +252,7 @@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a
+@@ -253,7 +253,7 @@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a
LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
# Add GCC lib
@@ -20,7 +20,7 @@ index 8bfc891..e9bf61a 100644
# The "tools" are needed early, so put this first
# Don't include stuff already done in $(LIBS)
-@@ -2565,6 +2565,12 @@ SMN42_config : unconfig
+@@ -2569,6 +2569,12 @@ SMN42_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292
#########################################################################
@@ -1467,10 +1467,10 @@ new file mode 100644
+#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */
diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c
new file mode 100644
-index 0000000..0bdfb72
+index 0000000..7d9a566
--- /dev/null
+++ b/board/omap3530beagle/omap3530beagle.c
-@@ -0,0 +1,390 @@
+@@ -0,0 +1,388 @@
+/*
+ * (C) Copyright 2004-2008
+ * Texas Instruments, <www.ti.com>
@@ -1740,8 +1740,6 @@ index 0000000..0bdfb72
+ *((uint *) 0x49058094) = 0x00000506;
+ *((uint *) 0x49056094) = 0xF060F000;
+
-+ /* set clksel_tv and clksel_dss1 */
-+ *((uint *) 0x48004E40) = 0x00001002;
+ return (0);
+}
+
@@ -2323,19 +2321,60 @@ index 0000000..72f15f6
+ .bss : { *(.bss) }
+ _end = .;
+}
-diff --git a/common/env_nand.c b/common/env_nand.c
-index a48e98e..8b04a01 100644
---- a/common/env_nand.c
-+++ b/common/env_nand.c
-@@ -231,6 +231,8 @@ int saveenv(void)
- size_t total;
- int ret = 0;
+diff --git a/common/cmd_nand.c b/common/cmd_nand.c
+index 9e38bf7..0ae362c 100644
+--- a/common/cmd_nand.c
++++ b/common/cmd_nand.c
+@@ -37,6 +37,12 @@ int find_dev_and_part(const char *id, struct mtd_device **dev,
+ u8 *part_num, struct part_info **part);
+ #endif
-+ nand_erase_options_t nand_erase_options;
++#if defined(CONFIG_OMAP) && (defined(CONFIG_OMAP3_BEAGLE))
++extern void omap_nand_switch_ecc(nand_info_t *nand, int hardware);
++#else
++#define omap_nand_switch_ecc(x, y) do {} while(0)
++#endif
+
- nand_erase_options.length = CFG_ENV_RANGE;
- nand_erase_options.quiet = 0;
- nand_erase_options.jffs2 = 0;
+ static int nand_dump_oob(nand_info_t *nand, ulong off)
+ {
+ return 0;
+@@ -222,7 +228,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+ strncmp(cmd, "dump", 4) != 0 &&
+ strncmp(cmd, "read", 4) != 0 && strncmp(cmd, "write", 5) != 0 &&
+ strcmp(cmd, "scrub") != 0 && strcmp(cmd, "markbad") != 0 &&
+- strcmp(cmd, "biterr") != 0 &&
++ strcmp(cmd, "biterr") != 0 && strncmp(cmd, "ecc", 3) != 0 &&
+ strcmp(cmd, "lock") != 0 && strcmp(cmd, "unlock") != 0 )
+ goto usage;
+
+@@ -307,6 +313,19 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+
+ }
+
++ if (strncmp(cmd, "ecc", 3) == 0) {
++ if (argc < 2)
++ goto usage;
++ if (strncmp(argv[2], "hw", 2) == 0)
++ omap_nand_switch_ecc(nand, 1);
++ else if (strncmp(argv[2], "sw", 2) == 0)
++ omap_nand_switch_ecc(nand, 0);
++ else
++ goto usage;
++
++ return 0;
++ }
++
+ /* read write */
+ if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) {
+ int read;
+@@ -472,6 +491,7 @@ U_BOOT_CMD(nand, 5, 1, do_nand,
+ "nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n"
+ "nand markbad off - mark bad block at offset (UNSAFE)\n"
+ "nand biterr off - make a bit error at offset (UNSAFE)\n"
++ "nand ecc [hw/sw] - switch the ecc calculation algorithm \n"
+ "nand lock [tight] [status] - bring nand to lock state or display locked pages\n"
+ "nand unlock [offset] [size] - unlock section\n");
+
diff --git a/cpu/omap3/Makefile b/cpu/omap3/Makefile
new file mode 100644
index 0000000..097447a
@@ -4122,10 +4161,10 @@ diff --git a/fs/jffs2/jffs2_1pass.c b/fs
udelay(1000);
}else
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
-index 7e27ee1..e552e08 100644
+index d1423c1..%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list