* [Qemu-devel] [PULL v2 0/5] sdl patch queue.
@ 2015-03-12 8:38 Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 1/5] sdl: Refresh debug statements Gerd Hoffmann
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 8:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Hi,
Misc stuff in the basket: sdl bugfixes, some preparing patches for the
upcoming opengl support in sdl2, x11 build improvement.
v2 fixes the clang build failure.
please pull,
Gerd
The following changes since commit d598911b6f5e7bf7bafb63b8e1d074729e94aca7:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150311' into staging (2015-03-11 16:30:33 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/pull-sdl-20150312-1
for you to fetch changes up to ecdc9a53acd7a5d0cf48f1b77b83c70e513e81da:
pixman: add a bunch of PIXMAN_BE_* defines for 32bpp (2015-03-12 09:20:42 +0100)
----------------------------------------------------------------
misc ui patches, mostly sdl related.
----------------------------------------------------------------
Benjamin Herrenschmidt (2):
sdl: Refresh debug statements
sdl: Fix crash when calling sdl_switch() with NULL surface
Gerd Hoffmann (2):
configure: opengl overhaul
pixman: add a bunch of PIXMAN_BE_* defines for 32bpp
Jeremy White (1):
Allow the use of X11 from a non standard location.
configure | 59 +++++++++++++++++++++++-----------------
default-configs/lm32-softmmu.mak | 2 +-
hw/display/Makefile.objs | 3 +-
hw/lm32/milkymist-hw.h | 4 +--
include/sysemu/sysemu.h | 1 +
include/ui/qemu-pixman.h | 16 +++++++++++
ui/sdl.c | 27 ++++++++++++++++--
vl.c | 1 +
8 files changed, 81 insertions(+), 32 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL v2 1/5] sdl: Refresh debug statements
2015-03-12 8:38 [Qemu-devel] [PULL v2 0/5] sdl patch queue Gerd Hoffmann
@ 2015-03-12 8:38 ` Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 2/5] sdl: Fix crash when calling sdl_switch() with NULL surface Gerd Hoffmann
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 8:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Anthony Liguori
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Put them under a #define similar to the VGA model and make them
actually compile. Add a couple too.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/sdl.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/ui/sdl.c b/ui/sdl.c
index 138ca73..b89182a 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -61,16 +61,24 @@ static SDL_PixelFormat host_format;
static int scaling_active = 0;
static Notifier mouse_mode_notifier;
+#if 0
+#define DEBUG_SDL
+#endif
+
static void sdl_update(DisplayChangeListener *dcl,
int x, int y, int w, int h)
{
- // printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h);
SDL_Rect rec;
rec.x = x;
rec.y = y;
rec.w = w;
rec.h = h;
+#ifdef DEBUG_SDL
+ printf("SDL: Updating x=%d y=%d w=%d h=%d (scaling: %d)\n",
+ x, y, w, h, scaling_active);
+#endif
+
if (guest_screen) {
if (!scaling_active) {
SDL_BlitSurface(guest_screen, &rec, real_screen, &rec);
@@ -89,7 +97,9 @@ static void do_sdl_resize(int width, int height, int bpp)
int flags;
SDL_Surface *tmp_screen;
- // printf("resizing to %d %d\n", w, h);
+#ifdef DEBUG_SDL
+ printf("SDL: Resizing to %dx%d bpp %d\n", width, height, bpp);
+#endif
flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
if (gui_fullscreen) {
@@ -143,6 +153,12 @@ static void sdl_switch(DisplayChangeListener *dcl,
if (guest_screen != NULL) {
SDL_FreeSurface(guest_screen);
}
+
+#ifdef DEBUG_SDL
+ printf("SDL: Creating surface with masks: %08x %08x %08x %08x\n",
+ pf.rmask, pf.gmask, pf.bmask, pf.amask);
+#endif
+
guest_screen = SDL_CreateRGBSurfaceFrom
(surface_data(surface),
surface_width(surface), surface_height(surface),
@@ -486,6 +502,10 @@ static void sdl_scale(int width, int height)
{
int bpp = real_screen->format->BitsPerPixel;
+#ifdef DEBUG_SDL
+ printf("SDL: Scaling to %dx%d bpp %d\n", width, height, bpp);
+#endif
+
if (bpp != 16 && bpp != 32) {
bpp = 32;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL v2 2/5] sdl: Fix crash when calling sdl_switch() with NULL surface
2015-03-12 8:38 [Qemu-devel] [PULL v2 0/5] sdl patch queue Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 1/5] sdl: Refresh debug statements Gerd Hoffmann
@ 2015-03-12 8:38 ` Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 3/5] configure: opengl overhaul Gerd Hoffmann
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 8:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Anthony Liguori
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This happens for example when doing ctrl-alt-u and segfaults
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/sdl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/sdl.c b/ui/sdl.c
index b89182a..8bdbf52 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -135,12 +135,13 @@ static void do_sdl_resize(int width, int height, int bpp)
static void sdl_switch(DisplayChangeListener *dcl,
DisplaySurface *new_surface)
{
- PixelFormat pf = qemu_pixelformat_from_pixman(new_surface->format);
+ PixelFormat pf;
/* temporary hack: allows to call sdl_switch to handle scaling changes */
if (new_surface) {
surface = new_surface;
}
+ pf = qemu_pixelformat_from_pixman(surface->format);
if (!scaling_active) {
do_sdl_resize(surface_width(surface), surface_height(surface), 0);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL v2 3/5] configure: opengl overhaul
2015-03-12 8:38 [Qemu-devel] [PULL v2 0/5] sdl patch queue Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 1/5] sdl: Refresh debug statements Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 2/5] sdl: Fix crash when calling sdl_switch() with NULL surface Gerd Hoffmann
@ 2015-03-12 8:38 ` Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 4/5] Allow the use of X11 from a non standard location Gerd Hoffmann
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 8:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Michael Walle, Gerd Hoffmann, Anthony Liguori
Rename config option from "glx" to "opengl", glx will not be the only
option for opengl in near future. Also switch over to pkg-config for
opengl support detection.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
configure | 39 +++++++++++++++++----------------------
default-configs/lm32-softmmu.mak | 2 +-
hw/display/Makefile.objs | 2 +-
hw/lm32/milkymist-hw.h | 4 ++--
include/sysemu/sysemu.h | 1 +
vl.c | 1 +
6 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/configure b/configure
index 7ba4bcb..ecd7893 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ rbd=""
smartcard_nss=""
libusb=""
usb_redir=""
-glx=""
+opengl=""
zlib="yes"
lzo=""
snappy=""
@@ -1027,9 +1027,9 @@ for opt do
;;
--enable-vhost-scsi) vhost_scsi="yes"
;;
- --disable-glx) glx="no"
+ --disable-opengl) opengl="no"
;;
- --enable-glx) glx="yes"
+ --enable-opengl) opengl="yes"
;;
--disable-rbd) rbd="no"
;;
@@ -3107,23 +3107,18 @@ fi
libs_softmmu="$libs_softmmu $fdt_libs"
##########################################
-# GLX probe, used by milkymist-tmu2
-if test "$glx" != "no" ; then
- glx_libs="-lGL -lX11"
- cat > $TMPC << EOF
-#include <X11/Xlib.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
-int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; }
-EOF
- if compile_prog "" "-lGL -lX11" ; then
- glx=yes
+# opengl probe (for sdl2, milkymist-tmu2)
+if test "$opengl" != "no" ; then
+ opengl_pkgs="gl"
+ if $pkg_config $opengl_pkgs; then
+ opengl_libs="$($pkg_config --libs $opengl_pkgs) -lX11"
+ opengl=yes
else
- if test "$glx" = "yes" ; then
- feature_not_found "glx" "Install GL devel (e.g. MESA)"
+ if test "$opengl" = "yes" ; then
+ feature_not_found "opengl" "Install GL devel (e.g. MESA)"
fi
- glx_libs=
- glx=no
+ opengl_libs=""
+ opengl=no
fi
fi
@@ -4390,7 +4385,7 @@ echo "xfsctl support $xfs"
echo "nss used $smartcard_nss"
echo "libusb $libusb"
echo "usb net redir $usb_redir"
-echo "GLX support $glx"
+echo "OpenGL support $opengl"
echo "libiscsi support $libiscsi"
echo "libnfs support $libnfs"
echo "build guest agent $guest_agent"
@@ -4756,9 +4751,9 @@ if test "$usb_redir" = "yes" ; then
echo "CONFIG_USB_REDIR=y" >> $config_host_mak
fi
-if test "$glx" = "yes" ; then
- echo "CONFIG_GLX=y" >> $config_host_mak
- echo "GLX_LIBS=$glx_libs" >> $config_host_mak
+if test "$opengl" = "yes" ; then
+ echo "CONFIG_OPENGL=y" >> $config_host_mak
+ echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
fi
if test "$lzo" = "yes" ; then
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index 7df58c8..4889348 100644
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -2,7 +2,7 @@
CONFIG_LM32=y
CONFIG_MILKYMIST=y
-CONFIG_MILKYMIST_TMU2=$(CONFIG_GLX)
+CONFIG_MILKYMIST_TMU2=$(CONFIG_OPENGL)
CONFIG_FRAMEBUFFER=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI01=y
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 7ed76a9..e18ea57 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -20,7 +20,7 @@ common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
ifeq ($(CONFIG_MILKYMIST_TMU2),y)
common-obj-y += milkymist-tmu2.o
-libs_softmmu += $(GLX_LIBS)
+libs_softmmu += $(OPENGL_LIBS)
endif
obj-$(CONFIG_OMAP) += omap_dss.o
diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h
index 5317ce6..8d20cac 100644
--- a/hw/lm32/milkymist-hw.h
+++ b/hw/lm32/milkymist-hw.h
@@ -86,7 +86,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base,
return dev;
}
-#ifdef CONFIG_GLX
+#ifdef CONFIG_OPENGL
#include <X11/Xlib.h>
#include <GL/glx.h>
static const int glx_fbconfig_attr[] = {
@@ -100,7 +100,7 @@ static const int glx_fbconfig_attr[] = {
static inline DeviceState *milkymist_tmu2_create(hwaddr base,
qemu_irq irq)
{
-#ifdef CONFIG_GLX
+#ifdef CONFIG_OPENGL
DeviceState *dev;
Display *d;
GLXFBConfig *configs;
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 6e85097..8a52934 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -114,6 +114,7 @@ extern int graphic_width;
extern int graphic_height;
extern int graphic_depth;
extern DisplayType display_type;
+extern int display_opengl;
extern const char *keyboard_layout;
extern int win2k_install_hack;
extern int alt_grab;
diff --git a/vl.c b/vl.c
index eba5d4c..694deb4 100644
--- a/vl.c
+++ b/vl.c
@@ -130,6 +130,7 @@ static int data_dir_idx;
const char *bios_name = NULL;
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
DisplayType display_type = DT_DEFAULT;
+int display_opengl;
static int display_remote;
const char* keyboard_layout = NULL;
ram_addr_t ram_size;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL v2 4/5] Allow the use of X11 from a non standard location.
2015-03-12 8:38 [Qemu-devel] [PULL v2 0/5] sdl patch queue Gerd Hoffmann
` (2 preceding siblings ...)
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 3/5] configure: opengl overhaul Gerd Hoffmann
@ 2015-03-12 8:38 ` Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 5/5] pixman: add a bunch of PIXMAN_BE_* defines for 32bpp Gerd Hoffmann
2015-03-12 10:35 ` [Qemu-devel] [PULL v2 0/5] sdl patch queue Peter Maydell
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 8:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Jeremy White, Gerd Hoffmann
From: Jeremy White <jwhite@codeweavers.com>
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
[ kraxel: solve opengl patch conflicts ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
configure | 24 +++++++++++++++++++-----
hw/display/Makefile.objs | 1 +
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index ecd7893..fef9c95 100755
--- a/configure
+++ b/configure
@@ -2085,6 +2085,15 @@ if test "$sparse" != "no" ; then
fi
##########################################
+# X11 probe
+x11_cflags=
+x11_libs=-lX11
+if $pkg_config --exists "x11"; then
+ x11_cflags=`$pkg_config --cflags x11`
+ x11_libs=`$pkg_config --libs x11`
+fi
+
+##########################################
# GTK probe
if test "$gtkabi" = ""; then
@@ -2111,7 +2120,8 @@ if test "$gtk" != "no"; then
gtk_cflags=`$pkg_config --cflags $gtkpackage`
gtk_libs=`$pkg_config --libs $gtkpackage`
if $pkg_config --exists "$gtkx11package >= $gtkversion"; then
- gtk_libs="$gtk_libs -lX11"
+ gtk_cflags="$gtk_cflags $x11_cflags"
+ gtk_libs="$gtk_libs $x11_libs"
fi
libs_softmmu="$gtk_libs $libs_softmmu"
gtk="yes"
@@ -2236,8 +2246,9 @@ if test "$sdl" = "yes" ; then
#endif
int main(void) { return 0; }
EOF
- if compile_prog "$sdl_cflags" "$sdl_libs" ; then
- sdl_libs="$sdl_libs -lX11"
+ if compile_prog "$sdl_cflags $x11_cflags" "$sdl_libs $x11_libs" ; then
+ sdl_cflags="$sdl_cflags $x11_cflags"
+ sdl_libs="$sdl_libs $x11_libs"
fi
libs_softmmu="$sdl_libs $libs_softmmu"
fi
@@ -3110,13 +3121,15 @@ libs_softmmu="$libs_softmmu $fdt_libs"
# opengl probe (for sdl2, milkymist-tmu2)
if test "$opengl" != "no" ; then
opengl_pkgs="gl"
- if $pkg_config $opengl_pkgs; then
- opengl_libs="$($pkg_config --libs $opengl_pkgs) -lX11"
+ if $pkg_config $opengl_pkgs x11; then
+ opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags"
+ opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs"
opengl=yes
else
if test "$opengl" = "yes" ; then
feature_not_found "opengl" "Install GL devel (e.g. MESA)"
fi
+ opengl_cflags=""
opengl_libs=""
opengl=no
fi
@@ -4753,6 +4766,7 @@ fi
if test "$opengl" = "yes" ; then
echo "CONFIG_OPENGL=y" >> $config_host_mak
+ echo "OPENGL_CFLAGS=$opengl_cflags" >> $config_host_mak
echo "OPENGL_LIBS=$opengl_libs" >> $config_host_mak
fi
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index e18ea57..e73cb7d 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -20,6 +20,7 @@ common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
ifeq ($(CONFIG_MILKYMIST_TMU2),y)
common-obj-y += milkymist-tmu2.o
+milkymist-tmu2.o-cflags := $(OPENGL_CFLAGS)
libs_softmmu += $(OPENGL_LIBS)
endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PULL v2 5/5] pixman: add a bunch of PIXMAN_BE_* defines for 32bpp
2015-03-12 8:38 [Qemu-devel] [PULL v2 0/5] sdl patch queue Gerd Hoffmann
` (3 preceding siblings ...)
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 4/5] Allow the use of X11 from a non standard location Gerd Hoffmann
@ 2015-03-12 8:38 ` Gerd Hoffmann
2015-03-12 10:35 ` [Qemu-devel] [PULL v2 0/5] sdl patch queue Peter Maydell
5 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 8:38 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
include/ui/qemu-pixman.h | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h
index 3dee576..5d7a9ac 100644
--- a/include/ui/qemu-pixman.h
+++ b/include/ui/qemu-pixman.h
@@ -27,8 +27,24 @@
#ifdef HOST_WORDS_BIGENDIAN
# define PIXMAN_BE_r8g8b8 PIXMAN_r8g8b8
+# define PIXMAN_BE_x8r8g8b8 PIXMAN_x8r8g8b8
+# define PIXMAN_BE_a8r8g8b8 PIXMAN_a8r8g8b8
+# define PIXMAN_BE_b8g8r8x8 PIXMAN_b8g8r8x8
+# define PIXMAN_BE_b8g8r8a8 PIXMAN_b8g8r8a8
+# define PIXMAN_BE_r8g8b8x8 PIXMAN_r8g8b8x8
+# define PIXMAN_BE_r8g8b8a8 PIXMAN_r8g8b8a8
+# define PIXMAN_BE_x8b8g8r8 PIXMAN_x8b8g8r8
+# define PIXMAN_BE_a8b8g8r8 PIXMAN_a8b8g8r8
#else
# define PIXMAN_BE_r8g8b8 PIXMAN_b8g8r8
+# define PIXMAN_BE_x8r8g8b8 PIXMAN_b8g8r8x8
+# define PIXMAN_BE_a8r8g8b8 PIXMAN_b8g8r8a8
+# define PIXMAN_BE_b8g8r8x8 PIXMAN_x8r8g8b8
+# define PIXMAN_BE_b8g8r8a8 PIXMAN_a8r8g8b8
+# define PIXMAN_BE_r8g8b8x8 PIXMAN_x8b8g8r8
+# define PIXMAN_BE_r8g8b8a8 PIXMAN_a8b8g8r8
+# define PIXMAN_BE_x8b8g8r8 PIXMAN_r8g8b8x8
+# define PIXMAN_BE_a8b8g8r8 PIXMAN_r8g8b8a8
#endif
/* -------------------------------------------------------------------- */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/5] sdl patch queue.
2015-03-12 8:38 [Qemu-devel] [PULL v2 0/5] sdl patch queue Gerd Hoffmann
` (4 preceding siblings ...)
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 5/5] pixman: add a bunch of PIXMAN_BE_* defines for 32bpp Gerd Hoffmann
@ 2015-03-12 10:35 ` Peter Maydell
2015-03-12 10:48 ` Gerd Hoffmann
5 siblings, 1 reply; 10+ messages in thread
From: Peter Maydell @ 2015-03-12 10:35 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On 12 March 2015 at 08:38, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Hi,
>
> Misc stuff in the basket: sdl bugfixes, some preparing patches for the
> upcoming opengl support in sdl2, x11 build improvement.
>
> v2 fixes the clang build failure.
>
> please pull,
> Gerd
>
> The following changes since commit d598911b6f5e7bf7bafb63b8e1d074729e94aca7:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150311' into staging (2015-03-11 16:30:33 +0000)
>
> are available in the git repository at:
>
>
> git://git.kraxel.org/qemu tags/pull-sdl-20150312-1
>
> for you to fetch changes up to ecdc9a53acd7a5d0cf48f1b77b83c70e513e81da:
>
> pixman: add a bunch of PIXMAN_BE_* defines for 32bpp (2015-03-12 09:20:42 +0100)
>
> ----------------------------------------------------------------
> misc ui patches, mostly sdl related.
Still fails to build on OSX:
manooth$ make -C build/all
CC lm32-softmmu/hw/lm32/milkymist.o
In file included from /Users/pm215/src/qemu/hw/lm32/milkymist.c:30:
/Users/pm215/src/qemu/hw/lm32/milkymist-hw.h:90:10: fatal error:
'X11/Xlib.h' file not found
#include <X11/Xlib.h>
^
1 error generated.
make[1]: *** [hw/lm32/milkymist.o] Error 1
make: *** [subdir-lm32-softmmu] Error 2
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/5] sdl patch queue.
2015-03-12 10:35 ` [Qemu-devel] [PULL v2 0/5] sdl patch queue Peter Maydell
@ 2015-03-12 10:48 ` Gerd Hoffmann
2015-03-12 11:16 ` Peter Maydell
0 siblings, 1 reply; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 10:48 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
Hi,
> Still fails to build on OSX:
>
> manooth$ make -C build/all
> CC lm32-softmmu/hw/lm32/milkymist.o
> In file included from /Users/pm215/src/qemu/hw/lm32/milkymist.c:30:
> /Users/pm215/src/qemu/hw/lm32/milkymist-hw.h:90:10: fatal error:
> 'X11/Xlib.h' file not found
> #include <X11/Xlib.h>
> ^
> 1 error generated.
Does the attached patch fix it?
cheers,
Gerd
[-- Attachment #2: 0001-opengl-require-glx.patch --]
[-- Type: text/x-patch, Size: 1104 bytes --]
>From fffbae0bcc7480d3b3dd145c93cb3c36860ebcf6 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 12 Mar 2015 11:44:11 +0100
Subject: [PATCH] opengl: require glx
hw/display/milkymist-tmu2.c uses glx. That will be replaced with egl in
the future, with qemu getting more opengl support. But we are not there
yet, so put it back into configure to fix build failures on machines
without glx (i.e. macos, possibly windows too).
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index bd55786..ed49990 100755
--- a/configure
+++ b/configure
@@ -3120,7 +3120,7 @@ libs_softmmu="$libs_softmmu $fdt_libs"
##########################################
# opengl probe (for sdl2, milkymist-tmu2)
if test "$opengl" != "no" ; then
- opengl_pkgs="egl gl glesv2"
+ opengl_pkgs="glx egl gl glesv2"
if $pkg_config $opengl_pkgs x11; then
opengl_cflags="$($pkg_config --cflags $opengl_pkgs) $x11_cflags"
opengl_libs="$($pkg_config --libs $opengl_pkgs) $x11_libs"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/5] sdl patch queue.
2015-03-12 10:48 ` Gerd Hoffmann
@ 2015-03-12 11:16 ` Peter Maydell
2015-03-12 14:54 ` Gerd Hoffmann
0 siblings, 1 reply; 10+ messages in thread
From: Peter Maydell @ 2015-03-12 11:16 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On 12 March 2015 at 10:48, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Hi,
>
>> Still fails to build on OSX:
>>
>> manooth$ make -C build/all
>> CC lm32-softmmu/hw/lm32/milkymist.o
>> In file included from /Users/pm215/src/qemu/hw/lm32/milkymist.c:30:
>> /Users/pm215/src/qemu/hw/lm32/milkymist-hw.h:90:10: fatal error:
>> 'X11/Xlib.h' file not found
>> #include <X11/Xlib.h>
>> ^
>> 1 error generated.
>
> Does the attached patch fix it?
That patch doesn't apply, because it does:
- opengl_pkgs="egl gl glesv2"
+ opengl_pkgs="glx egl gl glesv2"
but the configure as of your pull req has just:
opengl_pkgs="gl"
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL v2 0/5] sdl patch queue.
2015-03-12 11:16 ` Peter Maydell
@ 2015-03-12 14:54 ` Gerd Hoffmann
0 siblings, 0 replies; 10+ messages in thread
From: Gerd Hoffmann @ 2015-03-12 14:54 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On Do, 2015-03-12 at 11:16 +0000, Peter Maydell wrote:
> On 12 March 2015 at 10:48, Gerd Hoffmann <kraxel@redhat.com> wrote:
> > Hi,
> >
> >> Still fails to build on OSX:
> >>
> >> manooth$ make -C build/all
> >> CC lm32-softmmu/hw/lm32/milkymist.o
> >> In file included from /Users/pm215/src/qemu/hw/lm32/milkymist.c:30:
> >> /Users/pm215/src/qemu/hw/lm32/milkymist-hw.h:90:10: fatal error:
> >> 'X11/Xlib.h' file not found
> >> #include <X11/Xlib.h>
> >> ^
> >> 1 error generated.
> >
> > Does the attached patch fix it?
>
> That patch doesn't apply, because it does:
>
> - opengl_pkgs="egl gl glesv2"
> + opengl_pkgs="glx egl gl glesv2"
>
> but the configure as of your pull req has just:
> opengl_pkgs="gl"
Oh, right, there is some wip opengl stuff in the sdl branch.
Fixed it in patch #3, created a new tag: pull-sdl-20150312-2
Does that build for you?
cheers,
Gerd
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-03-12 14:55 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-12 8:38 [Qemu-devel] [PULL v2 0/5] sdl patch queue Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 1/5] sdl: Refresh debug statements Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 2/5] sdl: Fix crash when calling sdl_switch() with NULL surface Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 3/5] configure: opengl overhaul Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 4/5] Allow the use of X11 from a non standard location Gerd Hoffmann
2015-03-12 8:38 ` [Qemu-devel] [PULL v2 5/5] pixman: add a bunch of PIXMAN_BE_* defines for 32bpp Gerd Hoffmann
2015-03-12 10:35 ` [Qemu-devel] [PULL v2 0/5] sdl patch queue Peter Maydell
2015-03-12 10:48 ` Gerd Hoffmann
2015-03-12 11:16 ` Peter Maydell
2015-03-12 14:54 ` Gerd Hoffmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.