Skip to contentSkip to conversation

libsdl2: upgrade 2.0.10 -> 2.0.12

PATCH New Andreas Müller 1 participant 1 message Mar 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libsdl2: upgrade 2.0.10 -> 2.0.12

* checked all hunks: backported patches can go
* for machines with neon in TUNE_FEATURES enable new configure option --enable-arm-neon. If enabled, license must be extended to MIT
* license checksum changed by copyright year

---
 ...alidate-image-size-when-loading-BMP-.patch | 34 ------------
 ...for-build-dir-when-building-version-.patch | 53 -------------------
 ...DL-fails-to-compile-with-Mesa-Master.patch | 41 --------------
 .../{libsdl2_2.0.10.bb => libsdl2_2.0.12.bb}  | 15 +++---
 4 files changed, 9 insertions(+), 134 deletions(-)
 delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch
 delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch
 delete mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch
 rename meta/recipes-graphics/libsdl2/{libsdl2_2.0.10.bb => libsdl2_2.0.12.bb} (81%)
meta/recipes-graphics/libsdl2/libsdl2/0001-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch deleted +0 -34
deleted file mode 100644
index 674decccbb..0000000000
@@ -1,34 +0,0 @@
-From 85138c1ec673e05263ae666baf61f79384daf7e0 Mon Sep 17 00:00:00 2001
-From: Sam Lantinga <[email protected]>
-Date: Tue, 30 Jul 2019 11:00:00 -0700
-Subject: [PATCH] Fixed bug 4538 - validate image size when loading BMP files
-
-Upstream-Status: Backport
-[https://hg.libsdl.org/SDL/rev/e7ba650a643a]
-
-CVE: CVE-2019-13616
-
-Signed-off-by: Yi Zhao <[email protected]>
----
- src/video/SDL_bmp.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
-index 0b68918..a06b0c9 100644
---- a/src/video/SDL_bmp.c
-+++ b/src/video/SDL_bmp.c
-@@ -226,6 +226,11 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
-             SDL_RWseek(src, (biSize - headerSize), RW_SEEK_CUR);
-         }
-     }
-+    if (biWidth <= 0 || biHeight == 0) {
-+        SDL_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight);
-+        was_error = SDL_TRUE;
-+        goto done;
-+    }
-     if (biHeight < 0) {
-         topDown = SDL_TRUE;
-         biHeight = -biHeight;
--- 
-2.7.4
-
meta/recipes-graphics/libsdl2/libsdl2/0001-configure-check-for-build-dir-when-building-version-.patch deleted +0 -53

53 lines not on this page · raw message

meta/recipes-graphics/libsdl2/libsdl2/0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch deleted +0 -41

41 lines not on this page · raw message

meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb renamed from meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb +9 -6
similarity index 81%
rename from meta/recipes-graphics/libsdl2/libsdl2_2.0.10.bb
rename to meta/recipes-graphics/libsdl2/libsdl2_2.0.12.bb
index 413f53476a..c1c941e452 100644
@@ -8,21 +8,22 @@ BUGTRACKER = "http://bugzilla.libsdl.org/"
 SECTION = "libs"
 
 LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=504a9454ceb89fd75a2583473b11409e"
+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-Fixed-bug-4538-validate-image-size-when-loading-BMP-.patch \
-           file://0002-Fixed-bug-4797-SDL-fails-to-compile-with-Mesa-Master.patch \
-           file://0001-configure-check-for-build-dir-when-building-version-.patch \
 "
 
 S = "${WORKDIR}/SDL2-${PV}"
 
-SRC_URI[md5sum] = "5a2114f2a6f348bdab5bf52b994811db"
-SRC_URI[sha256sum] = "b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57"
+SRC_URI[md5sum] = "783b6f2df8ff02b19bb5ce492b99c8ff"
+SRC_URI[sha256sum] = "349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863"
 
 inherit autotools lib_package binconfig-disabled pkgconfig
 
@@ -50,8 +51,10 @@ 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"
Signature · 1 line
2.21.1