diff options
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko-versions.inc | 4 | ||||
| -rw-r--r-- | packages/mtd/mtd-utils_1.0.0+git.bb | 4 | ||||
| -rw-r--r-- | packages/mtd/mtd-utils_1.1.0.bb | 4 | ||||
| -rw-r--r-- | packages/vte/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/vte/files/vte-pkgconfig-fixes.patch | 47 | ||||
| -rw-r--r-- | packages/vte/vte.inc | 2 | ||||
| -rw-r--r-- | packages/vte/vte_0.16.9.bb | 2 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.22.bb | 16 |
8 files changed, 72 insertions, 7 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc index ef97eae09a..700af88653 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc @@ -1111,8 +1111,8 @@ PREFERRED_VERSION_libxres ?= "1.0.3" PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" PREFERRED_VERSION_libxsettings ?= "0.11" PREFERRED_VERSION_libxsettings-client ?= "0.17" -PREFERRED_VERSION_libxslt ?= "1.1.21" -PREFERRED_VERSION_libxslt-native ?= "1.1.21" +PREFERRED_VERSION_libxslt ?= "1.1.22" +PREFERRED_VERSION_libxslt-native ?= "1.1.22" PREFERRED_VERSION_libxt ?= "1.0.5" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxtst ?= "1.0.3" diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb index 42d92edd9a..b325bb03d3 100644 --- a/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/packages/mtd/mtd-utils_1.0.0+git.bb @@ -36,12 +36,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ do_install () { install -d ${D}${bindir} - install -d ${D}${includedir} + install -d ${D}${includedir}/mtd for binary in ${mtd_utils}; do install -m 0755 $binary ${D}${bindir} done for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir} + install -m 0644 $f ${D}${includedir}/mtd done } diff --git a/packages/mtd/mtd-utils_1.1.0.bb b/packages/mtd/mtd-utils_1.1.0.bb index 679fc7e79e..ed9a8b8441 100644 --- a/packages/mtd/mtd-utils_1.1.0.bb +++ b/packages/mtd/mtd-utils_1.1.0.bb @@ -33,12 +33,12 @@ mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ do_install () { install -d ${D}${bindir} - install -d ${D}${includedir} + install -d ${D}${includedir}/mtd for binary in ${mtd_utils}; do install -m 0755 $binary ${D}${bindir} done for f in ${S}/include/mtd/*.h; do - install -m 0644 $f ${D}${includedir} + install -m 0644 $f ${D}${includedir}/mtd done } diff --git a/packages/vte/files/.mtn2git_empty b/packages/vte/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vte/files/.mtn2git_empty diff --git a/packages/vte/files/vte-pkgconfig-fixes.patch b/packages/vte/files/vte-pkgconfig-fixes.patch new file mode 100644 index 0000000000..2acc7348e7 --- /dev/null +++ b/packages/vte/files/vte-pkgconfig-fixes.patch @@ -0,0 +1,47 @@ +Index: vte-0.16.9/configure.in +=================================================================== +--- vte-0.16.9.orig/configure.in 2007-09-17 23:07:18.000000000 +0100 ++++ vte-0.16.9/configure.in 2008-03-05 15:59:04.000000000 +0000 +@@ -381,8 +381,6 @@ + + # Search for the required modules. + PKG_CHECK_MODULES(VTE,[$wantedmodules]) +-NEEDEDPACKAGES="$wantedmodules" +-AC_SUBST(NEEDEDPACKAGES) + + # Check for various optional functions within those modules + save_CFLAGS="$CFLAGS" +@@ -403,10 +401,12 @@ + + # Require Freetype2. First see if there is suitable pkgconfig file... + PKG_CHECK_EXISTS(freetype2 >= 6.1.0, +- [PKG_CHECK_MODULES(FT2, freetype2)], [ ++ [PKG_CHECK_MODULES(FT2, freetype2) ++ wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [ + # We use our local copy of the macro because packages of + # freetype's development files don't always include the proper macro. +- VTE_CHECK_FT2(6.1.0,, ++ VTE_CHECK_FT2(6.1.0,[ ++ wantedmodules="$wantedmodules freetype2 >= 6.1.0" ], + [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])]) + + # Temporarily pull in the Freetype cflags and libs for checking what's +@@ -508,6 +508,8 @@ + CFLAGS="$savecflags" + CPPFLAGS="$savecppflags" + ++NEEDEDPACKAGES="$wantedmodules" ++AC_SUBST(NEEDEDPACKAGES) + + wcs_funcs_includes=" + #ifdef HAVE_STRING_H +Index: vte-0.16.9/vte.pc.in +=================================================================== +--- vte-0.16.9.orig/vte.pc.in 2007-02-26 21:05:19.000000000 +0000 ++++ vte-0.16.9/vte.pc.in 2008-03-05 15:56:37.000000000 +0000 +@@ -11,4 +11,4 @@ + Requires: @NEEDEDPACKAGES@ + Libs: -L${libdir} -lvte @OTHERLIBS@ + Libs.private: @FT2_LIBS@ +-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@ ++Cflags: -I${includedir} @OTHERCFLAGS@ diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc index e575a5a3fb..e9313cd861 100644 --- a/packages/vte/vte.inc +++ b/packages/vte/vte.inc @@ -5,6 +5,8 @@ RDEPENDS = "termcap" inherit gnome +SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1" + EXTRA_OECONF = "--disable-gtk-doc" do_stage() { diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb index f408632430..5875fd317f 100644 --- a/packages/vte/vte_0.16.9.bb +++ b/packages/vte/vte_0.16.9.bb @@ -1,2 +1,2 @@ require vte.inc -PR = "r3" +PR = "r4" diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb new file mode 100644 index 0000000000..a30a37c893 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh " + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} |