summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2019-06-27 17:40:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-28 13:28:37 +0100
commitbc231b1f22664efe7bdac80541b1deb0dad9f519 (patch)
treec31da7f7b8145eaadbbc2fe6065d1bd49d4d0a69 /meta/recipes-graphics/xorg-lib
parent56fd11118cb46341479a91e7773e98b00355c10b (diff)
downloadpoky-bc231b1f22664efe7bdac80541b1deb0dad9f519.tar.gz
libxt: update to 1.2.0
License checksum changed due to modified copyright year. Removed patch was upstreamed. (From OE-Core rev: 4a77ac273cb16167fff8fcb9831434d9a25f8fcf) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch33
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch16
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb (renamed from meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb)9
3 files changed, 16 insertions, 42 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch b/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch
deleted file mode 100644
index 1a691a3d5e..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From b0c0e6d90bd99a699701c9542640adb218f5d536 Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Mon, 10 Jul 2017 16:51:13 +0300
4Subject: [PATCH] libXt: util: don't link makestrs with target cflags
5
6The line: AM_CFLAGS = $(XT_CFLAGS)
7in util/Makefile.am is wrong because it adds target cflags to the
8compilation of makestrs, which is built for the build machine, which
9leads to build failures when cross-compiling.
10
11Upstream-Status: Pending
12
13Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
14Signed-off-by: Maxin B. John <maxin.john@intel.com>
15---
16 util/Makefile.am | 1 -
17 1 file changed, 1 deletion(-)
18
19diff --git a/util/Makefile.am b/util/Makefile.am
20index 800b35b..f2dd1f9 100644
21--- a/util/Makefile.am
22+++ b/util/Makefile.am
23@@ -11,7 +11,6 @@ EXTRA_DIST = \
24 StrDefs.ht \
25 string.list
26
27-AM_CFLAGS = $(XT_CFLAGS)
28 makestrs_SOURCES = makestrs.c
29
30
31--
322.4.0
33
diff --git a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
index ffc2c15d71..ff8c675dbd 100644
--- a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
+++ b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
@@ -1,3 +1,8 @@
1From f069b0a430fe96f3ece2106d34375008833599d3 Mon Sep 17 00:00:00 2001
2From: Nitin A Kamble <nitin.a.kamble@intel.com>
3Date: Fri, 2 Dec 2011 12:20:05 -0800
4Subject: [PATCH] libxt: fix compilatoin with x32 toolchain
5
1Upstream-Status: Pending 6Upstream-Status: Pending
2 7
3This fixes compilation with x32 toolchain. 8This fixes compilation with x32 toolchain.
@@ -5,10 +10,15 @@ This fixes compilation with x32 toolchain.
5Received this patch from H.J. Lu <hjl.tools@gmail.com> 10Received this patch from H.J. Lu <hjl.tools@gmail.com>
6Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 11Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1
7 12
13---
14 include/X11/Xtos.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
8 16
9--- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800 17diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
10+++ libXt-1.1.1/include/X11/Xtos.h 2011-11-30 17:19:27.473349770 -0800 18index 64b2da8..44f52c2 100644
11@@ -62,7 +62,7 @@ SOFTWARE. 19--- a/include/X11/Xtos.h
20+++ b/include/X11/Xtos.h
21@@ -59,7 +59,7 @@ SOFTWARE.
12 defined(__sparc64__) || \ 22 defined(__sparc64__) || \
13 defined(__s390x__) || \ 23 defined(__s390x__) || \
14 (defined(__hppa__) && defined(__LP64__)) || \ 24 (defined(__hppa__) && defined(__LP64__)) || \
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb
index 23d9db41c4..42df435052 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb
@@ -13,8 +13,7 @@ independent of any particular user interface policy or style."
13require xorg-lib-common.inc 13require xorg-lib-common.inc
14 14
15LICENSE = "MIT & MIT-style" 15LICENSE = "MIT & MIT-style"
16LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" 16LIC_FILES_CHKSUM = "file://COPYING;md5=73d55cea4d27ca1a09a5d23378b3ecf8"
17
18 17
19DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp" 18DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp"
20PROVIDES = "xt" 19PROVIDES = "xt"
@@ -24,12 +23,10 @@ PE = "1"
24XORG_PN = "libXt" 23XORG_PN = "libXt"
25 24
26SRC_URI += "file://libxt_fix_for_x32.patch \ 25SRC_URI += "file://libxt_fix_for_x32.patch \
27 file://0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch \
28 " 26 "
27SRC_URI[md5sum] = "a9019421d3ee8b4937b6afd9025f018a"
28SRC_URI[sha256sum] = "b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831"
29 29
30BBCLASSEXTEND = "native nativesdk" 30BBCLASSEXTEND = "native nativesdk"
31 31
32EXTRA_OECONF += "--disable-xkb" 32EXTRA_OECONF += "--disable-xkb"
33
34SRC_URI[md5sum] = "8f5b5576fbabba29a05f3ca2226f74d3"
35SRC_URI[sha256sum] = "46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a"