[meta-intel] [meta-intel PATCH] xf86-video-mga: upgrade and fix build

Thu Nov 29 12:24:08 PST 2012

On Thu, 2012-11-29 at 11:21 +0000, Ross Burton wrote:
> 1.4.13 doesn't build against new X servers as XAA has been dropped, so upgrade
> to 1.6.2 which makes XAA optional.
> 

Hmm, I'm getting the below do_rootfs dependency error for
xserver-xorg-module-xaa with this:

ERROR: Function failed: do_rootfs (see /usr/local/dev/yocto/isg-test/build/tmp/work/romley-poky-linux/core-image-sato/1.0-r0/temp/log.do_rootfs.5104 for further information)
ERROR: Logfile of failure stored in: /usr/local/dev/yocto/isg-test/build/tmp/work/romley-poky-linux/core-image-sato/1.0-r0/temp/log.do_rootfs.5104
Log data follows:
| DEBUG: Executing shell function do_rootfs
| Generating solve db for /usr/local/dev/yocto/isg-test/build/tmp/deploy/rpm/romley...
| Generating solve db for /usr/local/dev/yocto/isg-test/build/tmp/deploy/rpm/x86_64...
| Generating solve db for /usr/local/dev/yocto/isg-test/build/tmp/deploy/rpm/all...
|    total:               1      0.000000 MB     32.028527 secs
|    fingerprint:     15279      0.200384 MB      0.915764 secs
|    install:          5093      0.000000 MB     10.695525 secs
|    digest:          10186     45.574370 MB      0.190004 secs
|    signature:       10186      0.000000 MB     15.824291 secs
|    dbadd:            5093      0.000000 MB     10.565355 secs
|    dbget:           74636      0.000000 MB      0.141470 secs
|    dbput:            5093     27.957180 MB      7.158784 secs
|    readhdr:         50931     55.678978 MB      0.102926 secs
|    hdrload:         26383     87.481686 MB      0.149103 secs
|    hdrget:         955873      0.000000 MB      0.829142 secs
| Generating solve db for /usr/local/dev/yocto/isg-test/build/tmp/deploy/rpm/all...
| Processing locale-base-en-us...
| Processing locale-base-en-gb...
| Processing packagegroup-core-ssh-dropbear...
| Processing packagegroup-core-x11-sato-games...
| Processing packagegroup-core-x11-base...
| Processing zypper...
| Processing psplash...
| Processing packagegroup-core-boot...
| Processing packagegroup-base-extended...
| Processing rpm...
| Processing packagegroup-core-x11-sato...
| error: Failed dependencies:
| 	xserver-xorg-module-xaa is needed by packagegroup-core-x11-xserver-1.0-r39.romley
| ERROR: Function failed: do_rootfs (see /usr/local/dev/yocto/isg-test/build/tmp/work/romley-poky-linux/core-image-sato/1.0-r0/temp/log.do_rootfs.5104 for further information)
ERROR: Task 7 (/usr/local/dev/yocto/isg-test/meta/recipes-sato/images/core-image-sato.bb, do_rootfs) failed with exit code '1'
NOTE: Tasks Summary: Attempted 5361 tasks of which 401 didn't need to be rerun and 1 failed.
No currently running tasks (5361 of 5363)

Summary: 1 task failed:
  /usr/local/dev/yocto/isg-test/meta/recipes-sato/images/core-image-sato.bb, do_rootfs
Summary: There was 1 ERROR message shown, returning a non-zero exit code.

Tom

