Skip to contentSkip to conversation

fix to bug 1670

PATCH In review Dexuan Cui 4 participants 8 messages Oct 12, 2011

lore
Share & tools
lore

Dexuan Cui

author
#0 lore raw

cover fix to bug 1670

The following changes since commit e0e52850cf5f84fb4ee1bfa15571aaf61e068450:

meta-emenlow: restore /usr/lib/dri for xpsb-glx (2011-10-10 08:22:54 -0500)

are available in the git repository at:
git://git.pokylinux.org/meta-intel-contrib dcui/fix_1670
http://git.pokylinux.org/cgit.cgi/meta-intel-contrib/log/?h=dcui/fix_1670

Dexuan Cui (1):
xserver-xf86-dri-lite: rename it to xserver-xorg

 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    2 +-
 .../nodolt.patch                                   |    0
 ...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} |    2 +-
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    6 +++---
 meta-crownbay/conf/machine/crownbay.conf           |    8 ++++----
 meta-emenlow/conf/machine/emenlow.conf             |    2 +-
 .../xorg-xserver/xserver-psb_1.7.99.2.bb           |    2 +-
 meta-fishriver/conf/machine/fishriver.conf         |    6 +++---
 meta-fri2/conf/machine/fri2-noemgd.conf            |    6 +++---
 meta-fri2/conf/machine/fri2.conf                   |    8 ++++----
 meta-jasperforest/conf/machine/jasperforest.conf   |    6 +++---
 meta-n450/conf/machine/n450.conf                   |    6 +++---
 meta-sugarbay/conf/machine/sugarbay.conf           |    6 +++---
 15 files changed, 30 insertions(+), 30 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/1 xserver-xf86-dri-lite: rename it to xserver-xorg

Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) breaks BSP building.
This patch makes changes accordingly.

Fixes bug [YOCTO #1670]

Signed-off-by Dexuan Cui <[email protected]>
Cc Martin Jansa <[email protected]>
---
 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    2 +-
 .../nodolt.patch                                   |    0
 ...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} |    2 +-
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    6 +++---
 meta-crownbay/conf/machine/crownbay.conf           |    8 ++++----
 meta-emenlow/conf/machine/emenlow.conf             |    2 +-
 .../xorg-xserver/xserver-psb_1.7.99.2.bb           |    2 +-
 meta-fishriver/conf/machine/fishriver.conf         |    6 +++---
 meta-fri2/conf/machine/fri2-noemgd.conf            |    6 +++---
 meta-fri2/conf/machine/fri2.conf                   |    8 ++++----
 meta-jasperforest/conf/machine/jasperforest.conf   |    6 +++---
 meta-n450/conf/machine/n450.conf                   |    6 +++---
 meta-sugarbay/conf/machine/sugarbay.conf           |    6 +++---
 15 files changed, 30 insertions(+), 30 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%)
common/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
common/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch +1 -1
similarity index 93%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index 2b75427..2b32d4e 100644
@@ -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.
common/recipes-graphics/xorg-xserver/xserver-xorg/nodolt.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/nodolt.patch
common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +1 -1
similarity index 87%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
rename to common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
index 81d70bc..480ed6a 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
 
 PROTO_DEPS += "xf86driproto dri2proto"
meta-crownbay/conf/machine/crownbay-noemgd.conf +3 -3
index c668f4a..3b90136 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-crownbay/conf/machine/crownbay.conf +4 -4
index 457bdfc..e293861 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            emgd-driver-bin \
            xf86-input-mouse \
            xf86-input-keyboard \

@@ -27,7 +27,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-synaptics \
            xf86-video-vesa"
 
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
meta-emenlow/conf/machine/emenlow.conf +1 -1
index 9745531..dabc82d 100644
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
 PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
-PREFERRED_PROVIDER_xserver-xf86-dri-lite = "xserver-psb"
+PREFERRED_PROVIDER_xserver-xorg = "xserver-psb"
 
 XSERVER ?= "xserver-psb \
            xf86-input-mouse \
meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb +1 -1
index 5227faa..ccbed08 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
 
 PR = "r3"
