diff options
Diffstat (limited to 'external/poky/meta/recipes-graphics/libsdl2')
| -rw-r--r-- | external/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch | 141 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch | 37 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb (renamed from external/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb) | 22 |
3 files changed, 42 insertions, 158 deletions
diff --git a/external/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch b/external/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch deleted file mode 100644 index 9b32b378..00000000 --- a/external/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch +++ /dev/null @@ -1,141 +0,0 @@ -From c215ba1d52a3d4ef03af3ab1a5baa1863f812aed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 24 Aug 2018 23:10:25 +0200 -Subject: [PATCH] GLES2: Get sin/cos out of vertex shader -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The only place angle is activated and causes effect is RenderCopyEx. All other -methods which use vertex shader, leave angle disabled and cause useless sin/cos -calculation in shader. - -To get around shader's interface is changed to a vector that contains results -of sin and cos. To behave properly when disabled, cos value is set with offset --1.0 making 0.0 default when deactivated. - -As nice side effect it simplifies GLES2_UpdateVertexBuffer: All attributes are -vectors now. - -Additional background: - -* On RaspberryPi it gives a performace win for operations. Tested with - [1] numbers go down for 5-10% (not easy to estimate due to huge variation). -* SDL_RenderCopyEx was tested with [2] -* It works around left rotated display caused by low accuracy sin implemetation - in RaspberryPi/VC4 [3] - -Upstream-Status: Accepted [4] - -[1] https://github.com/schnitzeltony/sdl2box -[2] https://github.com/schnitzeltony/sdl2rendercopyex -[3] https://github.com/anholt/mesa/issues/110 -[4] https://hg.libsdl.org/SDL/rev/e5a666405750 - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - src/render/opengles2/SDL_render_gles2.c | 17 ++++++++++++----- - src/render/opengles2/SDL_shaders_gles2.c | 14 +++++++++----- - 2 files changed, 21 insertions(+), 10 deletions(-) - -diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c -index 14671f7c8..7c54a7333 100644 ---- a/src/render/opengles2/SDL_render_gles2.c -+++ b/src/render/opengles2/SDL_render_gles2.c -@@ -1530,7 +1530,7 @@ GLES2_UpdateVertexBuffer(SDL_Renderer *renderer, GLES2_Attribute attr, - GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata; - - #if !SDL_GLES2_USE_VBOS -- data->glVertexAttribPointer(attr, attr == GLES2_ATTRIBUTE_ANGLE ? 1 : 2, GL_FLOAT, GL_FALSE, 0, vertexData); -+ data->glVertexAttribPointer(attr, 2, GL_FLOAT, GL_FALSE, 0, vertexData); - #else - if (!data->vertex_buffers[attr]) { - data->glGenBuffers(1, &data->vertex_buffers[attr]); -@@ -1545,7 +1545,7 @@ GLES2_UpdateVertexBuffer(SDL_Renderer *renderer, GLES2_Attribute attr, - data->glBufferSubData(GL_ARRAY_BUFFER, 0, dataSizeInBytes, vertexData); - } - -- data->glVertexAttribPointer(attr, attr == GLES2_ATTRIBUTE_ANGLE ? 1 : 2, GL_FLOAT, GL_FALSE, 0, 0); -+ data->glVertexAttribPointer(attr, 2, GL_FLOAT, GL_FALSE, 0, 0); - #endif - - return 0; -@@ -1853,6 +1853,8 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s - return GL_CheckError("", renderer); - } - -+#define PI 3.14159265f -+ - static int - GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *srcrect, - const SDL_FRect *dstrect, const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip) -@@ -1861,8 +1863,9 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect - GLfloat vertices[8]; - GLfloat texCoords[8]; - GLfloat translate[8]; -- GLfloat fAngle[4]; -+ GLfloat fAngle[8]; - GLfloat tmp; -+ float radian_angle; - - GLES2_ActivateRenderer(renderer); - -@@ -1872,7 +1875,11 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect - - data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_CENTER); - data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE); -- fAngle[0] = fAngle[1] = fAngle[2] = fAngle[3] = (GLfloat)(360.0f - angle); -+ -+ radian_angle = PI * (360.0f - angle) / 180.f; -+ fAngle[0] = fAngle[2] = fAngle[4] = fAngle[6] = (GLfloat)sin(radian_angle); -+ /* render expects cos value - 1 (see GLES2_VertexSrc_Default_) */ -+ fAngle[1] = fAngle[3] = fAngle[5] = fAngle[7] = (GLfloat)cos(radian_angle) - 1.0f; - /* Calculate the center of rotation */ - translate[0] = translate[2] = translate[4] = translate[6] = (center->x + dstrect->x); - translate[1] = translate[3] = translate[5] = translate[7] = (center->y + dstrect->y); -@@ -1901,7 +1908,7 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect - data->glVertexAttribPointer(GLES2_ATTRIBUTE_CENTER, 2, GL_FLOAT, GL_FALSE, 0, translate); - data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);*/ - -- GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_ANGLE, fAngle, 4 * sizeof(GLfloat)); -+ GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_ANGLE, fAngle, 8 * sizeof(GLfloat)); - GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_CENTER, translate, 8 * sizeof(GLfloat)); - GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_POSITION, vertices, 8 * sizeof(GLfloat)); - -diff --git a/src/render/opengles2/SDL_shaders_gles2.c b/src/render/opengles2/SDL_shaders_gles2.c -index b0bcdff25..f428a4945 100644 ---- a/src/render/opengles2/SDL_shaders_gles2.c -+++ b/src/render/opengles2/SDL_shaders_gles2.c -@@ -30,20 +30,24 @@ - /************************************************************************************************* - * Vertex/fragment shader source * - *************************************************************************************************/ -- -+/* Notes on a_angle: -+ * It is a vector containing sin and cos for rotation matrix -+ * To get correct rotation for most cases when a_angle is disabled cos -+ value is decremented by 1.0 to get proper output with 0.0 which is -+ default value -+*/ - static const Uint8 GLES2_VertexSrc_Default_[] = " \ - uniform mat4 u_projection; \ - attribute vec2 a_position; \ - attribute vec2 a_texCoord; \ -- attribute float a_angle; \ -+ attribute vec2 a_angle; \ - attribute vec2 a_center; \ - varying vec2 v_texCoord; \ - \ - void main() \ - { \ -- float angle = radians(a_angle); \ -- float c = cos(angle); \ -- float s = sin(angle); \ -+ float s = a_angle[0]; \ -+ float c = a_angle[1] + 1.0; \ - mat2 rotationMatrix = mat2(c, -s, s, c); \ - vec2 position = rotationMatrix * (a_position - a_center) + a_center; \ - v_texCoord = a_texCoord; \ --- -2.14.4 - diff --git a/external/poky/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch b/external/poky/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch index 29076bf6..8ca52ebd 100644 --- a/external/poky/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch +++ b/external/poky/meta/recipes-graphics/libsdl2/libsdl2/more-gen-depends.patch @@ -1,3 +1,8 @@ +From e0f4b6d18ce6f025c78773e909b9c395ad833c7a Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Mon, 29 Jul 2019 08:38:32 +0800 +Subject: [PATCH] configure: fix dependencies + Many source files include e.g. wayland-protocols.h which should be found in the sysroot but SDL wants to build its own headers from the XML definitions. @@ -14,34 +19,42 @@ the primary objects. Upstream-Status: Pending Signed-off-by: Ross Burton <ross.burton@intel.com> +[Moved to configure.ac] +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -diff --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 -index 1c7e79338..ba07a4a4e 100644 ---- a/configure.in -+++ b/data/poky-tmp/master/work/corei7-64-poky-linux/libsdl2/2.0.8-r0/SDL2-2.0.8/configure.in -@@ -4011,7 +4011,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'` +diff --git a/configure.ac b/configure.ac +index 9e782c6..997915a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4061,7 +4061,7 @@ DEPENDS=`echo $SOURCES | tr ' ' '\n'` for EXT in asm cc m c S; do OBJECTS=`echo "$OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.'$EXT',$(objects)/\1.lo,g'` DEPENDS=`echo "$DEPENDS" | sed "s,^\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.$EXT\\$,\\\\ --\\$(objects)/\\2.lo: \\1/\\2.$EXT\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(GEN_OBJECTS)\\\\ +-\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created\\\\ ++\\$(objects)/\\2.lo: \\1/\\2.$EXT \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` done -@@ -4028,14 +4028,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` +@@ -4078,14 +4078,14 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.lo: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c \\$(GEN_OBJECTS)\\\\ +-\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\ ++\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.lo: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ \\$(GEN_OBJECTS)\\\\ +-\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created\\\\ ++\\$(objects)/\\2.lo: \\1/\\2.c \\$(objects)/.created \\$(GEN_OBJECTS)\\\\ \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` # Set runtime shared library paths as needed +-- +2.7.4 + diff --git a/external/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/external/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb index 812a9abf..c1c941e4 100644 --- a/external/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb +++ b/external/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb @@ -8,21 +8,28 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" SECTION = "libs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=02ee26814dd044bd7838ae24e05b880f" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=2d4af6adb4d89aad0cdedbcc18c9a32f" + +# arm-neon adds MIT license +LICENSE_append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', '& MIT', '', d)}" +LIC_FILES_CHKSUM_append = " ${@bb.utils.contains('PACKAGECONFIG', 'arm-neon', 'file://src/video/arm/pixman-arm-neon-asm.h;md5=9a9cc1e51abbf1da58f4d9528ec9d49b;beginline=1;endline=24', '', d)}" PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ - file://0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch \ " S = "${WORKDIR}/SDL2-${PV}" -SRC_URI[md5sum] = "3800d705cef742c6a634f202c37f263f" -SRC_URI[sha256sum] = "edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec" +SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff" +SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863" + +inherit autotools lib_package binconfig-disabled pkgconfig + +BINCONFIG = "${bindir}/sdl2-config" -inherit autotools lib_package binconfig pkgconfig +CVE_PRODUCT = "simple_directmedia_layer sdl" EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ @@ -31,6 +38,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ --enable-sdl-dlopen \ --disable-rpath \ --disable-sndio \ + --disable-fcitx --disable-ibus \ " # opengl packageconfig factored out to make it easy for distros @@ -43,10 +51,14 @@ PACKAGECONFIG ??= " \ ${PACKAGECONFIG_GL} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa directfb pulseaudio x11', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland gles2', '', d)} \ + ${@bb.utils.contains("TUNE_FEATURES", "neon","arm-neon","",d)} \ " PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," +PACKAGECONFIG[arm-neon] = "--enable-arm-neon,--disable-arm-neon" PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,virtual/libgles2" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" |