fixes for meta-toolchain without x11

index 33abf96..27ce14d 100644
@@ -57,7 +57,8 @@ do_install () {
 }
 
 DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk glib-2.0-nativesdk"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk \
+                               ${@base_contains('DISTRO_FEATURES', 'x11', 'qemugl-nativesdk', '', d)}"
 RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
 EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-vnc-tls"
 

index 3a6389b..b6a2294 100644
@@ -3,7 +3,7 @@ require qemu.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-PR = "r2"
+PR = "r3"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
 FILESDIR = "${WORKDIR}"

@@ -36,10 +36,17 @@ SRC_URI_append_virtclass-native = "\
     "
 
 SRC_URI_append_virtclass-nativesdk = "\
-    ${QEMUGLPATCHES} \
-    file://glflags.patch \
+    ${@base_contains('DISTRO_FEATURES', 'x11', '${QEMUGLPATCHES} file://glflags.patch', '', d)}  \
     "
 SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed"
 SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba"
 
 S = "${WORKDIR}/qemu-${PV}"
+
+do_configure_prepend_virtclass-nativesdk() {
+	if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
+		# Undo the -lX11 added by linker-flags.patch
+		sed -i 's/-lX11//g' Makefile.target
+	fi
+}
+

index 5b87f39..62a2d1f 100644
@@ -12,10 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
 
 PROVIDES = "virtual/libsdl"
 
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
-DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
+           ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
+           tslib"
+DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk', '', d)}"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://configure_tweak.patch \

@@ -32,11 +34,12 @@ inherit autotools lib_package binconfig pkgconfig
 EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
                 --enable-file --disable-oss --disable-esd --disable-arts \
                 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
-                --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
+                --disable-mintaudio --disable-nasm --disable-video-dga \
                 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
                 --disable-video-xbios --disable-video-gem --disable-video-dummy \
                 --enable-input-events --enable-input-tslib --enable-pthreads \
                 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
+                ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
                 --disable-video-svga \
                 --disable-video-picogui --disable-video-qtopia --enable-dlopen \
                 --disable-rpath \