meta-fishriver/conf/machine/fishriver.conf +3 -3
index 2fe78e8..ffbc05a 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-fri2/conf/machine/fri2-noemgd.conf +3 -3
index b02e037..11bb9bb 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-fri2/conf/machine/fri2.conf +4 -4
index eab4b50..6ea78f4 100644
@@ -17,16 +17,16 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
            emgd-driver-bin"
 
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
meta-jasperforest/conf/machine/jasperforest.conf +3 -3
index 9fdb968..f117860 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-n450/conf/machine/n450.conf +3 -3
index 79970d1..ed9850a 100644
@@ -15,9 +15,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-sugarbay/conf/machine/sugarbay.conf +3 -3
index 6277e20..5b7842a 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
Signature · 1 line
1.7.6
#2 lore raw

Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg

Quoted 23 lines · Dexuan Cui

Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) breaks BSP building.
This patch makes changes accordingly.

Fixes bug [YOCTO #1670]

Signed-off-by Dexuan Cui <[email protected]>
Cc Martin Jansa <[email protected]>
---
 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    2 +-
 .../nodolt.patch                                   |    0
 ...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} |    2 +-
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    6 +++---
 meta-crownbay/conf/machine/crownbay.conf           |    8 ++++----
 meta-emenlow/conf/machine/emenlow.conf             |    2 +-
 .../xorg-xserver/xserver-psb_1.7.99.2.bb           |    2 +-
 meta-fishriver/conf/machine/fishriver.conf         |    6 +++---
 meta-fri2/conf/machine/fri2-noemgd.conf            |    6 +++---
 meta-fri2/conf/machine/fri2.conf                   |    8 ++++----
 meta-jasperforest/conf/machine/jasperforest.conf   |    6 +++---
Quoted 8 lines
 meta-n450/conf/machine/n450.conf                   |    6 +++---
 meta-sugarbay/conf/machine/sugarbay.conf           |    6 +++---
 15 files changed, 30 insertions(+), 30 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%)

just curious, why there is whole xserver-xorg_1.11.1.bb recipe and patches not just small .bbappend?

Regards,

Quoted 225 lines
common/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
common/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch +1 -1
similarity index 93%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index 2b75427..2b32d4e 100644
@@ -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.
common/recipes-graphics/xorg-xserver/xserver-xorg/nodolt.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/nodolt.patch
common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +1 -1
similarity index 87%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
rename to common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
index 81d70bc..480ed6a 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
 
 PROTO_DEPS += "xf86driproto dri2proto"
meta-crownbay/conf/machine/crownbay-noemgd.conf +3 -3
index c668f4a..3b90136 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-crownbay/conf/machine/crownbay.conf +4 -4
index 457bdfc..e293861 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            emgd-driver-bin \
            xf86-input-mouse \
            xf86-input-keyboard \

@@ -27,7 +27,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-synaptics \
            xf86-video-vesa"
 
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
meta-emenlow/conf/machine/emenlow.conf +1 -1
index 9745531..dabc82d 100644
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
 PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
-PREFERRED_PROVIDER_xserver-xf86-dri-lite = "xserver-psb"
+PREFERRED_PROVIDER_xserver-xorg = "xserver-psb"
 
 XSERVER ?= "xserver-psb \
            xf86-input-mouse \
meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb +1 -1
index 5227faa..ccbed08 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
 
 PR = "r3"
meta-fishriver/conf/machine/fishriver.conf +3 -3
index 2fe78e8..ffbc05a 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-fri2/conf/machine/fri2-noemgd.conf +3 -3
index b02e037..11bb9bb 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-fri2/conf/machine/fri2.conf +4 -4
index eab4b50..6ea78f4 100644
@@ -17,16 +17,16 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
            emgd-driver-bin"
 
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
meta-jasperforest/conf/machine/jasperforest.conf +3 -3
index 9fdb968..f117860 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-n450/conf/machine/n450.conf +3 -3
index 79970d1..ed9850a 100644
@@ -15,9 +15,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-sugarbay/conf/machine/sugarbay.conf +3 -3
index 6277e20..5b7842a 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
Signature · 6 lines
1.7.6

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw

Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg

Quoted 33 lines · Martin Jansa
Quoted 23 lines · Dexuan Cui

Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) breaks BSP building.
This patch makes changes accordingly.

Fixes bug [YOCTO #1670]

Signed-off-by Dexuan Cui <[email protected]>
Cc Martin Jansa <[email protected]>
---
 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    2 +-
 .../nodolt.patch                                   |    0
 ...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} |    2 +-
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    6 +++---
 meta-crownbay/conf/machine/crownbay.conf           |    8 ++++----
 meta-emenlow/conf/machine/emenlow.conf             |    2 +-
 .../xorg-xserver/xserver-psb_1.7.99.2.bb           |    2 +-
 meta-fishriver/conf/machine/fishriver.conf         |    6 +++---
 meta-fri2/conf/machine/fri2-noemgd.conf            |    6 +++---
 meta-fri2/conf/machine/fri2.conf                   |    8 ++++----
 meta-jasperforest/conf/machine/jasperforest.conf   |    6 +++---
