[PATCH 0/6] Upgrade X drivers and xkeyboard-config

[PATCH 0/6] Upgrade X drivers and xkeyboard-config

[Jussi Kukkonen]

Some of the drivers I am not able to test: all upgrades are fairly
small point upgrades though.

The following changes since commit fcc67ae90feeceee204bdb36e45eacf8d056779a:

  xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change) (2015-06-03 16:38:49 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/xorg-drivers
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/xorg-drivers

Jussi Kukkonen (6):
  xf86-input-evdev: Upgrade 2.9.1 -> 2.9.2
  xf86-input-keyboard: Upgrade 1.8.0 -> 1.8.1
  xf86-input-synaptics: Upgrade 1.8.1 -> 1.8.2
  xf86-video-omap: Upgrade to 0.4.3
  xf86-video-vmware: Upgrade 13.0.2 -> 13.1.0
  xkeyboard-config: Upgrade 2.14 -> 2.15

 ...ut-evdev_2.9.1.bb => xf86-input-evdev_2.9.2.bb} |  4 +-
 ...board_1.8.0.bb => xf86-input-keyboard_1.8.1.bb} |  4 +-
 ...tics_1.8.1.bb => xf86-input-synaptics_1.8.2.bb} |  4 +-
 .../xorg-driver/xf86-video-omap/configure.patch    | 74 ----------------------
 ...-video-omap_git.bb => xf86-video-omap_0.4.3.bb} | 11 +---
 ...001-configure-fix-build-without-xatracker.patch | 37 -----------
 ...mware_13.0.2.bb => xf86-video-vmware_13.1.0.bb} |  7 +-
 .../0001-Remove-GPLv3-content.patch                | 51 ---------------
 ...ard-config_2.14.bb => xkeyboard-config_2.15.bb} |  8 +--
 9 files changed, 15 insertions(+), 185 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.9.1.bb => xf86-input-evdev_2.9.2.bb} (83%)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.8.0.bb => xf86-input-keyboard_1.8.1.bb} (73%)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.8.1.bb => xf86-input-synaptics_1.8.2.bb} (80%)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb => xf86-video-omap_0.4.3.bb} (85%)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_13.0.2.bb => xf86-video-vmware_13.1.0.bb} (59%)
 delete mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
 rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.14.bb => xkeyboard-config_2.15.bb} (82%)

-- 
2.1.4

