All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Anuj Mittal" <anuj.mittal@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [gatesgarth][PATCH 15/22] libsdl2: Fix directfb syntax error
Date: Fri,  6 Nov 2020 14:28:13 +0800	[thread overview]
Message-ID: <8f91ad31d0e9941d0c5843905c4abc1cc0021c0c.1604643684.git.anuj.mittal@intel.com> (raw)
In-Reply-To: <cover.1604643684.git.anuj.mittal@intel.com>

From: Mark Jonas <toertel@gmail.com>

Build of libsdl2 with directfb is broken due to a spurious '}' and a
missing 'E' since version 2.0.12. The upstream is already fixed.

(From OE-Core rev: 8963daba093c3c5e2c60e1e4e057862971b84cb0)

Signed-off-by: Mark Jonas <toertel@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9e9871de010d79cb93aeb48d8d56bac62c09e347)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 ...ectfb-spurious-curly-brace-missing-e.patch | 49 +++++++++++++++++++
 .../libsdl2/libsdl2_2.0.12.bb                 |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch

diff --git a/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch b/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
new file mode 100644
index 0000000000..aa351a89ba
--- /dev/null
+++ b/meta/recipes-graphics/libsdl2/libsdl2/directfb-spurious-curly-brace-missing-e.patch
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User Fabrice Fontaine <fontaine.fabrice@gmail.com>
+# Date 1585069551 25200
+# Node ID 769f800952179633ec6c3e6bc1bc1d40e401750a
+# Parent  63387e8920f58f608288f247824ec5f4c286691f
+src/video/directfb/SDL_DirectFB_render.c: fix build
+Build with directfb is broken due to a spurious '}' and a missing 'E'
+since version 2.0.12 and https://hg.libsdl.org/SDL/rev/2d5b5a5ccbfb:
+
+/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c: In function 'SetBlendMode':
+/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:202:9: error: case label not within a switch statement
+  202 |         case SDL_BLENDMODE_MUL:
+      |         ^~~~
+
+/home/buildroot/autobuild/run/instance-2/output-1/build/sdl2-2.0.12/src/video/directfb/SDL_DirectFB_render.c:205:67: error: 'DSBF_DSTCOLOR' undeclared (first use in this function); did you mean 'DSBF_DESTCOLOR'?
+  205 |             SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR));
+      |                                                                   ^~~~~~~~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/83ccefee68c2800c0544e6f40fa8bc8ee6b67b77
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+--
+
+The patch was imported from the libsdl Mercurial repository
+(https://hg.libsdl.org/SDL) as of changeset id 769f80095217.
+
+Upstream-Status: Backport
+
+Signed-off-by: Mark Jonas <toertel@gmail.com>
+
+
+diff -r 63387e8920f5 -r 769f80095217 src/video/directfb/SDL_DirectFB_render.c
+--- a/src/video/directfb/SDL_DirectFB_render.c	Mon Mar 23 14:10:25 2020 -0700
++++ b/src/video/directfb/SDL_DirectFB_render.c	Tue Mar 24 10:05:51 2020 -0700
+@@ -198,11 +198,10 @@
+             SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_SRCCOLOR));
+
+             break;
+-        }
+         case SDL_BLENDMODE_MUL:
+             data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
+             data->drawFlags = DSDRAW_BLEND;
+-            SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DSTCOLOR));
++            SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_DESTCOLOR));
+             SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA));
+
+             break;
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
index 83dce86801..8ecf161f69 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
@@ -18,6 +18,7 @@ PROVIDES = "virtual/libsdl2"
 
 SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
            file://more-gen-depends.patch \
+           file://directfb-spurious-curly-brace-missing-e.patch \
 "
 
 S = "${WORKDIR}/SDL2-${PV}"
-- 
2.28.0


  parent reply	other threads:[~2020-11-06  6:28 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-06  6:27 [gatesgarth][PATCH 00/22] gatesgarth review request Anuj Mittal
2020-11-06  6:27 ` [gatesgarth][PATCH 01/22] gstreamer1.0: Fix reproducibility issue around libcap Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 02/22] gstreamer1.0: Update 1.16.2 -> Update 1.16.3 Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 03/22] gstreamer1.0-plugins-base: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 04/22] gstreamer1.0-plugins-good: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 05/22] gstreamer1.0-plugins-bad: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 06/22] gstreamer1.0-plugins-ugly: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 07/22] gstreamer1.0-libav: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 08/22] gstreamer1.0-vaapi: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 09/22] gstreamer1.0-rtsp-server: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 10/22] gstreamer1.0-omx: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 11/22] gstreamer1.0-python: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 12/22] gst-validate: " Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 13/22] bluez5: fix CVE-2020-27153 Anuj Mittal
2020-11-06 15:12   ` [OE-core] " Steve Sakoman
2020-11-11  7:06     ` Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 14/22] ruby: fix CVE-2020-25613 Anuj Mittal
2020-11-06  6:28 ` Anuj Mittal [this message]
2020-11-06  6:28 ` [gatesgarth][PATCH 16/22] libsdl2: Fix directfb SDL_RenderFillRect Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 17/22] grub: clean up CVE patches Anuj Mittal
2020-11-06 15:14   ` [OE-core] " Steve Sakoman
2020-11-06 16:07     ` Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 18/22] qemuboot.bbclass: Fix a typo Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 19/22] common-licenses: add bzip2-1.0.4 Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 20/22] recipes-core/busybox: fixup licensing information Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 21/22] apt: remove host contamination with gtest Anuj Mittal
2020-11-06  6:28 ` [gatesgarth][PATCH 22/22] update_udev_hwdb: clean hwdb.bin Anuj Mittal
2020-11-06 15:45   ` [OE-core] " Steve Sakoman
2020-11-06 16:04     ` Anuj Mittal
2020-11-06 16:30       ` Steve Sakoman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8f91ad31d0e9941d0c5843905c4abc1cc0021c0c.1604643684.git.anuj.mittal@intel.com \
    --to=anuj.mittal@intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.