summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-07-29 11:20:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-31 13:50:46 +0100
commit07ba3a1d7320946c22a3dafefcb2aab6b1906b90 (patch)
treeafbc461770f0b81cc9207de97c1a531fc687e852 /meta/recipes-graphics
parent01f3a0cd730519a3a3402082a53ed7814d58a427 (diff)
downloadpoky-07ba3a1d7320946c22a3dafefcb2aab6b1906b90.tar.gz
libsdl2: upgrade 2.0.9 -> 2.0.10
License-Update: Change in Copyright Year. Refresh the patch to apply on configure.ac instead of .in. (From OE-Core rev: f00b9aad7c3e2e1ec41597539c4fe2307043b6cf) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch37
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb (renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb)6
2 files changed, 28 insertions, 15 deletions
diff --git a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch b/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
index 29076bf6cb..8ca52ebde7 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
+++ b/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch
@@ -1,3 +1,8 @@
1From e0f4b6d18ce6f025c78773e909b9c395ad833c7a Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Mon, 29 Jul 2019 08:38:32 +0800
4Subject: [PATCH] configure: fix dependencies
5
1Many source files include e.g. wayland-protocols.h which should be found in the 6Many source files include e.g. wayland-protocols.h which should be found in the
2sysroot but SDL wants to build its own headers from the XML definitions. 7sysroot but SDL wants to build its own headers from the XML definitions.
3 8
@@ -14,34 +19,42 @@ the primary objects.
14 19
15Upstream-Status: Pending 20Upstream-Status: Pending
16Signed-off-by: Ross Burton <ross.burton@intel.com> 21Signed-off-by: Ross Burton <ross.burton@intel.com>
22[Moved to configure.ac]
23Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
24---
25 configure.ac | 6 +++---
26 1 file changed, 3 insertions(+), 3 deletions(-)
17 27
18diff --git a/configure.in b/data/poky-tmp/master/work/corei7-64-poky-linux/libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in 28diff --git a/configure.ac b/configure.ac
19index 1c7e79338..ba07a4a4e 100644 29index 9e782c6..997915a 100644
20--- a/configure.in 30--- a/configure.ac
21+++ b/data/poky-tmp/master/work/corei7-64-poky-linux/libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in 31+++ b/configure.ac
22@@ -4011,7 +4011,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'` 32@@ -4061,7 +4061,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'`
23 for EXT in asm cc m c S; do 33 for EXT in asm cc m c S; do
24 OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'` 34 OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'`
25 DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\ 35 DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\
26-\\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\ 36-\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created\\\\
27+\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(GEN_OBJECTS)\\\\ 37+\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created \\$(GEN_OBJECTS)\\\\
28 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` 38 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
29 done 39 done
30 40
31@@ -4028,14 +4028,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` 41@@ -4078,14 +4078,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
32 SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` 42 SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
33 SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` 43 SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
34 SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ 44 SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
35-\\$(objects)/\\2.lo: \\1/\\2.c\\\\ 45-\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\
36+\\$(objects)/\\2.lo: \\1/\\2.c \\$(GEN_OBJECTS)\\\\ 46+\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\
37 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` 47 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
38 48
39 SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` 49 SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
40 SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` 50 SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
41 SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` 51 SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
42 SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ 52 SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\
43-\\$(objects)/\\2.lo: \\1/\\2.c\\\\ 53-\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\
44+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ \\$(GEN_OBJECTS)\\\\ 54+\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\
45 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` 55 \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
46 56
47 # Set runtime shared library paths as needed 57 # Set runtime shared library paths as needed
58--
592.7.4
60
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
index a0a0b1509a..3a0654b866 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
@@ -8,7 +8,7 @@ BUGTRACKER = "http://bugzilla.libsdl.org/"
8SECTION = "libs" 8SECTION = "libs"
9 9
10LICENSE = "Zlib" 10LICENSE = "Zlib"
11LIC_FILES_CHKSUM = "file://COPYING.txt;md5=02ee26814dd044bd7838ae24e05b880f" 11LIC_FILES_CHKSUM = "file://COPYING.txt;md5=504a9454ceb89fd75a2583473b11409e"
12 12
13PROVIDES = "virtual/libsdl2" 13PROVIDES = "virtual/libsdl2"
14 14
@@ -18,8 +18,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
18 18
19S = "${WORKDIR}/SDL2-${PV}" 19S = "${WORKDIR}/SDL2-${PV}"
20 20
21SRC_URI[md5sum] = "f2ecfba915c54f7200f504d8b48a5dfe" 21SRC_URI[md5sum] = "5a2114f2a6f348bdab5bf52b994811db"
22SRC_URI[sha256sum] = "255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1" 22SRC_URI[sha256sum] = "b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57"
23 23
24inherit autotools lib_package binconfig-disabled pkgconfig 24inherit autotools lib_package binconfig-disabled pkgconfig
25 25