diff options
| -rw-r--r-- | recipes/dbus/dbus.inc | 1 | ||||
| -rw-r--r-- | recipes/intltool/intltool_0.40.3.bb | 2 | ||||
| -rw-r--r-- | recipes/mc/mc.inc | 2 | ||||
| -rw-r--r-- | recipes/mc/mc_4.6.2.bb | 11 | ||||
| -rw-r--r-- | recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch | 48 | ||||
| -rw-r--r-- | recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb | 2 | ||||
| -rw-r--r-- | recipes/xorg-driver/xorg-driver-common.inc | 3 |
7 files changed, 67 insertions, 2 deletions
diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc index b5eeb08629..202aec432d 100644 --- a/recipes/dbus/dbus.inc +++ b/recipes/dbus/dbus.inc @@ -41,6 +41,7 @@ do_install_append() { install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M: if [ -e bus/.libs/dbus-daemon-launch-helper ]; then + install -d ${D}${libexecdir}/ install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/ fi } diff --git a/recipes/intltool/intltool_0.40.3.bb b/recipes/intltool/intltool_0.40.3.bb index d906cb787c..a5aa151337 100644 --- a/recipes/intltool/intltool_0.40.3.bb +++ b/recipes/intltool/intltool_0.40.3.bb @@ -2,6 +2,8 @@ require intltool.inc PR = "${INC_PR}.0" +DEPENDS += " libxml-parser-perl-native" + EXTRA_OEMAKE = "'PERL_TARGET=/usr/bin/perl'" do_configure_prepend() { diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc index 9d00aca664..f7db53ffd0 100644 --- a/recipes/mc/mc.inc +++ b/recipes/mc/mc.inc @@ -9,7 +9,7 @@ RDEPENDS = "ncurses-terminfo" SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz" -inherit autotools +inherit autotools gettext EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \ --without-nfs --without-gpm-mouse --with-screen=ncurses \ diff --git a/recipes/mc/mc_4.6.2.bb b/recipes/mc/mc_4.6.2.bb index 10da272f79..387187dc52 100644 --- a/recipes/mc/mc_4.6.2.bb +++ b/recipes/mc/mc_4.6.2.bb @@ -1,5 +1,5 @@ require mc.inc -PR = "r3" +PR = "r4" HOMEPAGE = "http://www.midnight-commander.org/" # most of these fixes were copied from openSUSE Factory. @@ -78,3 +78,12 @@ do_utf8_conversion() { popd popd } + +do_configure_prepend() { + +AUTOFOO="config.guess config.rpath config.sub depcomp install-sh missing mkinstalldirs" + + for i in ${AUTOFOO}; do + rm config/${i} + done +} diff --git a/recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch b/recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch new file mode 100644 index 0000000000..0bf41fd4dd --- /dev/null +++ b/recipes/xorg-driver/xf86-video-fbdev/use-staged-headers.patch @@ -0,0 +1,48 @@ +Index: xf86-video-fbdev-0.4.0/src/fbdev.c +=================================================================== +--- xf86-video-fbdev-0.4.0.orig/src/fbdev.c ++++ xf86-video-fbdev-0.4.0/src/fbdev.c +@@ -10,29 +10,29 @@ + #include <string.h> + + /* all driver need this */ +-#include "xf86.h" +-#include "xf86_OSproc.h" ++#include <xf86.h> ++#include <xf86_OSproc.h> + +-#include "mipointer.h" +-#include "mibstore.h" +-#include "micmap.h" +-#include "colormapst.h" +-#include "xf86cmap.h" ++#include <mipointer.h> ++#include <mibstore.h> ++#include <micmap.h> ++#include <colormapst.h> ++#include <xf86cmap.h> + #include "shadow.h" +-#include "dgaproc.h" ++#include <dgaproc.h> + + /* for visuals */ +-#include "fb.h" ++#include <fb.h> + #ifdef USE_AFB + #include "afb.h" + #endif + +-#include "xf86Resources.h" +-#include "xf86RAC.h" ++#include <xf86Resources.h> ++#include <xf86RAC.h> + +-#include "fbdevhw.h" ++#include <fbdevhw.h> + +-#include "xf86xv.h" ++#include <xf86xv.h> + + #ifdef XSERVER_LIBPCIACCESS + #include <pciaccess.h> + diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb b/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb index ee2ec96eb5..ea21fd3dc8 100644 --- a/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb +++ b/recipes/xorg-driver/xf86-video-fbdev_0.4.0.bb @@ -3,4 +3,6 @@ PE = "1" DESCRIPTION = "X.Org X server -- fbdev display driver" +FILES_${PN} += " file://use-staged-headers.patch;patch=1" + #DEPENDS += " " diff --git a/recipes/xorg-driver/xorg-driver-common.inc b/recipes/xorg-driver/xorg-driver-common.inc index 36c0ddf3b3..110ccde3b6 100644 --- a/recipes/xorg-driver/xorg-driver-common.inc +++ b/recipes/xorg-driver/xorg-driver-common.inc @@ -16,6 +16,9 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/*/.debug" inherit autotools pkgconfig +TARGET_CPPFLAGS += "-I${STAGING_DIR_HOST}/usr/include/xorg" + + do_stage() { autotools_stage_all } |