[PATCH 0/3] xf86-video-omap build failure with poky/master

[PATCH 0/3] xf86-video-omap build failure with poky/master

[Nicolas Dechesne]

From: Nicolas Dechesne <n-dechesne@ti.com>

hi,

as discussed in a couple of threads recently, and now that 'danny' branch
was created, i am sending a couple of changes for xf86-video-omap:
 - xf86-video-omap was added in oe-core and poky, so let's remove our 
version and use it.
 - same for libdrm, where OMAP 'experimental' support was enabled
 - the appropriate Xorg related config changes (after new upstream) in 
this serie.

I have tested these patches with the following build config:

BB_VERSION        = "1.16.0"
TARGET_ARCH       = "arm"
TARGET_OS         = "linux-gnueabi"
MACHINE           = "pandaboard"
DISTRO            = "poky"
DISTRO_VERSION    = "1.3+snapshot-20121122"
TUNE_FEATURES     = "armv7a vfp neon cortexa9"
TARGET_FPU        = "vfp-neon"
meta
meta-yocto        = "master:14f7c9c9d87e1a9b0c20d78d528068fd9f1a27cf"

and patches applied on top of:
meta-ti           = "master:fe6972418ab6d2b39a0991ecbe29887b259170f6"


It is important to note that we really need this oe-core patch from Ross:

8043f45 xf86-video-omap: don't use AC_CHECK_FILE

As agreed on thread, this serie is for master only, for danny we will keep
what we have in metat-ti since danny doesn't know about xf86-video-omap.


Nicolas Dechesne (3):
  Revert "libdrm: enable omap experimental api support"
  Revert "xf86-video-omap: add new recipe for OMAP4/5 X11 video driver"
  conf/machine: omap4: update configs after xorg upgrade

 conf/machine/include/omap4.inc                     |    3 --
 recipes-graphics/drm/libdrm_2.4.39.bbappend        |    3 --
 .../xorg-driver/xf86-video-omap_git.bb             |   31 --------------------
 3 files changed, 0 insertions(+), 37 deletions(-)
 delete mode 100644 recipes-graphics/drm/libdrm_2.4.39.bbappend
 delete mode 100644 recipes-graphics/xorg-driver/xf86-video-omap_git.bb

[PATCH 1/3] Revert "libdrm: enable omap experimental api support"

[Nicolas Dechesne]

From: Nicolas Dechesne <n-dechesne@ti.com>

This reverts commit cce5a7aea905d2e2b167ab51b132ec43ed519a12.

Because oe-core (then poky master) was upgraded to libdrm 2.40,
and because OMAP experimental support was enabled there too.
---
 recipes-graphics/drm/libdrm_2.4.39.bbappend |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
 delete mode 100644 recipes-graphics/drm/libdrm_2.4.39.bbappend

diff --git a/recipes-graphics/drm/libdrm_2.4.39.bbappend b/recipes-graphics/drm/libdrm_2.4.39.bbappend
deleted file mode 100644
index d0c1a77..0000000
--- a/recipes-graphics/drm/libdrm_2.4.39.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPATIBLE_MACHINE = "omap4|omap5"
-
-EXTRA_OECONF += "--enable-omap-experimental-api"
-- 
1.7.0.4

[PATCH 2/3] Revert "xf86-video-omap: add new recipe for OMAP4/5 X11 video driver"

[Nicolas Dechesne]

From: Nicolas Dechesne <n-dechesne@ti.com>

This reverts commit 410dc026f2ee24a2346e7563a83f0181c79809cf.

Because this recipe was integrated in oe-core (then poky master).
---
 .../xorg-driver/xf86-video-omap_git.bb             |   31 --------------------
 1 files changed, 0 insertions(+), 31 deletions(-)
 delete mode 100644 recipes-graphics/xorg-driver/xf86-video-omap_git.bb

diff --git a/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
deleted file mode 100644
index abe773a..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require recipes-graphics/xorg-driver/xorg-driver-video.inc
-
-SUMMARY = "X.Org X server -- TI OMAP integrated graphics chipsets driver"
-
-DESCRIPTION = "Open-source X.org graphics driver for TI OMAP graphics \
-Currently relies on a closed-source submodule for EXA acceleration on \
-the following chipsets: \
-  + OMAP3430 \
-  + OMAP3630 \
-  + OMAP4430 \
-  + OMAP4460 \
-  + OMAP5430 \
-  + OMAP5432 \
-\
-NOTE: this driver is work in progress..  you probably don't want to try \
-and use it yet.  The API/ABI between driver and kernel, and driver and \
-acceleration submodules is not stable yet.  This driver requires the \
-omapdrm kernel driver w/ GEM support. \
-"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
-
-DEPENDS += "virtual/libx11 drm xf86driproto udev"
-
-SRCREV = "653ccadb38c87be565df3fbf2ff24a0cbe5a5e98"
-PR = "${INC_PR}.1"
-PV = "0.4.2+gitr${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git"
-
-S = "${WORKDIR}/git"
-- 
1.7.0.4

[PATCH 3/3] conf/machine: omap4: update configs after xorg upgrade

[Nicolas Dechesne]

From: Nicolas Dechesne <n-dechesne@ti.com>

There were some changes in the xserver-xorg upstream project that need
to be reflected here too:
 * extmod module was removed completely as it became empty;
 * DRI1, DRI2, DBE (among others) were made built-in;

(see poky rev: 5cea09e3d010d4799eab296b2a0cb83a0af09c76)

Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com>
---
 conf/machine/include/omap4.inc |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index ecd23c4..5ee5f9d 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -8,9 +8,6 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
-           xserver-xorg-extension-dri \
-           xserver-xorg-extension-dri2 \
-           xserver-xorg-extension-glx \
            xserver-xorg-module-exa \
            xf86-input-evdev \
            xf86-video-omap"
-- 
1.7.0.4