Quoted 8 lines
 meta-n450/conf/machine/n450.conf                   |    6 +++---
 meta-sugarbay/conf/machine/sugarbay.conf           |    6 +++---
 15 files changed, 30 insertions(+), 30 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%)
Quoted 2 lines

just curious, why there is whole xserver-xorg_1.11.1.bb recipe and patches not just small .bbappend?

looking at
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tree/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
i don't know why it's here at all :)

Quoted 230 lines

Regards,

Quoted 225 lines
common/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
common/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch +1 -1
similarity index 93%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index 2b75427..2b32d4e 100644
@@ -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.
common/recipes-graphics/xorg-xserver/xserver-xorg/nodolt.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg/nodolt.patch
common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +1 -1
similarity index 87%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
rename to common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
index 81d70bc..480ed6a 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
 
 PROTO_DEPS += "xf86driproto dri2proto"
meta-crownbay/conf/machine/crownbay-noemgd.conf +3 -3
index c668f4a..3b90136 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-crownbay/conf/machine/crownbay.conf +4 -4
index 457bdfc..e293861 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            emgd-driver-bin \
            xf86-input-mouse \
            xf86-input-keyboard \

@@ -27,7 +27,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-synaptics \
            xf86-video-vesa"
 
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
meta-emenlow/conf/machine/emenlow.conf +1 -1
index 9745531..dabc82d 100644
@@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-psb"
 PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb"
-PREFERRED_PROVIDER_xserver-xf86-dri-lite = "xserver-psb"
+PREFERRED_PROVIDER_xserver-xorg = "xserver-psb"
 
 XSERVER ?= "xserver-psb \
            xf86-input-mouse \
meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb +1 -1
index 5227faa..ccbed08 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
 
 PR = "r3"
meta-fishriver/conf/machine/fishriver.conf +3 -3
index 2fe78e8..ffbc05a 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-fri2/conf/machine/fri2-noemgd.conf +3 -3
index b02e037..11bb9bb 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-fri2/conf/machine/fri2.conf +4 -4
index eab4b50..6ea78f4 100644
@@ -17,16 +17,16 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
            emgd-driver-bin"
 
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
meta-jasperforest/conf/machine/jasperforest.conf +3 -3
index 9fdb968..f117860 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-n450/conf/machine/n450.conf +3 -3
index 79970d1..ed9850a 100644
@@ -15,9 +15,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
meta-sugarbay/conf/machine/sugarbay.conf +3 -3
index 6277e20..5b7842a 100644
@@ -17,9 +17,9 @@ PREFERRED_VERSION_linux-yocto = "3.0%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
Signature · 6 lines
1.7.6

_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#4 lore raw

Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg

Martin Jansa wrote on 2011-10-12:

Quoted 12 lines · Martin Jansa
Quoted 11 lines · Dexuan Cui
Quoted 9 lines

Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) breaks BSP building.
This patch makes changes accordingly. common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3. bb
=> xserver-xorg_1.11.1.bb} (87%)

Quoted 2 lines
Quoted 2 lines

just curious, why there is whole xserver-xorg_1.11.1.bb recipe and patches not just small .bbappend?

Yes, it seems strange to me, too.
I suppose Tom may know the history?

Quoted 4 lines

looking at
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tree/common/recip
es-grap hics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb i don't know why it's here at all :)

Thanks,
-- Dexuan

#5 lore raw

Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg

Quoted 13 lines · Dexuan

Martin Jansa wrote on 2011-10-12:

Quoted 12 lines · Martin Jansa
Quoted 11 lines · Dexuan Cui
Quoted 9 lines

Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) breaks BSP building.
This patch makes changes accordingly. common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3. bb
=> xserver-xorg_1.11.1.bb} (87%)

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines

just curious, why there is whole xserver-xorg_1.11.1.bb recipe and patches not just small .bbappend?

Yes, it seems strange to me, too.
I suppose Tom may know the history?

Maybe it's because of extra
--enable-dga which is by default disabled in xserver-xorg-common, but maybe we can enable it by default and keep it disabled only for xserver-xorg-lite as in attached patch (which would need PR bump too).

Regards,

