sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa 2011-10-07 16:37:10 +02:00 committed by Richard Purdie
parent 3590061599
commit c09f0eb561
19 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/conf/distro/include/default-providers.inc
View File

@ -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"

20
meta/conf/distro/include/distro_tracking_fields.inc
View File

@ -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-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-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"

6
meta/conf/machine/qemux86-64.conf
View File

@ -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 \

6
meta/conf/machine/qemux86.conf
View File

@ -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 \

2
meta/conf/multilib.conf
View File

@ -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}"

1
meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc → meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
View File

@ -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:

4
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc → meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
View File

@ -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"

0
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
View File

0
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
View File

2
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
View File

@ -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.

2
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb → meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
View File

@ -1,4 +1,4 @@
require xserver-xf86-lite.inc
require xserver-xorg-lite.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"

2
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc → meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
View File

@ -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"

0
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
View File

0
meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
View File

0
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
View File

0
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
View File

2
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch → meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
View File

@ -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.

2
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb → meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
View File

@ -1,4 +1,4 @@
require xserver-xf86-dri-lite.inc
require xserver-xorg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"

2
meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb → meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
View File

@ -1,4 +1,4 @@
require xserver-xf86-dri-lite.inc
require xserver-xorg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"