diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 19:45:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 21:38:15 +0300 |
commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/yocto-poky/meta/recipes-sato | |
parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
download | openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.xz |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-sato')
9 files changed, 47 insertions, 59 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 97cced7cc..224428ddd 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb @@ -46,7 +46,7 @@ WEB ?= "" SUMMARY_${PN}-apps = "Sato desktop - applications" RDEPENDS_${PN}-apps = "\ l3afpad \ - gst-player \ + gst-examples \ matchbox-terminal \ sato-screenshot \ ${FILEMANAGER} \ diff --git a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb b/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb index 75ff7731b..4127a0704 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/pcmanfm/pcmanfm_1.2.5.bb @@ -9,9 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ SECTION = "x11" DEPENDS = "gtk+3 startup-notification libfm intltool-native gettext-native glib-2.0-native" - -COMPATIBLE_HOST = '(x86_64.*|i.86.*|aarch64.*|arm.*|mips.*|powerpc.*|sh.*)-(linux|freebsd.*)' - SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.xz \ file://gnome-fs-directory.png \ file://gnome-fs-regular.png \ diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Clarify-conditions-to-avoid-compiler-errors.patch b/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Clarify-conditions-to-avoid-compiler-errors.patch deleted file mode 100644 index 89aa1587c..000000000 --- a/import-layers/yocto-poky/meta/recipes-sato/puzzles/files/0001-Clarify-conditions-to-avoid-compiler-errors.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 72f2e9043ef509992dfa61791638db87bf0ae37b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 6 Dec 2016 01:20:00 +0000 -Subject: [PATCH] Clarify conditions to avoid compiler errors - -Fix errors pointed out by clang - -error: logical not is only applied to the left hand side of this bitwise operator [-Werror,-Wlogical-not-parentheses] -| if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue; -| ^ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - signpost.c | 2 +- - tracks.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/signpost.c b/signpost.c -index aa2e13a..2e2dff2 100644 ---- a/signpost.c -+++ b/signpost.c -@@ -284,7 +284,7 @@ static int check_nums(game_state *orig, game_state *copy, int only_immutable) - int i, ret = 1; - assert(copy->n == orig->n); - for (i = 0; i < copy->n; i++) { -- if (only_immutable && !copy->flags[i] & FLAG_IMMUTABLE) continue; -+ if (only_immutable && !(copy->flags[i] & FLAG_IMMUTABLE)) continue; - assert(copy->nums[i] >= 0); - assert(copy->nums[i] <= copy->n); - if (copy->nums[i] != orig->nums[i]) { -diff --git a/tracks.c b/tracks.c -index 5b27350..ca44ce1 100644 ---- a/tracks.c -+++ b/tracks.c -@@ -1072,7 +1072,7 @@ static int solve_check_single_sub(game_state *state, int si, int id, int n, - x = i%w; - y = i/w; - if (abs(ox-x) > 1 || abs(oy-y) > 1) { -- if (!state->sflags[i] & S_TRACK) -+ if (!(state->sflags[i] & S_TRACK)) - did += solve_set_sflag(state, x, y, S_NOTRACK, what); - } - } --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb b/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb index decd2a8b3..bfd817719 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/puzzles/puzzles_git.bb @@ -7,18 +7,17 @@ DEPENDS = "libxt" REQUIRED_DISTRO_FEATURES = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" +LIC_FILES_CHKSUM = "file://LICENCE;md5=da6110d4ed1225a287eab2bf0ac0193b" SRC_URI = "git://git.tartarus.org/simon/puzzles.git \ file://fix-compiling-failure-with-option-g-O.patch \ file://0001-Use-labs-instead-of-abs.patch \ file://0001-palisade-Fix-warnings-with-clang-on-arm.patch \ - file://0001-Clarify-conditions-to-avoid-compiler-errors.patch \ file://0001-Use-Wno-error-format-overflow-if-the-compiler-suppor.patch \ " -UPSTREAM_VERSION_UNKNOWN = "1" -SRCREV = "8dfe5cec31e784e4ece2955ecc8cc35ee7e8fbb3" -PE = "1" +UPSTREAM_CHECK_COMMITS = "1" +SRCREV = "2adf0052d66eae88c7a5e55e67fe16e13f7018b5" +PE = "2" PV = "0.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index 4d5daa661..b568f0458 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/import-layers/yocto-poky/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc @@ -12,7 +12,7 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 file://rxvt.desktop \ file://rxvt.png" -inherit autotools update-alternatives +inherit autotools pkgconfig update-alternatives PROVIDES = "virtual/x-terminal-emulator" ALTERNATIVE_${PN} = "x-terminal-emulator" diff --git a/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index ceaeccaaa..bb6b69b90 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -10,7 +10,7 @@ SECTION = "x11" # SRCREV tagged 0.0.2 SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ - file://addsoundkeys.patch;apply=yes \ + file://addsoundkeys.patch \ file://70settings-daemon.sh \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch new file mode 100644 index 000000000..21574072f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch @@ -0,0 +1,38 @@ +From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001 +From: Bhargava Sreekantappa Gayathri + <bhargava.sreekantappa-gayathri@xilinx.com> +Date: Tue, 27 Feb 2018 16:09:31 -0800 +Subject: [PATCH] Fix gles3 header when gles2 is enabled + +A GLES 2 application should not use gl3.h. +Fix the gles3 header failure while compiling webkitgtk. + +FAILED: +Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o + ^~~~~~~~~~~~~ +compilation terminated. + +Upstream-Status: Backport +Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008 + +Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com> +Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> +--- + Source/WebCore/platform/graphics/GLContext.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp +index 599dcc0..46d2fd4 100644 +--- a/Source/WebCore/platform/graphics/GLContext.cpp ++++ b/Source/WebCore/platform/graphics/GLContext.cpp +@@ -31,7 +31,6 @@ + #elif USE(OPENGL_ES_2) + #define GL_GLEXT_PROTOTYPES 1 + #include <GLES2/gl2.h> +-#include <GLES3/gl3.h> + #endif + + #if USE(GLX) +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch index dfdc11601..9fc1421fd 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch @@ -16,6 +16,7 @@ and ends up with compile errors e.g. Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- Source/WebCore/PlatformGTK.cmake | 6 +++--- diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb index 9fac04444..c29fa7f4c 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb @@ -21,6 +21,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ file://fix-configure-failure-aarch64.patch \ + file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \ " SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" |