deleted file mode 100644
index eb107b8..0000000
@@ -1,86 +0,0 @@
-From de01f17a2cb88dc5ff53cc321342b888c33b120a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <[email protected]>
-Date: Thu, 11 Feb 2010 17:42:33 +0100
-Subject: [PATCH] Detect and use GCC atomic builtins for locking
-
----
- configure   |   17 +++++++++++++++++
- qemu-lock.h |   13 +++++++++++++
- 2 files changed, 30 insertions(+), 0 deletions(-)
-
-Upstream-Status: Pending
-
-Index: qemu-0.14.0/configure
-===================================================================
---- qemu-0.14.0.orig/configure
-+++ qemu-0.14.0/configure
-@@ -2243,6 +2243,20 @@ fi
- ##########################################
- 
- ##########################################
-+# check if we have gcc atomic built-ins
-+gcc_atomic_builtins=no
-+cat > $TMPC << EOF
-+int main(void) {
-+    int i;
-+    __sync_lock_test_and_set(&i, 1);
-+    __sync_lock_release(&i);
-+}
-+EOF
-+if compile_prog "" ""; then
-+    gcc_atomic_builtins=yes
-+fi
-+
-+##########################################
- # check if we have fdatasync
- 
- fdatasync=no
-@@ -2731,6 +2745,9 @@ fi
- if test "$gcc_attribute_warn_unused_result" = "yes" ; then
-   echo "CONFIG_GCC_ATTRIBUTE_WARN_UNUSED_RESULT=y" >> $config_host_mak
- fi
-+if test "$gcc_atomic_builtins" = "yes" ; then
-+  echo "CONFIG_GCC_ATOMIC_BUILTINS=y" >> $config_host_mak
-+fi
- if test "$fdatasync" = "yes" ; then
-   echo "CONFIG_FDATASYNC=y" >> $config_host_mak
- fi
-Index: qemu-0.14.0/qemu-lock.h
-===================================================================
---- qemu-0.14.0.orig/qemu-lock.h
-+++ qemu-0.14.0/qemu-lock.h
-@@ -33,6 +33,14 @@
- 
- #else
- 
-+#ifdef CONFIG_GCC_ATOMIC_BUILTINS
-+typedef int spinlock_t;
-+
-+#define SPIN_LOCK_UNLOCKED 0
-+
-+#define resetlock(p) __sync_lock_release((p))
-+#else /* CONFIG_GCC_ATOMIC_BUILTINS */
-+
- #if defined(__hppa__)
- 
- typedef int spinlock_t[4];
-@@ -56,7 +64,11 @@ static inline void resetlock (spinlock_t
- }
- 
- #endif
-+#endif /* !CONFIG_GCC_ATOMIC_BUILTINS */
- 
-+#ifdef CONFIG_GCC_ATOMIC_BUILTINS
-+#define testandset(p) __sync_lock_test_and_set((p), 1)
-+#else /* CONFIG_GCC_ATOMIC_BUILTINS */
- #if defined(_ARCH_PPC)
- static inline int testandset (int *p)
- {
-@@ -213,6 +225,7 @@ static inline int testandset (int *p)
- #else
- #error unimplemented CPU support
- #endif
-+#endif /* !CONFIG_GCC_ATOMIC_BUILTINS */
- 
- #if defined(CONFIG_USER_ONLY)
- static inline void spin_lock(spinlock_t *lock)

deleted file mode 100644
index a8fe65a..0000000
@@ -1,30 +0,0 @@
-After kernel commit:
-
-http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0/commit/?h=meta&id=9728c1b6a724daefc413b44e10253cdbb5e06d08
-
-It appears that the emulated colours in qemu are incorrect and that 
-the red and blue channels are reversed. This patch reverses that logic
-so the colours are correctly displayed on the versatile platform which
-doesn't support the BGR bit.
-
-RP 16/9/2011
-
-Upstream-Status: Pending
-
-Index: qemu-0.14.0/hw/pl110.c
-===================================================================
---- qemu-0.14.0.orig/hw/pl110.c	2011-09-16 14:45:34.228668514 +0100
-+++ qemu-0.14.0/hw/pl110.c	2011-09-16 15:17:22.458671206 +0100
-@@ -141,7 +141,11 @@
-         fprintf(stderr, "pl110: Bad color depth\n");
-         exit(1);
-     }
--    if (s->cr & PL110_CR_BGR)
-+
-+    if (s->versatile && s->bpp == BPP_16)
-+        /* Code assumes BPP_16 == 565 and BGR is never set on the versatile in 565 mode */
-+        bpp_offset = 0;
-+    else if (s->cr & PL110_CR_BGR)
-         bpp_offset = 0;
-     else
-         bpp_offset = 18;

55 lines not on this page · raw message

deleted file mode 100644
index 2075386..0000000
@@ -1,39 +0,0 @@
-From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Thu, 13 May 2010 12:23:40 +0200
-Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read
-
-* 65536 is default at least for ubuntu and fedora.
----
- linux-user/main.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-Upstream-Status: Pending
-
-Index: qemu-0.14.0/linux-user/main.c
-===================================================================
---- qemu-0.14.0.orig/linux-user/main.c
-+++ qemu-0.14.0/linux-user/main.c
-@@ -36,6 +36,7 @@
- #include "envlist.h"
- 
- #define DEBUG_LOGFILE "/tmp/qemu.log"
-+#define MMAP_MIN_ADDR_DEFAULT 65536
- 
- char *exec_path;
- 
-@@ -3010,8 +3011,14 @@ int main(int argc, char **argv, char **e
-             if (fscanf(fp, "%lu", &tmp) == 1) {
-                 mmap_min_addr = tmp;
-                 qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr);
-+            } else {
-+                qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
-+                mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
-             }
-             fclose(fp);
-+        } else {
-+            qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
-+            mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
-         }
-     }
- 

deleted file mode 100644
index 96881bb..0000000
@@ -1,22 +0,0 @@
-In native builds, qemu can fail to find zlib development files in the native 
-sysroot and the build machine might not have zlib-dev packages installed.
-
-Add CFLAGS to qemu's CFLAGS which in the native case means BUILD_CFLAGS are
-added and files in the sysroot can be found.
-
-Patch from Paul Eggleton, Comments by RP 28/11/10
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: qemu-0.14.0/configure
-===================================================================
---- qemu-0.14.0.orig/configure
-+++ qemu-0.14.0/configure
-@@ -229,6 +229,7 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun
- QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
- QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
- QEMU_INCLUDES="-I. -I\$(SRC_PATH)"
-+QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS"
- LDFLAGS="-g $LDFLAGS"
- 
- # make source path absolute