[PATCH 1/6] xf86-input-evdev: Upgrade 2.9.1 -> 2.9.2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{xf86-input-evdev_2.9.1.bb => xf86-input-evdev_2.9.2.bb}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.9.1.bb => xf86-input-evdev_2.9.2.bb} (83%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
index 6d71ba8..66428df 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb
@@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16"
 
 DEPENDS += "mtdev libevdev"
 
-SRC_URI[md5sum] = "8f73a98e32dccc9d054b54727cc4093f"
-SRC_URI[sha256sum] = "0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9"
+SRC_URI[md5sum] = "99eebf171e6c7bffc42d4fc430d47454"
+SRC_URI[sha256sum] = "792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec"
-- 
2.1.4

[PATCH 2/6] xf86-input-keyboard: Upgrade 1.8.0 -> 1.8.1

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{xf86-input-keyboard_1.8.0.bb => xf86-input-keyboard_1.8.1.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-keyboard_1.8.0.bb => xf86-input-keyboard_1.8.1.bb} (73%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
index f138918..6fe51ac 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-keyboard_1.8.1.bb
@@ -9,5 +9,5 @@ core keyboard."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea2099d24ac9e316a6d4b9f20b3d4e10"
 
-SRC_URI[md5sum] = "ce936e219682bacf5a4a9c4ab940edb8"
-SRC_URI[sha256sum] = "41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b"
+SRC_URI[md5sum] = "96ccc43d389b970afbd3893875dfd678"
+SRC_URI[sha256sum] = "1ac8ff39bf9da7d2fc7fd6c24515726e8138340c0518ab8c606e008cf93ca211"
-- 
2.1.4

[PATCH 3/6] xf86-input-synaptics: Upgrade 1.8.1 -> 1.8.2

[Jussi Kukkonen]

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../{xf86-input-synaptics_1.8.1.bb => xf86-input-synaptics_1.8.2.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.8.1.bb => xf86-input-synaptics_1.8.2.bb} (80%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
index 19be77a..19c122f 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
@@ -10,8 +10,8 @@ advanced features of the touchpad to become available."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
 
-SRC_URI[md5sum] = "ed70d0cba94262a4008dcef654ab34a9"
-SRC_URI[sha256sum] = "d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a"
+SRC_URI[md5sum] = "8ed68e8cc674dd61adb280704764aafb"
+SRC_URI[sha256sum] = "7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80"
 
 DEPENDS += "libxi mtdev libxtst libevdev"
 
-- 
2.1.4

[PATCH 4/6] xf86-video-omap: Upgrade to 0.4.3

[Jussi Kukkonen]

Use last release instead of slightly older git revision, drop the
upstreamed patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../xorg-driver/xf86-video-omap/configure.patch    | 74 ----------------------
 ...-video-omap_git.bb => xf86-video-omap_0.4.3.bb} | 11 +---
 2 files changed, 3 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb => xf86-video-omap_0.4.3.bb} (85%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
deleted file mode 100644
index d298d5d..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 21 Nov 2012 23:39:18 +0000
-Subject: [PATCH] build: rationalise DRI checks
-
-The existing logic around DRI was complicated and defined a number of variables
-that were not used, when in reality DRI is required.
-
-Move the glproto check to the main pkg-config check, and remove everything else.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- configure.ac |   33 +--------------------------------
- 1 file changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11238b1..c321b98 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
- # Checks for pkg-config packages
--PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
- 
- # Checks for header files.
- AC_HEADER_STDC
- 
--save_CFLAGS="$CFLAGS"
--CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
--CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
--AC_MSG_CHECKING([whether to include DRI support])
--if test x$DRI != xno; then
--        AC_CHECK_FILE([${sdkdir}/dri.h],
--                      [have_dri_h="yes"], [have_dri_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 "$have_dri_h" = yes -a \
--                "$have_dristruct_h" = yes; then
--                DRI="yes"
--        else
--                DRI="no"
--        fi
--fi
--AC_MSG_RESULT([$DRI])
--CFLAGS="$save_CFLAGS $DEBUGFLAGS"
--
--AM_CONDITIONAL(DRI, test x$DRI = xyes)
--if test "$DRI" = yes; then
--        PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
--        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
--        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
--fi
--
- AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
- if test "$VIDEO_DEBUG" = yes; then
- 	AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
- fi
- 
--AC_SUBST([DRI_CFLAGS])
- 
- DRIVER_NAME=omap
- AC_SUBST([DRIVER_NAME])
--- 
-1.7.10.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
similarity index 85%
rename from meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
index 454d0a1..95de4ba 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
@@ -24,15 +24,10 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
 DEPENDS += "virtual/libx11 libdrm xf86driproto"
 
-SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
-PR = "${INC_PR}.3"
-PV = "0.4.2+gitr${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
-           file://configure.patch \
-"
+SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5"
+SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d"
 
-S = "${WORKDIR}/git"
+PR = "${INC_PR}.3"
 
 CFLAGS += " -I${STAGING_INCDIR}/xorg "
 
-- 
2.1.4

[PATCH 5/6] xf86-video-vmware: Upgrade 13.0.2 -> 13.1.0

[Jussi Kukkonen]

Remove one upstreamed patch.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 ...001-configure-fix-build-without-xatracker.patch | 37 ----------------------
 ...mware_13.0.2.bb => xf86-video-vmware_13.1.0.bb} |  7 ++--
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_13.0.2.bb => xf86-video-vmware_13.1.0.bb} (59%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
deleted file mode 100644
index cf66403..0000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0001-configure-fix-build-without-xatracker.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From bdaa9de44a197ba1297b990422ed9e515289f141 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Tue, 1 Apr 2014 10:11:13 +0200
-Subject: [PATCH 1/2] configure: fix build without xatracker
-
-ACTION-IF-NOT-FOUND is the fourth argument to PKG_CHECK_MODULES, not the
-fifth.
-
-Debian bug#743239 <https://bugs.debian.org/743239>
-
-Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd3ad4e..be40ed7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -126,7 +126,7 @@ if test x$BUILD_VMWGFX = xyes; then
- 			  [PKG_CHECK_EXISTS([xatracker = 2.0.0],
- 	                  [AC_DEFINE([HAVE_XA_2], 1,
-                		  [Has version 2 of XA])])],
--			  [],[BUILD_VMWGFX=no])
-+			  [BUILD_VMWGFX=no])
- #
- # Check for prime.
- #
--- 
-1.7.10.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
similarity index 59%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
index 24041b5..89b98ee 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.0.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
 
 DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess"
 
-SRC_URI += "file://0001-configure-fix-build-without-xatracker.patch \
-            file://0002-add-option-for-vmwgfx.patch"
+SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
 
-SRC_URI[md5sum] = "91d1d7d33181766714405ab013d31244"
-SRC_URI[sha256sum] = "c8ba3d2cead3620dba2cbf5defb7f1759b2b96f4fe209f4bf6976832b6763c54"
+SRC_URI[md5sum] = "0cba22fed4cb639d5c4276f7892c543d"
+SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939e4a0cc"
 
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
 
-- 
2.1.4

[PATCH 6/6] xkeyboard-config: Upgrade 2.14 -> 2.15

[Jussi Kukkonen]

Drop what remains of the patch the removed some GPLv3 content: both
eu and ph layout licenses have been corrected.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 .../0001-Remove-GPLv3-content.patch                | 51 ----------------------
 ...ard-config_2.14.bb => xkeyboard-config_2.15.bb} |  8 ++--
 2 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
 rename meta/recipes-graphics/xorg-lib/{xkeyboard-config_2.14.bb => xkeyboard-config_2.15.bb} (82%)

diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch b/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
deleted file mode 100644
index 596dc7b..0000000
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Remove GPLv3 content so the package remains MIT licensed.
-
-symbols/eu has been relicensed upstream.
-Remove symbols/ph until that is relicensed upstream.
-
-Upstream-Status; Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From b3a21c1137c011d9220775fd8b2e704ff75c088c Mon Sep 17 00:00:00 2001
-From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
-Date: Tue, 26 May 2015 20:57:46 +0100
-Subject: Removed GPLv3 line
-
-https://bugs.freedesktop.org/show_bug.cgi?id=31073
-
-diff --git a/symbols/ph b/symbols/ph
-index 6b3defa..a5fe5dc 100644
---- a/symbols/ph
-+++ b/symbols/ph
-@@ -2,8 +2,6 @@
- // Philippines National Keyboard Layout v1.0.0 (2010-10-23)                   //
- // http://laibcoms.com/sandbox/the-philippines-national-keyboard-layout       //
- //                                                                            //
--// License: GNU/GPLv3                                                         //
--//                                                                            //
- // Loosely based on ISO/IEC 9995-3:2009                                       //
- //	* glyphs that are not used in Philippine Languages and                //
- //		Philippine English were not included                          //
--- 
-cgit v0.10.2
-
-From 5da6d510b460cad1b31288618cc364e586576826 Mon Sep 17 00:00:00 2001
-From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
-Date: Sat, 9 May 2015 00:35:25 +0100
-Subject: fixed the license (removed GPL)
-
-https://bugs.freedesktop.org/show_bug.cgi?id=31658
-
-diff --git a/symbols/eu b/symbols/eu
-index 0a4d31a..5b767f1 100644
---- a/symbols/eu
-+++ b/symbols/eu
-@@ -1,6 +1,5 @@
- // Based on <http://eurkey.steffen.bruentjen.eu/>
- // Copyright: Copyright 2012 Steffen Bruentjen (eurkey (at) steffen dot bruentjen dot de)
--// License: GPLv3 <http://www.gnu.org/licenses/gpl-3.0.html>
- // modified by Christoph Roeper <spam (at) roeper dot biz> (use firstName to mail)
- 
- default  partial alphanumeric_keys modifier_keys 
--- 
-cgit v0.10.2
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb
rename to meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
index a960744..f416990 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
@@ -12,11 +12,9 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi
 LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
 
-SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \
-           file://0001-Remove-GPLv3-content.patch \
-           "
-SRC_URI[md5sum] = "2869c03d85b606f929aab054ef6e1b60"
-SRC_URI[sha256sum] = "dc91458a214c56a35727f9e523fc647615de64137057ca6ee4d4d4474a4bb2ae"
+SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "4af1deeb7c5f4cad62e65957d98d6758"
+SRC_URI[sha256sum] = "0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf"
 
 SECTION = "x11/libs"
 DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native"
-- 
2.1.4

Re: [PATCH 4/6] xf86-video-omap: Upgrade to 0.4.3

[Martin Jansa]

On Thu, Jun 04, 2015 at 01:44:20PM +0300, Jussi Kukkonen wrote:
> Use last release instead of slightly older git revision, drop the
> upstreamed patch.
> 
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
>  .../xorg-driver/xf86-video-omap/configure.patch    | 74 ----------------------
>  ...-video-omap_git.bb => xf86-video-omap_0.4.3.bb} | 11 +---
>  2 files changed, 3 insertions(+), 82 deletions(-)
>  delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
>  rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb => xf86-video-omap_0.4.3.bb} (85%)
> 
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
> deleted file mode 100644
> index d298d5d..0000000
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
> +++ /dev/null
> @@ -1,74 +0,0 @@
> -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386]
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Wed, 21 Nov 2012 23:39:18 +0000
> -Subject: [PATCH] build: rationalise DRI checks
> -
> -The existing logic around DRI was complicated and defined a number of variables
> -that were not used, when in reality DRI is required.
> -
> -Move the glproto check to the main pkg-config check, and remove everything else.
> -
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> ----
> - configure.ac |   33 +--------------------------------
> - 1 file changed, 1 insertion(+), 32 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 11238b1..c321b98 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
> - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
> - 
> - # Checks for pkg-config packages
> --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
> --sdkdir=$(pkg-config --variable=sdkdir xorg-server)
> -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
> - 
> - # Checks for header files.
> - AC_HEADER_STDC
> - 
> --save_CFLAGS="$CFLAGS"
> --CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
> --CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
> --AC_MSG_CHECKING([whether to include DRI support])
> --if test x$DRI != xno; then
> --        AC_CHECK_FILE([${sdkdir}/dri.h],
> --                      [have_dri_h="yes"], [have_dri_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 "$have_dri_h" = yes -a \
> --                "$have_dristruct_h" = yes; then
> --                DRI="yes"
> --        else
> --                DRI="no"
> --        fi
> --fi
> --AC_MSG_RESULT([$DRI])
> --CFLAGS="$save_CFLAGS $DEBUGFLAGS"
> --
> --AM_CONDITIONAL(DRI, test x$DRI = xyes)
> --if test "$DRI" = yes; then
> --        PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
> --        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
> --        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
> --fi
> --
> - AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
> - if test "$VIDEO_DEBUG" = yes; then
> - 	AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
> - fi
> - 
> --AC_SUBST([DRI_CFLAGS])
> - 
> - DRIVER_NAME=omap
> - AC_SUBST([DRIVER_NAME])
> --- 
> -1.7.10.4
> -
> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
> similarity index 85%
> rename from meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
> rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
> index 454d0a1..95de4ba 100644
> --- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
> @@ -24,15 +24,10 @@ LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
>  DEPENDS += "virtual/libx11 libdrm xf86driproto"
>  
> -SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
> -PR = "${INC_PR}.3"
> -PV = "0.4.2+gitr${SRCPV}"
> -
> -SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
> -           file://configure.patch \
> -"
> +SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5"
> +SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d"
>  
> -S = "${WORKDIR}/git"
> +PR = "${INC_PR}.3"

Drop PR when PV is incremented.

>  
>  CFLAGS += " -I${STAGING_INCDIR}/xorg "
>  
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

Re: [PATCH 4/6] xf86-video-omap: Upgrade to 0.4.3

[Jussi Kukkonen]

On 4 June 2015 at 14:13, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Jun 04, 2015 at 01:44:20PM +0300, Jussi Kukkonen wrote:
>> Use last release instead of slightly older git revision, drop the
>> upstreamed patch.
>>
>> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>> ---
>>  .../xorg-driver/xf86-video-omap/configure.patch    | 74 ----------------------
>>  ...-video-omap_git.bb => xf86-video-omap_0.4.3.bb} | 11 +---
>>  2 files changed, 3 insertions(+), 82 deletions(-)
>>  delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
>>  rename meta/recipes-graphics/xorg-driver/{xf86-video-omap_git.bb => xf86-video-omap_0.4.3.bb} (85%)
>>
>> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
>> deleted file mode 100644
>> index d298d5d..0000000
>> --- a/meta/recipes-graphics/xorg-driver/xf86-video-omap/configure.patch
>> +++ /dev/null
>> @@ -1,74 +0,0 @@
>> -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57386]
>> -Signed-off-by: Ross Burton <ross.burton@intel.com>
>> -
>> -From fc7b6045aaec583c7e29021bd23c20a877b20546 Mon Sep 17 00:00:00 2001
>> -From: Ross Burton <ross.burton@intel.com>
>> -Date: Wed, 21 Nov 2012 23:39:18 +0000
>> -Subject: [PATCH] build: rationalise DRI checks
>> -
>> -The existing logic around DRI was complicated and defined a number of variables
>> -that were not used, when in reality DRI is required.
>> -
>> -Move the glproto check to the main pkg-config check, and remove everything else.
>> -
>> -Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ----
>> - configure.ac |   33 +--------------------------------
>> - 1 file changed, 1 insertion(+), 32 deletions(-)
>> -
>> -diff --git a/configure.ac b/configure.ac
>> -index 11238b1..c321b98 100644
>> ---- a/configure.ac
>> -+++ b/configure.ac
>> -@@ -44,47 +44,16 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
>> - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
>> -
>> - # Checks for pkg-config packages
>> --PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto $REQUIRED_MODULES)
>> --sdkdir=$(pkg-config --variable=sdkdir xorg-server)
>> -+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3] xproto fontsproto [libdrm >= 2.4.36] libdrm_omap xf86driproto glproto $REQUIRED_MODULES)
>> -
>> - # Checks for header files.
>> - AC_HEADER_STDC
>> -
>> --save_CFLAGS="$CFLAGS"
>> --CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
>> --CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
>> --AC_MSG_CHECKING([whether to include DRI support])
>> --if test x$DRI != xno; then
>> --        AC_CHECK_FILE([${sdkdir}/dri.h],
>> --                      [have_dri_h="yes"], [have_dri_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 "$have_dri_h" = yes -a \
>> --                "$have_dristruct_h" = yes; then
>> --                DRI="yes"
>> --        else
>> --                DRI="no"
>> --        fi
>> --fi
>> --AC_MSG_RESULT([$DRI])
>> --CFLAGS="$save_CFLAGS $DEBUGFLAGS"
>> --
>> --AM_CONDITIONAL(DRI, test x$DRI = xyes)
>> --if test "$DRI" = yes; then
>> --        PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
>> --        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
>> --        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
>> --fi
>> --
>> - AM_CONDITIONAL(VIDEO_DEBUG, test x$VIDEO_DEBUG = xyes)
>> - if test "$VIDEO_DEBUG" = yes; then
>> -     AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support])
>> - fi
>> -
>> --AC_SUBST([DRI_CFLAGS])
>> -
>> - DRIVER_NAME=omap
>> - AC_SUBST([DRIVER_NAME])
>> ---
>> -1.7.10.4
>> -
>> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
>> similarity index 85%
>> rename from meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
>> rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
>> index 454d0a1..95de4ba 100644
>> --- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb
>> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb
>> @@ -24,15 +24,10 @@ LICENSE = "GPLv2+"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
>>  DEPENDS += "virtual/libx11 libdrm xf86driproto"
>>
>> -SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f"
>> -PR = "${INC_PR}.3"
>> -PV = "0.4.2+gitr${SRCPV}"
>> -
>> -SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap \
>> -           file://configure.patch \
>> -"
>> +SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5"
>> +SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d"
>>
>> -S = "${WORKDIR}/git"
>> +PR = "${INC_PR}.3"
>
> Drop PR when PV is incremented.

Thanks. I've dropped the PR and pushed to same branch.

Jussi

>>
>>  CFLAGS += " -I${STAGING_INCDIR}/xorg "
>>
>> --
>> 2.1.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com