[PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Ross Burton]

EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
it's being used.  Note that it's dynamically loaded so the automatic library
dependencies won't catch this, but as far as I'm aware nothing on oe-core or
meta-oe is using EXA.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |    2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index 017ac91..b588c11 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,5 +8,5 @@ SRC_URI += "file://crosscompile.patch \
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
 
-PR = "r4"
+PR = "r5"
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 98f3d14..738ccb3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -29,6 +29,7 @@ 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
+#  91.0k   libexa.so
 #  336.0k  libglx.so
 #  1360k   libint10.so
 #  180.0k  libwfb.so
@@ -58,6 +59,7 @@ PACKAGES =+ "${PN}-security-policy \
              ${PN}-module-libwfb  \
              ${PN}-module-libmfb \
              ${PN}-module-libcfb \
+             ${PN}-module-exa \
              ${PN}-module-xaa \
              ${PN}-module-libxf1bpp \
              ${PN}-module-libxf4bpp"
@@ -91,6 +93,7 @@ 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-exa = "${libdir}/xorg/modules/libexa.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"
-- 
1.7.10

[PATCH 2/2] task-core-x11: default to xserver-xorg instead of kdrive

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-sato/tasks/task-core-x11-mini.bb |    2 +-
 meta/recipes-sato/tasks/task-core-x11.bb      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/tasks/task-core-x11-mini.bb b/meta/recipes-sato/tasks/task-core-x11-mini.bb
index 98189fe..ad736b9 100644
--- a/meta/recipes-sato/tasks/task-core-x11-mini.bb
+++ b/meta/recipes-sato/tasks/task-core-x11-mini.bb
@@ -16,7 +16,7 @@ PACKAGES = "\
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-XSERVER ?= "xserver-kdrive-fbdev"
+XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
 
 ALLOW_EMPTY = "1"
 
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb
index f1b06f9..00e3c0c 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -22,7 +22,7 @@ PACKAGES = "\
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-XSERVER ?= "xserver-kdrive-fbdev"
+XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
 
 ALLOW_EMPTY = "1"
 
-- 
1.7.10

Re: [PATCH 2/2] task-core-x11: default to xserver-xorg instead of kdrive

[Koen Kooi]

Op 29 aug. 2012, om 17:53 heeft Ross Burton <ross.burton@intel.com> het volgende geschreven:

> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-sato/tasks/task-core-x11-mini.bb |    2 +-
> meta/recipes-sato/tasks/task-core-x11.bb      |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-sato/tasks/task-core-x11-mini.bb b/meta/recipes-sato/tasks/task-core-x11-mini.bb
> index 98189fe..ad736b9 100644
> --- a/meta/recipes-sato/tasks/task-core-x11-mini.bb
> +++ b/meta/recipes-sato/tasks/task-core-x11-mini.bb
> @@ -16,7 +16,7 @@ PACKAGES = "\
> 
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> 
> -XSERVER ?= "xserver-kdrive-fbdev"
> +XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
> 
> ALLOW_EMPTY = "1"
> 
> diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb
> index f1b06f9..00e3c0c 100644
> --- a/meta/recipes-sato/tasks/task-core-x11.bb
> +++ b/meta/recipes-sato/tasks/task-core-x11.bb
> @@ -22,7 +22,7 @@ PACKAGES = "\
> 
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> 
> -XSERVER ?= "xserver-kdrive-fbdev"
> +XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev"
> 
> ALLOW_EMPTY = "1"


Missing PR bumps

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Koen Kooi]

Op 29 aug. 2012, om 17:53 heeft Ross Burton <ross.burton@intel.com> het volgende geschreven:

> EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
> it's being used.  Note that it's dynamically loaded so the automatic library
> dependencies won't catch this, but as far as I'm aware nothing on oe-core or
> meta-oe is using EXA.

FWIW, the idea of those subpackages was to split every module out, but I haven't kept up with xorg modules for some years now.

Re: [PATCH 2/2] task-core-x11: default to xserver-xorg instead of kdrive

[Burton, Ross]

On 29 August 2012 17:50, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Missing PR bumps

Fixed on the branch.

Ross

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Burton, Ross]

On 29 August 2012 17:51, Koen Kooi <koen@dominion.thruhere.net> wrote:
> FWIW, the idea of those subpackages was to split every module out, but I haven't kept up with xorg modules for some years now.

There's also a lot of work ensuring that the dependencies are in place
because they can't be automatically inferred.  I'm happy leaving
fb/fbdev/shadow/shadowfb in the main package for now...

Ross

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Koen Kooi]

Op 30 aug. 2012, om 13:28 heeft "Burton, Ross" <ross.burton@intel.com> het volgende geschreven:

> On 29 August 2012 17:51, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> FWIW, the idea of those subpackages was to split every module out, but I haven't kept up with xorg modules for some years now.
> 
> There's also a lot of work ensuring that the dependencies are in place
> because they can't be automatically inferred.  I'm happy leaving
> fb/fbdev/shadow/shadowfb in the main package for now...

Indeed. In the past I had every device using full Xorg in OE on my desk, but with the demise of kdrive and the adoption rate of OE it has become impossible to have access to each device :)

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Burton, Ross]

On 30 August 2012 13:17, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Indeed. In the past I had every device using full Xorg in OE on my desk, but with the demise of kdrive and the adoption rate of OE it has become impossible to have access to each device :)

Speaking of hardware I'd like to test the touchscreen calibration code
in Xorg and purge the bits that are kdrive-specific.  Any
recommendations for hardware with a touchscreen?

