summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McCarty <patrick.mccarty@linux.intel.com>2013-04-17 13:52:12 -0700
committerPatrick McCarty <patrick.mccarty@linux.intel.com>2013-05-01 14:24:27 -0700
commit5388c0db620583ddf353b0e1d27b472255ed7729 (patch)
tree0ceb21e73535b5ca369bf09fb53ea01ad8b17620
parent32c8b0f0d5fdd30e49f19489f12162b15652ae24 (diff)
downloadqemu-accepted/tizen/20130503.225109.tar.gz
qemu-accepted/tizen/20130503.225109.tar.bz2
qemu-accepted/tizen/20130503.225109.zip
Change-Id: I559e3192d37463f1649e75565dff17598abcb99d
-rw-r--r--packaging/qemu.changes3
-rw-r--r--packaging/qemu.spec21
2 files changed, 17 insertions, 7 deletions
diff --git a/packaging/qemu.changes b/packaging/qemu.changes
index 61fbfe414..31b607a66 100644
--- a/packaging/qemu.changes
+++ b/packaging/qemu.changes
@@ -1,3 +1,6 @@
+* Wed Apr 17 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 1127a7e
+- (TZPC-970) Enable SDL display support
+
* Tue Jan 15 2013 Anas Nashif <anas.nashif@intel.com> upstream/1.3.0@4698b64
- Update to 1.3
diff --git a/packaging/qemu.spec b/packaging/qemu.spec
index dea565001..06b06c1f1 100644
--- a/packaging/qemu.spec
+++ b/packaging/qemu.spec
@@ -2,7 +2,7 @@ Name: qemu
Url: http://www.qemu.org/
Summary: Universal CPU emulator
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT
-Group: System/Emulators/PC
+Group: System/GUI/Other
Version: 1.3.0
Release: 0
Source: %name-%version.tar.bz2
@@ -37,6 +37,7 @@ BuildRequires: glib2-devel
#BuildRequires: libvdeplug3-devel
BuildRequires: pwdutils
BuildRequires: python
+BuildRequires: pkgconfig(sdl)
Requires: /usr/sbin/groupadd
Requires: pwdutils
Requires: timezone
@@ -50,7 +51,7 @@ as PC and PowerMac systems.
%package tools
Summary: Universal CPU emulator -- Tools
-Group: System/Emulators/PC
+Group: System/GUI/Other
Provides: qemu:%_libexecdir/qemu-bridge-helper
%description tools
@@ -64,7 +65,7 @@ This sub-package contains various tools, including a bridge helper.
%package guest-agent
Summary: Universal CPU emulator -- Guest agent
-Group: System/Emulators/PC
+Group: System/GUI/Other
Provides: qemu:%_bindir/qemu-ga
%description guest-agent
@@ -78,7 +79,7 @@ This sub-package contains the guest agent.
%package linux-user
Summary: Universal CPU emulator -- Linux User binaries
-Group: System/Emulators/PC
+Group: System/GUI/Other
Provides: qemu:%_bindir/qemu-arm
%description linux-user
@@ -99,11 +100,17 @@ run cross-architecture builds.
# build QEMU
mkdir -p dynamic
# build qemu-system
-./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
+./configure --prefix=%_prefix \
+ --sysconfdir=%_sysconfdir \
--libexecdir=%_libexecdir \
--enable-curl \
- --enable-virtfs --disable-linux-aio \
- --extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user
+ --enable-virtfs \
+ --disable-linux-aio \
+ --extra-cflags="$QEMU_OPT_FLAGS" \
+ --enable-system \
+ --disable-linux-user \
+ --enable-sdl
+
make %{?jobs:-j%jobs} V=1
mv *-softmmu/qemu-system-* dynamic
mv qemu-io qemu-img qemu-nbd qemu-bridge-helper dynamic