* [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
@ 2011-10-07 17:04 ` Martin Jansa
[not found] ` <cover.1318007397.git.Martin.Jansa@gmail.com>
` (2 more replies)
2011-10-07 17:04 ` [PATCHv3 02/31] xserver-xorg: remove old git recipe Martin Jansa
` (30 subsequent siblings)
31 siblings, 3 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
* xserver-xorg is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/distro/include/default-providers.inc | 4 ++--
.../conf/distro/include/distro_tracking_fields.inc | 20 ++++++++++----------
meta/conf/machine/qemux86-64.conf | 6 +++---
meta/conf/machine/qemux86.conf | 6 +++---
meta/conf/multilib.conf | 2 +-
...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 4 +---
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 2 +-
...-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} | 2 +-
...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
.../cache-xkbcomp-output-for-fast-start-up.patch | 0
.../crosscompile.patch | 0
.../fix_macros1.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 2 +-
...6-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} | 2 +-
...er-xf86-dri-lite_git.bb => xserver-xorg_git.bb} | 2 +-
19 files changed, 27 insertions(+), 28 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc => xserver-xorg-common.inc} (96%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc => xserver-xorg-lite.inc} (95%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-lite}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-lite}/macro_tweak.patch (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} (89%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc => xserver-xorg.inc} (97%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_macros1.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb => xserver-xorg_git.bb} (94%)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index d51ac64..a5cdb5b 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -3,8 +3,8 @@
#
PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 7b6c4a9..8af80c7 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic core"
RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke <ke.yu@intel.com>"
-RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
-RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
-RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes"
-RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
-RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
-RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
-RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke <ke.yu@intel.com>"
+RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
+RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
+RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes"
+RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
+RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
+RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
+RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke <ke.yu@intel.com>"
RECIPE_STATUS_pn-xf86-input-synaptics = "red"
DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
@@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
-DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
-DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 18a7513..f28cf08 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,8 +4,8 @@
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
require conf/machine/include/tune-x86_64.inc
require conf/machine/include/qemu.inc
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
+XSERVER ?= "xserver-xorg \
mesa-dri-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 5d0d03e..75c9042 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,8 +4,8 @@
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
require conf/machine/include/tune-i586.inc
require conf/machine/include/qemu.inc
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
+XSERVER ?= "xserver-xorg \
mesa-dri-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index b9da33a..5e4b435 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
similarity index 96%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 17d456c..78c5f2e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
+# deprecated, we should use virtual/xserver instead
PROVIDES = "virtual/xserver-xf86"
# Other packages tend to just care that there is *an* X server:
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
similarity index 95%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index 131c258..f1cef1b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,6 +1,4 @@
-require xserver-xf86-common.inc
-
-PROVIDES += "xserver-xf86-lite"
+require xserver-xorg-common.inc
PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
similarity index 93%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
index 2b75427..2b32d4e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
@@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
xorg-server 1.8.99.904.
the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
+xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
can be safely replace by this patch.
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
similarity index 89%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
index e42f27d..63b2c38 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
@@ -1,4 +1,4 @@
-require xserver-xf86-lite.inc
+require xserver-xorg-lite.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
similarity index 97%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6b13873..9bc0ee4 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,4 +1,4 @@
-require xserver-xf86-common.inc
+require xserver-xorg-common.inc
PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
similarity index 93%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index 2b75427..2b32d4e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
@@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
xorg-server 1.8.99.904.
the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
+xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
can be safely replace by this patch.
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
similarity index 93%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
index b797f97..0194798 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
@@ -1,4 +1,4 @@
-require xserver-xf86-dri-lite.inc
+require xserver-xorg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
similarity index 94%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
index 87ba040..beef06a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
@@ -1,4 +1,4 @@
-require xserver-xf86-dri-lite.inc
+require xserver-xorg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 02/31] xserver-xorg: remove old git recipe
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
2011-10-07 17:04 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
@ 2011-10-07 17:04 ` Martin Jansa
2011-10-07 17:04 ` [PATCHv3 03/31] glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn't uclibc Martin Jansa
` (29 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg_git.bb | 25 --------------------
1 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
deleted file mode 100644
index beef06a..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require xserver-xorg.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
-PE = "1"
-PR = "r3"
-PV = "1.10+git${SRCPV}"
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
- file://crosscompile.patch; \
- file://fix_macros1.patch;"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
-
-S = "${WORKDIR}/git"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 03/31] glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn't uclibc
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
2011-10-07 17:04 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
2011-10-07 17:04 ` [PATCHv3 02/31] xserver-xorg: remove old git recipe Martin Jansa
@ 2011-10-07 17:04 ` Martin Jansa
2011-10-07 17:04 ` [PATCHv3 04/31] xserver-xorg-common: fix LIC_FILES_CHKSUM Martin Jansa
` (28 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
* will be used in mesa-common.inc and xserver-xorg.inc
* based on mesa-tls.inc (glx-use-tls.bbclass) from
http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
---
meta/recipes-graphics/mesa/glx-use-tls.inc | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc
diff --git a/meta/recipes-graphics/mesa/glx-use-tls.inc b/meta/recipes-graphics/mesa/glx-use-tls.inc
new file mode 100644
index 0000000..7530872
--- /dev/null
+++ b/meta/recipes-graphics/mesa/glx-use-tls.inc
@@ -0,0 +1,7 @@
+def get_tls_setting(bb, d):
+ # until we have no prober TLS support in uclibc disable it
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
+ return ""
+ return "--enable-glx-tls"
+
+EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 04/31] xserver-xorg-common: fix LIC_FILES_CHKSUM
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (2 preceding siblings ...)
2011-10-07 17:04 ` [PATCHv3 03/31] glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn't uclibc Martin Jansa
@ 2011-10-07 17:04 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 05/31] xserver-xorg-common: move SRC_URI closer together Martin Jansa
` (27 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
* old value was actually from xserver-kdrive, use the same as
xserver-xorg-1.10.1 and newer has
./xserver-kdrive.inc:LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
./xserver-xorg-lite_1.10.1.bb:LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 78c5f2e..3a69d7d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -2,8 +2,7 @@ DESCRIPTION = "The X.Org X server"
HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT-X"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 05/31] xserver-xorg-common: move SRC_URI closer together
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (3 preceding siblings ...)
2011-10-07 17:04 ` [PATCHv3 04/31] xserver-xorg-common: fix LIC_FILES_CHKSUM Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 06/31] xserver-xorg-common: Split out some bigger modules and extensions from the main package Martin Jansa
` (26 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 3a69d7d..67edbcf 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -14,6 +14,7 @@ PROVIDES += "virtual/xserver"
XORG_PN = "xorg-server"
SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI += "file://macro_tweak.patch"
S = "${WORKDIR}/${XORG_PN}-${PV}"
@@ -32,8 +33,6 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
${libdir}/xorg/modules/*/*/.debug \
"
-SRC_URI += "file://macro_tweak.patch"
-
EXTRA_OECONF = "--with-fop=no"
PACKAGECONFIG ??= "udev"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 06/31] xserver-xorg-common: Split out some bigger modules and extensions from the main package
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (4 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 05/31] xserver-xorg-common: move SRC_URI closer together Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 07/31] xserver-xorg-common: improve packaging Martin Jansa
` (25 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 60 +++++++++++++++++++-
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 67edbcf..c0fcf8b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -20,11 +20,44 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
-PACKAGES =+ "${PN}-utils"
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+# 32.0k libdri.so
+# 336.0k libglx.so
+# 1360k libint10.so
+# 180.0k libwfb.so
+# 320.0k libxaa.so
+# 124.0k libxf1bpp.so
+# 84.0k libxf4bpp.so
+# librecord.so
+# libextmod.so
+# libdbe.so
+
+PACKAGES =+ "${PN}-security-policy \
+ ${PN}-sdl \
+ ${PN}-fbdev \
+ ${PN}-xprint \
+ ${PN}-xvfb \
+ ${PN}-utils \
+ ${PN}-xephyr \
+ ${PN}-multimedia-modules \
+ ${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-glx \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ ${PN}-module-libint10 \
+ ${PN}-module-libafb \
+ ${PN}-module-libwfb \
+ ${PN}-module-libmfb \
+ ${PN}-module-libcfb \
+ ${PN}-module-xaa \
+ ${PN}-module-libxf1bpp \
+ ${PN}-module-libxf4bpp"
RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
-FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
@@ -33,6 +66,29 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
${libdir}/xorg/modules/*/*/.debug \
"
+FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
+FILES_${PN}-sdl = "${bindir}/Xsdl"
+FILES_${PN}-fbdev = "${bindir}/Xfbdev"
+FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
+FILES_${PN}-xvfb = "${bindir}/Xvfb"
+FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
+FILES_${PN}-xephyr = "${bindir}/Xephyr"
+FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
+FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
+FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
+FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
+FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
+FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
+FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
+FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
+FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
+FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
+FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
+FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
+FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
+FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
+FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
+
EXTRA_OECONF = "--with-fop=no"
PACKAGECONFIG ??= "udev"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 07/31] xserver-xorg-common: improve packaging
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (5 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 06/31] xserver-xorg-common: Split out some bigger modules and extensions from the main package Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 08/31] xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc Martin Jansa
` (24 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* add ${bindir} and protocol.txt to ${PN}
* SecurityPolicy is now in ${PN}-security-policy
* package .la files to ${PN}-dev
* README.compiled is lately in ${localstatedir}/lib/xkb so add it too to ${PN}-doc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index c0fcf8b..0a5d8b6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -58,14 +58,13 @@ PACKAGES =+ "${PN}-security-policy \
RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
-FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
-FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
-
+FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
+FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
+FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
- "
-
+ ${libdir}/xorg/modules/*/*/.debug \
+ "
FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
FILES_${PN}-sdl = "${bindir}/Xsdl"
FILES_${PN}-fbdev = "${bindir}/Xfbdev"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 08/31] xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (6 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 07/31] xserver-xorg-common: improve packaging Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 09/31] xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS Martin Jansa
` (23 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* xserver-xorg.inc is appending extra xf86driproto dri2proto to PROTO_DEPS and virtual/libgl to LIB_DEPS
* both lite and dri variants now depend on font-util (from DEPENDS in xserver-xorg-common.inc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 4 ++++
.../xorg-xserver/xserver-xorg-lite.inc | 6 ------
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 7 ++-----
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 0a5d8b6..d901e2c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -20,6 +20,10 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
+PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
+LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
+DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
+
# Split out some modules and extensions from the main package
# These aren't needed for basic operations and only take up space:
# 32.0k libdri.so
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index f1cef1b..a942a11 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,11 +1,5 @@
require xserver-xorg-common.inc
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-
-LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
RDEPENDS_${PN} += "xorg-minimal-fonts"
FILES_${PN} += "${bindir}/Xorg "
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9bc0ee4..71754f7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,10 +1,7 @@
require xserver-xorg-common.inc
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-
-LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
+PROTO_DEPS += "xf86driproto dri2proto"
+LIB_DEPS += "virtual/libgl"
RDEPENDS_${PN} += "xorg-minimal-fonts"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 09/31] xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (7 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 08/31] xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 10/31] xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc Martin Jansa
` (22 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* when someone is using hal or udev explicitly, then he doesn't need xserver-xf86-config
* add xkeyboard-config to RDEPENDS_${PN}-xvfb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index d901e2c..099d240 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -60,7 +60,8 @@ PACKAGES =+ "${PN}-security-policy \
${PN}-module-libxf1bpp \
${PN}-module-libxf4bpp"
-RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
+RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
+RDEPENDS_${PN}-xvfb += "xkeyboard-config"
FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 10/31] xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (8 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 09/31] xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 11/31] xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${bindir} in FILES_ defined in " Martin Jansa
` (21 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 1 +
.../xorg-xserver/xserver-xorg-lite.inc | 2 --
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 099d240..77c3761 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -60,6 +60,7 @@ PACKAGES =+ "${PN}-security-policy \
${PN}-module-libxf1bpp \
${PN}-module-libxf4bpp"
+RDEPENDS_${PN} += "xorg-minimal-fonts"
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index a942a11..2483553 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,7 +1,5 @@
require xserver-xorg-common.inc
-RDEPENDS_${PN} += "xorg-minimal-fonts"
-
FILES_${PN} += "${bindir}/Xorg "
EXTRA_OECONF += "--disable-static \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 71754f7..6a4f978 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -3,8 +3,6 @@ require xserver-xorg-common.inc
PROTO_DEPS += "xf86driproto dri2proto"
LIB_DEPS += "virtual/libgl"
-RDEPENDS_${PN} += "xorg-minimal-fonts"
-
FILES_${PN} += "${bindir}/Xorg "
EXTRA_OECONF += "--disable-static \
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 11/31] xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${bindir} in FILES_ defined in shared .inc
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (9 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 10/31] xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 12/31] xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which doesn't enable it for uClibc Martin Jansa
` (20 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-lite.inc | 2 --
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 --
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index 2483553..b82d153 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,7 +1,5 @@
require xserver-xorg-common.inc
-FILES_${PN} += "${bindir}/Xorg "
-
EXTRA_OECONF += "--disable-static \
--disable-acfb \
--disable-ccfb \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6a4f978..dfad8f3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -3,8 +3,6 @@ require xserver-xorg-common.inc
PROTO_DEPS += "xf86driproto dri2proto"
LIB_DEPS += "virtual/libgl"
-FILES_${PN} += "${bindir}/Xorg "
-
EXTRA_OECONF += "--disable-static \
--disable-acfb \
--disable-ccfb \
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 12/31] xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which doesn't enable it for uClibc
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (10 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 11/31] xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${bindir} in FILES_ defined in " Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 13/31] xserver-xorg: move shared EXTRA_OECONF entries to shared .inc Martin Jansa
` (19 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index dfad8f3..726fbaa 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -3,6 +3,8 @@ require xserver-xorg-common.inc
PROTO_DEPS += "xf86driproto dri2proto"
LIB_DEPS += "virtual/libgl"
+require ../mesa/glx-use-tls.inc
+
EXTRA_OECONF += "--disable-static \
--disable-acfb \
--disable-ccfb \
@@ -16,7 +18,6 @@ EXTRA_OECONF += "--disable-static \
--disable-xnest \
--disable-xvfb \
--enable-composite \
- --enable-glx-tls \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
--with-pic \
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 13/31] xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (11 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 12/31] xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which doesn't enable it for uClibc Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 14/31] xserver-xorg: add new version 1.11.1 Martin Jansa
` (18 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* after this xserver-xorg-lite.inc is disabling only dri/glx
and xserver-xorg.inc is forcing dri/dri2 enabled
the rest is defined in xserver-xorg-common.inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 21 ++++++++++++++++++-
.../xorg-xserver/xserver-xorg-lite.inc | 20 +----------------
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 22 +++----------------
3 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 77c3761..0cc3dc0 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -94,7 +94,26 @@ FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
-EXTRA_OECONF = "--with-fop=no"
+EXTRA_OECONF += "--with-fop=no \
+ --disable-static \
+ --disable-acfb \
+ --disable-ccfb \
+ --disable-mcfb \
+ --disable-dga \
+ --disable-xinerama \
+ --disable-xf86misc \
+ --disable-xorgcfg \
+ --disable-record \
+ --disable-dmx \
+ --disable-xnest \
+ --disable-xvfb \
+ --enable-composite \
+ --sysconfdir=/etc/X11 \
+ --localstatedir=/var \
+ --with-fontdir=${datadir}/fonts/X11 \
+ --with-xkb-output=/var/lib/xkb \
+ ac_cv_file__usr_share_sgml_X11_defs_ent=no \
+"
PACKAGECONFIG ??= "udev"
PACKAGECONFIG[hal] = "--enable-config-hal,--disable-config-hal,,hal"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index b82d153..be84e9e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,22 +1,6 @@
require xserver-xorg-common.inc
-EXTRA_OECONF += "--disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
+EXTRA_OECONF += "\
--disable-dri \
--disable-glx \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 726fbaa..f734873 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -5,26 +5,12 @@ LIB_DEPS += "virtual/libgl"
require ../mesa/glx-use-tls.inc
-EXTRA_OECONF += "--disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
+EXTRA_OECONF += "\
+ --enable-dri \
+ --enable-dri2 \
--with-pic \
--with-int10=x86emu \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no"
+"
# Due to mesa-dri
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 14/31] xserver-xorg: add new version 1.11.1
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (12 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 13/31] xserver-xorg: move shared EXTRA_OECONF entries to shared .inc Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 15/31] xserver-xorg: remove old 1.10.1 version Martin Jansa
` (17 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* move shared definitions to .inc file
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-1.11.1.inc | 7 +++++++
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb | 2 ++
.../xorg-xserver/xserver-xorg_1.11.1.bb | 4 ++++
3 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
new file mode 100644
index 0000000..690de3f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
@@ -0,0 +1,7 @@
+SRC_URI += "file://crosscompile.patch"
+
+# Misc build failure for master HEAD
+SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+
+SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d"
+SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
new file mode 100644
index 0000000..799b11a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
@@ -0,0 +1,2 @@
+require xserver-xorg-lite.inc
+require xserver-xorg-${PV}.inc
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
new file mode 100644
index 0000000..8e97888
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
@@ -0,0 +1,4 @@
+require xserver-xorg.inc
+require xserver-xorg-${PV}.inc
+
+PE = "1"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 15/31] xserver-xorg: remove old 1.10.1 version
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (13 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 14/31] xserver-xorg: add new version 1.11.1 Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 16/31] xserver-xorg: remove COMPATIBLE_HOST Martin Jansa
` (16 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-lite_1.10.1.bb | 12 ------------
.../xorg-xserver/xserver-xorg_1.10.1.bb | 20 --------------------
2 files changed, 0 insertions(+), 32 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
deleted file mode 100644
index 63b2c38..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require xserver-xorg-lite.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-PR = "r3"
-
-DEPENDS += "font-util"
-
-SRC_URI += "file://crosscompile.patch"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
deleted file mode 100644
index 0194798..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require xserver-xorg.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-PE = "1"
-PR = "r3"
-
-SRC_URI += "file://crosscompile.patch"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch"
-
-SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de"
-SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 00/31] Xorg related changes
@ 2011-10-07 17:05 Martin Jansa
2011-10-07 17:04 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
` (31 more replies)
0 siblings, 32 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
this patchset brings meta-oe and oe-core xorg stuff together and most of
xorg recipes will be removed from meta-oe (sending another pull request now).
This step is needed to be able to separate common x11 to meta-x11 or whatever later.
The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
Martin Jansa (31):
xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
xserver-xorg: remove old git recipe
glx-use-tls.inc: add include file to enable glx-tls only when
TARGET_OS isn't uclibc
xserver-xorg-common: fix LIC_FILES_CHKSUM
xserver-xorg-common: move SRC_URI closer together
xserver-xorg-common: Split out some bigger modules and extensions
from the main package
xserver-xorg-common: improve packaging
xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from
xserver-xorg.inc and xserver-xorg-lite.inc to
xserver-xorg-common.inc
xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config
dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
shared .inc
xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have
whole ${bindir} in FILES_ defined in shared .inc
xserver-xorg: replace hardcoded --enable-glx-tls with
glx-use-tls.inc, which doesn't enable it for uClibc
xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
xserver-xorg: add new version 1.11.1
xserver-xorg: remove old 1.10.1 version
xserver-xorg: remove COMPATIBLE_HOST
xserver-xorg: drop unused files
xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use
same directory from xserver-xf86-lite recipe
xserver-kdrive: drop unused files (same files are in
xserver-kdrive-1.7.99.2 directory
xorg-driver-common.inc: use virtual/xserver instead of older
virtual/xserver-xf86
xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new
xserver-xorg ABI
libx11: package xcb, merge few changes from meta-oe
libx11: add new version 1.4.4
libx11: remove older 1.3.4
libx11: drop old 1.2.2 git version
libx11-trim: move files for libx11-trim from libx11-1.3.4 to
libx11-trim-1.3.4
libx11-diet: move old patches used only by libx11-diet-1.3 to
separate directory
mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move
uclibc.patch
mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2
was removed
mesa: add new version 7.11
mesa: drop older 7.10.2 and 7.7+git recipes
meta/conf/distro/include/default-providers.inc | 4 +-
.../conf/distro/include/distro_tracking_fields.inc | 20 +-
meta/conf/machine/qemux86-64.conf | 6 +-
meta/conf/machine/qemux86.conf | 6 +-
meta/conf/multilib.conf | 2 +-
meta/recipes-graphics/mesa/glx-use-tls.inc | 7 +
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 +
meta/recipes-graphics/mesa/mesa-common.inc | 36 ++-
.../mesa/mesa-dri-glsl-native_7.11.bb | 28 +
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27 -
meta/recipes-graphics/mesa/mesa-dri.inc | 22 +
meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 --
meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 -
meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 ------
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 --
meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 4 +
meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 --
meta/recipes-graphics/mesa/mesa-xlib.inc | 1 +
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 -
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 4 +
.../mesa/{mesa-dri => mesa}/uclibc.patch | 0
.../xorg-driver/xorg-driver-common.inc | 4 +-
.../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 +
.../libx11-1.4.4/x11_disable_makekeys.patch | 29 +
.../{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff | 0
.../fix-disable-xlocale.diff | 0
.../fix-utf8-wrong-define.patch | 0
.../include_fix.patch | 0
.../{libx11-git => libx11-diet-1.3}/nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 3 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 17 -
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 570 --------------------
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 30 -
.../include_fix.patch | 0
.../makekeys_crosscompile.patch | 0
.../nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
.../xorg-lib/libx11-trim/include_fix.patch | 25 -
.../xorg-lib/libx11-trim/nodolt.patch | 14 -
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 10 +-
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 13 -
meta/recipes-graphics/xorg-lib/libx11.inc | 25 +-
.../xorg-lib/libx11/fix-disable-xlocale.diff | 16 -
.../xorg-lib/libx11/fix-utf8-wrong-define.patch | 17 -
.../xorg-lib/libx11/include_fix.patch | 25 -
meta/recipes-graphics/xorg-lib/libx11/nodolt.patch | 14 -
.../xorg-lib/libx11/x11_disable_makekeys.patch | 31 --
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 35 --
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 18 +
meta/recipes-graphics/xorg-lib/libx11_git.bb | 14 -
meta/recipes-graphics/xorg-lib/libx11_git.inc | 11 -
.../xorg-xserver/files/macro_tweak.patch | 20 -
.../xorg-xserver/xserver-kdrive/disable-apm.patch | 24 -
.../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 43 --
.../xorg-xserver/xserver-kdrive/extra-kmodes.patch | 87 ---
.../xserver-kdrive/fbdev_xrandr_ioctl.patch | 63 ---
.../xserver-kdrive/no-serial-probing.patch | 17 -
.../xorg-xserver/xserver-xf86-common.inc | 42 --
.../xorg-xserver/xserver-xf86-dri-lite.inc | 36 --
.../cache-xkbcomp-output-for-fast-start-up.patch | 360 ------------
.../xserver-xf86-dri-lite/fix_macros1.patch | 24 -
.../fix_open_max_preprocessor_error.patch | 15 -
.../xserver-xf86-dri-lite/macro_tweak.patch | 30 -
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 -
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 25 -
.../xorg-xserver/xserver-xf86-lite.inc | 34 --
.../xserver-xf86-lite/crosscompile.patch | 22 -
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 -
.../xorg-xserver/xserver-xorg-1.11.1.inc | 7 +
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 7 +-
.../xorg-xserver/xserver-xorg-common.inc | 121 +++++
.../xorg-xserver/xserver-xorg-lite.inc | 6 +
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb | 4 +
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 13 +
.../xorg-xserver/xserver-xorg_1.11.1.bb | 4 +
78 files changed, 381 insertions(+), 2126 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/cross2.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_git.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc
delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/fix-disable-xlocale.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/fix-utf8-wrong-define.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-trim => libx11-diet-1.3}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-1.11.1}/macro_tweak.patch (74%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
--
1.7.7
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv3 16/31] xserver-xorg: remove COMPATIBLE_HOST
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (14 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 15/31] xserver-xorg: remove old 1.10.1 version Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 17/31] xserver-xorg: drop unused files Martin Jansa
` (15 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* ie om-gta02 has mesa-dri module too
so this should be limited in mesa-dri only
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index f734873..01cdd68 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -11,6 +11,3 @@ EXTRA_OECONF += "\
--with-pic \
--with-int10=x86emu \
"
-
-# Due to mesa-dri
-COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 17/31] xserver-xorg: drop unused files
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (15 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 16/31] xserver-xorg: remove COMPATIBLE_HOST Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 18/31] xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe Martin Jansa
` (14 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/files/macro_tweak.patch | 20 --
.../cache-xkbcomp-output-for-fast-start-up.patch | 360 --------------------
.../xorg-xserver/xserver-xorg/fix_macros1.patch | 24 --
3 files changed, 0 insertions(+), 404 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
diff --git a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
deleted file mode 100644
index c4af228..0000000
--- a/meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Pending
-
-Index: xorg-server-1.5.0/xorg-server.m4
-===================================================================
---- xorg-server-1.5.0.orig/xorg-server.m4 2007-05-29 20:36:51.000000000 +0100
-+++ xorg-server-1.5.0/xorg-server.m4 2008-11-04 23:56:55.000000000 +0000
-@@ -28,9 +28,12 @@
- # Checks for the $1 define in xorg-server.h (from the sdk). If it
- # is defined, then add $1 to $REQUIRED_MODULES.
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
-+ PKG_PROG_PKG_CONFIG
- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
-+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`pkg-config --variable=sdkdir xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
deleted file mode 100644
index 6b1b40f..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
+++ /dev/null
@@ -1,360 +0,0 @@
-From 0f70ba9d3412b17ac4e08e33e1be3c226c06ea54 Mon Sep 17 00:00:00 2001
-From: Yan Li <yan.i.li@intel.com>
-Date: Tue, 12 May 2009 17:49:07 +0800
-Subject: [PATCH] XKB: cache xkbcomp output for fast start-up v5 for 1.6.1
-Organization: Intel
-
-xkbcomp outputs will be cached in files with hashed keymap as
-names. This saves boot time for around 1s on commodity netbooks.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yan Li <yan.i.li@intel.com>
----
- configure.ac | 6 +-
- xkb/README.compiled | 8 +-
- xkb/ddxLoad.c | 192 +++++++++++++++++++++++++++++++++++++++++---------
- 3 files changed, 164 insertions(+), 42 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4c4c797..7a5020a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -476,9 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [
- AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
- [ XKBPATH="$withval" ],
- [ XKBPATH="${datadir}/X11/xkb" ])
--AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
-+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]),
- [ XKBOUTPUT="$withval" ],
-- [ XKBOUTPUT="compiled" ])
-+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ])
- AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
- [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
- [ SERVERCONFIG="$withval" ],
-@@ -1757,7 +1757,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
- XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
-
- if [[ x$XKBOUTPUT_FIRSTCHAR != x/ ]] ; then
-- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
-+ AC_MSG_ERROR([xkb-output must be an absolute path.])
- fi
-
- # XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-diff --git a/xkb/README.compiled b/xkb/README.compiled
-index 71caa2f..a4a2ae0 100644
---- a/xkb/README.compiled
-+++ b/xkb/README.compiled
-@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients. The X server
- or some other tool might destroy or replace the files in this directory,
- so it is not a safe place to store compiled keymaps for long periods of
- time. The default keymap for any server is usually stored in:
-- X<num>-default.xkm
--where <num> is the display number of the server in question, which makes
--it possible for several servers *on the same host* to share the same
--directory.
-+ server-<SHA1>.xkm
-+
-+where <SHA1> is the SHA1 hash of keymap source, so that compiled
-+keymap of different keymap sources are stored in different files.
-
- Unless the X server is modified, sharing this directory between servers on
- different hosts could cause problems.
-diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
-index 4d5dfb6..60a68af 100644
---- a/xkb/ddxLoad.c
-+++ b/xkb/ddxLoad.c
-@@ -32,6 +32,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <xkb-config.h>
- #endif
-
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+# include <sha1.h>
-+#else /* Use OpenSSL's libcrypto */
-+# include <stddef.h> /* buggy openssl/sha.h wants size_t */
-+# include <openssl/sha.h>
-+#endif
- #include <stdio.h>
- #include <ctype.h>
- #define NEED_EVENTS 1
-@@ -46,24 +52,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #define XKBSRV_NEED_FILE_FUNCS
- #include <xkbsrv.h>
- #include <X11/extensions/XI.h>
-+#include <errno.h>
- #include "xkb.h"
-
- #if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
- #include <paths.h>
- #endif
-
-- /*
-- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is
-- * relative to the top-level XKB configuration directory.
-- * Making the server write to a subdirectory of that directory
-- * requires some work in the general case (install procedure
-- * has to create links to /var or somesuch on many machines),
-- * so we just compile into /usr/tmp for now.
-- */
--#ifndef XKM_OUTPUT_DIR
--#define XKM_OUTPUT_DIR "compiled/"
--#endif
--
- #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\""
- #define ERROR_PREFIX "\"> \""
- #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\""
-@@ -179,6 +174,45 @@ OutputDirectory(
- }
-
- static Bool
-+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input)
-+{
-+ int i;
-+ unsigned char sha1[SHA_DIGEST_LENGTH];
-+
-+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */
-+ SHA1_CTX ctx;
-+
-+ SHA1Init (&ctx);
-+ SHA1Update (&ctx, input, strlen(input));
-+ SHA1Final (sha1, &ctx);
-+#else /* Use OpenSSL's libcrypto */
-+ SHA_CTX ctx;
-+ int success;
-+
-+ success = SHA1_Init (&ctx);
-+ if (! success)
-+ return BadAlloc;
-+
-+ success = SHA1_Update (&ctx, input, strlen(input));
-+ if (! success)
-+ return BadAlloc;
-+
-+ success = SHA1_Final (sha1, &ctx);
-+ if (! success)
-+ return BadAlloc;
-+#endif
-+
-+ /* convert sha1 to sha1_asc */
-+ for(i=0; i<SHA_DIGEST_LENGTH; ++i) {
-+ sprintf(sha1Asc+i*2, "%02X", sha1[i]);
-+ }
-+
-+ return Success;
-+}
-+
-+/* call xkbcomp and compile XKB keymap, return xkm file name in
-+ nameRtrn */
-+static Bool
- XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- XkbComponentNamesPtr names,
- unsigned want,
-@@ -187,7 +221,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- int nameRtrnLen)
- {
- FILE * out;
-- char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
-+ char * buf = NULL, xkmfile[PATH_MAX], xkm_output_dir[PATH_MAX];
-+ char * tmpXkmFile = NULL;
-+ char * canonicalXkmFileName = NULL;
-+ char sha1Asc[SHA_DIGEST_LENGTH*2+1], xkbKeyMapBuf[100*1024];
-+ int ret, result;
-
- const char *emptystring = "";
- const char *xkbbasedirflag = emptystring;
-@@ -198,16 +236,70 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- /* WIN32 has no popen. The input must be stored in a file which is
- used as input for xkbcomp. xkbcomp does not read from stdin. */
- char tmpname[PATH_MAX];
-- const char *xkmfile = tmpname;
-+ const char *xkbfile = tmpname;
- #else
-- const char *xkmfile = "-";
-+ const char *xkbfile = "-";
- #endif
-
-- snprintf(keymap, sizeof(keymap), "server-%s", display);
-+ /* Write keymap source (xkbfile) to memory buffer `xkbKeyMapBuf',
-+ of which SHA1 is generated and used as result xkm file name */
-+ memset(xkbKeyMapBuf, 0, sizeof(xkbKeyMapBuf));
-+ out = fmemopen(xkbKeyMapBuf, sizeof(xkbKeyMapBuf), "w");
-+ if (NULL == out) {
-+ ErrorF("[xkb] Open xkbKeyMapBuf for writing failed\n");
-+ return False;
-+ }
-+ ret = XkbWriteXKBKeymapForNames(out, names, xkb, want, need);
-+ if (fclose(out) !=0)
-+ {
-+ ErrorF("[xkb] XkbWriteXKBKeymapForNames error, perhaps xkbKeyMapBuf is too small\n");
-+ return False;
-+ }
-+#ifdef DEBUG
-+ if (xkbDebugFlags) {
-+ ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
-+ fputs(xkbKeyMapBuf, stderr);
-+ }
-+#endif
-+ if (!ret) {
-+ ErrorF("[xkb] Generating XKB Keymap failed, giving up compiling keymap\n");
-+ return False;
-+ }
-+
-+ DebugF("[xkb] computing SHA1 of keymap\n");
-+ if (Success == Sha1Asc(sha1Asc, xkbKeyMapBuf)) {
-+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", sha1Asc);
-+ }
-+ else {
-+ ErrorF("[xkb] Computing SHA1 of keymap failed, "
-+ "using display name instead as xkm file name\n");
-+ snprintf(xkmfile, sizeof(xkmfile), "server-%s", display);
-+ }
-
-- XkbEnsureSafeMapName(keymap);
-+ XkbEnsureSafeMapName(xkmfile);
- OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
-
-+ /* set nameRtrn, fail if it's too small */
-+ if ((strlen(xkmfile)+1 > nameRtrnLen) && nameRtrn) {
-+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n");
-+ return False;
-+ }
-+ strncpy(nameRtrn, xkmfile, nameRtrnLen);
-+
-+ /* if the xkm file already exists, reuse it */
-+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile);
-+ if (access(canonicalXkmFileName, R_OK) == 0) {
-+ /* yes, we can reuse the old xkm file */
-+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName);
-+ result = True;
-+ goto _ret;
-+ }
-+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName);
-+
-+ /* continue to call xkbcomp to compile the keymap. to avoid race
-+ condition, we compile it to a tmpfile then rename it to
-+ xkmfile */
-+
- #ifdef WIN32
- strcpy(tmpname, Win32TempDir());
- strcat(tmpname, "\\xkb_XXXXXX");
-@@ -230,19 +322,30 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- }
- }
-
-+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) {
-+ ErrorF("[xkb] Can't generate temp xkm file name");
-+ result = False;
-+ goto _ret;
-+ }
-+
- buf = Xprintf("\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" "
-- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"",
-+ "-em1 %s -emp %s -eml %s \"%s\"",
- xkbbindir, xkbbindirsep,
- ( (xkbDebugFlags < 2) ? 1 :
- ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
-- xkbbasedirflag, xkmfile,
-+ xkbbasedirflag, xkbfile,
- PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
-- xkm_output_dir, keymap);
-+ tmpXkmFile);
-
- if (xkbbasedirflag != emptystring) {
- xfree(xkbbasedirflag);
- }
-
-+ /* there's a potential race condition between calling tempnam()
-+ and invoking xkbcomp to write the result file (potential temp
-+ file name conflicts), but since xkbcomp is a standalone
-+ program, we have to live with this */
-+
- #ifndef WIN32
- out= Popen(buf,"w");
- #else
-@@ -250,31 +353,43 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- #endif
-
- if (out!=NULL) {
--#ifdef DEBUG
-- if (xkbDebugFlags) {
-- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n");
-- XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
-+ /* write XKBKeyMapBuf to xkbcomp */
-+ if (EOF==fputs(xkbKeyMapBuf, out))
-+ {
-+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n");
-+ result = False;
-+ goto _ret;
- }
--#endif
-- XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
- #ifndef WIN32
- if (Pclose(out)==0)
- #else
- if (fclose(out)==0 && System(buf) >= 0)
- #endif
- {
-+ /* xkbcomp success */
- if (xkbDebugFlags)
- DebugF("[xkb] xkb executes: %s\n",buf);
-- if (nameRtrn) {
-- strncpy(nameRtrn,keymap,nameRtrnLen);
-- nameRtrn[nameRtrnLen-1]= '\0';
-+
-+ /* if canonicalXkmFileName already exists now, we simply
-+ overwrite it, this is OK */
-+ ret = rename(tmpXkmFile, canonicalXkmFileName);
-+ if (0 != ret) {
-+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n",
-+ tmpXkmFile, canonicalXkmFileName,
-+ strerror(errno));
-+
-+ /* in case of error, don't unlink tmpXkmFile, leave it
-+ for debugging */
-+
-+ result = False;
-+ goto _ret;
- }
-- if (buf != NULL)
-- xfree (buf);
-- return True;
-+
-+ result = True;
-+ goto _ret;
- }
- else
-- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap);
-+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile);
- #ifdef WIN32
- /* remove the temporary file */
- unlink(tmpname);
-@@ -289,9 +404,17 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
- }
- if (nameRtrn)
- nameRtrn[0]= '\0';
-+ result = False;
-+
-+_ret:
-+ if (tmpXkmFile)
-+ free(tmpXkmFile);
-+ if (canonicalXkmFileName)
-+ xfree(canonicalXkmFileName);
- if (buf != NULL)
- xfree (buf);
-- return False;
-+
-+ return result;
- }
-
- static FILE *
-@@ -375,7 +498,6 @@ unsigned missing;
- DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
- }
- fclose(file);
-- (void) unlink (fileName);
- return (need|want)&(~missing);
- }
-
---
-1.5.6.5
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
deleted file mode 100644
index b2c8d58..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-We need to insert the sysroot path into compiler commandlines for this
-kind of variable use, otherwise we're looking into /usr/include/.
-
-RP - 26/11/09
-
-Upstream-Status: Pending
-
-Index: git/xorg-server.m4
-===================================================================
---- git.orig/xorg-server.m4 2010-02-05 10:00:55.000000000 +0000
-+++ git/xorg-server.m4 2010-02-05 10:02:12.000000000 +0000
-@@ -28,10 +28,11 @@
- # Checks for the $1 define in xorg-server.h (from the sdk). If it
- # is defined, then add $1 to $REQUIRED_MODULES.
-
-+m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 18/31] xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (16 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 17/31] xserver-xorg: drop unused files Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 19/31] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory Martin Jansa
` (13 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1
because in .inc we don't have ${PV} expanded yet
* crosscompile.patch macro_tweak.patch were identical
* fix_open_max_preprocessor_error.patch has only different header
# $ diff xserver-xorg/fix_open_max_preprocessor_error.patch xserver-xorg-dri/fix_open_max_preprocessor_error.patch
1c1
< Upstream-Status: Pending
---
> Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 7 +----
.../xserver-xorg-lite/macro_tweak.patch | 30 --------------------
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb | 2 +
.../xorg-xserver/xserver-xorg/crosscompile.patch | 22 --------------
.../fix_open_max_preprocessor_error.patch | 15 ----------
7 files changed, 3 insertions(+), 73 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-lite => xserver-xorg-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-lite => xserver-xorg-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg => xserver-xorg-1.11.1}/macro_tweak.patch (75%)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
similarity index 75%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
index 2b32d4e..ec0eea6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
@@ -1,10 +1,5 @@
This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
+xorg-server 1.8.99.904 and newer.
Upstream-Status: Pending
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
deleted file mode 100644
index 2b32d4e..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-diff --git a/xorg-server.m4 b/xorg-server.m4
-index bdecf62..040fdb8 100644
---- a/xorg-server.m4
-+++ b/xorg-server.m4
-@@ -28,10 +28,12 @@ dnl
- # Checks for the $1 define in xorg-server.h (from the sdk). If it
- # is defined, then add $1 to $REQUIRED_MODULES.
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
-+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include "xorg-server.h"
- #if !defined $1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
index 799b11a..ec29b21 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
@@ -1,2 +1,4 @@
require xserver-xorg-lite.inc
require xserver-xorg-${PV}.inc
+
+FILESEXTRAPATHS_append := "${THISDIR}/xserver-xorg:${THISDIR}/xserver-xorg-${PV}:"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
deleted file mode 100644
index 2f98bb8..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff --git a/configure.ac b/configure.ac
-index b3b752c..600500b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
- dnl compiling, assume default font path uses standard FONTROOTDIR directories.
- DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
--if test "$cross_compiling" != yes; then
-- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
-- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
-- [case $host_os in
-+ case $host_os in
- darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
-- esac])
--fi
-+ esac
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- [ FONTPATH="$withval" ],
- [ FONTPATH="${DEFAULT_FONT_PATH}" ])
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
deleted file mode 100644
index 9c33072..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: git/os/osdep.h
-===================================================================
---- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100
-+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100
-@@ -92,7 +92,7 @@
- * like sysconf(_SC_OPEN_MAX) is not supported.
- */
-
--#if OPEN_MAX <= 256
-+#if 0
- #define MAXSOCKS (OPEN_MAX - 1)
- #else
- #define MAXSOCKS 256
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 19/31] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (17 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 18/31] xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 20/31] xorg-driver-common.inc: use virtual/xserver instead of older virtual/xserver-xf86 Martin Jansa
` (12 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-kdrive/disable-apm.patch | 24 ------
.../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 43 ----------
| 87 --------------------
.../xserver-kdrive/fbdev_xrandr_ioctl.patch | 63 --------------
.../xserver-kdrive/no-serial-probing.patch | 17 ----
5 files changed, 0 insertions(+), 234 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
deleted file mode 100644
index c22b1c0..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
---- xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 +0000
-+++ xserver/hw/kdrive/linux/linux.c 2005-04-23 15:57:05.001094192 +0000
-@@ -342,7 +342,7 @@
- /*
- * Open the APM driver
- */
-- LinuxApmFd = open ("/dev/apm_bios", 2);
-+ /*LinuxApmFd = open ("/dev/apm_bios", 2);
- if (LinuxApmFd < 0 && errno == ENOENT)
- LinuxApmFd = open ("/dev/misc/apm_bios", 2);
- if (LinuxApmFd >= 0)
-@@ -352,7 +352,7 @@
- RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0);
- AddEnabledDevice (LinuxApmFd);
- }
--
-+ */
- /*
- * now get the VT
- */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
deleted file mode 100644
index 631c111..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
-Index: xorg-server-1.3.0.0/configure.ac
-===================================================================
---- xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.000000000 +0200
-+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.000000000 +0200
-@@ -520,7 +520,11 @@
- XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-
- dnl Core modules for most extensions, et al.
-+if test "$KDRIVE" = yes; then
-+REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto >= 1.0.3]"
-+else
- REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto >= 1.0.3]"
-+fi
- REQUIRED_LIBS="xfont xau fontenc"
-
- AM_CONDITIONAL(XV, [test "x$XV" = xyes])
-@@ -1603,7 +1607,9 @@
- AC_SUBST(XKB_COMPILED_DIR)
-
- dnl and the rest of these are generic, so they're in config.h
-+if test ! x"$KDRIVE" = xyes; then
- AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
-+fi
- AC_DEFINE(XResExtension, 1, [Build XRes extension])
-
- AC_TRY_COMPILE([
-@@ -1616,10 +1622,12 @@
-
- AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
-
-+if test ! "x$KDRIVE" = xyes ; then
- dnl xorgconfig CLI configuration utility
- PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
- AC_SUBST(XORGCONFIG_DEP_CFLAGS)
- AC_SUBST(XORGCONFIG_DEP_LIBS)
-+fi
-
- dnl xorgcfg GUI configuration utility
- AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
deleted file mode 100644
index 896c033..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Add some extra video modes and change the default to VGA.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
----
- hw/kdrive/src/kmode.c | 41 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 39 insertions(+), 2 deletions(-)
-
-Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.000000000 +0000
-+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.000000000 +0000
-@@ -32,6 +32,31 @@ const KdMonitorTiming kdMonitorTimings[
- /* H V Hz KHz */
- /* FP BP BLANK POLARITY */
-
-+ /* Treo 650 */
-+
-+ { 320, 320, 64, 16256,
-+ 17, 12, 32, KdSyncNegative,
-+ 1, 11, 14, KdSyncNegative,
-+ },
-+
-+ { 320, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
-+ /* LifeDrive/T3/TX modes */
-+
-+ { 320, 480, 64, 16256,
-+ 17, 12, 32, KdSyncNegative,
-+ 1, 11, 14, KdSyncNegative,
-+ },
-+
-+ { 480, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
-+
- /* IPAQ modeline:
- *
- * Modeline "320x240" 5.7222 320 337 340 352 240 241 244 254"
-@@ -41,6 +66,11 @@ const KdMonitorTiming kdMonitorTimings[
- 1, 11, 14, KdSyncNegative,
- },
-
-+ { 240, 320, 64, 0,
-+ 0, 0, 0, KdSyncNegative,
-+ 0, 0, 0, KdSyncNegative,
-+ },
-+
- /* Other VESA modes */
- { 640, 350, 85, 31500, /* VESA */
- 32, 96, 192, KdSyncPositive, /* 26.413 */
-@@ -76,10 +106,19 @@ const KdMonitorTiming kdMonitorTimings[
- 16, 120, 176, KdSyncNegative, /* 37.861 */
- 1, 20, 24, KdSyncNegative, /* 72.809 */
- },
-+ /* DEFAULT */
-+#define MONITOR_TIMING_DEFAULT 13
- { 640, 480, 60, 25175, /* VESA */
- 16, 48, 160, KdSyncNegative, /* 31.469 */
- 10, 33, 45, KdSyncNegative, /* 59.940 */
- },
-+
-+
-+ { 480, 640, 60, 0, /* VESA */
-+ 0, 0, 0, KdSyncNegative, /* 31.469 */
-+ 0, 0, 0, KdSyncNegative, /* 59.940 */
-+ },
-+
-
- /* 800x600 modes */
- { 800, 600, 85, 56250, /* VESA */
-@@ -90,8 +129,6 @@ const KdMonitorTiming kdMonitorTimings[
- 16, 160, 256, KdSyncPositive, /* 46.875 */
- 1, 21, 25, KdSyncPositive, /* 75.000 */
- },
-- /* DEFAULT */
--#define MONITOR_TIMING_DEFAULT 9
- { 800, 600, 72, 50000, /* VESA */
- 56, 64, 240, KdSyncPositive, /* 48.077 */
- 37, 23, 66, KdSyncPositive, /* 72.188 */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
deleted file mode 100644
index 07348dc..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Upstream-Status: Pending
-
-Index: xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c
-===================================================================
---- xorg-server-1.3.0.0.orig/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:12.000000000 +0100
-+++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2008-09-25 21:55:46.000000000 +0100
-@@ -498,6 +498,7 @@
- KdScreenInfo *screen = pScreenPriv->screen;
- FbdevScrPriv *scrpriv = screen->driver;
- Bool wasEnabled = pScreenPriv->enabled;
-+ FbdevPriv *priv = screen->card->driver;
- FbdevScrPriv oldscr;
- int oldwidth;
- int oldheight;
-@@ -525,11 +526,46 @@
- oldheight = screen->height;
- oldmmwidth = pScreen->mmWidth;
- oldmmheight = pScreen->mmHeight;
--
-+
- /*
- * Set new configuration
- */
--
-+
-+ if (newwidth != oldwidth || newheight != oldheight)
-+ {
-+ struct fb_var_screeninfo var;
-+ int k;
-+
-+ k = ioctl (priv->fd, FBIOGET_VSCREENINFO, &var);
-+
-+ if (k < 0)
-+ {
-+ ErrorF("Error with framebuffer ioctl FBIOGET_VSCREENINFO: %s", strerror (errno));
-+ return FALSE;
-+ }
-+
-+ var.xres = newwidth;
-+ var.yres = newheight;
-+ var.activate = FB_ACTIVATE_NOW;
-+
-+ k = ioctl (priv->fd, FBIOPUT_VSCREENINFO, &var);
-+
-+ if (k >= 0)
-+ {
-+ if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0)
-+ {
-+ perror("Error with framebuffer ioctl FIOGET_FSCREENINFO");
-+ close (priv->fd);
-+ return FALSE;
-+ }
-+ if ((k=ioctl(priv->fd, FBIOGET_VSCREENINFO, &priv->var)) < 0) {
-+ perror("Error framebuffer ioctl FIOGET_VSCREENINFO");
-+ close (priv->fd);
-+ return FALSE;
-+ }
-+ }
-+ }
-+
- scrpriv->randr = KdAddRotation (screen->randr, randr);
-
- KdOffscreenSwapOut (screen->pScreen);
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
deleted file mode 100644
index 6acb834..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke <ke.yu@intel.com>
-
---- xserver/hw/kdrive/linux/mouse.c.orig 2004-05-13 14:25:51.000000000 -0700
-+++ xserver/hw/kdrive/linux/mouse.c 2005-09-22 12:20:47.000000000 -0700
-@@ -927,8 +927,10 @@ char *kdefaultMouse[] = {
- "/dev/psaux",
- "/dev/input/mice",
- "/dev/adbmouse",
-+#ifdef BREAK_MY_SERIAL_CONSOLE
- "/dev/ttyS0",
- "/dev/ttyS1",
-+#endif
- };
-
- #define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 20/31] xorg-driver-common.inc: use virtual/xserver instead of older virtual/xserver-xf86
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (18 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 19/31] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 21/31] xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new xserver-xorg ABI Martin Jansa
` (11 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xorg-driver-common.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 801d8d3..da3a90b 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -7,7 +7,7 @@ LICENSE = "MIT-X"
PE = "1"
INC_PR = "r15"
-DEPENDS = "virtual/xserver-xf86 xproto randrproto util-macros"
+DEPENDS = "virtual/xserver xproto randrproto util-macros"
SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 21/31] xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new xserver-xorg ABI
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (19 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 20/31] xorg-driver-common.inc: use virtual/xserver instead of older virtual/xserver-xf86 Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 22/31] libx11: package xcb, merge few changes from meta-oe Martin Jansa
` (10 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-driver/xorg-driver-common.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index da3a90b..097060e 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -5,7 +5,7 @@ SECTION = "x11/drivers"
LICENSE = "MIT-X"
PE = "1"
-INC_PR = "r15"
+INC_PR = "r17"
DEPENDS = "virtual/xserver xproto randrproto util-macros"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 22/31] libx11: package xcb, merge few changes from meta-oe
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (20 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 21/31] xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new xserver-xorg ABI Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 23/31] libx11: add new version 1.4.4 Martin Jansa
` (9 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* move --with-keysymdef/--with-keysymdefdir setting to recipes (newer
versions are using keysymdefdir instead keysymdef
* fix MIN_REHASH in makekeys by sed call
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 2 +-
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11.inc | 25 ++++++++++++-------
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11_git.bb | 2 +
7 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index e7ad2d8..d97a5b8 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -22,5 +22,5 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
index dea7faf..4cda779 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
@@ -13,5 +13,5 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 5a63c53..3c33de9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -17,4 +17,4 @@ SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
-EXTRA_OECONF += "--disable-xcms --with-xcb"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
index 730efe1..d1bf67b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
@@ -8,6 +8,6 @@ SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
-EXTRA_OECONF += "--disable-xcms --with-xcb"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 455753f..748a48c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,32 +11,39 @@ inherit siteinfo
PROVIDES = "virtual/libx11"
XORG_PN = "libX11"
-LEAD_SONAME = "libX11.so"
+LICENSE = "MIT & MIT-style & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-specs"
+EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
+
+PACKAGES =+ "${PN}-xcb"
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-do_compile() {
+do_compile_prepend() {
cd ${S}/src/util
mv makekeys.c.orig makekeys.c || true
touch makekeys-makekeys.o
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ # MIN_REHASH 10 is only in 1.0.1
+ sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c
+ sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
+ touch makekeys-makekeys.o;
if [ "${SITEINFO_BITS}" == "64" ]; then
- ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
- else
- ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys
- fi
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+ else
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys
+ fi
)
if [ "$?" != "0" ]; then
exit 1
fi
# mv to stop it getting rebuilt
mv makekeys.c makekeys.c.orig
- cd ${S}
- oe_runmake
+ cd ../../
}
# Multiple libx11 derivatives from from this file and are selected by virtual/libx11
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
index f98bbe8..ffec7d1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
@@ -30,6 +30,6 @@ DEPENDS_virtclass-nativesdk += "bigreqsproto xproto xextproto \
XCB = "--with-xcb"
XCB_virtclass-native = "--without-xcb"
XCB_virtclass-nativesdk = "--without-xcb"
-EXTRA_OECONF += "${XCB}"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb
index 4da80bd..afa1560 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_git.bb
@@ -11,4 +11,6 @@ DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
DEFAULT_PREFERENCE = "-1"
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
BBCLASSEXTEND = "nativesdk"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 23/31] libx11: add new version 1.4.4
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (21 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 22/31] libx11: package xcb, merge few changes from meta-oe Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 24/31] libx11: remove older 1.3.4 Martin Jansa
` (8 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 +++++++++++++++
.../libx11-1.4.4/x11_disable_makekeys.patch | 29 ++++++++++++++++++++
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 18 ++++++++++++
3 files changed, 70 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
new file mode 100644
index 0000000..d1bdab9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
+--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
++++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
+@@ -355,7 +355,14 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysym definitions])
+-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++AC_ARG_WITH(keysymdefdir,
++ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
++ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
++
++if test x$KEYSYMDEFDIR = x; then
++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++fi
++
+ FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+ for i in $FILES; do
+ if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000..9763313
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.3.4/src/util/Makefile.am
+===================================================================
+--- libX11-1.3.4.orig/src/util/Makefile.am
++++ libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+-
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
new file mode 100644
index 0000000..823b3dc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
@@ -0,0 +1,18 @@
+require libx11.inc
+inherit gettext
+
+BBCLASSEXTEND = "native nativesdk"
+
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
+
+DEPENDS += "util-macros xtrans libxdmcp libxau \
+ bigreqsproto xproto xextproto xcmiscproto \
+ xf86bigfontproto kbproto inputproto libxcb \
+ xproto-native"
+
+SRC_URI += " file://keysymdef_include.patch \
+ file://x11_disable_makekeys.patch \
+ "
+
+SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
+SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 24/31] libx11: remove older 1.3.4
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (22 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 23/31] libx11: add new version 1.4.4 Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 25/31] libx11: drop old 1.2.2 git version Martin Jansa
` (7 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* libx11-1.3.4 directory is kept for libx11-trim_1.3.4.bb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 35 ------------------------
1 files changed, 0 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
deleted file mode 100644
index ffec7d1..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require libx11.inc
-inherit gettext
-
-LICENSE = "MIT & MIT-style & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
-
-PE = "1"
-PR = "r4"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
- file://nodolt.patch \
- file://include_fix.patch \
- file://makekeys_crosscompile.patch"
-
-SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
-SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
-
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
- libxdmcp xf86bigfontproto kbproto inputproto xproto-native libxcb"
-
-DEPENDS_virtclass-native += "bigreqsproto-native xextproto-native \
- xtrans-native libxau-native xcmiscproto-native \
- libxdmcp-native xf86bigfontproto-native kbproto-native \
- inputproto-native xproto-native"
-
-DEPENDS_virtclass-nativesdk += "bigreqsproto xproto xextproto \
- xtrans libxau xcmiscproto libxdmcp xf86bigfontproto kbproto \
- inputproto xproto-native"
-
-XCB = "--with-xcb"
-XCB_virtclass-native = "--without-xcb"
-XCB_virtclass-nativesdk = "--without-xcb"
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}"
-
-BBCLASSEXTEND = "native nativesdk"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 25/31] libx11: drop old 1.2.2 git version
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (23 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 24/31] libx11: remove older 1.3.4 Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 26/31] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4 Martin Jansa
` (6 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 21993 bytes --]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 17 -
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 570 --------------------
.../xorg-lib/libx11-git/fix-disable-xlocale.diff | 16 -
.../libx11-git/fix-utf8-wrong-define.patch | 17 -
.../xorg-lib/libx11-git/include_fix.patch | 25 -
.../xorg-lib/libx11-git/nodolt.patch | 14 -
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 30 -
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 13 -
meta/recipes-graphics/xorg-lib/libx11_git.bb | 16 -
meta/recipes-graphics/xorg-lib/libx11_git.inc | 11 -
10 files changed, 0 insertions(+), 729 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.inc
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
deleted file mode 100644
index 4cda779..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
-this version."
-
-SRC_URI += "file://X18NCMSstubs.diff \
- file://fix-disable-xlocale.diff \
- file://fix-utf8-wrong-define.patch"
-
-DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
- libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-
-SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
-CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
deleted file mode 100644
index b49fc22..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
+++ /dev/null
@@ -1,570 +0,0 @@
-Upstream-Status: Pending
-
----
- configure.ac | 9 -
- src/Makefile.am | 5
- src/X18NCMSstubs.c | 428 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/imConv.c | 4
- src/locking.c | 4
- 5 files changed, 448 insertions(+), 2 deletions(-)
-
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -263,11 +263,18 @@ if test -f "$KEYSYMDEF"; then
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
- AC_SUBST(KEYSYMDEF)
-
--AM_CONDITIONAL(UDC, test xfalse = xtrue)
-+AC_ARG_ENABLE(udc,
-+ AC_HELP_STRING([--disable-udc],
-+ [Disable Xlib support for UDC *EXPERIMENTAL*]),
-+ [UDC=$enableval],[UDC=yes])
-+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
-+if test x"$UDC" = "xyes"; then
-+ AC_DEFINE(UDC,1,[Include support for UDC])
-+fi
-
- AC_ARG_ENABLE(xcms,
- AC_HELP_STRING([--disable-xcms],
- [Disable Xlib support for CMS *EXPERIMENTAL*]),
- [XCMS=$enableval],[XCMS=yes])
---- git.orig/src/Makefile.am
-+++ git/src/Makefile.am
-@@ -329,18 +329,21 @@ endif
-
- if THRSTUBS
- libX11_la_SOURCES+=UIThrStubs.c
- endif
-
-+libX11_la_SOURCES+=X18NCMSstubs.c
-+
- x11datadir = @X11_DATADIR@
- x11data_DATA = XKeysymDB XErrorDB
-
- EXTRA_DIST = \
- $(x11data_DATA) \
- os2Stubs.c \
- udcInf.c \
-- UIThrStubs.c
-+ UIThrStubs.c \
-+ X18NCMSstubs.c
-
- if XCB
- libX11_la_SOURCES += \
- xcb_lock.c \
- xcb_disp.c \
---- /dev/null
-+++ git/src/X18NCMSstubs.c
-@@ -0,0 +1,428 @@
-+/*
-+ * X18NCMSstubs.c
-+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
-+ *
-+ * Copyright © 2003 Matthew Allum
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Matthew Allum not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Keith Packard and Compaq makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include <stdlib.h>
-+#include "Xlibint.h"
-+#include "Xlcint.h"
-+#include <X11/Xlocale.h>
-+#include <X11/Xos.h>
-+#ifdef WIN32
-+#undef close
-+#endif
-+#include <X11/Xutil.h>
-+#include "XlcPubI.h"
-+
-+#include "Xcmsint.h" /* for XcmsCCC type */
-+#include "XlcPubI.h" /* for XLCd type */
-+#include "config.h"
-+
-+#if ! XLOCALE
-+
-+Bool
-+XSupportsLocale()
-+{
-+ return False;
-+}
-+
-+char *
-+XSetLocaleModifiers(
-+ const char *modifiers)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XOpenLC(
-+ char *name)
-+{
-+ return NULL;
-+}
-+
-+XLCd
-+_XlcCurrentLC()
-+{
-+ return NULL;
-+}
-+
-+void
-+_XlcVaToArgList(
-+ va_list var,
-+ int count,
-+ XlcArgList *args_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XlcCountVaList(
-+ va_list var,
-+ int *count_ret)
-+{
-+ return;
-+}
-+
-+void
-+_XCloseLC(
-+ XLCd lcd)
-+{
-+ return;
-+}
-+
-+int
-+_XlcConvert(
-+ XlcConv conv,
-+ XPointer *from,
-+ int *from_left,
-+ XPointer *to,
-+ int *to_left,
-+ XPointer *args,
-+ int num_args)
-+{
-+ return 0;
-+}
-+
-+/* XIM Stubs */
-+
-+XPointer
-+_XimGetLocaleCode ( _Xconst char* encoding_name )
-+{
-+ return NULL;
-+}
-+
-+int
-+_XimGetCharCode (
-+ XPointer ucs_conv,
-+ KeySym keysym,
-+ unsigned char* buf,
-+ int nbytes)
-+{
-+ return 0;
-+}
-+
-+/* Xrm Stubs */
-+
-+XrmMethods
-+_XrmInitParseInfo(
-+ XPointer *state)
-+{
-+ return (XrmMethods) NULL;
-+}
-+
-+/* Xwc Stubs */
-+
-+int
-+XwcTextExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcDrawString(Display *display,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x, int y,
-+ _Xconst wchar_t *string,
-+ int num_wchars)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XwcTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XwcDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextEscapement(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XwcTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst wchar_t *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ ;
-+}
-+
-+int
-+XwcTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ wchar_t ***list_ret,
-+ int *count_ret)
-+{
-+ return 0;
-+}
-+
-+int
-+XwcTextListToTextProperty(
-+ Display *dpy,
-+ wchar_t **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return 0;
-+}
-+
-+void
-+XwcFreeStringList(wchar_t **list)
-+{
-+ return;
-+}
-+
-+
-+void XmbSetWMProperties ( /* Actually from mbWMProps.c */
-+ Display *dpy,
-+ Window w,
-+ _Xconst char *windowName,
-+ _Xconst char *iconName,
-+ char **argv,
-+ int argc,
-+ XSizeHints *sizeHints,
-+ XWMHints *wmHints,
-+ XClassHint *classHints)
-+{
-+ return;
-+}
-+
-+int
-+XmbTextPropertyToTextList(
-+ Display *dpy,
-+ const XTextProperty *text_prop,
-+ char ***list_ret,
-+ int *count_ret)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextListToTextProperty(
-+ Display *dpy,
-+ char **list,
-+ int count,
-+ XICCEncodingStyle style,
-+ XTextProperty *text_prop)
-+{
-+ return XLocaleNotSupported;
-+}
-+
-+int
-+XmbTextExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *overall_ink_extents,
-+ XRectangle *overall_logical_extents)
-+{
-+ return 0;
-+}
-+
-+void
-+XmbDrawText(
-+ Display *dpy,
-+ Drawable d,
-+ GC gc,
-+ int x,
-+ int y,
-+ XmbTextItem *text_items,
-+ int nitems)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+void
-+XmbDrawImageString(
-+ Display *dpy,
-+ Drawable d,
-+ XFontSet font_set,
-+ GC gc,
-+ int x,
-+ int y,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ ;
-+}
-+
-+int
-+XmbTextEscapement(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len)
-+{
-+ return 0;
-+}
-+
-+Status
-+XmbTextPerCharExtents(
-+ XFontSet font_set,
-+ _Xconst char *text,
-+ int text_len,
-+ XRectangle *ink_extents_buffer,
-+ XRectangle *logical_extents_buffer,
-+ int buffer_size,
-+ int *num_chars,
-+ XRectangle *max_ink_extents,
-+ XRectangle *max_logical_extents)
-+{
-+ return 0;
-+}
-+
-+unsigned int
-+KeySymToUcs4(KeySym keysym)
-+{
-+ return 0;
-+}
-+
-+#endif
-+
-+#if ! XCMS
-+
-+XcmsCCC
-+XcmsCCCOfColormap(dpy, cmap)
-+ Display *dpy;
-+ Colormap cmap;
-+{
-+ return NULL;
-+}
-+
-+Status
-+_XcmsResolveColorString (
-+ XcmsCCC ccc,
-+ const char **color_string,
-+ XcmsColor *pColor_exact_return,
-+ XcmsColorFormat result_format)
-+{
-+ return(XcmsFailure);
-+}
-+
-+void
-+_XcmsUnresolveColor(
-+ XcmsCCC ccc,
-+ XcmsColor *pColor)
-+{
-+ return;
-+}
-+
-+void
-+_XUnresolveColor(
-+ XcmsCCC ccc,
-+ XColor *pXColor)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsAddCmapRec(dpy, cmap, windowID, visual)
-+ Display *dpy;
-+ Colormap cmap;
-+ Window windowID;
-+ Visual *visual;
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsRGB_to_XColor(
-+ XcmsColor *pColors,
-+ XColor *pXColors,
-+ unsigned int nColors)
-+{
-+ return;
-+}
-+
-+XcmsCmapRec *
-+_XcmsCopyCmapRecAndFree(
-+ Display *dpy,
-+ Colormap src_cmap,
-+ Colormap copy_cmap)
-+{
-+ return NULL;
-+}
-+
-+void
-+_XcmsDeleteCmapRec(
-+ Display *dpy,
-+ Colormap cmap)
-+{
-+ return;
-+}
-+
-+#endif
---- git.orig/src/imConv.c
-+++ git/src/imConv.c
-@@ -81,10 +81,11 @@ static const struct SubstRec SubstTable[
- /*
- * Given the name of a charset, returns the pointer to convertors
- * from UCS char to specified charset char.
- * This converter is needed for _XimGetCharCode subroutine.
- */
-+#ifdef XLOCALE
- XPointer
- _XimGetLocaleCode (
- _Xconst char* encoding_name)
- {
- XPointer cvt = _Utf8GetConvByName(encoding_name);
-@@ -94,10 +95,11 @@ _XimGetLocaleCode (
- if (!strcmp(encoding_name, SubstTable[i].encoding_name))
- return _Utf8GetConvByName(SubstTable[i].charset_name);
- }
- return cvt;
- }
-+#endif
-
- /*
- * Returns the locale dependent representation of a keysym.
- * The locale's encoding is passed in form of pointer to UCS convertor.
- * The resulting multi-byte sequence is placed starting at buf (a buffer
-@@ -105,10 +107,11 @@ _XimGetLocaleCode (
- * Returns the length of the resulting multi-byte sequence, excluding the
- * terminating NUL byte. Return 0 if the keysym is not representable in the
- * locale
- */
- /*ARGSUSED*/
-+#ifdef XLOCALE
- int
- _XimGetCharCode (
- XPointer ucs_conv,
- KeySym keysym,
- unsigned char* buf,
-@@ -133,10 +136,11 @@ _XimGetCharCode (
- return nbytes;
- if (count<nbytes)
- buf[count]= '\0';
- return count;
- }
-+#endif
-
- #ifdef XKB
- static int lookup_string(
- XKeyEvent* event,
- char* buffer,
---- git.orig/src/locking.c
-+++ git/src/locking.c
-@@ -53,11 +53,13 @@ in this Software without prior written a
- #endif
-
- #define NUM_FREE_CVLS 4
-
- /* in lcWrap.c */
-+#ifdef XLOCALE
- extern LockInfoPtr _Xi18n_lock;
-+#endif
-
- #ifdef WIN32
- static DWORD _X_TlsIndex = (DWORD)-1;
-
- void _Xthread_init()
-@@ -623,13 +625,15 @@ Status XInitThreads()
- return 0;
- }
- _Xglobal_lock = &global_lock;
- xmutex_init(_Xglobal_lock->lock);
- xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
-+#ifdef XLOCALE
- _Xi18n_lock = &i18n_lock;
- xmutex_init(_Xi18n_lock->lock);
- xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n");
-+#endif
- _XLockMutex_fn = _XLockMutex;
- _XUnlockMutex_fn = _XUnlockMutex;
- _XCreateMutex_fn = _XCreateMutex;
- _XFreeMutex_fn = _XFreeMutex;
- _XInitDisplayLock_fn = _XInitDisplayLock;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
deleted file mode 100644
index 7dcdd6a..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
-+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
-@@ -701,7 +701,11 @@
- }
- if (l - 2 - (p - charset) < 0)
- return 0;
-+#ifdef XLOCALE
- if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
-+#else
-+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
-+#endif
- return 0;
- if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
- return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
deleted file mode 100644
index 26d3349..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define
-+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h
-@@ -103,7 +103,7 @@
-
- /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
- November 2000. Its presence is indicated through the following macro. */
--#define X_HAVE_UTF8_STRING 1
-+#undef X_HAVE_UTF8_STRING
-
- typedef char *XPointer;
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
deleted file mode 100644
index b3bcbab..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- libX11-1.1.5.orig/configure.ac
-+++ libX11-1.1.5/configure.ac
-@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
- AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
-
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
- if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
deleted file mode 100644
index cc05fdc..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libX11-1.2.1/configure.ac
-===================================================================
---- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
-+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
-@@ -20,7 +20,6 @@
-
- # Checks for programs.
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_CC
- XORG_CWARNFLAGS
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
deleted file mode 100644
index 5dc6f06..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- src/util/Makefile.am | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-Index: git/src/util/Makefile.am
-===================================================================
---- git.orig/src/util/Makefile.am 2010-01-28 22:24:29.000000000 +0000
-+++ git/src/util/Makefile.am 2010-01-28 22:29:26.000000000 +0000
-@@ -1,19 +1,2 @@
-
--noinst_PROGRAMS=makekeys
-
--makekeys_CFLAGS=$(X11_CFLAGS)
--
--CC = @CC_FOR_BUILD@
--
--EXTRA_DIST = mkks.sh
--
--if LINT
--# Check source code with tools like lint & sparse
--
--ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
--
--lint:
-- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
--
--endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
deleted file mode 100644
index d1bf67b..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-DESCRIPTION += " Support for XCB, and XCMS is disabled in this version."
-
-PR = "r2"
-SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-
-DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
-
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
-CFLAGS += "-D_GNU_SOURCE"
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb
deleted file mode 100644
index afa1560..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-inherit gettext
-
-SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
-PR = "r2"
-
-DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \
- bigreqsproto xtrans libxau libxcb libxdmcp util-macros"
-
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-
-BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.inc b/meta/recipes-graphics/xorg-lib/libx11_git.inc
deleted file mode 100644
index 4de424d..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11_git.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PV = "1.2.1+git${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git"
-S = "${WORKDIR}/git"
-
-SRC_URI += "file://x11_disable_makekeys.patch \
- file://include_fix.patch \
- file://nodolt.patch"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11-git"
-FILESPATH = "${FILE_DIRNAME}/libx11-git"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 26/31] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (24 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 25/31] libx11: drop old 1.2.2 git version Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 27/31] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory Martin Jansa
` (5 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* because there isn't libx11-1.3.4 recipe anymore
* remove older versions from libx11-trim directory
* notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has
--with-xcb
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff | 0
.../fix-disable-xlocale.diff | 0
.../fix-utf8-wrong-define.patch | 0
.../include_fix.patch | 0
.../makekeys_crosscompile.patch | 0
.../nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
.../xorg-lib/libx11-trim/include_fix.patch | 25 ----------------
.../xorg-lib/libx11-trim/nodolt.patch | 14 ---------
.../libx11-trim/x11_disable_makekeys.patch | 31 --------------------
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 8 ++--
11 files changed, 4 insertions(+), 74 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/fix-disable-xlocale.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/fix-utf8-wrong-define.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
deleted file mode 100644
index b3bcbab..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- libX11-1.1.5.orig/configure.ac
-+++ libX11-1.1.5/configure.ac
-@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
- AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
-
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
- if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
deleted file mode 100644
index cc05fdc..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libX11-1.2.1/configure.ac
-===================================================================
---- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
-+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
-@@ -20,7 +20,6 @@
-
- # Checks for programs.
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_CC
- XORG_CWARNFLAGS
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
deleted file mode 100644
index 0445835..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- src/util/Makefile.am | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-Index: libX11-1.2.1/src/util/Makefile.am
-===================================================================
---- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
-+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
-@@ -1,20 +1,3 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
-
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS=$(X11_CFLAGS)
--
--CC = @CC_FOR_BUILD@
--
- EXTRA_DIST = mkks.sh
--
--if LINT
--# Check source code with tools like lint & sparse
--
--ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
--
--lint:
-- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
--
--endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 3c33de9..3a8f2c4 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -9,10 +9,10 @@ PR = "r2"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
-SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \
- file://../libx11-${PV}/include_fix.patch \
- file://../libx11-${PV}/nodolt.patch \
- file://../libx11-${PV}/makekeys_crosscompile.patch"
+SRC_URI += "file://x11_disable_makekeys.patch \
+ file://include_fix.patch \
+ file://nodolt.patch \
+ file://makekeys_crosscompile.patch"
SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 27/31] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (25 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 26/31] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4 Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 28/31] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch Martin Jansa
` (4 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../{libx11 => libx11-diet-1.3}/include_fix.patch | 0
.../{libx11 => libx11-diet-1.3}/nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 1 -
4 files changed, 0 insertions(+), 1 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/x11_disable_makekeys.patch (100%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index d97a5b8..de7edf1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -20,7 +20,6 @@ SRC_URI[sha256sum] = "34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2
DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
CFLAGS += "-D_GNU_SOURCE"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 28/31] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (26 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 27/31] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 29/31] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed Martin Jansa
` (3 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* uclibc patch does apply to all mesa versions and adding mesa-dri to
FILESPATH in all recipes is worse then adding mesa
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-common.inc | 36 +++++++++++++++++---
meta/recipes-graphics/mesa/mesa-dri.inc | 22 ++++++++++++
meta/recipes-graphics/mesa/mesa-xlib.inc | 1 +
.../mesa/{mesa-dri => mesa}/uclibc.patch | 0
4 files changed, 54 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index d8e800e..85db07a 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -10,25 +10,51 @@ HOMEPAGE = "http://mesa3d.org"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11"
LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
- ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos "
+INC_PR = "r12"
+PE = "2"
+PROTO_DEPS = "xf86driproto glproto"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
+
+DEPENDS = "makedepend-native ${PROTO_DEPS} ${LIB_DEPS}"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
S = "${WORKDIR}/Mesa-${PV}"
PROVIDES = "virtual/libgl"
+# for mesa-dri and mesa-xlib
+FILESEXTRAPATHS_append := "${THISDIR}/mesa:${THISDIR}/mesa-${PV}:"
+
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-glu \
--disable-glw \
--disable-glut \
- --enable-glx-tls"
+ "
+
+require glx-use-tls.inc
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
+ install -d ${D}/${includedir}/GL
+ cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
new file mode 100644
index 0000000..ce98228
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -0,0 +1,22 @@
+DEPENDS += "dri2proto expat libdrm"
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = "-1"
+
+MACHINE_DRI_MODULES ?= ""
+PACKAGE_ARCH = "${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1) == '']}"
+
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium -with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
+
+python populate_packages_prepend() {
+ import os.path
+
+ dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
+
+ do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+PACKAGES_DYNAMIC = "mesa-dri-driver-*"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+
diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc b/meta/recipes-graphics/mesa/mesa-xlib.inc
new file mode 100644
index 0000000..44e5dc6
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
@@ -0,0 +1 @@
+EXTRA_OECONF += " --with-driver=xlib"
diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch b/meta/recipes-graphics/mesa/mesa/uclibc.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
rename to meta/recipes-graphics/mesa/mesa/uclibc.patch
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 29/31] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (27 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 28/31] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-07 17:05 ` [PATCHv3 30/31] mesa: add new version 7.11 Martin Jansa
` (2 subsequent siblings)
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
* it will be added again with 7.11 but with different content (builtin_compiler, instead of glsl)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27 --------------------
1 files changed, 0 insertions(+), 27 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
deleted file mode 100644
index d6f2c33..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "gl shader language specific build from mesa-dri"
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://apps/compile.c;endline=26;md5=27c2833286ce9566b162bcbe21d5b267"
-PR = "r0"
-
-DEPENDS = "makedepend-native"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
-SRC_URI[md5sum] = "6be2d343a0089bfd395ce02aaf8adb57"
-SRC_URI[sha256sum] = "505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d"
-
-S = "${WORKDIR}/Mesa-7.8.2/src/glsl/"
-
-inherit native
-
-# use default config for native build
-do_configure_prepend() {
- ln -s ${S}/../../configs/default ${S}/../../configs/current
-}
-
-do_install() {
- install -d ${D}/${bindir}
- install -m 755 ${S}/apps/compile ${D}/${bindir}/glsl-compile
-}
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 30/31] mesa: add new version 7.11
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (28 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 29/31] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed Martin Jansa
@ 2011-10-07 17:05 ` Martin Jansa
2011-10-10 10:29 ` [PATCHv3 00/31] Xorg related changes Richard Purdie
2011-10-10 10:40 ` Koen Kooi
31 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 ++++++++++
.../mesa/mesa-dri-glsl-native_7.11.bb | 28 ++++++++++++++++++++
meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 4 +++
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 4 +++
4 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-7.11.inc
new file mode 100644
index 0000000..98b888f
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -0,0 +1,15 @@
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+ file://uclibc.patch \
+ "
+
+DEPENDS += "mesa-dri-glsl-native"
+
+SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
+SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+
+do_configure_prepend() {
+ #check for python not python2, because python-native does not stage python2 binary/link
+ sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
+ # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)"
+ sed -i "s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g" ${S}/src/glsl/Makefile
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
new file mode 100644
index 0000000..f1987fd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "gl shader language specific build from mesa-dri"
+HOMEPAGE = "http://mesa3d.org"
+BUGTRACKER = "https://bugs.freedesktop.org"
+SECTION = "x11"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
+
+DEPENDS = "makedepend-native"
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
+SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
+
+S = "${WORKDIR}/Mesa-${PV}/src/glsl/"
+
+inherit native
+
+# use default config for native build
+do_configure_prepend() {
+ ln -s ${S}/../../configs/default ${S}/../../configs/current
+}
+
+do_install() {
+ install -d ${D}/${bindir}/glsl
+ install -m 755 ${S}/builtin_compiler ${D}/${bindir}/glsl/builtin_compiler
+ install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
new file mode 100644
index 0000000..26b56e4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-dri.inc
+PR = "${INC_PR}.0"
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
new file mode 100644
index 0000000..93bb8cd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-xlib.inc
+PR = "${INC_PR}.0"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* [PATCHv3 31/31] mesa: drop older 7.10.2 and 7.7+git recipes
[not found] ` <cover.1318007397.git.Martin.Jansa@gmail.com>
@ 2011-10-07 17:10 ` Martin Jansa
0 siblings, 0 replies; 42+ messages in thread
From: Martin Jansa @ 2011-10-07 17:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 ------
meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 ---
meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 --------------------
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 -----
meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 -------
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 ---
6 files changed, 0 insertions(+), 345 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/cross2.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_git.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch b/meta/recipes-graphics/mesa/mesa-dri/cross2.patch
deleted file mode 100644
index 264c153..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri/cross2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2009-09-01 16:38:26.000000000 +0100
-+++ git/configure.ac 2009-09-01 16:38:47.000000000 +0100
-@@ -269,15 +269,6 @@
- GLAPI_ASM_SOURCES=""
- AC_MSG_CHECKING([whether to enable assembly])
- test "x$enable_asm" = xno && AC_MSG_RESULT([no])
--# disable if cross compiling on x86/x86_64 since we must run gen_matypes
--if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
-- case "$host_cpu" in
-- i?86 | x86_64)
-- enable_asm=no
-- AC_MSG_RESULT([no, cross compiling])
-- ;;
-- esac
--fi
- # check for supported arches
- if test "x$enable_asm" = xyes; then
- case "$host_cpu" in
-Index: git/src/mesa/x86/Makefile
-===================================================================
---- git.orig/src/mesa/x86/Makefile 2009-09-01 16:40:02.000000000 +0100
-+++ git/src/mesa/x86/Makefile 2009-09-01 16:40:13.000000000 +0100
-@@ -14,19 +14,6 @@
- -I../tnl
-
-
--default: gen_matypes matypes.h
--
--clean:
-- -rm -f matypes.h gen_matypes
--
--
--gen_matypes: gen_matypes.c
-- $(HOST_CC) $(ARCH_FLAGS) $(INCLUDE_DIRS) $(HOST_CFLAGS) gen_matypes.c -o gen_matypes
--
--# need some special rules here, unfortunately
--matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
-- ./gen_matypes > matypes.h
--
- common_x86_asm.o: matypes.h
- 3dnow_normal.o: matypes.h
- 3dnow_xform1.o: matypes.h
diff --git a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch b/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
deleted file mode 100644
index d300e2f..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-Index: Mesa-7.5/bin/mklib
-===================================================================
---- Mesa-7.5.orig/bin/mklib 2009-08-12 13:01:34.000000000 +0100
-+++ Mesa-7.5/bin/mklib 2009-08-12 13:04:19.000000000 +0100
-@@ -234,9 +234,9 @@
- if [ "x$LINK" = "x" ] ; then
- # -linker was not specified so set default link command now
- if [ $CPLUSPLUS = 1 ] ; then
-- LINK=g++
-+ LINK=$CXX
- else
-- LINK=gcc
-+ LINK=$CC
- fi
- fi
-
diff --git a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h b/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
deleted file mode 100644
index 98d2188..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * This file is automatically generated from the Mesa internal type
- * definitions. Do not edit directly.
- */
-
-#ifndef __ASM_TYPES_H__
-#define __ASM_TYPES_H__
-
-
-
-/* =============================================================
- * Offsets for GLcontext
- */
-
-#define CTX_DRIVER_CTX 996
-
-#define CTX_LIGHT_ENABLED 39404
-#define CTX_LIGHT_SHADE_MODEL 39408
-#define CTX_LIGHT_COLOR_MAT_FACE 39412
-#define CTX_LIGHT_COLOR_MAT_MODE 39416
-#define CTX_LIGHT_COLOR_MAT_MASK 39420
-#define CTX_LIGHT_COLOR_MAT_ENABLED 39424
-#define CTX_LIGHT_ENABLED_LIST 39432
-#define CTX_LIGHT_NEED_VERTS 43793
-#define CTX_LIGHT_FLAGS 43796
-#define CTX_LIGHT_BASE_COLOR 43800
-
-
-/* =============================================================
- * Offsets for struct vertex_buffer
- */
-
-#define VB_SIZE 0
-#define VB_COUNT 4
-
-#define VB_ELTS 8
-#define VB_OBJ_PTR 12
-#define VB_EYE_PTR 16
-#define VB_CLIP_PTR 20
-#define VB_PROJ_CLIP_PTR 24
-#define VB_CLIP_OR_MASK 28
-#define VB_CLIP_MASK 32
-#define VB_NORMAL_PTR 36
-#define VB_EDGE_FLAG 44
-#define VB_TEX0_COORD_PTR 48
-#define VB_TEX1_COORD_PTR 52
-#define VB_TEX2_COORD_PTR 56
-#define VB_TEX3_COORD_PTR 60
-#define VB_INDEX_PTR 80
-#define VB_COLOR_PTR 88
-#define VB_SECONDARY_COLOR_PTR 96
-#define VB_FOG_COORD_PTR 104
-#define VB_PRIMITIVE 108
-
-
-/*
- * Flags for struct vertex_buffer
- */
-
-#define VERT_BIT_OBJ 0x1
-#define VERT_BIT_NORM 0x4
-#define VERT_BIT_RGBA 0x8
-#define VERT_BIT_SPEC_RGB 0x10
-#define VERT_BIT_FOG_COORD 0x20
-#define VERT_BIT_TEX0 0x100
-#define VERT_BIT_TEX1 0x200
-#define VERT_BIT_TEX2 0x400
-#define VERT_BIT_TEX3 0x800
-
-
-/* =============================================================
- * Offsets for GLvector4f
- */
-
-#define V4F_DATA 0
-#define V4F_START 4
-#define V4F_COUNT 8
-#define V4F_STRIDE 12
-#define V4F_SIZE 16
-#define V4F_FLAGS 20
-
-/*
- * Flags for GLvector4f
- */
-
-#define VEC_MALLOC 0x10
-#define VEC_NOT_WRITEABLE 0x40
-#define VEC_BAD_STRIDE 0x100
-
-#define VEC_SIZE_1 0x1
-#define VEC_SIZE_2 0x3
-#define VEC_SIZE_3 0x7
-#define VEC_SIZE_4 0xf
-
-
-/* =============================================================
- * Offsets for GLmatrix
- */
-
-#define MATRIX_DATA 0
-#define MATRIX_INV 4
-#define MATRIX_FLAGS 8
-#define MATRIX_TYPE 12
-
-
-/* =============================================================
- * Offsets for struct gl_light
- */
-
-#define LIGHT_NEXT 0
-#define LIGHT_PREV 4
-
-#define LIGHT_AMBIENT 8
-#define LIGHT_DIFFUSE 24
-#define LIGHT_SPECULAR 40
-#define LIGHT_EYE_POSITION 56
-#define LIGHT_SPOT_DIRECTION 72
-#define LIGHT_SPOT_EXPONENT 88
-#define LIGHT_SPOT_CUTOFF 92
-#define LIGHT_COS_CUTOFF 100
-#define LIGHT_CONST_ATTEN 104
-#define LIGHT_LINEAR_ATTEN 108
-#define LIGHT_QUADRATIC_ATTEN 112
-#define LIGHT_ENABLED 116
-
-#define LIGHT_FLAGS 120
-
-#define LIGHT_POSITION 124
-#define LIGHT_VP_INF_NORM 140
-#define LIGHT_H_INF_NORM 152
-#define LIGHT_NORM_DIRECTION 164
-#define LIGHT_VP_INF_SPOT_ATTEN 180
-
-#define LIGHT_SPOT_EXP_TABLE 184
-#define LIGHT_MAT_AMBIENT 4280
-#define LIGHT_MAT_DIFFUSE 4304
-#define LIGHT_MAT_SPECULAR 4328
-
-#define SIZEOF_GL_LIGHT 4360
-
-/*
- * Flags for struct gl_light
- */
-
-#define LIGHT_SPOT 0x1
-#define LIGHT_LOCAL_VIEWER 0x2
-#define LIGHT_POSITIONAL 0x4
-
-#define LIGHT_NEED_VERTICES 0x6
-
-
-/* =============================================================
- * Offsets for struct gl_lightmodel
- */
-
-#define LIGHT_MODEL_AMBIENT 0
-#define LIGHT_MODEL_LOCAL_VIEWER 16
-#define LIGHT_MODEL_TWO_SIDE 17
-#define LIGHT_MODEL_COLOR_CONTROL 20
-
-
-#endif /* __ASM_TYPES_H__ */
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
deleted file mode 100644
index 68f89a2..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-include mesa-common.inc
-
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat \
- libxml2-native"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native"
-
-PR = "r2"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
- file://crossfix.patch \
- file://uclibc.patch \
- "
-
-SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771"
-SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-LEAD_SONAME = "libGL.so.1"
-
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
-
-python populate_packages_prepend() {
- import os.path
-
- dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
- do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
-COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_git.bb b/meta/recipes-graphics/mesa/mesa-dri_git.bb
deleted file mode 100644
index 9e32d0a..0000000
--- a/meta/recipes-graphics/mesa/mesa-dri_git.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-include mesa-common.inc
-
-SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
- file://cross2.patch \
- file://matypes.h"
-# file://mesa-DRI2Swapbuffer.patch "
-S = "${WORKDIR}/git"
-
-PROTO_DEPS = "xf86driproto glproto dri2proto"
-LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
-SRCREV = "1bf94d419805538ac23a4d0b04d31ac5e4487aca"
-PV = "7.7+git${SRCPV}"
-PR = "r2"
-
-# most of our targets do not have DRI so will use mesa-xlib
-DEFAULT_PREFERENCE = "-1"
-
-PACKAGES =+ "${PN}-xprogs"
-PACKAGES_DYNAMIC = "mesa-dri-driver-*"
-
-FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
-FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
-
-LEAD_SONAME = "libGL.so.1"
-
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
-
-do_configure_prepend () {
- cp ${WORKDIR}/matypes.h ${S}/src/mesa/x86
- touch ${S}/src/mesa/x86/matypes.h
-}
-
-do_compile () {
- oe_runmake clean
- oe_runmake -C src/glsl CC='${BUILD_CC}' CFLAGS=""
- mv ${S}/src/glsl/apps/compile ${S}/host_compile
- oe_runmake clean
- oe_runmake GLSL_CL="${S}/host_compile"
-}
-
-do_install_append () {
- install -d ${D}/usr/bin
- install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
-
-python populate_packages_prepend() {
- import os.path
-
- dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), "dri")
-
- do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
-}
-
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
deleted file mode 100644
index 511103d..0000000
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-include mesa-common.inc
-
-FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
- file://uclibc.patch \
- "
-
-SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771"
-SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
-
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native"
-
-PE = "1"
-PR = "r1"
-
-EXTRA_OECONF += "--with-driver=xlib"
--
1.7.7
^ permalink raw reply related [flat|nested] 42+ messages in thread
* Re: [PATCHv3 00/31] Xorg related changes
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (29 preceding siblings ...)
2011-10-07 17:05 ` [PATCHv3 30/31] mesa: add new version 7.11 Martin Jansa
@ 2011-10-10 10:29 ` Richard Purdie
2011-10-10 10:40 ` Koen Kooi
31 siblings, 0 replies; 42+ messages in thread
From: Richard Purdie @ 2011-10-10 10:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-10-07 at 19:05 +0200, Martin Jansa wrote:
> this patchset brings meta-oe and oe-core xorg stuff together and most of
> xorg recipes will be removed from meta-oe (sending another pull request now).
>
> This step is needed to be able to separate common x11 to meta-x11 or whatever later.
>
> The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
>
> gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
>
> Martin Jansa (31):
> xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
> xserver-xorg: remove old git recipe
> glx-use-tls.inc: add include file to enable glx-tls only when
> TARGET_OS isn't uclibc
> xserver-xorg-common: fix LIC_FILES_CHKSUM
> xserver-xorg-common: move SRC_URI closer together
> xserver-xorg-common: Split out some bigger modules and extensions
> from the main package
> xserver-xorg-common: improve packaging
> xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from
> xserver-xorg.inc and xserver-xorg-lite.inc to
> xserver-xorg-common.inc
> xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config
> dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
> xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
> shared .inc
> xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have
> whole ${bindir} in FILES_ defined in shared .inc
> xserver-xorg: replace hardcoded --enable-glx-tls with
> glx-use-tls.inc, which doesn't enable it for uClibc
> xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
> xserver-xorg: add new version 1.11.1
> xserver-xorg: remove old 1.10.1 version
> xserver-xorg: remove COMPATIBLE_HOST
> xserver-xorg: drop unused files
> xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use
> same directory from xserver-xf86-lite recipe
> xserver-kdrive: drop unused files (same files are in
> xserver-kdrive-1.7.99.2 directory
> xorg-driver-common.inc: use virtual/xserver instead of older
> virtual/xserver-xf86
> xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new
> xserver-xorg ABI
> libx11: package xcb, merge few changes from meta-oe
> libx11: add new version 1.4.4
> libx11: remove older 1.3.4
> libx11: drop old 1.2.2 git version
> libx11-trim: move files for libx11-trim from libx11-1.3.4 to
> libx11-trim-1.3.4
> libx11-diet: move old patches used only by libx11-diet-1.3 to
> separate directory
> mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move
> uclibc.patch
> mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2
> was removed
> mesa: add new version 7.11
> mesa: drop older 7.10.2 and 7.7+git recipes
I love the xserver patches, this series is much easier to review than
the previous ones. I appreciate the work that's gone into it and I'll
likely take those.
I'll also likely take the libx11 pieces however I notice upgrades for
libx11-trim and libx11-diet are missing.
I've therefore queued both pieces on master-next for a bit more testing.
One other thing that did concern me is the removal of the git recipes. I
know why you've done it and I'll take the patches however I would like
to get back to the point that "bleeding" builds work and this isn't
going to help with that :/.
I haven't got as far as the mesa patches yet. Those aren't as easy to
follow and I've probably enough to test with the above changes right at
this moment.
Cheers,
Richard
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 00/31] Xorg related changes
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
` (30 preceding siblings ...)
2011-10-10 10:29 ` [PATCHv3 00/31] Xorg related changes Richard Purdie
@ 2011-10-10 10:40 ` Koen Kooi
2011-10-11 7:08 ` Martin Jansa
31 siblings, 1 reply; 42+ messages in thread
From: Koen Kooi @ 2011-10-10 10:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 7 okt. 2011, om 19:05 heeft Martin Jansa het volgende geschreven:
> this patchset brings meta-oe and oe-core xorg stuff together and most of
> xorg recipes will be removed from meta-oe (sending another pull request now).
>
> This step is needed to be able to separate common x11 to meta-x11 or whatever later.
>
> The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
>
> gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
>
> Martin Jansa (31):
>
> xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
> shared .inc
I have been running X images without minimal fonts for some time now, so AFAICS it can be dropped completely.
regards,
Koen
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
2011-10-07 17:04 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
[not found] ` <cover.1318007397.git.Martin.Jansa@gmail.com>
@ 2011-10-11 6:47 ` Kang Kai
2011-10-11 7:03 ` Martin Jansa
2011-10-12 3:48 ` Cui, Dexuan
2 siblings, 1 reply; 42+ messages in thread
From: Kang Kai @ 2011-10-11 6:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
[-- Attachment #1: Type: text/plain, Size: 18507 bytes --]
On 2011?10?08? 01:04, Martin Jansa wrote:
> * xserver-xorg is closer to upstream naming and
> that's how it's named in OE-classic and meta-oe? It would make meta-oe
> transition easier and better to do it now then convert meta-oe to
> xserver-xf86 and then rename it back later.
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta/conf/distro/include/default-providers.inc | 4 ++--
> .../conf/distro/include/distro_tracking_fields.inc | 20 ++++++++++----------
> meta/conf/machine/qemux86-64.conf | 6 +++---
> meta/conf/machine/qemux86.conf | 6 +++---
> meta/conf/multilib.conf | 2 +-
> ...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
> ...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 4 +---
> .../crosscompile.patch | 0
> .../fix_open_max_preprocessor_error.patch | 0
> .../macro_tweak.patch | 2 +-
> ...-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} | 2 +-
> ...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
> .../cache-xkbcomp-output-for-fast-start-up.patch | 0
> .../crosscompile.patch | 0
> .../fix_macros1.patch | 0
> .../fix_open_max_preprocessor_error.patch | 0
> .../macro_tweak.patch | 2 +-
> ...6-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} | 2 +-
> ...er-xf86-dri-lite_git.bb => xserver-xorg_git.bb} | 2 +-
> 19 files changed, 27 insertions(+), 28 deletions(-)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc => xserver-xorg-common.inc} (96%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc => xserver-xorg-lite.inc} (95%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-lite}/crosscompile.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-lite}/macro_tweak.patch (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} (89%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc => xserver-xorg.inc} (97%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg}/crosscompile.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_macros1.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb => xserver-xorg_git.bb} (94%)
>
> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> index d51ac64..a5cdb5b 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -3,8 +3,8 @@
> #
> PREFERRED_PROVIDER_virtual/db ?= "db"
> PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
> PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
> PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
> index 7b6c4a9..8af80c7 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic core"
> RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
> RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke<ke.yu@intel.com>"
>
> -RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
> -RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
> -RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes"
> -RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
> -RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
> -RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
> -RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke<ke.yu@intel.com>"
> +RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
> +RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
> +RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes"
> +RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
> +RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
> +RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
> +RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke<ke.yu@intel.com>"
>
> RECIPE_STATUS_pn-xf86-input-synaptics = "red"
> DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
> @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
>
> DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
> DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
Hi Martin,
> +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
I guess this should be xserver-xorg-lite.
Regards,
Kai
>
> +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
> DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
> diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
> index 18a7513..f28cf08 100644
> --- a/meta/conf/machine/qemux86-64.conf
> +++ b/meta/conf/machine/qemux86-64.conf
> @@ -4,8 +4,8 @@
>
> PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
>
> require conf/machine/include/tune-x86_64.inc
> require conf/machine/include/qemu.inc
> @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> SERIAL_CONSOLE = "115200 ttyS0"
>
> # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xf86-dri-lite \
> +XSERVER ?= "xserver-xorg \
> mesa-dri-driver-swrast \
> xf86-input-vmmouse \
> xf86-input-keyboard \
> diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
> index 5d0d03e..75c9042 100644
> --- a/meta/conf/machine/qemux86.conf
> +++ b/meta/conf/machine/qemux86.conf
> @@ -4,8 +4,8 @@
>
> PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
>
> require conf/machine/include/tune-i586.inc
> require conf/machine/include/qemu.inc
> @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> SERIAL_CONSOLE = "115200 ttyS0"
>
> # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xf86-dri-lite \
> +XSERVER ?= "xserver-xorg \
> mesa-dri-driver-swrast \
> xf86-input-vmmouse \
> xf86-input-keyboard \
> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> index b9da33a..5e4b435 100644
> --- a/meta/conf/multilib.conf
> +++ b/meta/conf/multilib.conf
> @@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
> -BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
> +BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> similarity index 96%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> index 17d456c..78c5f2e 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
>
> # xf86-*-* packages depend on an X server built with the xfree86 DDX
> # so we have a virtual to represent that:
> +# deprecated, we should use virtual/xserver instead
> PROVIDES = "virtual/xserver-xf86"
>
> # Other packages tend to just care that there is *an* X server:
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> similarity index 95%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> index 131c258..f1cef1b 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> @@ -1,6 +1,4 @@
> -require xserver-xf86-common.inc
> -
> -PROVIDES += "xserver-xf86-lite"
> +require xserver-xorg-common.inc
>
> PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
> similarity index 100%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
> similarity index 100%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> similarity index 93%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> index 2b75427..2b32d4e 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
> xorg-server 1.8.99.904.
>
> the files/macro_tweak.patch can not removed now since it is used by
> -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
> +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> can be safely replace by this patch.
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> similarity index 89%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> index e42f27d..63b2c38 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-lite.inc
> +require xserver-xorg-lite.inc
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> similarity index 97%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 6b13873..9bc0ee4 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -1,4 +1,4 @@
> -require xserver-xf86-common.inc
> +require xserver-xorg-common.inc
>
> PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
> similarity index 100%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> similarity index 100%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> similarity index 100%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
> similarity index 100%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> similarity index 93%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> index 2b75427..2b32d4e 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
> xorg-server 1.8.99.904.
>
> the files/macro_tweak.patch can not removed now since it is used by
> -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
> +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> can be safely replace by this patch.
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> similarity index 93%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> index b797f97..0194798 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-dri-lite.inc
> +require xserver-xorg.inc
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> similarity index 94%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> index 87ba040..beef06a 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-dri-lite.inc
> +require xserver-xorg.inc
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
[-- Attachment #2: Type: text/html, Size: 19430 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
2011-10-11 6:47 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Kang Kai
@ 2011-10-11 7:03 ` Martin Jansa
2011-10-11 13:05 ` Richard Purdie
0 siblings, 1 reply; 42+ messages in thread
From: Martin Jansa @ 2011-10-11 7:03 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3077 bytes --]
On Tue, Oct 11, 2011 at 02:47:54PM +0800, Kang Kai wrote:
> On 2011?10?08? 01:04, Martin Jansa wrote:
> > * xserver-xorg is closer to upstream naming and
> > that's how it's named in OE-classic and meta-oe? It would make meta-oe
> > transition easier and better to do it now then convert meta-oe to
> > xserver-xf86 and then rename it back later.
> >
> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > ---
> > diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
> > index 7b6c4a9..8af80c7 100644
> > --- a/meta/conf/distro/include/distro_tracking_fields.inc
> > +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> > @@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic core"
> > RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
> > RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke<ke.yu@intel.com>"
> >
> > -RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
> > -RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
> > -RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
> > -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes"
> > -RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
> > -RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
> > -RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
> > -RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke<ke.yu@intel.com>"
> > +RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
> > +RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
> > +RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
> > +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes"
> > +RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
> > +RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
> > +RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
> > +RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke<ke.yu@intel.com>"
> >
> > RECIPE_STATUS_pn-xf86-input-synaptics = "red"
> > DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
> > @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
> >
> > DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
> > DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> > -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> > -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
>
> Hi Martin,
> > +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> I guess this should be xserver-xorg-lite.
>
> Regards,
> Kai
You're right, I've added patch for that on top of jansa/x11-v2.
RP: I'll squash it to 01/31 if you want, but I didn't want to rebase as
you already have it in master-next.. so it's on top.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 00/31] Xorg related changes
2011-10-10 10:40 ` Koen Kooi
@ 2011-10-11 7:08 ` Martin Jansa
2011-10-11 7:37 ` Koen Kooi
0 siblings, 1 reply; 42+ messages in thread
From: Martin Jansa @ 2011-10-11 7:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
On Mon, Oct 10, 2011 at 12:40:08PM +0200, Koen Kooi wrote:
>
> Op 7 okt. 2011, om 19:05 heeft Martin Jansa het volgende geschreven:
>
> > this patchset brings meta-oe and oe-core xorg stuff together and most of
> > xorg recipes will be removed from meta-oe (sending another pull request now).
> >
> > This step is needed to be able to separate common x11 to meta-x11 or whatever later.
> >
> > The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
> >
> > gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
> >
> > are available in the git repository at:
> > git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
> > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
> >
> > Martin Jansa (31):
> >
> > xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
> > shared .inc
>
> I have been running X images without minimal fonts for some time now, so AFAICS it can be dropped completely.
I'm also fine without (as it was in meta-oe and OE-classic), but it's
quite small:
276 KiB /all/xorg-minimal-fonts_1.0-r1_all.ipk
so I've kept it as it was..
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 00/31] Xorg related changes
2011-10-11 7:08 ` Martin Jansa
@ 2011-10-11 7:37 ` Koen Kooi
2011-10-11 18:06 ` Khem Raj
0 siblings, 1 reply; 42+ messages in thread
From: Koen Kooi @ 2011-10-11 7:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 11 okt. 2011, om 09:08 heeft Martin Jansa het volgende geschreven:
> On Mon, Oct 10, 2011 at 12:40:08PM +0200, Koen Kooi wrote:
>>
>> Op 7 okt. 2011, om 19:05 heeft Martin Jansa het volgende geschreven:
>>
>>> this patchset brings meta-oe and oe-core xorg stuff together and most of
>>> xorg recipes will be removed from meta-oe (sending another pull request now).
>>>
>>> This step is needed to be able to separate common x11 to meta-x11 or whatever later.
>>>
>>> The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
>>>
>>> gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
>>>
>>> are available in the git repository at:
>>> git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
>>> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
>>>
>>> Martin Jansa (31):
>>>
>>> xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
>>> shared .inc
>>
>> I have been running X images without minimal fonts for some time now, so AFAICS it can be dropped completely.
>
> I'm also fine without (as it was in meta-oe and OE-classic), but it's
> quite small:
> 276 KiB /all/xorg-minimal-fonts_1.0-r1_all.ipk
> so I've kept it as it was..
I know it's small, it's a minimal collection of fonts from my debian system a few years ago :) It's not a real package, just a hack to get an ancient X working years ago.
regards,
Koen
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
2011-10-11 7:03 ` Martin Jansa
@ 2011-10-11 13:05 ` Richard Purdie
0 siblings, 0 replies; 42+ messages in thread
From: Richard Purdie @ 2011-10-11 13:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-10-11 at 09:03 +0200, Martin Jansa wrote:
> On Tue, Oct 11, 2011 at 02:47:54PM +0800, Kang Kai wrote:
> > On 2011?10?08? 01:04, Martin Jansa wrote:
> > > * xserver-xorg is closer to upstream naming and
> > > that's how it's named in OE-classic and meta-oe? It would make meta-oe
> > > transition easier and better to do it now then convert meta-oe to
> > > xserver-xf86 and then rename it back later.
> > >
> > > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > > ---
> > > diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
> > > index 7b6c4a9..8af80c7 100644
> > > --- a/meta/conf/distro/include/distro_tracking_fields.inc
> > > +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> > > @@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic core"
> > > RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
> > > RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke<ke.yu@intel.com>"
> > >
> > > -RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
> > > -RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
> > > -RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
> > > -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes"
> > > -RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
> > > -RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
> > > -RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
> > > -RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke<ke.yu@intel.com>"
> > > +RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
> > > +RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
> > > +RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
> > > +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes"
> > > +RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
> > > +RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
> > > +RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
> > > +RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke<ke.yu@intel.com>"
> > >
> > > RECIPE_STATUS_pn-xf86-input-synaptics = "red"
> > > DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
> > > @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
> > >
> > > DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
> > > DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> > > -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> > > -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> >
> > Hi Martin,
> > > +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
> > I guess this should be xserver-xorg-lite.
> >
> > Regards,
> > Kai
>
> You're right, I've added patch for that on top of jansa/x11-v2.
>
> RP: I'll squash it to 01/31 if you want, but I didn't want to rebase as
> you already have it in master-next.. so it's on top.
Thats great, thanks. I've squashed it into master-next.
Cheers,
Richard
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 00/31] Xorg related changes
2011-10-11 7:37 ` Koen Kooi
@ 2011-10-11 18:06 ` Khem Raj
0 siblings, 0 replies; 42+ messages in thread
From: Khem Raj @ 2011-10-11 18:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, Oct 11, 2011 at 12:37 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> I know it's small, it's a minimal collection of fonts from my debian system a few years ago :) It's not a real package, just a hack to get an ancient X working years ago.
if its not needed throw it out.
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
2011-10-07 17:04 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
[not found] ` <cover.1318007397.git.Martin.Jansa@gmail.com>
2011-10-11 6:47 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Kang Kai
@ 2011-10-12 3:48 ` Cui, Dexuan
2011-10-12 7:22 ` Cui, Dexuan
2 siblings, 1 reply; 42+ messages in thread
From: Cui, Dexuan @ 2011-10-12 3:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
Glad to see the patches to upgrade xserver and libx11. Good work! :-)
BTW, we also need to upgrade meta-intel's side since BSP can't build now:
http://bugzilla.pokylinux.org/show_bug.cgi?id=1670
I'm working on this bug.
Thanks,
-- Dexuan
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Martin Jansa
> Sent: Saturday, October 08, 2011 1:05 AM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [oe-core][PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to
> xserver-xorg and xserver-xorg-lite
>
> * xserver-xorg is closer to upstream naming and
> that's how it's named in OE-classic and meta-oe? It would make meta-oe
> transition easier and better to do it now then convert meta-oe to
> xserver-xf86 and then rename it back later.
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/conf/distro/include/default-providers.inc | 4 ++--
> .../conf/distro/include/distro_tracking_fields.inc | 20 ++++++++++----------
> meta/conf/machine/qemux86-64.conf | 6 +++---
> meta/conf/machine/qemux86.conf | 6 +++---
> meta/conf/multilib.conf | 2 +-
> ...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
> ...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 4 +---
> .../crosscompile.patch | 0
> .../fix_open_max_preprocessor_error.patch | 0
> .../macro_tweak.patch | 2 +-
> ...-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} | 2 +-
> ...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
> .../cache-xkbcomp-output-for-fast-start-up.patch | 0
> .../crosscompile.patch | 0
> .../fix_macros1.patch | 0
> .../fix_open_max_preprocessor_error.patch | 0
> .../macro_tweak.patch | 2 +-
> ...6-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} | 2 +-
> ...er-xf86-dri-lite_git.bb => xserver-xorg_git.bb} | 2 +-
> 19 files changed, 27 insertions(+), 28 deletions(-)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc =>
> xserver-xorg-common.inc} (96%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc =>
> xserver-xorg-lite.inc} (95%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg-lite}/crosscompile.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> xserver-xorg-lite}/macro_tweak.patch (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb =>
> xserver-xorg-lite_1.10.1.bb} (89%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc =>
> xserver-xorg.inc} (97%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> xserver-xorg}/crosscompile.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/fix_macros1.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> xserver-xorg}/macro_tweak.patch (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb =>
> xserver-xorg_1.10.1.bb} (93%)
> rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb =>
> xserver-xorg_git.bb} (94%)
>
> diff --git a/meta/conf/distro/include/default-providers.inc
> b/meta/conf/distro/include/default-providers.inc
> index d51ac64..a5cdb5b 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -3,8 +3,8 @@
> #
> PREFERRED_PROVIDER_virtual/db ?= "db"
> PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
> PREFERRED_PROVIDER_virtual/update-alternatives ?=
> "update-alternatives-cworth"
> PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc
> b/meta/conf/distro/include/distro_tracking_fields.inc
> index 7b6c4a9..8af80c7 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic
> core"
> RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
> RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke <ke.yu@intel.com>"
>
> -RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
> -RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
> -RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2
> monthes"
> -RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
> -RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
> -RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
> -RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke <ke.yu@intel.com>"
> +RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
> +RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
> +RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2
> monthes"
> +RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
> +RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
> +RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
> +RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke <ke.yu@intel.com>"
>
> RECIPE_STATUS_pn-xf86-input-synaptics = "red"
> DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics
> Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics
> Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
> @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
>
> DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
> DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server
> Ubuntu=xserver-xorg"
> DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
> DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
> diff --git a/meta/conf/machine/qemux86-64.conf
> b/meta/conf/machine/qemux86-64.conf
> index 18a7513..f28cf08 100644
> --- a/meta/conf/machine/qemux86-64.conf
> +++ b/meta/conf/machine/qemux86-64.conf
> @@ -4,8 +4,8 @@
>
> PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
>
> require conf/machine/include/tune-x86_64.inc
> require conf/machine/include/qemu.inc
> @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> SERIAL_CONSOLE = "115200 ttyS0"
>
> # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xf86-dri-lite \
> +XSERVER ?= "xserver-xorg \
> mesa-dri-driver-swrast \
> xf86-input-vmmouse \
> xf86-input-keyboard \
> diff --git a/meta/conf/machine/qemux86.conf
> b/meta/conf/machine/qemux86.conf
> index 5d0d03e..75c9042 100644
> --- a/meta/conf/machine/qemux86.conf
> +++ b/meta/conf/machine/qemux86.conf
> @@ -4,8 +4,8 @@
>
> PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
>
> require conf/machine/include/tune-i586.inc
> require conf/machine/include/qemu.inc
> @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> SERIAL_CONSOLE = "115200 ttyS0"
>
> # We bypass swrast but we need it to be present for X to load correctly
> -XSERVER ?= "xserver-xf86-dri-lite \
> +XSERVER ?= "xserver-xorg \
> mesa-dri-driver-swrast \
> xf86-input-vmmouse \
> xf86-input-keyboard \
> diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> index b9da33a..5e4b435 100644
> --- a/meta/conf/multilib.conf
> +++ b/meta/conf/multilib.conf
> @@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = "
> ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
> -BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
> +BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
> BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> similarity index 96%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> index 17d456c..78c5f2e 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
>
> # xf86-*-* packages depend on an X server built with the xfree86 DDX
> # so we have a virtual to represent that:
> +# deprecated, we should use virtual/xserver instead
> PROVIDES = "virtual/xserver-xf86"
>
> # Other packages tend to just care that there is *an* X server:
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> similarity index 95%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> index 131c258..f1cef1b 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> @@ -1,6 +1,4 @@
> -require xserver-xf86-common.inc
> -
> -PROVIDES += "xserver-xf86-lite"
> +require xserver-xorg-common.inc
>
> PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto
> xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto
> xf86bigfontproto compositeproto recordproto resourceproto videoproto
> scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto
> bigreqsproto xcmiscproto glproto"
>
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproc
> essor_error.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproc
> essor_error.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproces
> sor_error.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproce
> ssor_error.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> similarity index 93%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> index 2b75427..2b32d4e 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> +++
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
> xorg-server 1.8.99.904.
>
> the files/macro_tweak.patch can not removed now since it is used by
> -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
> +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> can be safely replace by this patch.
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> similarity index 89%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> index e42f27d..63b2c38 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-lite.inc
> +require xserver-xorg-lite.inc
>
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> similarity index 97%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index 6b13873..9bc0ee4 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -1,4 +1,4 @@
> -require xserver-xf86-common.inc
> +require xserver-xorg-common.inc
>
> PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto
> xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto
> xf86bigfontproto compositeproto recordproto resourceproto videoproto
> scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto
> bigreqsproto xcmiscproto glproto"
>
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-out
> put-for-fast-start-up.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for
> -fast-start-up.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-outpu
> t-for-fast-start-up.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fa
> st-start-up.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prep
> rocessor_error.patch
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocess
> or_error.patch
> similarity index 100%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prepro
> cessor_error.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor
> _error.patch
> diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> h b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> similarity index 93%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
> rename to
> meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> index 2b75427..2b32d4e 100644
> ---
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> h
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
> xorg-server 1.8.99.904.
>
> the files/macro_tweak.patch can not removed now since it is used by
> -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
> +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> can be safely replace by this patch.
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> similarity index 93%
> rename from
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> index b797f97..0194798 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-dri-lite.inc
> +require xserver-xorg.inc
>
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> similarity index 94%
> rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> index 87ba040..beef06a 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> @@ -1,4 +1,4 @@
> -require xserver-xf86-dri-lite.inc
> +require xserver-xorg.inc
>
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
>
> --
> 1.7.7
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
2011-10-12 3:48 ` Cui, Dexuan
@ 2011-10-12 7:22 ` Cui, Dexuan
0 siblings, 0 replies; 42+ messages in thread
From: Cui, Dexuan @ 2011-10-12 7:22 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
BTW, I sent out 2 patches (to poky@yoctoproject.org) for bug 1670: http://bugzilla.pokylinux.org/show_bug.cgi?id=1670#c2
Thanks,
-- Dexuan
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Cui, Dexuan
> Sent: Wednesday, October 12, 2011 11:49 AM
> To: Patches and discussions about the oe-core layer
> Cc: Martin Jansa
> Subject: Re: [OE-core] [oe-core][PATCHv3 01/31] xserver-xf86(-dri)-lite: rename
> to xserver-xorg and xserver-xorg-lite
>
> Glad to see the patches to upgrade xserver and libx11. Good work! :-)
>
> BTW, we also need to upgrade meta-intel's side since BSP can't build now:
> http://bugzilla.pokylinux.org/show_bug.cgi?id=1670
> I'm working on this bug.
>
> Thanks,
> -- Dexuan
>
>
> > -----Original Message-----
> > From: openembedded-core-bounces@lists.openembedded.org
> > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf
> Of
> > Martin Jansa
> > Sent: Saturday, October 08, 2011 1:05 AM
> > To: openembedded-core@lists.openembedded.org
> > Subject: [OE-core] [oe-core][PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to
> > xserver-xorg and xserver-xorg-lite
> >
> > * xserver-xorg is closer to upstream naming and
> > that's how it's named in OE-classic and meta-oe? It would make meta-oe
> > transition easier and better to do it now then convert meta-oe to
> > xserver-xf86 and then rename it back later.
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/conf/distro/include/default-providers.inc | 4 ++--
> > .../conf/distro/include/distro_tracking_fields.inc | 20
> ++++++++++----------
> > meta/conf/machine/qemux86-64.conf | 6 +++---
> > meta/conf/machine/qemux86.conf | 6 +++---
> > meta/conf/multilib.conf | 2 +-
> > ...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
> > ...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 4 +---
> > .../crosscompile.patch | 0
> > .../fix_open_max_preprocessor_error.patch | 0
> > .../macro_tweak.patch | 2 +-
> > ...-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} | 2 +-
> > ...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
> > .../cache-xkbcomp-output-for-fast-start-up.patch | 0
> > .../crosscompile.patch | 0
> > .../fix_macros1.patch | 0
> > .../fix_open_max_preprocessor_error.patch | 0
> > .../macro_tweak.patch | 2 +-
> > ...6-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} | 2 +-
> > ...er-xf86-dri-lite_git.bb => xserver-xorg_git.bb} | 2 +-
> > 19 files changed, 27 insertions(+), 28 deletions(-)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc =>
> > xserver-xorg-common.inc} (96%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc =>
> > xserver-xorg-lite.inc} (95%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg-lite}/crosscompile.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> > xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> > xserver-xorg-lite}/macro_tweak.patch (93%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb
> =>
> > xserver-xorg-lite_1.10.1.bb} (89%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc =>
> > xserver-xorg.inc} (97%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =>
> > xserver-xorg}/crosscompile.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/fix_macros1.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =>
> > xserver-xorg}/macro_tweak.patch (93%)
> > rename
> meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb =>
> > xserver-xorg_1.10.1.bb} (93%)
> > rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb =>
> > xserver-xorg_git.bb} (94%)
> >
> > diff --git a/meta/conf/distro/include/default-providers.inc
> > b/meta/conf/distro/include/default-providers.inc
> > index d51ac64..a5cdb5b 100644
> > --- a/meta/conf/distro/include/default-providers.inc
> > +++ b/meta/conf/distro/include/default-providers.inc
> > @@ -3,8 +3,8 @@
> > #
> > PREFERRED_PROVIDER_virtual/db ?= "db"
> > PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
> > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
> > -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> > +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> > PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
> > PREFERRED_PROVIDER_virtual/update-alternatives ?=
> > "update-alternatives-cworth"
> > PREFERRED_PROVIDER_virtual/update-alternatives-native ?=
> "opkg-native"
> > diff --git a/meta/conf/distro/include/distro_tracking_fields.inc
> > b/meta/conf/distro/include/distro_tracking_fields.inc
> > index 7b6c4a9..8af80c7 100644
> > --- a/meta/conf/distro/include/distro_tracking_fields.inc
> > +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> > @@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic
> > core"
> > RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
> > RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke <ke.yu@intel.com>"
> >
> > -RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
> > -RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
> > -RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
> > -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2
> > monthes"
> > -RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
> > -RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
> > -RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
> > -RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke <ke.yu@intel.com>"
> > +RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
> > +RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
> > +RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
> > +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2
> > monthes"
> > +RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
> > +RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
> > +RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
> > +RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke <ke.yu@intel.com>"
> >
> > RECIPE_STATUS_pn-xf86-input-synaptics = "red"
> > DISTRO_PN_ALIAS_pn-xf86-input-synaptics =
> "Meego=xorg-x11-drv-synaptics
> > Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics
> > Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
> > @@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
> >
> > DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools
> Fedora=btrfs-progs"
> > DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
> > -DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > -DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > +DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server
> > Ubuntu=xserver-xorg"
> > DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
> > DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
> > diff --git a/meta/conf/machine/qemux86-64.conf
> > b/meta/conf/machine/qemux86-64.conf
> > index 18a7513..f28cf08 100644
> > --- a/meta/conf/machine/qemux86-64.conf
> > +++ b/meta/conf/machine/qemux86-64.conf
> > @@ -4,8 +4,8 @@
> >
> > PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> > PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> > -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> > +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> >
> > require conf/machine/include/tune-x86_64.inc
> > require conf/machine/include/qemu.inc
> > @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> > SERIAL_CONSOLE = "115200 ttyS0"
> >
> > # We bypass swrast but we need it to be present for X to load correctly
> > -XSERVER ?= "xserver-xf86-dri-lite \
> > +XSERVER ?= "xserver-xorg \
> > mesa-dri-driver-swrast \
> > xf86-input-vmmouse \
> > xf86-input-keyboard \
> > diff --git a/meta/conf/machine/qemux86.conf
> > b/meta/conf/machine/qemux86.conf
> > index 5d0d03e..75c9042 100644
> > --- a/meta/conf/machine/qemux86.conf
> > +++ b/meta/conf/machine/qemux86.conf
> > @@ -4,8 +4,8 @@
> >
> > PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
> > PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> > -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> > -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
> > +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
> > +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
> >
> > require conf/machine/include/tune-i586.inc
> > require conf/machine/include/qemu.inc
> > @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
> > SERIAL_CONSOLE = "115200 ttyS0"
> >
> > # We bypass swrast but we need it to be present for X to load correctly
> > -XSERVER ?= "xserver-xf86-dri-lite \
> > +XSERVER ?= "xserver-xorg \
> > mesa-dri-driver-swrast \
> > xf86-input-vmmouse \
> > xf86-input-keyboard \
> > diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
> > index b9da33a..5e4b435 100644
> > --- a/meta/conf/multilib.conf
> > +++ b/meta/conf/multilib.conf
> > @@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = "
> > ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
> > -BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
> > +BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
> > BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> > similarity index 96%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> > index 17d456c..78c5f2e 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> > @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
> > "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
> >
> > # xf86-*-* packages depend on an X server built with the xfree86 DDX
> > # so we have a virtual to represent that:
> > +# deprecated, we should use virtual/xserver instead
> > PROVIDES = "virtual/xserver-xf86"
> >
> > # Other packages tend to just care that there is *an* X server:
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> > similarity index 95%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> > index 131c258..f1cef1b 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
> > @@ -1,6 +1,4 @@
> > -require xserver-xf86-common.inc
> > -
> > -PROVIDES += "xserver-xf86-lite"
> > +require xserver-xorg-common.inc
> >
> > PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto
> > xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto
> > xf86bigfontproto compositeproto recordproto resourceproto videoproto
> > scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto
> inputproto
> > bigreqsproto xcmiscproto glproto"
> >
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
> > similarity index 100%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproc
> > essor_error.patch
> >
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproc
> > essor_error.patch
> > similarity index 100%
> > rename from
> >
> meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preproces
> > sor_error.patch
> > rename to
> >
> meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preproce
> > ssor_error.patch
> > diff --git
> > a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> > similarity index 93%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> > index 2b75427..2b32d4e 100644
> > ---
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
> > +++
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
> > @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
> > xorg-server 1.8.99.904.
> >
> > the files/macro_tweak.patch can not removed now since it is used by
> > -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
> > +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> > are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> > can be safely replace by this patch.
> >
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> > similarity index 89%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> > index e42f27d..63b2c38 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-lite.inc
> > +require xserver-xorg-lite.inc
> >
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
> >
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> > similarity index 97%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> > index 6b13873..9bc0ee4 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-common.inc
> > +require xserver-xorg-common.inc
> >
> > PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto
> > xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto
> > xf86bigfontproto compositeproto recordproto resourceproto videoproto
> > scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto
> inputproto
> > bigreqsproto xcmiscproto glproto"
> >
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-out
> > put-for-fast-start-up.patch
> >
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for
> > -fast-start-up.patch
> > similarity index 100%
> > rename from
> >
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-outpu
> > t-for-fast-start-up.patch
> > rename to
> >
> meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fa
> > st-start-up.patch
> > diff --git
> > a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> > similarity index 100%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> > similarity index 100%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prep
> > rocessor_error.patch
> >
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocess
> > or_error.patch
> > similarity index 100%
> > rename from
> >
> meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_prepro
> > cessor_error.patch
> > rename to
> >
> meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor
> > _error.patch
> > diff --git
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> > h b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> > similarity index 93%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
> > rename to
> > meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> > index 2b75427..2b32d4e 100644
> > ---
> >
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patc
> > h
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
> > @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
> > xorg-server 1.8.99.904.
> >
> > the files/macro_tweak.patch can not removed now since it is used by
> > -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
> > +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
> > are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
> > can be safely replace by this patch.
> >
> > diff --git
> a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> > similarity index 93%
> > rename from
> > meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> > index b797f97..0194798 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-dri-lite.inc
> > +require xserver-xorg.inc
> >
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
> >
> > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> > b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> > similarity index 94%
> > rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> > rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> > index 87ba040..beef06a 100644
> > --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
> > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
> > @@ -1,4 +1,4 @@
> > -require xserver-xf86-dri-lite.inc
> > +require xserver-xorg.inc
> >
> > LIC_FILES_CHKSUM =
> > "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
> >
> > --
> > 1.7.7
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 42+ messages in thread
end of thread, other threads:[~2011-10-12 7:28 UTC | newest]
Thread overview: 42+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-07 17:05 [PATCHv3 00/31] Xorg related changes Martin Jansa
2011-10-07 17:04 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Martin Jansa
[not found] ` <cover.1318007397.git.Martin.Jansa@gmail.com>
2011-10-07 17:10 ` [PATCHv3 31/31] mesa: drop older 7.10.2 and 7.7+git recipes Martin Jansa
2011-10-11 6:47 ` [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite Kang Kai
2011-10-11 7:03 ` Martin Jansa
2011-10-11 13:05 ` Richard Purdie
2011-10-12 3:48 ` Cui, Dexuan
2011-10-12 7:22 ` Cui, Dexuan
2011-10-07 17:04 ` [PATCHv3 02/31] xserver-xorg: remove old git recipe Martin Jansa
2011-10-07 17:04 ` [PATCHv3 03/31] glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn't uclibc Martin Jansa
2011-10-07 17:04 ` [PATCHv3 04/31] xserver-xorg-common: fix LIC_FILES_CHKSUM Martin Jansa
2011-10-07 17:05 ` [PATCHv3 05/31] xserver-xorg-common: move SRC_URI closer together Martin Jansa
2011-10-07 17:05 ` [PATCHv3 06/31] xserver-xorg-common: Split out some bigger modules and extensions from the main package Martin Jansa
2011-10-07 17:05 ` [PATCHv3 07/31] xserver-xorg-common: improve packaging Martin Jansa
2011-10-07 17:05 ` [PATCHv3 08/31] xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc Martin Jansa
2011-10-07 17:05 ` [PATCHv3 09/31] xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS Martin Jansa
2011-10-07 17:05 ` [PATCHv3 10/31] xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc Martin Jansa
2011-10-07 17:05 ` [PATCHv3 11/31] xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${bindir} in FILES_ defined in " Martin Jansa
2011-10-07 17:05 ` [PATCHv3 12/31] xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which doesn't enable it for uClibc Martin Jansa
2011-10-07 17:05 ` [PATCHv3 13/31] xserver-xorg: move shared EXTRA_OECONF entries to shared .inc Martin Jansa
2011-10-07 17:05 ` [PATCHv3 14/31] xserver-xorg: add new version 1.11.1 Martin Jansa
2011-10-07 17:05 ` [PATCHv3 15/31] xserver-xorg: remove old 1.10.1 version Martin Jansa
2011-10-07 17:05 ` [PATCHv3 16/31] xserver-xorg: remove COMPATIBLE_HOST Martin Jansa
2011-10-07 17:05 ` [PATCHv3 17/31] xserver-xorg: drop unused files Martin Jansa
2011-10-07 17:05 ` [PATCHv3 18/31] xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe Martin Jansa
2011-10-07 17:05 ` [PATCHv3 19/31] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory Martin Jansa
2011-10-07 17:05 ` [PATCHv3 20/31] xorg-driver-common.inc: use virtual/xserver instead of older virtual/xserver-xf86 Martin Jansa
2011-10-07 17:05 ` [PATCHv3 21/31] xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new xserver-xorg ABI Martin Jansa
2011-10-07 17:05 ` [PATCHv3 22/31] libx11: package xcb, merge few changes from meta-oe Martin Jansa
2011-10-07 17:05 ` [PATCHv3 23/31] libx11: add new version 1.4.4 Martin Jansa
2011-10-07 17:05 ` [PATCHv3 24/31] libx11: remove older 1.3.4 Martin Jansa
2011-10-07 17:05 ` [PATCHv3 25/31] libx11: drop old 1.2.2 git version Martin Jansa
2011-10-07 17:05 ` [PATCHv3 26/31] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4 Martin Jansa
2011-10-07 17:05 ` [PATCHv3 27/31] libx11-diet: move old patches used only by libx11-diet-1.3 to separate directory Martin Jansa
2011-10-07 17:05 ` [PATCHv3 28/31] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch Martin Jansa
2011-10-07 17:05 ` [PATCHv3 29/31] mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2 was removed Martin Jansa
2011-10-07 17:05 ` [PATCHv3 30/31] mesa: add new version 7.11 Martin Jansa
2011-10-10 10:29 ` [PATCHv3 00/31] Xorg related changes Richard Purdie
2011-10-10 10:40 ` Koen Kooi
2011-10-11 7:08 ` Martin Jansa
2011-10-11 7:37 ` Koen Kooi
2011-10-11 18:06 ` Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox