diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc) | 1 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc) | 4 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch) | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb) | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc) | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch) | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb) | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb (renamed from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb) | 2 |
14 files changed, 8 insertions, 9 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 17d456cb5..78c5f2e3b 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 index 131c258e8..f1cef1bb5 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 index 2f98bb8c8..2f98bb8c8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch +++ b/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 index 2f629724c..2f629724c 100644 --- 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 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 index 2b7542712..2b32d4e48 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 index e42f27d58..63b2c3882 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 index 6b138732d..9bc0ee48c 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 index 6b1b40f62..6b1b40f62 100644 --- 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 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch index 2f98bb8c8..2f98bb8c8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch +++ b/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 index b2c8d58f5..b2c8d58f5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch +++ b/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 index 9c33072c5..9c33072c5 100644 --- 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 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 index 2b7542712..2b32d4e48 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 index b797f9701..0194798a1 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 index 87ba04025..beef06a3e 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" |