127 lines not on this page · raw message

deleted file mode 100644
index 0ad5551..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: qemu-0.14.0/Makefile.target
-===================================================================
---- qemu-0.14.0.orig/Makefile.target	2011-04-04 12:12:19.142871742 +0100
-+++ qemu-0.14.0/Makefile.target	2011-04-04 12:12:21.772871742 +0100
-@@ -362,7 +362,7 @@
- 
- monitor.o: hmp-commands.h qmp-commands.h
- 
--LIBS += -lGL -lGLU
-+LIBS += -lGL
- 
- $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
- 

deleted file mode 100644
index 2250444..0000000
@@ -1,18 +0,0 @@
-# This is a workaround to the crashes seen on Ubuntu.  Setting info to zero
-# makes info.info.x11.display zero and avoids the calls to
-# opengl_exec_set_parent_window, one of which is crashing.
-
-Upstream-Status: Pending
-
-Index: qemu-0.14.0/ui/sdl.c
-===================================================================
---- qemu-0.14.0.orig/ui/sdl.c
-+++ qemu-0.14.0/ui/sdl.c
-@@ -863,6 +863,7 @@ void sdl_display_init(DisplayState *ds,
-     vi = SDL_GetVideoInfo();
-     host_format = *(vi->vfmt);
- 
-+    bzero(&info, sizeof(info));
-     SDL_GetWMInfo(&info);
-     if (info.subsystem == SDL_SYSWM_X11 && info.info.x11.display)
-         opengl_exec_set_parent_window(info.info.x11.display,

deleted file mode 100644
index 711c360..0000000
@@ -1,22 +0,0 @@
-This patch is taken from debian. 128M is too less sometimes if distro
-with lot of packages is booted so this patch raises the default to 384M
-
-It has not been applied to upstream qemu
-
-Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-
-Index: qemu-0.14.0/vl.c
-===================================================================
---- qemu-0.14.0.orig/vl.c
-+++ qemu-0.14.0/vl.c
-@@ -168,7 +168,7 @@ int main(int argc, char **argv)
- //#define DEBUG_NET
- //#define DEBUG_SLIRP
- 
--#define DEFAULT_RAM_SIZE 128
-+#define DEFAULT_RAM_SIZE 384
- 
- #define MAX_VIRTIO_CONSOLES 1
- 

deleted file mode 100644
index c0d1e55..0000000
@@ -1,25 +0,0 @@
-Fedora 13 switched the default behaviour of the linker to no longer
-indirectly link to required libraries (i.e. dependencies of a library
-already linked to). Therefore we need to explicitly pass the depended on
-libraries into the linker for building to work on Fedora 13.
-
-More information is available on the Fedora Wiki:
-https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
-
-JL - 15/06/10
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: qemu-0.14.0/Makefile.target
-===================================================================
---- qemu-0.14.0.orig/Makefile.target
-+++ qemu-0.14.0/Makefile.target
-@@ -218,7 +218,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p
- obj-y += rwhandler.o
- obj-$(CONFIG_KVM) += kvm.o kvm-all.o
- obj-$(CONFIG_NO_KVM) += kvm-stub.o
--LIBS+=-lz
-+LIBS+=-lz -lX11 -ldl
- 
- QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
- QEMU_CFLAGS += $(VNC_SASL_CFLAGS)

deleted file mode 100644
index d6a4377..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: qemu-0.14.0/Makefile
-===================================================================
---- qemu-0.14.0.orig/Makefile
-+++ qemu-0.14.0/Makefile
-@@ -235,7 +235,7 @@ install-sysconfig:
- install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig
- 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
- ifneq ($(TOOLS),)
--	$(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
-+	$(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
- endif
- ifneq ($(BLOBS),)
- 	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"

43 lines not on this page · raw message

deleted file mode 100644
index c4044296c51529878f5d2a46230949d09ef1d4e2..0000000000000000000000000000000000000000
GIT binary patch

2,503 lines not on this page · raw message

118 lines not on this page · raw message

65 lines not on this page · raw message

74 lines not on this page · raw message

152 lines not on this page · raw message

48 lines not on this page · raw message