[OE-core] [PATCH 12/12] xf86-video-omapfb: upgrade to 0.4.2

[Laurentiu Palcu]

Other changes:
 * changed the recipe's SRC_URI to track the new (maintained) repo;
 * removed all old patches as the latest driver's structure has changed
   drastically;
 * license file changed quite a bit: MIT -> GPLv2 (needs to be reviewed
   by somebody with a better understanding of these things though);
 * xf86-video-omapfb changed its name to xf86-video-omap: change the
   recipe name and config files accordingly;
 * add dependency of libdrm-omap;

Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
---
 meta-yocto-bsp/conf/machine/beagleboard.conf       |    2 +-
 ...-video-omapfb_git.bb => xf86-video-omap_git.bb} |   23 ++++++++------------
 .../target/arch/arm/conf/machine/{{=machine}}.conf |    2 +-
 3 files changed, 11 insertions(+), 16 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb => xf86-video-omap_git.bb} (43%)

diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
index 6633880..204be95 100644
--- a/meta-yocto-bsp/conf/machine/beagleboard.conf
+++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
@@ -6,7 +6,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-omapfb \
+           xf86-video-omap \
            xf86-input-keyboard"
 
 # Ship all kernel modules by default
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
similarity index 43%
rename from meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
index f16441e..2a85890 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
@@ -6,19 +6,14 @@ DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \
 framebuffer."
 
 LICENSE = "MIT-X & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
-DEPENDS += "virtual/libx11"
-
-SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
-PR = "${INC_PR}.6"
-PV = "0.1.1+gitr${SRCPV}"
-
-SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
-            file://omap-revert-set-CRTC-limit.patch \
-            file://omap-revert-set-virtual-size.patch \
-            file://omap-force-plain-mode.patch  \
-            file://omap-blacklist-tv-out.patch  \
-            file://0004-Attempt-to-fix-VRFB.patch \
+LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
+DEPENDS += "virtual/libx11 libdrm-omap"
+
+SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
+PR = "${INC_PR}.0"
+PV = "0.4.2+gitr${SRCPV}"
+
+SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \
 "
 
 S = "${WORKDIR}/git"
@@ -28,5 +23,5 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg "
 
 # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay)
 do_compile_prepend_armv7a () {
-        sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c
+        sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c
 }
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
index a3e2970..1990ef6 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
-           xf86-video-omapfb \
+           xf86-video-omap \
            xf86-input-keyboard"
 
 # Ship all kernel modules by default
-- 
1.7.9.5