From dcef902e9a2880edd892d8ef226b8c8a27471727 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Jun 2007 18:28:01 +0000 Subject: minimo: declare missing dependency on zip-native. Looks like there are other dependencies missing since compilation from scratch still fails for me. zip-native is certainly needed, though and thus I commit early and often. --- packages/mozilla/minimo_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index 9c29926100..c0e8edc747 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -4,7 +4,7 @@ LICENSE = "MPL GPL LGPL" HOMEPAGE = "http://www.mozilla.org/projects/minimo/" PRIORITY = "optional" -DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native" +DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native" CVSSVR="cvs-mirror.mozilla.org" BRTAG = "MOZILLA_1_8_BRANCH" -- cgit v1.2.3 From 0b5013a28916853b93db43529d96ed68c767c223 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Jun 2007 18:47:19 +0000 Subject: jikes: make jikes-native PROVIDE virtual/javac-native c.f. http://www.openembedded.org/wiki/AdvancedConfiguration --- packages/jikes/jikes-native_1.21.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/jikes/jikes-native_1.21.bb b/packages/jikes/jikes-native_1.21.bb index 7bea3e3cba..2996046639 100644 --- a/packages/jikes/jikes-native_1.21.bb +++ b/packages/jikes/jikes-native_1.21.bb @@ -1,6 +1,7 @@ -SECTION = "devel" inherit native require jikes_${PV}.bb + +PROVIDES = "virtual/javac-native" S = "${WORKDIR}/jikes-${PV}" do_stage() { -- cgit v1.2.3 From b2d2646a4c47bfd98984f13f42be469bcef92257 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Jun 2007 19:24:14 +0000 Subject: classpath: add virtual/java-native to DEPENDS this package now becomes unbuildable until bug 2323 is fixed which also lists a workaround Reasoning: the compilation of java requires the java command being available java is not among the RequiredSoftware as listed in the wiki There is no package providing virtual/java-native yet which is the aim of 2323 --- packages/classpath/classpath-gtk_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb index 53f494ab15..dac200249f 100644 --- a/packages/classpath/classpath-gtk_cvs.bb +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -8,7 +8,7 @@ PR = "r1" SRCDATE_${PN} ?= "20070501" PV = "0.93+cvs${SRCDATE}" -DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native" +DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native" RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" -- cgit v1.2.3 From 6a5d18a241746736f548ce5d5e6c315f1f50f53a Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Jun 2007 19:47:22 +0000 Subject: classpath: unify the gtk_cvs version and leave a note on how to compile it. --- packages/classpath/classpath-gtk_cvs.bb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb index dac200249f..690fb761b7 100644 --- a/packages/classpath/classpath-gtk_cvs.bb +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -1,13 +1,11 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" +require classpath.inc + PR = "r1" SRCDATE_${PN} ?= "20070501" PV = "0.93+cvs${SRCDATE}" +### note from Laibsch: bug 2523 has information on how to build this package DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native" RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" @@ -17,8 +15,6 @@ SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpa S = "${WORKDIR}/classpath" -inherit autotools - EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa" PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" @@ -41,6 +37,3 @@ do_install() { autotools_do_install mv ${D}${libdir}/security ${D}${libdir}/${PN} } - -PROVIDES = "classpath" -RPROVIDES = "classpath" -- cgit v1.2.3 From f53f96335ecc987fa9b8df806c375d2d2955a968 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 19 Jun 2007 10:30:29 +0000 Subject: classpath: fix compilation failure of classpath-gtk_cvs. Closes 2519. * add libxtst to DEPENDS * fix packaging * move stuff to *.inc (unify) --- packages/classpath/classpath-gtk_cvs.bb | 13 ++----------- packages/classpath/classpath.inc | 13 +++++++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb index 690fb761b7..18d79decae 100644 --- a/packages/classpath/classpath-gtk_cvs.bb +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -1,12 +1,12 @@ require classpath.inc -PR = "r1" +PR = "r2" SRCDATE_${PN} ?= "20070501" PV = "0.93+cvs${SRCDATE}" ### note from Laibsch: bug 2523 has information on how to build this package -DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native" +DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native libxtst" RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" @@ -17,15 +17,6 @@ S = "${WORKDIR}/classpath" EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa" -PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" - -FILES_classpath-doc = "${datadir}/info ${datadir}/man" -FILES_classpath-dev = "${includedir}" -FILES_${PN} = "${libdir} ${bindir}" -FILES_classpath-common = "${datadir}/classpath/glibj.zip" -FILES_classpath-examples = "${datadir}/classpath/examples" -FILES_classpath-tools = "${datadir}/classpath/tools.zip" - do_stage() { install -d ${STAGING_INCDIR}/classpath install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 1d684c0557..db75d52a5c 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -28,3 +28,16 @@ FILES_classpath-common += "${datadir}/classpath/glibj.zip" FILES_classpath-examples += "${datadir}/classpath/examples" FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools" FILES_classpath-dev += "${libdir}/*.so" +FILES_classpath-dbg += "${libdir}/classpath/.debug" + +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -d ${STAGING_DATADIR}/classpath + install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ +} + +do_install() { + autotools_do_install + mv ${D}${libdir}/security ${D}${libdir}/${PN} +} -- cgit v1.2.3 From 2340b33c5bb2e4206f9c35114a0bcbac711345d7 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 19 Jun 2007 13:42:09 +0000 Subject: classpath: some more fixes to packaging, etc and clean-up --- packages/classpath/classpath-gtk_0.93.bb | 11 +---------- packages/classpath/classpath-minimal-native_0.93.bb | 2 ++ packages/classpath/classpath-minimal_0.90.bb | 11 ++--------- packages/classpath/classpath.inc | 13 ------------- 4 files changed, 5 insertions(+), 32 deletions(-) diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb index 137ee8ffb2..a3b39d92f8 100644 --- a/packages/classpath/classpath-gtk_0.93.bb +++ b/packages/classpath/classpath-gtk_0.93.bb @@ -4,15 +4,6 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip- RDEPENDS_${PN} = "classpath-common (>= ${PV})" RCONFLICTS_${PN} = "classpath-minimal" -SRC_URI += "file://gconf_version.patch;patch=1" +SRC_URI += "file://disable-automake-checks-v2.patch;patch=1" EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi" - -PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" - -FILES_classpath-doc = "${datadir}/info" -FILES_classpath-dev = "${includedir}" -FILES_${PN} = "${libdir} ${bindir}" -FILES_classpath-common = "${datadir}/classpath/glibj.zip" -FILES_classpath-examples = "${datadir}/classpath/examples" -FILES_classpath-tools = "${datadir}/classpath/tools.zip" diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb index f8e88a0217..83cb60142c 100644 --- a/packages/classpath/classpath-minimal-native_0.93.bb +++ b/packages/classpath/classpath-minimal-native_0.93.bb @@ -3,6 +3,8 @@ require classpath.inc DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native" PR = "r1" +SRC_URI += "file://disable-automake-checks-v2.patch;patch=1" + S = "${WORKDIR}/classpath-${PV}" inherit native diff --git a/packages/classpath/classpath-minimal_0.90.bb b/packages/classpath/classpath-minimal_0.90.bb index 1339b2dbc8..8d9554c999 100644 --- a/packages/classpath/classpath-minimal_0.90.bb +++ b/packages/classpath/classpath-minimal_0.90.bb @@ -4,13 +4,6 @@ DEPENDS = "jikes-native zip-native" RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})" RCONFLICTS_${PBN}-minimal = "${PBN}-gtk" -EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa" - -PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}" +SRC_URI += "file://disable-automake-checks.patch;patch=1" -FILES_${PBN}-doc = "${datadir}/info" -FILES_${PBN}-dev = "${includedir}" -FILES_${PN} = "${libdir}" -FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip" -FILES_${PBN}-examples = "${datadir}/${PBN}/examples" -FILES_${PBN}-tools = "${datadir}/${PBN}/tools" +EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa" diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index db75d52a5c..d9498c99d5 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -7,7 +7,6 @@ PROVIDES = "classpath" RPROVIDES = "classpath" SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \ - file://disable-automake-checks.patch;patch=1 \ file://gconf_version.patch;patch=1 \ file://fix-endian-arm-floats.patch;patch=1" @@ -29,15 +28,3 @@ FILES_classpath-examples += "${datadir}/classpath/examples" FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools" FILES_classpath-dev += "${libdir}/*.so" FILES_classpath-dbg += "${libdir}/classpath/.debug" - -do_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ - install -d ${STAGING_DATADIR}/classpath - install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} -- cgit v1.2.3 From 978058847aa2b9a0b92be5ce59a512c421de8ee6 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 19 Jun 2007 15:37:30 +0000 Subject: freetype: update to 2.3.4. Closes 2218. --- packages/freetype/freetype-2.3.3/.mtn2git_empty | 0 .../freetype/freetype-2.3.3/fix-x86_64-build.patch | 26 -------------- packages/freetype/freetype-2.3.4/.mtn2git_empty | 0 .../freetype/freetype-2.3.4/fix-x86_64-build.patch | 26 ++++++++++++++ packages/freetype/freetype_2.3.3.bb | 41 ---------------------- packages/freetype/freetype_2.3.4.bb | 41 ++++++++++++++++++++++ 6 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 packages/freetype/freetype-2.3.3/.mtn2git_empty delete mode 100644 packages/freetype/freetype-2.3.3/fix-x86_64-build.patch create mode 100644 packages/freetype/freetype-2.3.4/.mtn2git_empty create mode 100644 packages/freetype/freetype-2.3.4/fix-x86_64-build.patch delete mode 100644 packages/freetype/freetype_2.3.3.bb create mode 100644 packages/freetype/freetype_2.3.4.bb diff --git a/packages/freetype/freetype-2.3.3/.mtn2git_empty b/packages/freetype/freetype-2.3.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch deleted file mode 100644 index ae504dcb0b..0000000000 --- a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: freetype-2.3.1/builds/unix/configure.raw -=================================================================== ---- freetype-2.3.1.orig/builds/unix/configure.raw -+++ freetype-2.3.1/builds/unix/configure.raw -@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) - # checks for native programs to generate building tool - - if test ${cross_compiling} = yes; then -- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) -+ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) - test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) -Index: freetype-2.3.1/builds/unix/configure.ac -=================================================================== ---- freetype-2.3.1.orig/builds/unix/configure.ac -+++ freetype-2.3.1/builds/unix/configure.ac -@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) - # checks for native programs to generate building tool - - if test ${cross_compiling} = yes; then -- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) -+ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) - test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) diff --git a/packages/freetype/freetype-2.3.4/.mtn2git_empty b/packages/freetype/freetype-2.3.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch new file mode 100644 index 0000000000..ae504dcb0b --- /dev/null +++ b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch @@ -0,0 +1,26 @@ +Index: freetype-2.3.1/builds/unix/configure.raw +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.raw ++++ freetype-2.3.1/builds/unix/configure.raw +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) +Index: freetype-2.3.1/builds/unix/configure.ac +=================================================================== +--- freetype-2.3.1.orig/builds/unix/configure.ac ++++ freetype-2.3.1/builds/unix/configure.ac +@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) + # checks for native programs to generate building tool + + if test ${cross_compiling} = yes; then +- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) ++ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) + test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) + test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) diff --git a/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.3.bb deleted file mode 100644 index c1febe8a90..0000000000 --- a/packages/freetype/freetype_2.3.3.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://fix-x86_64-build.patch;patch=1 \ - file://no-hardcode.patch;patch=1 \ - " - -S = "${WORKDIR}/freetype-${PV}" - -inherit autotools pkgconfig binconfig - -DEFAULT_PREFERENCE = "-1" - -LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" -EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -EXTRA_OECONF = "--without-zlib" - -do_configure() { - cd builds/unix - gnu-configize - aclocal -I . - autoconf - cd ${S} - oe_runconf -} - -do_compile_prepend() { - ${BUILD_CC} -o objs/apinames src/tools/apinames.c -} - -do_stage() { - export LIBTOOL='${LIBTOOL}' - autotools_stage_all - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/packages/freetype/freetype_2.3.4.bb b/packages/freetype/freetype_2.3.4.bb new file mode 100644 index 0000000000..c1febe8a90 --- /dev/null +++ b/packages/freetype/freetype_2.3.4.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Freetype font rendering library" +SECTION = "libs" +LICENSE = "freetype" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://fix-x86_64-build.patch;patch=1 \ + file://no-hardcode.patch;patch=1 \ + " + +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +DEFAULT_PREFERENCE = "-1" + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" + +do_configure() { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_stage() { + export LIBTOOL='${LIBTOOL}' + autotools_stage_all + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" -- cgit v1.2.3 From e832d9bf772b3c45f400871e3b9163807cea3a76 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 20 Jun 2007 01:24:42 +0000 Subject: xchat: Fix QA error over .debug directry in /usr/lib/xchat/ --- packages/xchat/xchat_2.6.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/xchat/xchat_2.6.1.bb b/packages/xchat/xchat_2.6.1.bb index ec058067c5..fc362a9c41 100644 --- a/packages/xchat/xchat_2.6.1.bb +++ b/packages/xchat/xchat_2.6.1.bb @@ -3,10 +3,11 @@ LICENSE = "GPL" HOMEPAGE = "http://www.xchat.org" SECTION = "x11/network" DEPENDS = "libgcrypt zlib gtk+" -PR = "r2" +PR = "r3" SRC_URI = "http://www.xchat.org/files/source/2.6/xchat-${PV}.tar.bz2" inherit autotools EXTRA_OECONF = " --disable-perl --disable-python " +FILES_${PN}-dbg += " /usr/lib/xchat/plugins/.debug" -- cgit v1.2.3 From 0985aab11d4a6ecf875257450b1cb553169fd920 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 20 Jun 2007 10:32:52 +0000 Subject: esound 0.2.36 clean up, add no-docs patch --- packages/esound/esound-gpe/.mtn2git_empty | 0 packages/esound/esound-gpe/audiofile-please.patch | 40 ----------------------- packages/esound/esound-gpe/configure.patch | 20 ------------ packages/esound/esound_0.2.36.bb | 16 ++++----- packages/esound/files/.mtn2git_empty | 0 packages/esound/files/no-docs.patch | 11 +++++++ packages/esound/old/esound-gpe_20020817.bb | 35 -------------------- packages/esound/old/esound-gpe_20070109.bb | 34 ------------------- 8 files changed, 19 insertions(+), 137 deletions(-) delete mode 100644 packages/esound/esound-gpe/.mtn2git_empty delete mode 100644 packages/esound/esound-gpe/audiofile-please.patch delete mode 100644 packages/esound/esound-gpe/configure.patch create mode 100644 packages/esound/files/.mtn2git_empty create mode 100644 packages/esound/files/no-docs.patch delete mode 100644 packages/esound/old/esound-gpe_20020817.bb delete mode 100644 packages/esound/old/esound-gpe_20070109.bb diff --git a/packages/esound/esound-gpe/.mtn2git_empty b/packages/esound/esound-gpe/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/esound/esound-gpe/audiofile-please.patch b/packages/esound/esound-gpe/audiofile-please.patch deleted file mode 100644 index 0bfb629040..0000000000 --- a/packages/esound/esound-gpe/audiofile-please.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- esound/esd.h~ 2002-07-19 13:36:44.000000000 +0100 -+++ esound/esd.h 2004-05-16 11:04:29.000000000 +0100 -@@ -1,6 +1,8 @@ - #ifndef ESD_H - #define ESD_H - -+#define SUPPORT_AUDIOFILE -+ - #ifdef SUPPORT_AUDIOFILE - #include - #endif ---- esound/Makefile.am~ 2002-07-19 13:36:44.000000000 +0100 -+++ esound/Makefile.am 2004-05-16 10:56:35.000000000 +0100 -@@ -26,8 +26,8 @@ - lib_LTLIBRARIES = libesd.la $(libesddsp_la) - - libesd_la_LDFLAGS = -version-info $(ESD_VERSION_INFO) --#libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS) --libesd_la_LIBADD = $(SOUND_LIBS) -+libesd_la_LIBADD = $(AUDIOFILE_LIBS) $(SOUND_LIBS) -+#libesd_la_LIBADD = $(SOUND_LIBS) - - libesd_la_SOURCES = \ - esdlib.c \ -@@ -36,6 +36,7 @@ - audio.c \ - genrand.c \ - genrand.h \ -+ esdfile.c \ - util.c - - # one of these gets included by audio.c -@@ -79,7 +80,6 @@ - proto.c \ - samples.c \ - $(getopt_src) \ -- util.c \ - esd-server.h - - esdcat_SOURCES = \ diff --git a/packages/esound/esound-gpe/configure.patch b/packages/esound/esound-gpe/configure.patch deleted file mode 100644 index c6c33df11c..0000000000 --- a/packages/esound/esound-gpe/configure.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- esound/configure.in~ 2002-07-19 13:14:01.000000000 +0100 -+++ esound/configure.in 2004-05-16 10:51:48.000000000 +0100 -@@ -352,17 +352,5 @@ - esound.spec - esound.pc - esddsp --docs/Makefile --docs/esd.1 --docs/esdcat.1 --docs/esd-config.1 --docs/esdctl.1 --docs/esddsp.1 --docs/esdfilt.1 --docs/esdloop.1 --docs/esdmon.1 --docs/esdplay.1 --docs/esdrec.1 --docs/esdsample.1 - ]) - dnl , [case "$CONFIG_FILES" in *esd-config*) chmod +x esd-config;; esac]) diff --git a/packages/esound/esound_0.2.36.bb b/packages/esound/esound_0.2.36.bb index 1cf99ac90a..4797843acf 100644 --- a/packages/esound/esound_0.2.36.bb +++ b/packages/esound/esound_0.2.36.bb @@ -1,19 +1,19 @@ -DESCRIPTION = "Enlightened Sound Daemon - GPE version" +DESCRIPTION = "Enlightened Sound Daemon" SECTION = "gpe/base" LICENSE = "GPL" DEPENDS = "audiofile" - -PR = "r1" +PR = "r2" inherit gnome binconfig -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2" +SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-0.2.36.tar.bz2 \ + file://no-docs.patch;patch=1" EXTRA_OECONF = " \ - --disable-alsa \ - --disable-arts \ - --disable-artstest \ - " + --disable-alsa \ + --disable-arts \ + --disable-artstest \ +" do_configure_prepend() { sed -i -e 's:/usr/include/mme:${STAGING_INCDIR}/mme:g' configure.ac } diff --git a/packages/esound/files/.mtn2git_empty b/packages/esound/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/esound/files/no-docs.patch b/packages/esound/files/no-docs.patch new file mode 100644 index 0000000000..fc69f1a038 --- /dev/null +++ b/packages/esound/files/no-docs.patch @@ -0,0 +1,11 @@ +Index: esound-0.2.36/Makefile.am +=================================================================== +--- esound-0.2.36.orig/Makefile.am ++++ esound-0.2.36/Makefile.am +@@ -1,5 +1,5 @@ + +-SUBDIRS = docs ++SUBDIRS = + + ACLOCAL_FLAGS = -I m4 + diff --git a/packages/esound/old/esound-gpe_20020817.bb b/packages/esound/old/esound-gpe_20020817.bb deleted file mode 100644 index a698211f7d..0000000000 --- a/packages/esound/old/esound-gpe_20020817.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Enlightened Sound Daemon - GPE version" -SECTION = "gpe/base" -LICENSE = "GPL" -DEPENDS = "audiofile" -PR = "r5" -PROVIDES += "esound" -RPROVIDES += "esound" - -SRCDATE := "${PV}" -SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/base/;module=esound;date=20061119 \ - file://audiofile-please.patch;patch=1 \ - file://configure.patch;patch=1" - -S = "${WORKDIR}/esound" - -inherit autotools binconfig pkgconfig - -EXTRA_OECONF = "--disable-alsa" - -SOV = "0.2.28" -PV = "${SOV}+cvs${SRCDATE}" - - -do_stage () { - install -m 0644 esd.h ${STAGING_INCDIR}/esd.h - oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR} - install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la - install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal -} - -PACKAGES =+ "esddsp esd esd-utils" - -FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" -FILES_esd = "${bindir}/esd" -FILES_esd-utils = "${bindir}/*" diff --git a/packages/esound/old/esound-gpe_20070109.bb b/packages/esound/old/esound-gpe_20070109.bb deleted file mode 100644 index 850def76a0..0000000000 --- a/packages/esound/old/esound-gpe_20070109.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Enlightened Sound Daemon - GPE version" -SECTION = "gpe/base" -LICENSE = "GPL" -DEPENDS = "audiofile" -PR = "r0" -PROVIDES += "esound" -RPROVIDES += "esound" - -SRCDATE = "${PV}" -SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/;module=extra/esound;rev=8935 \ - file://audiofile-please.patch;patch=1 \ - file://configure.patch;patch=1" - -S = "${WORKDIR}/esound" - -inherit autotools binconfig pkgconfig - -EXTRA_OECONF = "--disable-alsa" - -SOV = "0.2.28" -PV = "${SOV}+cvs${SRCDATE}" - -do_stage () { - install -m 0644 esd.h ${STAGING_INCDIR}/esd.h - oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR} - install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la - install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal -} - -PACKAGES =+ "esddsp esd esd-utils" - -FILES_esddsp = "${bindir}/esddsp ${libdir}/libesddsp.so.*" -FILES_esd = "${bindir}/esd" -FILES_esd-utils = "${bindir}/*" -- cgit v1.2.3 From c557c0fa98fc000c0fec2a3db8bd13378705eac0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 20 Jun 2007 10:33:53 +0000 Subject: directfb update: * bump ++dfb to 1.0.0 * bump examples to 1.0.0 * bump fusionsound to 1.0.0 * clean up a bit --- packages/directfb/++dfb_0.9.25.bb | 24 ----------- packages/directfb/++dfb_1.0.0.bb | 24 +++++++++++ packages/directfb/directfb-examples_0.9.25.bb | 15 ------- packages/directfb/directfb-examples_1.0.0.bb | 20 +++++++++ packages/directfb/directfb_1.0.0.bb | 12 +++--- packages/directfb/files/fix-includes.patch | 8 ++-- packages/directfb/files/fix-pkgconfig-specs.patch | 47 ++++++++++++---------- .../directfb/fusionsound_0.9.26+cvs20070207.bb | 37 ----------------- packages/directfb/fusionsound_1.0.0.bb | 37 +++++++++++++++++ 9 files changed, 117 insertions(+), 107 deletions(-) delete mode 100644 packages/directfb/++dfb_0.9.25.bb create mode 100644 packages/directfb/++dfb_1.0.0.bb delete mode 100644 packages/directfb/directfb-examples_0.9.25.bb create mode 100644 packages/directfb/directfb-examples_1.0.0.bb delete mode 100644 packages/directfb/fusionsound_0.9.26+cvs20070207.bb create mode 100644 packages/directfb/fusionsound_1.0.0.bb diff --git a/packages/directfb/++dfb_0.9.25.bb b/packages/directfb/++dfb_0.9.25.bb deleted file mode 100644 index f440e117ff..0000000000 --- a/packages/directfb/++dfb_0.9.25.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library." -HOMEPAGE = "http://directfb.org" -SECTION = "libs" -DEPENDS = "directfb" -LICENSE = "LGPL" - -SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz" -S = "${WORKDIR}/++DFB-${PV}" -RV = "0.9-25" - -inherit autotools pkgconfig - -do_configure_append() { - find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' -} - -do_stage() { - autotools_stage_all -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} -FILES_++dfb_append = " ${libdir}/*.so*" diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb new file mode 100644 index 0000000000..f440e117ff --- /dev/null +++ b/packages/directfb/++dfb_1.0.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library." +HOMEPAGE = "http://directfb.org" +SECTION = "libs" +DEPENDS = "directfb" +LICENSE = "LGPL" + +SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz" +S = "${WORKDIR}/++DFB-${PV}" +RV = "0.9-25" + +inherit autotools pkgconfig + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} +FILES_++dfb_append = " ${libdir}/*.so*" diff --git a/packages/directfb/directfb-examples_0.9.25.bb b/packages/directfb/directfb-examples_0.9.25.bb deleted file mode 100644 index 28de29c4a6..0000000000 --- a/packages/directfb/directfb-examples_0.9.25.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "DirectFB examples" -DEPENDS = "directfb" -SECTION = "devel/examples" -LICENSE = "GPL" - -SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz" -S = "${WORKDIR}/DirectFB-examples-${PV}" - -inherit autotools - -do_configure_append() { -# find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' - find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' -} - diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb new file mode 100644 index 0000000000..8a792b4ae4 --- /dev/null +++ b/packages/directfb/directfb-examples_1.0.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "DirectFB extra providers" +DEPENDS = "directfb" +SECTION = "libs" +LICENSE = "GPL" + +SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-extra-${PV}.tar.gz" +S = "${WORKDIR}/DirectFB-extra-${PV}" + +inherit autotools + +do_configure_append() { +# find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' + find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb index caa8dbee8f..669ed49283 100644 --- a/packages/directfb/directfb_1.0.0.bb +++ b/packages/directfb/directfb_1.0.0.bb @@ -7,7 +7,7 @@ SECTION = "libs" LICENSE = "LGPL" HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib" -PR = "r4" +PR = "r5" RV = "1.0-0" SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ @@ -38,18 +38,18 @@ do_install() { FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \ - ${libdir}/directfb-${RV}/*/.debug/*.so \ - " + ${libdir}/directfb-${RV}/*/.debug/*.so \ +" FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \ ${libdir}/directfb-${RV}/inputdrivers/*.la \ ${libdir}/directfb-${RV}/interfaces/*/*.la \ - ${libdir}/directfb-${RV}/wm/*.la" - + ${libdir}/directfb-${RV}/wm/*.la \ +" FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \ ${libdir}/directfb-${RV}/inputdrivers/*.so \ ${libdir}/directfb-${RV}/interfaces/*/*.so \ ${libdir}/directfb-${RV}/wm/*.so \ ${datadir}/directfb-1.0.0 \ - " +" diff --git a/packages/directfb/files/fix-includes.patch b/packages/directfb/files/fix-includes.patch index 0c40cdb3a6..7b4a112582 100644 --- a/packages/directfb/files/fix-includes.patch +++ b/packages/directfb/files/fix-includes.patch @@ -1,7 +1,7 @@ # # pkgconfig points to STAGING_INCDIR, hence -# we need to append a directfb/ to make it -# find its header files +# we need to make this a local include +# or else it doesn't find its own header files # # Signed-Off: mickey@openmoko.org # @@ -14,11 +14,11 @@ Index: DirectFB-1.0.0/include/directfb.h #define __DIRECTFB_H__ -#include -+#include ++#include "dfb_types.h" #include /* struct timeval */ -#include -+#include ++#include "directfb_keyboard.h" #ifdef __cplusplus extern "C" diff --git a/packages/directfb/files/fix-pkgconfig-specs.patch b/packages/directfb/files/fix-pkgconfig-specs.patch index 0273b58ec5..c252dc1792 100644 --- a/packages/directfb/files/fix-pkgconfig-specs.patch +++ b/packages/directfb/files/fix-pkgconfig-specs.patch @@ -1,43 +1,48 @@ -diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-internal.pc.in ---- DirectFB-1.0.0~org/directfb-internal.pc.in 2003-07-04 13:30:22.000000000 -0400 -+++ DirectFB-1.0.0/directfb-internal.pc.in 2007-03-16 22:34:17.000000000 -0400 -@@ -8,4 +8,4 @@ +Index: DirectFB-1.0.0/directfb-internal.pc.in +=================================================================== +--- DirectFB-1.0.0.orig/directfb-internal.pc.in ++++ DirectFB-1.0.0/directfb-internal.pc.in +@@ -8,4 +8,4 @@ Name: DirectFB-Internal Description: Third party module support package for DirectFB. Version: @VERSION@ Requires: directfb = @VERSION@ -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ -+Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir} -diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in ---- DirectFB-1.0.0~org/directfb.pc.in 2004-08-04 12:28:20.000000000 -0400 -+++ DirectFB-1.0.0/directfb.pc.in 2007-03-16 22:31:33.000000000 -0400 -@@ -8,4 +8,4 @@ ++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir} -I${includedir}/../directfb +Index: DirectFB-1.0.0/directfb.pc.in +=================================================================== +--- DirectFB-1.0.0.orig/directfb.pc.in ++++ DirectFB-1.0.0/directfb.pc.in +@@ -8,4 +8,4 @@ Description: Graphics and windowing libr Version: @VERSION@ Requires: fusion direct Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@ -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ +Cflags: @THREADFLAGS@ -I${includedir} -diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in ---- DirectFB-1.0.0~org/lib/direct/direct.pc.in 2005-11-23 09:18:59.000000000 -0500 -+++ DirectFB-1.0.0/lib/direct/direct.pc.in 2007-03-16 22:32:13.000000000 -0400 -@@ -7,4 +7,4 @@ +Index: DirectFB-1.0.0/lib/direct/direct.pc.in +=================================================================== +--- DirectFB-1.0.0.orig/lib/direct/direct.pc.in ++++ DirectFB-1.0.0/lib/direct/direct.pc.in +@@ -7,4 +7,4 @@ Name: Direct Description: DirectFB base development library Version: @VERSION@ Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@ -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ +Cflags: @THREADFLAGS@ -I${includedir} -diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in ---- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in 2004-05-19 07:30:56.000000000 -0400 -+++ DirectFB-1.0.0/lib/fusion/fusion.pc.in 2007-03-16 22:32:34.000000000 -0400 -@@ -8,4 +8,4 @@ +Index: DirectFB-1.0.0/lib/fusion/fusion.pc.in +=================================================================== +--- DirectFB-1.0.0.orig/lib/fusion/fusion.pc.in ++++ DirectFB-1.0.0/lib/fusion/fusion.pc.in +@@ -8,4 +8,4 @@ Description: High Level IPC Mechanisms Version: @VERSION@ Requires: direct Libs: -L${libdir} -lfusion -Cflags: -I@INCLUDEDIR@ +Cflags: -I${includedir} -diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in ---- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in 2004-05-19 07:31:28.000000000 -0400 -+++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in 2007-03-16 22:32:55.000000000 -0400 -@@ -8,4 +8,4 @@ +Index: DirectFB-1.0.0/lib/voodoo/voodoo.pc.in +=================================================================== +--- DirectFB-1.0.0.orig/lib/voodoo/voodoo.pc.in ++++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in +@@ -8,4 +8,4 @@ Description: Interface based network tra Version: @VERSION@ Requires: direct Libs: -L${libdir} -lvoodoo diff --git a/packages/directfb/fusionsound_0.9.26+cvs20070207.bb b/packages/directfb/fusionsound_0.9.26+cvs20070207.bb deleted file mode 100644 index fe04a195c1..0000000000 --- a/packages/directfb/fusionsound_0.9.26+cvs20070207.bb +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "FusionSound for DirectFB" -DEPENDS = "directfb" -SECTION = "libs" -LICENSE = "LGPL" - -# this is a CVS only release - -SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=FusionSound;date=${@bb.data.getVar('PV', d, 1)[9:]}" - -S = "${WORKDIR}/FusionSound" - -inherit autotools pkgconfig - -do_configure_append() { - find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' -} - -do_stage() { - autotools_stage_all -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -FILES_fusionsound-dbg_append = " ${libdir}/directfb-1.0-0/*/*/.debug/*.so \ - ${libdir}/directfb-1.0-0/*/.debug/*.so \ - " - -FILES_fusionsound-dev_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.la \ - ${libdir}/directfb-1.0-0/snddrivers/*.la \ - " - -FILES_fusionsound_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.so \ - ${libdir}/directfb-1.0-0/snddrivers/*.so \ - " - diff --git a/packages/directfb/fusionsound_1.0.0.bb b/packages/directfb/fusionsound_1.0.0.bb new file mode 100644 index 0000000000..3cd4a385f6 --- /dev/null +++ b/packages/directfb/fusionsound_1.0.0.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "FusionSound for DirectFB" +DEPENDS = "directfb libmad libvorbis" +SECTION = "libs" +LICENSE = "LGPL" + +SRC_URI = "http://www.directfb.org/downloads/Core/FusionSound-${PV}.tar.gz" +S = "${WORKDIR}/FusionSound-${PV}" + +inherit autotools pkgconfig + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}/directfb:g' +} + +do_stage() { + autotools_stage_all +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +FILES_${PN} += "\ + ${libdir}/directfb-1.0-0/interfaces/*/*.so \ + ${libdir}/directfb-1.0-0/snddrivers/*.so \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/directfb-1.0-0/*/*/.debug/*.so \ + ${libdir}/directfb-1.0-0/*/.debug/*.so \ +" + +FILES_${PN}-dev += "\ + ${libdir}/directfb-1.0-0/interfaces/*/*.la \ + ${libdir}/directfb-1.0-0/snddrivers/*.la \ +" + -- cgit v1.2.3 From 66330066f357d88b85653ee8277c17fb52a3e2bd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Jun 2007 12:30:00 +0000 Subject: zaurus 2.4 kernels: add COMPATIBLE_HOST = "arm.*-linux" --- packages/linux/corgi-kernel-2.4-embedix.bb | 2 +- packages/linux/husky-kernel-2.4-embedix.bb | 1 + packages/linux/poodle-kernel-2.4-embedix.bb | 1 + packages/linux/poodle-kernels-2.4-embedix.bb | 1 + packages/linux/poodle255-kernel-2.4-embedix.bb | 2 +- packages/linux/shepherd-kernel-2.4-embedix.bb | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/linux/corgi-kernel-2.4-embedix.bb b/packages/linux/corgi-kernel-2.4-embedix.bb index 5870ed54b9..986ee7ac40 100644 --- a/packages/linux/corgi-kernel-2.4-embedix.bb +++ b/packages/linux/corgi-kernel-2.4-embedix.bb @@ -1,3 +1,3 @@ MACHINE = "corgi" - +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/husky-kernel-2.4-embedix.bb b/packages/linux/husky-kernel-2.4-embedix.bb index 19645079f1..81f859594c 100644 --- a/packages/linux/husky-kernel-2.4-embedix.bb +++ b/packages/linux/husky-kernel-2.4-embedix.bb @@ -1,3 +1,4 @@ +COMPATIBLE_HOST = "arm.*-linux" MACHINE = "husky" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/poodle-kernel-2.4-embedix.bb b/packages/linux/poodle-kernel-2.4-embedix.bb index 37845c4c96..2f26cbc863 100644 --- a/packages/linux/poodle-kernel-2.4-embedix.bb +++ b/packages/linux/poodle-kernel-2.4-embedix.bb @@ -1,4 +1,5 @@ MACHINE = "poodle" +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/poodle-kernels-2.4-embedix.bb b/packages/linux/poodle-kernels-2.4-embedix.bb index 7a714b7a12..21d334fec3 100644 --- a/packages/linux/poodle-kernels-2.4-embedix.bb +++ b/packages/linux/poodle-kernels-2.4-embedix.bb @@ -1,2 +1,3 @@ COMPATIBLE_MACHINE = "poodle" +COMPATIBLE_HOST = "arm.*-linux" DEPENDS = "poodle-kernel-2.4-embedix poodle255-kernel-2.4-embedix" diff --git a/packages/linux/poodle255-kernel-2.4-embedix.bb b/packages/linux/poodle255-kernel-2.4-embedix.bb index 2b58472185..f3044f4e67 100644 --- a/packages/linux/poodle255-kernel-2.4-embedix.bb +++ b/packages/linux/poodle255-kernel-2.4-embedix.bb @@ -1,4 +1,4 @@ MACHINE = "poodle255" - +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc diff --git a/packages/linux/shepherd-kernel-2.4-embedix.bb b/packages/linux/shepherd-kernel-2.4-embedix.bb index 874c72e432..ac573fd14e 100644 --- a/packages/linux/shepherd-kernel-2.4-embedix.bb +++ b/packages/linux/shepherd-kernel-2.4-embedix.bb @@ -1,5 +1,6 @@ MACHINE = "shepherd" COMPATIBLE_MACHINE = "shepherd" +COMPATIBLE_HOST = "arm.*-linux" require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc -- cgit v1.2.3 From 5e005f7ef14ad4c004512e9a0deda05052af082a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Jun 2007 13:09:55 +0000 Subject: angstrom: fix OABI package archs * downside: now there are 3 places for people to edit for people with oabi machines --- conf/distro/angstrom-2007.1.conf | 10 ++++------ conf/distro/include/angstromoabi.inc | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 conf/distro/include/angstromoabi.inc diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 6ef9646814..db293634f1 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -10,9 +10,12 @@ DISTRO_VERSION = "test-${DATE}" DISTRO_REVISION = "46" -require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc +#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} +ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}" +require conf/distro/include/angstrom${ARM_ABI}.inc + #Images built can have to modes: # 'debug': empty rootpassword, strace and gdb included # 'release' no root password, no strace and gdb by default @@ -88,11 +91,6 @@ FEED_ARCH_simpad = "arm-oabi" #Tweak packaging for strongarm machines since they can't use EABI -PACKAGE_ARCH_collie = "arm-oabi" -PACKAGE_ARCH_h3600 = "arm-oabi" -PACKAGE_ARCH_h3800 = "arm-oabi" -PACKAGE_ARCH_simpad = "arm-oabi" - PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi" PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi" diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc new file mode 100644 index 0000000000..bb7bc45fbd --- /dev/null +++ b/conf/distro/include/angstromoabi.inc @@ -0,0 +1,4 @@ +require conf/distro/include/angstrom.inc + +PACKAGE_ARCH = "arm-oabi" + -- cgit v1.2.3 From 39042a95f2c91d0b2a86ba882623a86364dbe013 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Jun 2007 13:47:53 +0000 Subject: uclibc 0.9.29: add generic config for arm (where 'generic', read 'armv4t') --- packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty | 0 packages/uclibc/uclibc-0.9.29/arm/uClibc.machine | 69 ++++++++++ .../uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine | 143 --------------------- 3 files changed, 69 insertions(+), 143 deletions(-) create mode 100644 packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty create mode 100644 packages/uclibc/uclibc-0.9.29/arm/uClibc.machine diff --git a/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/arm/uClibc.machine @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine index eec16b1b33..2d9f63e531 100644 --- a/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine +++ b/packages/uclibc/uclibc-0.9.29/ixp4xxbe/uClibc.machine @@ -68,146 +68,3 @@ DO_C99_MATH=y KERNEL_HEADERS="/usr/include" HAVE_DOT_CONFIG=y -# -# General Library Settings -# -# HAVE_NO_PIC is not set -# DOPIC is not set -# HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -HAVE_SHARED=y -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -# LDSO_PRELOAD_FILE_SUPPORT is not set -LDSO_BASE_FILENAME="ld.so" -# UCLIBC_STATIC_LDCONFIG is not set -LDSO_RUNPATH=y -UCLIBC_CTOR_DTOR=y -# HAS_NO_THREADS is not set -UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y -LINUXTHREADS_OLD=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y -MALLOC_GLIBC_COMPAT=y -UCLIBC_DYNAMIC_ATEXIT=y -COMPAT_ATEXIT=y -# UCLIBC_SUSV3_LEGACY is not set -# UCLIBC_SUSV3_LEGACY_MACROS is not set -UCLIBC_HAS_SHADOW=y -# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set -UCLIBC_HAS___PROGNAME=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" - -# -# Advanced Library Settings -# -UCLIBC_PWD_BUFFER_SIZE=256 -UCLIBC_GRP_BUFFER_SIZE=256 - -# -# Networking Support -# -UCLIBC_HAS_IPV6=y -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y -# UCLIBC_HAS_REENTRANT_RPC is not set -# UCLIBC_USE_NETLINK is not set -# UCLIBC_HAS_BSD_RES_CLOSE is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -# UCLIBC_HAS_CTYPE_UNSAFE is not set -UCLIBC_HAS_CTYPE_CHECKED=y -# UCLIBC_HAS_CTYPE_ENFORCED is not set -UCLIBC_HAS_WCHAR=y -# UCLIBC_HAS_LOCALE is not set -UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -UCLIBC_HAS_STDIO_BUFSIZ_256=y -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y -UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -UCLIBC_HAS_PRINTF_M_SPEC=y -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GNU_GETOPT=y -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -# UCLIBC_HAS_REGEX_OLD is not set -UCLIBC_HAS_FNMATCH=y -# UCLIBC_HAS_FNMATCH_OLD is not set -UCLIBC_HAS_WORDEXP=y -UCLIBC_HAS_FTW=y -UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PREFIX="/lib" -RUNTIME_PREFIX="/" -DEVEL_PREFIX="//usr" - -# -# Security options -# -# UCLIBC_BUILD_PIE is not set -# UCLIBC_HAS_ARC4RANDOM is not set -# HAVE_NO_SSP is not set -# UCLIBC_HAS_SSP is not set -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="" -UCLIBC_EXTRA_CFLAGS="" -# DODEBUG is not set -# DODEBUG_PT is not set -DOSTRIP=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -WARNINGS="-Wall" -# EXTRA_WARNINGS is not set -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set -- cgit v1.2.3 From b8acdc57cafa4e9f47d85c7866a50452ac0d067e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Jun 2007 14:53:04 +0000 Subject: evas-x11: enable x11-16 engine --- packages/efl/evas-x11_0.9.9.038.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/efl/evas-x11_0.9.9.038.bb b/packages/efl/evas-x11_0.9.9.038.bb index 765a8b73d4..60d8018201 100644 --- a/packages/efl/evas-x11_0.9.9.038.bb +++ b/packages/efl/evas-x11_0.9.9.038.bb @@ -1,6 +1,6 @@ require evas.inc DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r8" +PR = "r9" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -9,6 +9,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --enable-buffer \ --disable-software-qtopia \ --enable-software-x11 \ + --enable-software-16-x11 \ --disable-gl-x11 \ --enable-image-loader-eet \ --enable-image-loader-edb \ @@ -20,7 +21,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --enable-scale-sample \ --enable-scale-smooth \ --enable-convert-yuv \ - --disable-image-loader-svg \ + --disable-image-loader-svg \ --disable-convert-8-rgb-332 \ --disable-convert-8-rgb-666 \ --disable-convert-8-rgb-232 \ @@ -33,14 +34,14 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --disable-convert-16-rgb-444 \ --disable-convert-16-rgb-ipq \ --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-90 \ --enable-convert-16-rgb-rot-270 \ --disable-convert-24-rgb-888 \ --disable-convert-24-bgr-888 \ --disable-convert-32-rgb-8888 \ --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ --disable-convert-32-rgb-rot-0 \ --disable-convert-32-rgb-rot-90 \ --disable-convert-32-rgb-rot-270" -- cgit v1.2.3 From 58850c44dcb286fae07369d6e91c90c5b33ba04e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Jun 2007 15:14:43 +0000 Subject: evas-x11: also stage x11-16 header --- packages/efl/evas-x11_0.9.9.038.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/efl/evas-x11_0.9.9.038.bb b/packages/efl/evas-x11_0.9.9.038.bb index 60d8018201..4c5ef29515 100644 --- a/packages/efl/evas-x11_0.9.9.038.bb +++ b/packages/efl/evas-x11_0.9.9.038.bb @@ -1,6 +1,6 @@ require evas.inc DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r9" +PR = "r10" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -47,6 +47,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --disable-convert-32-rgb-rot-270" headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ + ../modules/engines/software_16_x11/Evas_Engine_Software_16_X11.h \ ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ ../modules/engines/buffer/Evas_Engine_Buffer.h \ ../modules/engines/fb/Evas_Engine_FB.h \ -- cgit v1.2.3 From ccc80138e3e4f00ea7798eca403c460cd8a346a1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Jun 2007 15:23:32 +0000 Subject: angstrom.conf: prefer version 2.3.4 of freetype --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index db293634f1..aa7aa0d345 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -136,7 +136,7 @@ PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.3" +PREFERRED_VERSION_freetype = "2.3.4" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.8" PREFERRED_VERSION_glib-2.0 = "2.12.12" -- cgit v1.2.3 From 6e88be3f9a9b1f633e607823b6386591333e7533 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Jun 2007 15:58:59 +0000 Subject: evas: inherit lib_package --- packages/efl/evas.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index f708200071..a175099c31 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -7,7 +7,7 @@ LICENSE = "MIT" DEPENDS = "freetype libpng jpeg eet" PROVIDES += "virtual/evas" -inherit efl +inherit efl lib_package export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" @@ -47,4 +47,4 @@ headers = "" libraries = "libevas" FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so" FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la" -FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/" \ No newline at end of file +FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/" -- cgit v1.2.3 From 64c2a82c5a282c5505caabc62221fede99083114 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 20 Jun 2007 18:29:50 +0000 Subject: linux-handhelds-2.6: Update defconfigs: * CONFIG_NLS_DEFAULT="utf8" (suggested by Koen Kooi) * For devices with builtin PCMCIA, enable driver for Ratoc USB Host Card. * htcuniversal: add supportf or ts-adc-debounce, modular, old driver, htcuniversal_ts, made modular too. * magician: Update for latest CVS. --- .../linux/linux-handhelds-2.6/aximx50/defconfig | 4 +- packages/linux/linux-handhelds-2.6/h2200/defconfig | 126 +++++++++++++++++++- packages/linux/linux-handhelds-2.6/h3600/defconfig | 4 +- packages/linux/linux-handhelds-2.6/h3800/defconfig | 4 +- packages/linux/linux-handhelds-2.6/h3900/defconfig | 4 +- packages/linux/linux-handhelds-2.6/h4000/defconfig | 4 +- packages/linux/linux-handhelds-2.6/h5000/defconfig | 4 +- .../linux-handhelds-2.6/htcblueangel/defconfig | 4 +- .../linux-handhelds-2.6/htcuniversal/defconfig | 10 +- .../linux/linux-handhelds-2.6/htcwallaby/defconfig | 4 +- .../linux/linux-handhelds-2.6/hx4700/defconfig | 129 ++++++++++++++++++++- .../linux/linux-handhelds-2.6/magician/defconfig | 7 +- packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb | 2 +- 13 files changed, 274 insertions(+), 32 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6/aximx50/defconfig b/packages/linux/linux-handhelds-2.6/aximx50/defconfig index fcb08aff2a..7b2c332d40 100644 --- a/packages/linux/linux-handhelds-2.6/aximx50/defconfig +++ b/packages/linux/linux-handhelds-2.6/aximx50/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh8 -# Mon Jun 18 14:34:05 2007 +# Wed Jun 20 18:24:21 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1128,7 +1128,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index 482b2bc273..c40780e0d9 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh8 -# Mon Jun 18 14:34:07 2007 +# Wed Jun 20 18:24:23 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -449,7 +449,10 @@ CONFIG_IRTTY_SIR=y # # FIR device drivers # +# CONFIG_USB_IRDA is not set +# CONFIG_SIGMATEL_FIR is not set CONFIG_PXA_FICP=y +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -463,9 +466,13 @@ CONFIG_BT_HIDP=m # # Bluetooth device drivers # +# CONFIG_BT_HCIUSB is not set CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIDTL1 is not set # CONFIG_BT_HCIBT3C is not set # CONFIG_BT_HCIBLUECARD is not set @@ -595,6 +602,7 @@ CONFIG_MTD_NAND_HAMCOP=y # CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -888,6 +896,7 @@ CONFIG_W1=y # # 1-wire Bus Masters # +# CONFIG_W1_MASTER_DS2490 is not set # CONFIG_W1_MASTER_DS2482 is not set CONFIG_W1_MASTER_DS1WM=y @@ -979,6 +988,7 @@ CONFIG_LEDS_TRIGGER_SHARED=y # Digital Video Broadcasting Devices # # CONFIG_DVB is not set +# CONFIG_USB_DABUSB is not set # # Graphics support @@ -1074,6 +1084,11 @@ CONFIG_SND_PXA2xx_I2SOUND=m # CONFIG_SND_PXA2XX_AC97 is not set # CONFIG_SND_RECON is not set +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + # # PCMCIA devices # @@ -1103,12 +1118,117 @@ CONFIG_HID=m CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB is not set +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_SL811_HCD=m +CONFIG_USB_SL811_CS=m + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' # +# +# may also be needed; see USB_STORAGE Help for more information +# +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set +# CONFIG_USB_GTCO is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set +# CONFIG_USB_USBNET is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_BERRY_CHARGE is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set + +# +# USB DSL modem support +# + # # USB Gadget Support # @@ -1285,7 +1405,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3600/defconfig b/packages/linux/linux-handhelds-2.6/h3600/defconfig index af98e10e7c..bd58264fd9 100644 --- a/packages/linux/linux-handhelds-2.6/h3600/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3600/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh8 -# Mon Jun 18 14:34:09 2007 +# Wed Jun 20 18:24:24 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1119,7 +1119,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3800/defconfig b/packages/linux/linux-handhelds-2.6/h3800/defconfig index f8f9cbd796..8b93a0f93c 100644 --- a/packages/linux/linux-handhelds-2.6/h3800/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3800/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh8 -# Mon Jun 18 14:34:11 2007 +# Wed Jun 20 18:24:26 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1119,7 +1119,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6/h3900/defconfig index 8ecfe9bcfe..5fba9c979f 100644 --- a/packages/linux/linux-handhelds-2.6/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh8 -# Mon Jun 18 14:34:13 2007 +# Wed Jun 20 18:24:28 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1215,7 +1215,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig index 7d0df5653b..5720f82af4 100644 --- a/packages/linux/linux-handhelds-2.6/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh8 -# Mon Jun 18