[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 3a831f: hw/display: Move Milkymist specific h
From: |
Peter Maydell |
Subject: |
[Qemu-commits] [qemu/qemu] 3a831f: hw/display: Move Milkymist specific hardware out o... |
Date: |
Fri, 01 Feb 2019 08:38:46 -0800 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 3a831fc0dfa5620cbd2ba1d66e8aa3a83bf475ef
https://github.com/qemu/qemu/commit/3a831fc0dfa5620cbd2ba1d66e8aa3a83bf475ef
Author: Philippe Mathieu-Daudé <address@hidden>
Date: 2019-02-01 (Fri, 01 Feb 2019)
Changed paths:
M hw/display/Makefile.objs
Log Message:
-----------
hw/display: Move Milkymist specific hardware out of common-obj list
The Milkymist specific hardware is only used by the LM32 target,
it is pointless to compile those objects in other targets.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
Commit: 99e1a93bbf602f16efacac7d392f355892328e2a
https://github.com/qemu/qemu/commit/99e1a93bbf602f16efacac7d392f355892328e2a
Author: Philippe Mathieu-Daudé <address@hidden>
Date: 2019-02-01 (Fri, 01 Feb 2019)
Changed paths:
M configure
Log Message:
-----------
configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11
Commit 5f9b1e35060b8 remove the dependency between OpenGL and X11.
However the milkymist-tmu2 device do require X11.
When using SDL, the configure script sets need_x11=yes, so the X11
flags are populated to the makefiles.
When building without SDL, X11 is not pulled and populated, leading
to a link failure:
LINK lm32-softmmu/qemu-system-lm32
hw/lm32/milkymist.o: In function `milkymist_tmu2_create':
hw/lm32/milkymist-hw.h:114: undefined reference to `XOpenDisplay'
hw/lm32/milkymist-hw.h:140: undefined reference to `XFree'
hw/lm32/milkymist-hw.h:141: undefined reference to `XCloseDisplay'
hw/lm32/milkymist-hw.h:130: undefined reference to `XCloseDisplay'
../hw/display/milkymist-tmu2.o: In function `tmu2_glx_init':
hw/display/milkymist-tmu2.c:112: undefined reference to `XOpenDisplay'
hw/display/milkymist-tmu2.c:123: undefined reference to `XFree'
collect2: error: ld returned 1 exit status
gmake[1]: *** [Makefile:199: qemu-system-lm32] Error 1
Enforce the X11 dependency when the LM32 target is built.
This will allow us to build QEMU without SDL.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
Commit: 57d434407adc967a696d7afad0cc32f8f7eb4a4f
https://github.com/qemu/qemu/commit/57d434407adc967a696d7afad0cc32f8f7eb4a4f
Author: Philippe Mathieu-Daudé <address@hidden>
Date: 2019-02-01 (Fri, 01 Feb 2019)
Changed paths:
M default-configs/lm32-softmmu.mak
M hw/display/Makefile.objs
M hw/lm32/milkymist-hw.h
Log Message:
-----------
hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL
The TMU device requires both X11 and OpenGL.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
Commit: 70cc0c1fb0b7b7bc185ca4a233e215ef44f35913
https://github.com/qemu/qemu/commit/70cc0c1fb0b7b7bc185ca4a233e215ef44f35913
Author: Philippe Mathieu-Daudé <address@hidden>
Date: 2019-02-01 (Fri, 01 Feb 2019)
Changed paths:
M MAINTAINERS
M hw/display/milkymist-tmu2.c
M hw/lm32/milkymist-hw.h
M hw/lm32/milkymist.c
A include/hw/display/milkymist_tmu2.h
Log Message:
-----------
hw/display/milkymist-tmu2: Move inlined code from header to source
Move the complexity of milkymist_tmu2_create() into the
source file. Doing so we avoid to include the X11/OpenGL
headers in all LM32 devices, and we also avoid the duplicate
declaration of glx_fbconfig_attr[] (it is already declared
in hw/display/milkymist-tmu2.c).
Since TYPE_MILKYMIST_TMU2 is now accessible, use it.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
Commit: 0015ca5cbabe0b31d31610ddfaafd90a9e5911a4
https://github.com/qemu/qemu/commit/0015ca5cbabe0b31d31610ddfaafd90a9e5911a4
Author: Daniel P. Berrangé <address@hidden>
Date: 2019-02-01 (Fri, 01 Feb 2019)
Changed paths:
M configure
M qemu-deprecated.texi
M ui/Makefile.objs
R ui/sdl.c
R ui/sdl_zoom.c
R ui/sdl_zoom.h
R ui/sdl_zoom_template.h
Log Message:
-----------
ui: remove support for SDL1.2 in favour of SDL2
SDL1.2 was deprecated in the 2.12.0 release with:
commit e52c6ba34149b4f39c3fd60e59ee32b809db2bfa
Author: Daniel P. Berrange <address@hidden>
Date: Mon Jan 15 14:25:33 2018 +0000
ui: deprecate use of SDL 1.2 in favour of 2.0 series
The SDL 2.0 release was made in Aug, 2013:
https://www.libsdl.org/release/
That will soon be 4 + 1/2 years ago, which is enough time to consider
the 2.0 series widely supported.
Thus we deprecate the SDL 1.2 support, which will allow us to delete it
in the last release of 2018. By this time, SDL 2.0 will be more than 5
years old.
Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
It is thus able to be removed in the 3.1.0 release.
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
[ kraxel: rebase ]
Signed-off-by: Gerd Hoffmann <address@hidden>
Commit: a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f
https://github.com/qemu/qemu/commit/a1bc3e7dc8f89facee6d3c25fb8465f8feccef1f
Author: Peter Maydell <address@hidden>
Date: 2019-02-01 (Fri, 01 Feb 2019)
Changed paths:
M MAINTAINERS
M configure
M default-configs/lm32-softmmu.mak
M hw/display/Makefile.objs
M hw/display/milkymist-tmu2.c
M hw/lm32/milkymist-hw.h
M hw/lm32/milkymist.c
A include/hw/display/milkymist_tmu2.h
M qemu-deprecated.texi
M ui/Makefile.objs
R ui/sdl.c
R ui/sdl_zoom.c
R ui/sdl_zoom.h
R ui/sdl_zoom_template.h
Log Message:
-----------
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190201-pull-request'
into staging
ui: fix build with SDL disabled, drop SDL1 support.
# gpg: Signature made Fri 01 Feb 2019 12:30:47 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>" [full]
# gpg: aka "Gerd Hoffmann <address@hidden>" [full]
# gpg: aka "Gerd Hoffmann (private) <address@hidden>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20190201-pull-request:
ui: remove support for SDL1.2 in favour of SDL2
hw/display/milkymist-tmu2: Move inlined code from header to source
hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL
configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11
hw/display: Move Milkymist specific hardware out of common-obj list
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/cfe6c547690b...a1bc3e7dc8f8
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 3a831f: hw/display: Move Milkymist specific hardware out o...,
Peter Maydell <=