Ross

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Koen Kooi]

Op 30 aug. 2012, om 14:24 heeft "Burton, Ross" <ross.burton@intel.com> het volgende geschreven:

> On 30 August 2012 13:17, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Indeed. In the past I had every device using full Xorg in OE on my desk, but with the demise of kdrive and the adoption rate of OE it has become impossible to have access to each device :)
> 
> Speaking of hardware I'd like to test the touchscreen calibration code
> in Xorg and purge the bits that are kdrive-specific.  Any
> recommendations for hardware with a touchscreen?

I'm biased of course, but this is what I use: http://beagleboardtoys.com/products/#LCD7 in combination with a beaglebone. Meta-ti has the needed drivers for it.

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Burton, Ross]

On 30 August 2012 14:12, Koen Kooi <koen@dominion.thruhere.net> wrote:
> I'm biased of course, but this is what I use: http://beagleboardtoys.com/products/#LCD7 in combination with a beaglebone. Meta-ti has the needed drivers for it.

I presume the same applies for the ULCD7 for the -xM?

Ross

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Koen Kooi]

Op 30 aug. 2012, om 16:04 heeft "Burton, Ross" <ross.burton@intel.com> het volgende geschreven:

> On 30 August 2012 14:12, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> I'm biased of course, but this is what I use: http://beagleboardtoys.com/products/#LCD7 in combination with a beaglebone. Meta-ti has the needed drivers for it.
> 
> I presume the same applies for the ULCD7 for the -xM?

Yes, but you'd still need meta-ti for the support. The uLCD7 for xM is in need of some driver love, which is on my TODO for next week.

Re: [PATCH 1/2] xserver-xorg: ship the exa module in a separate package

[Saul Wold]

On 08/29/2012 08:53 AM, Ross Burton wrote:
> EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
> it's being used.  Note that it's dynamically loaded so the automatic library
> dependencies won't catch this, but as far as I'm aware nothing on oe-core or
> meta-oe is using EXA.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |    2 +-
>   meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |    3 +++
>   2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> index 017ac91..b588c11 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> @@ -8,5 +8,5 @@ SRC_URI += "file://crosscompile.patch \
>   SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>   SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r4"
> +PR = "r5"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> index 98f3d14..738ccb3 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> @@ -29,6 +29,7 @@ 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.soOn 08/29/2012 08:53 AM, Ross Burton wrote:> EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
> it's being used.  Note that it's dynamically loaded so the automatic library
> dependencies won't catch this, but as far as I'm aware nothing on oe-core or
> meta-oe is using EXA.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |    2 +-
>   meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |    3 +++
>   2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> index 017ac91..b588c11 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> @@ -8,5 +8,5 @@ SRC_URI += "file://crosscompile.patch \
>   SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>   SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r4"
> +PR = "r5"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> index 98f3d14..738ccb3 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> @@ -29,6 +29,7 @@ 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
> +#  91.0k   libexa.so
>   #  336.0k  libglx.so
>   #  1360k   libint10.so
>   #  180.0k  libwfb.so
> @@ -58,6 +59,7 @@ PACKAGES =+ "${PN}-security-policy \
>                ${PN}-module-libwfb  \
>                ${PN}-module-libmfb \
>                ${PN}-module-libcfb \
> +             ${PN}-module-exa \
>                ${PN}-module-xaa \
>                ${PN}-module-libxf1bpp \
>                ${PN}-module-libxf4bpp"
> @@ -91,6 +93,7 @@ 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-exa = "${libdir}/xorg/modules/libexa.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"
>
> +#  91.0k   libexa.so
>   #  336.0k  libglx.so
>   #  1360k   libint10.so
>   #  180.0k  libwfb.so
> @@ -58,6 +59,7 @@ PACKAGES =+ "${PN}-security-policy \
>                ${PN}-module-libwfb  \On 08/29/2012 08:53 AM, Ross Burton wrote:> EXA is used by some Xorg video drivers, it doesn't need to be shipped unless
> it's being used.  Note that it's dynamically loaded so the automatic library
> dependencies won't catch this, but as far as I'm aware nothing on oe-core or
> meta-oe is using EXA.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc |    2 +-
>   meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc |    3 +++
>   2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> index 017ac91..b588c11 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> @@ -8,5 +8,5 @@ SRC_URI += "file://crosscompile.patch \
>   SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
>   SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r4"
> +PR = "r5"
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> index 98f3d14..738ccb3 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> @@ -29,6 +29,7 @@ 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
> +#  91.0k   libexa.so
>   #  336.0k  libglx.so
>   #  1360k   libint10.so
>   #  180.0k  libwfb.so
> @@ -58,6 +59,7 @@ PACKAGES =+ "${PN}-security-policy \
>                ${PN}-module-libwfb  \
>                ${PN}-module-libmfb \
>                ${PN}-module-libcfb \
> +             ${PN}-module-exa \
>                ${PN}-module-xaa \
>                ${PN}-module-libxf1bpp \
>                ${PN}-module-libxf4bpp"
> @@ -91,6 +93,7 @@ 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-exa = "${libdir}/xorg/modules/libexa.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"
>
>                ${PN}-module-libmfb \
>                ${PN}-module-libcfb \
> +             ${PN}-module-exa \
>                ${PN}-module-xaa \
>                ${PN}-module-libxf1bpp \
>                ${PN}-module-libxf4bpp"
> @@ -91,6 +93,7 @@ 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-exa = "${libdir}/xorg/modules/libexa.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"
>
Merged into OE-Core

Thanks
	Sau!