From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SoGMf-000659-Sc for openembedded-core@lists.openembedded.org; Mon, 09 Jul 2012 17:59:10 +0200 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 09 Jul 2012 08:47:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="190292872" Received: from unknown (HELO swold-mobl.bigsur.com) ([10.255.12.157]) by fmsmga002.fm.intel.com with ESMTP; 09 Jul 2012 08:47:57 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Mon, 9 Jul 2012 08:47:18 -0700 Message-Id: <73efc58525d0bbcde0476c506076c1db685c5dba.1341802889.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 04/41] libx11-trim: upgrade to 1.5.0 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jul 2012 15:59:10 -0000 From: Laurentiu Palcu Signed-off-by: Laurentiu Palcu --- .../keysymdef_include.patch | 0 .../makekeys_crosscompile.patch | 0 .../x11_disable_makekeys.patch | 13 ++++++++----- .../{libx11-trim_1.4.4.bb => libx11-trim_1.5.0.bb} | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11-trim-1.4.4 => libx11-trim-1.5.0}/keysymdef_include.patch (100%) rename meta/recipes-graphics/xorg-lib/{libx11-trim-1.4.4 => libx11-trim-1.5.0}/makekeys_crosscompile.patch (100%) rename meta/recipes-graphics/xorg-lib/{libx11-trim-1.4.4 => libx11-trim-1.5.0}/x11_disable_makekeys.patch (74%) rename meta/recipes-graphics/xorg-lib/{libx11-trim_1.4.4.bb => libx11-trim_1.5.0.bb} (79%) diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/keysymdef_include.patch rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/makekeys_crosscompile.patch rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch similarity index 74% rename from meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch index e3782a5..69f9e6c 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.4.4/x11_disable_makekeys.patch +++ b/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch @@ -1,10 +1,10 @@ Upstream-Status: Pending -Index: libX11-1.3.4/src/util/Makefile.am +Index: libX11-1.5.0/src/util/Makefile.am =================================================================== ---- libX11-1.3.4.orig/src/util/Makefile.am -+++ libX11-1.3.4/src/util/Makefile.am -@@ -1,24 +1 @@ +--- libX11-1.5.0.orig/src/util/Makefile.am ++++ libX11-1.5.0/src/util/Makefile.am +@@ -1,27 +1,2 @@ - -noinst_PROGRAMS=makekeys - @@ -12,13 +12,16 @@ Index: libX11-1.3.4/src/util/Makefile.am - $(X11_CFLAGS) \ - $(CWARNFLAGS) - +-makekeys_CPPFLAGS = \ +- -I$(top_srcdir)/include +- -CC = @CC_FOR_BUILD@ -CPPFLAGS = @CPPFLAGS_FOR_BUILD@ -CFLAGS = @CFLAGS_FOR_BUILD@ -LDFLAGS = @LDFLAGS_FOR_BUILD@ - EXTRA_DIST = mkks.sh -- + -if LINT -# Check source code with tools like lint & sparse - diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb similarity index 79% rename from meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb rename to meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index a86e13a..89c4597 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb @@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version." LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -PR = "r1" +PR = "r0" DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" @@ -16,7 +16,7 @@ SRC_URI += "file://x11_disable_makekeys.patch \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" -SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" +SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" +SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms " -- 1.7.7.6