From b5bbb8e8860708c9e07370595176c52a57ddc18e Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Wed, 12 Oct 2011 14:10:16 +0200
Subject: [PATCH] xserver-xorg: disable DGA only in -lite version, and force
it enabled in xserver-xorg

Signed-off-by Martin Jansa <[email protected]>
---
 .../xorg-xserver/xserver-xorg-common.inc           |    1 -
 .../xorg-xserver/xserver-xorg-lite.inc             |    1 +
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
 3 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +0 -1
index a8c7b0a..4d82d79 100644
@@ -98,7 +98,6 @@ EXTRA_OECONF += "--with-fop=no \
                  --disable-acfb \
                  --disable-ccfb \
                  --disable-mcfb \
-                 --disable-dga \
                  --disable-xinerama \
                  --disable-xf86misc \
                  --disable-xorgcfg \
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc +1 -0
index be84e9e..57615f5 100644
@@ -3,4 +3,5 @@ require xserver-xorg-common.inc
 EXTRA_OECONF += "\
                  --disable-dri \
                  --disable-glx \
+                 --disable-dga \
 "
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -0
index 01cdd68..0f34c1a 100644
@@ -8,6 +8,7 @@ require ../mesa/glx-use-tls.inc
 EXTRA_OECONF += "\
                  --enable-dri \
                  --enable-dri2 \
+                 --enable-dga \
                  --with-pic \
                  --with-int10=x86emu \
 "
Signature · 1 line
1.7.7
#6 lore raw

Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg

Quoted 4 lines · On Wednesday 12 October 2011 13:12:50 Martin Jansa wrote:

Maybe it's because of extra
--enable-dga which is by default disabled in xserver-xorg-common, but maybe we can enable it by default and keep it disabled only for xserver-xorg-lite as in attached patch (which would need PR bump too).

I meant to ask about this earlier - do we really still need DGA? Last I heard, and even that was some years ago, DGA was pretty ancient and the advice was it should no longer be used.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#7 lore raw

Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg

In reply to Martin Jansa
Quoted 16 lines · Martin Jansa
Quoted 15 lines · Dexuan

Martin Jansa wrote on 2011-10-12:

Quoted 14 lines · Martin Jansa
Quoted 13 lines · Dexuan Cui
Quoted 9 lines

Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) breaks BSP building.
This patch makes changes accordingly. common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3. bb
=> xserver-xorg_1.11.1.bb} (87%)

just curious, why there is whole xserver-xorg_1.11.1.bb recipe and patches not just small .bbappend?

Quoted 8 lines
Quoted 2 lines

Yes, it seems strange to me, too.
I suppose Tom may know the history?

Maybe it's because of extra
--enable-dga which is by default disabled in xserver-xorg-common, but maybe we can enable it by default and keep it disabled only for xserver-xorg-lite as in attached patch (which would need PR bump too).

The reason it's there is that 1.9.3 is required for EMGD, used by the meta-intel BSPS. EMGD is very particular about versions and won't work with e.g. 1.11.1.

Tom

Quoted 49 lines

Regards,

From b5bbb8e8860708c9e07370595176c52a57ddc18e Mon Sep 17 00:00:00 2001
From: Martin Jansa <[email protected]>
Date: Wed, 12 Oct 2011 14:10:16 +0200
Subject: [PATCH] xserver-xorg: disable DGA only in -lite version, and force
it enabled in xserver-xorg

Signed-off-by Martin Jansa <[email protected]>
---
 .../xorg-xserver/xserver-xorg-common.inc           |    1 -
 .../xorg-xserver/xserver-xorg-lite.inc             |    1 +
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    1 +
 3 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +0 -1
index a8c7b0a..4d82d79 100644
@@ -98,7 +98,6 @@ EXTRA_OECONF += "--with-fop=no \
                  --disable-acfb \
                  --disable-ccfb \
                  --disable-mcfb \
-                 --disable-dga \
                  --disable-xinerama \
                  --disable-xf86misc \
                  --disable-xorgcfg \
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc +1 -0
index be84e9e..57615f5 100644
@@ -3,4 +3,5 @@ require xserver-xorg-common.inc
 EXTRA_OECONF += "\
                  --disable-dri \
                  --disable-glx \
+                 --disable-dga \
 "
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -0
index 01cdd68..0f34c1a 100644
@@ -8,6 +8,7 @@ require ../mesa/glx-use-tls.inc
 EXTRA_OECONF += "\
                  --enable-dri \
                  --enable-dri2 \
+                 --enable-dga \
                  --with-pic \
                  --with-int10=x86emu \
 "