> Also configure.ac is using AC_CHECK_FILE which doesn't cross-compile, so remove
> those.
> 
> [ YOCTO #3495 ]
> 
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  .../xorg-driver/xf86-video-mga/checkfile.patch     |   68 ++++++++++++++++++++
>  .../xorg-driver/xf86-video-mga_1.4.13.bb           |   19 ------
>  .../xorg-driver/xf86-video-mga_1.6.2.bb            |   21 ++++++
>  3 files changed, 89 insertions(+), 19 deletions(-)
>  create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
>  delete mode 100755 common/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb
>  create mode 100644 common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.2.bb
> 
> diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch b/common/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
> new file mode 100644
> index 0000000..ceae6df
> --- /dev/null
> +++ b/common/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch
> @@ -0,0 +1,68 @@
> +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606]
> +Signed-off-by: Ross Burton <ross.burton at intel.com>
> +
> +From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001
> +From: Ross Burton <ross.burton at intel.com>
> +Date: Thu, 29 Nov 2012 11:00:43 +0000
> +Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI
> +
> +Automatically enabling or disabling a feature based on installed files isn't
> +deterministic, and AC_CHECK_FILE returns an error when cross-compiling.
> +
> +Fix this by enabling DRI by default, and removing the explicit file checks as
> +pkg-config is good enough.
> +
> +(#57606)
> +
> +Signed-off-by: Ross Burton <ross.burton at intel.com>
> +---
> + configure.ac |   25 ++-----------------------
> + 1 file changed, 2 insertions(+), 23 deletions(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index fca1a9c..d2aa2ed 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir,
> +             [moduledir="$libdir/xorg/modules"])
> + 
> + AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
> +-                                  [Disable DRI support [[default=auto]]]),
> ++                                  [Disable DRI support [[default=enabled]]]),
> +               [DRI="$enableval"],
> +-              [DRI=auto])
> ++              [DRI=yes])
> + AC_ARG_ENABLE(exa,
> +               AS_HELP_STRING([--disable-exa],
> +                              [Disable EXA support [[default=enabled]]]),
> +@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
> + 
> + # Checks for libraries.
> + 
> +-if test "x$DRI" != xno; then
> +-        AC_CHECK_FILE([${sdkdir}/dri.h],
> +-                      [have_dri_h="yes"], [have_dri_h="no"])
> +-        AC_CHECK_FILE([${sdkdir}/sarea.h],
> +-                      [have_sarea_h="yes"], [have_sarea_h="no"])
> +-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
> +-                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
> +-fi
> +-
> +-AC_MSG_CHECKING([whether to include DRI support])
> +-if test "x$DRI" = xauto; then
> +-        if test "x$have_dri_h" = xyes && \
> +-           test "x$have_sarea_h" = xyes && \
> +-           test "x$have_dristruct_h" = xyes; then
> +-                DRI="yes"
> +-        else
> +-                DRI="no"
> +-        fi
> +-fi
> +-AC_MSG_RESULT([$DRI])
> +-
> + AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
> + if test "x$DRI" = xyes; then
> +         PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto])
> +-- 
> +1.7.10.4
> +
> diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb
> deleted file mode 100755
> index b48e56d..0000000
> --- a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -require recipes-graphics/xorg-driver/xorg-driver-video.inc
> -
> -SUMMARY = "X.Org X server -- Matrox MGA display driver"
> -
> -DESCRIPTION = "mga is an Xorg driver for Matrox video cards"
> -
> -LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc"
> -
> -DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
> -	    virtual/libgl xineramaproto libpciaccess"
> -
> -EXTRA_OECONF += "--enable-dri"
> -
> -PR = "r0"
> -
> -COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
> -
> -SRC_URI[md5sum] = "f967fb3e655f6f68aa3f495eaadcaac2"
> -SRC_URI[sha256sum] = "b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6"
> diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.2.bb b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.2.bb
> new file mode 100644
> index 0000000..d20cadf
> --- /dev/null
> +++ b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.2.bb
> @@ -0,0 +1,21 @@
> +require recipes-graphics/xorg-driver/xorg-driver-video.inc
> +
> +SUMMARY = "X.Org X server -- Matrox MGA display driver"
> +
> +DESCRIPTION = "mga is an Xorg driver for Matrox video cards"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc"
> +
> +SRC_URI += "file://checkfile.patch"
> +
> +DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
> +	    virtual/libgl xineramaproto libpciaccess"
> +
> +EXTRA_OECONF += "--enable-dri"
> +
> +PR = "r0"
> +
> +COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
> +
> +SRC_URI[md5sum] = "f543877db4e260d8b43c7da3095605ed"
> +SRC_URI[sha256sum] = "3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c"