From 83a8b00dfb88115a612eff44296956062c5097a5 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 4 Aug 2015 14:01:14 +0300 Subject: [PATCH] xf86-input-vmmouse: Upgrade 13.0.0 -> 13.1.0 * Remove backported patch * Remove PR * Use ${nonarch_base_libdir} for udev files. Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- .../always_include_config.h.patch | 81 ------------------- ...13.0.0.bb => xf86-input-vmmouse_13.1.0.bb} | 12 ++- 2 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch rename meta/recipes-graphics/xorg-driver/{xf86-input-vmmouse_13.0.0.bb => xf86-input-vmmouse_13.1.0.bb} (68%) diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch deleted file mode 100644 index 12fb9df2fd..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Thu, 28 Nov 2013 11:59:53 -0800 -Subject: Always include config.h first - -This fixes some build warnings about CSRG_BASED being redefined due to -incorrect header include ordering. - -Signed-off-by: Jeremy Huddleston Sequoia - -Upstream-Status: Backport - -Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c -=================================================================== ---- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c 2014-08-28 18:33:16.168070587 -0700 -+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c 2014-08-28 18:33:16.152070587 -0700 -@@ -39,6 +39,10 @@ - #endif - - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "vmmouse_client.h" - #include "vmmouse_proto.h" - -Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c -=================================================================== ---- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c 2014-08-28 18:33:16.168070587 -0700 -+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c 2014-08-28 18:33:16.156070587 -0700 -@@ -33,6 +33,10 @@ - */ - - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "vmmouse_proto.h" - - -Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h -=================================================================== ---- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h 2014-08-28 18:33:16.168070587 -0700 -+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h 2014-08-28 18:33:16.156070587 -0700 -@@ -36,11 +36,6 @@ - #ifndef _VMMOUSE_PROTO_H_ - #define _VMMOUSE_PROTO_H_ - -- --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif -- - #include - - #ifdef HAVE_XORG_SERVER_1_1_0 -Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c -=================================================================== ---- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c 2014-08-28 18:33:16.168070587 -0700 -+++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c 2014-08-28 18:33:16.160070587 -0700 -@@ -26,14 +26,14 @@ - */ - - --#include --#include --#include "vmmouse_client.h" -- - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif - -+#include -+#include -+#include "vmmouse_client.h" -+ - void - segvCB(int sig) - { diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb similarity index 68% rename from meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb index 83ea960a88..8615b48daa 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb @@ -6,12 +6,8 @@ protocol that is provided by VMware virtual machines to give absolute \ pointer positioning. The vmmouse driver is capable of falling back to the \ standard 'mouse' driver if a VMware virtual machine is not detected." -PR = "${INC_PR}.0" - -SRC_URI += "file://always_include_config.h.patch" - -SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07" -SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c" +SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed" +SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319" RDEPENDS_${PN} += "xf86-input-mouse" @@ -25,4 +21,6 @@ do_install_append () { rm -rf ${D}${libdir}/hal/ } -FILES_${PN} += "${base_libdir}/udev/ ${datadir}/X11/xorg.conf.d" +EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" + +FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ ${datadir}/X11/xorg.conf.d" -- 2.40.1