summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics/libsdl
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-graphics/libsdl')
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch52
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb (renamed from meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb)7
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb2
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb3
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb3
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb3
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb31
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb16
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch34
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb27
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb33
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb27
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb17
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch69
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch23
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb35
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb14
-rw-r--r--meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb8
18 files changed, 145 insertions, 259 deletions
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch
new file mode 100644
index 0000000000..2007766f74
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch
@@ -0,0 +1,52 @@
1From 6c35fc94ca30a4d0662479f7ef8a704d97aa7352 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 18 May 2024 18:13:30 -0700
4Subject: [PATCH] stdlib: Make iconv use portable across glibc/musl
5
6This is a backport from libsdl2
7
8Upstream-Status: Backport [https://github.com/libsdl-org/SDL/blob/main/src/stdlib/SDL_iconv.c#L49C1-L51C1]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/stdlib/SDL_iconv.c | 19 ++++---------------
12 1 file changed, 4 insertions(+), 15 deletions(-)
13
14diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c
15index fa56a99..087b6ec 100644
16--- a/src/stdlib/SDL_iconv.c
17+++ b/src/stdlib/SDL_iconv.c
18@@ -28,27 +28,16 @@
19
20 #ifdef HAVE_ICONV
21
22-/* Depending on which standard the iconv() was implemented with,
23- iconv() may or may not use const char ** for the inbuf param.
24- If we get this wrong, it's just a warning, so no big deal.
25-*/
26-#if defined(_XGP6) || \
27- defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
28-#define ICONV_INBUF_NONCONST
29-#endif
30-
31 #include <errno.h>
32
33 size_t SDL_iconv(SDL_iconv_t cd,
34 const char **inbuf, size_t *inbytesleft,
35 char **outbuf, size_t *outbytesleft)
36 {
37- size_t retCode;
38-#ifdef ICONV_INBUF_NONCONST
39- retCode = iconv(cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft);
40-#else
41- retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft);
42-#endif
43+ /* iconv's second parameter may or may not be `const char const *` depending on the
44+ C runtime's whims. Casting to void * seems to make everyone happy, though. */
45+
46+ const size_t retCode = iconv((iconv_t)((uintptr_t)cd), (void *)inbuf, inbytesleft, outbuf, outbytesleft);
47 if ( retCode == (size_t)-1 ) {
48 switch(errno) {
49 case E2BIG:
50--
512.45.1
52
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb
index 666442fba2..d707b6c9b4 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084"
6DEPENDS = "libsdl" 6DEPENDS = "libsdl"
7 7
8SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" 8SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
9SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16" 9SRC_URI[sha256sum] = "dfb15ac5f8ce7a4952dc12d2aed9747518c5e6b335c0e31636d23f93c630f419"
10SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0"
11 10
12S = "${WORKDIR}/SDL_gfx-${PV}" 11UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sdlgfx/files/"
12
13S = "${UNPACKDIR}/SDL_gfx-${PV}"
13 14
14inherit autotools pkgconfig 15inherit autotools pkgconfig
15 16
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
index 01137bb0ca..29fb8cb4aa 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.
11 file://configure.patch" 11 file://configure.patch"
12SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" 12SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
13 13
14S = "${WORKDIR}/SDL_image-${PV}" 14S = "${UNPACKDIR}/SDL_image-${PV}"
15 15
16inherit autotools pkgconfig 16inherit autotools pkgconfig
17 17
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
index a470ee81d0..d87c15aebc 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-mixer_1.2.12.bb
@@ -8,10 +8,9 @@ SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.
8 file://configure.patch \ 8 file://configure.patch \
9" 9"
10 10
11SRC_URI[md5sum] = "e03ff73d77a55e3572ad0217131dc4a1"
12SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a" 11SRC_URI[sha256sum] = "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
13 12
14S = "${WORKDIR}/SDL_mixer-${PV}" 13S = "${UNPACKDIR}/SDL_mixer-${PV}"
15 14
16inherit autotools-brokensep pkgconfig 15inherit autotools-brokensep pkgconfig
17 16
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
index 49b1ef2879..ef4d13ebb6 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-net_1.2.8.bb
@@ -14,7 +14,6 @@ SRC_URI = " \
14 file://am_foreign.patch \ 14 file://am_foreign.patch \
15" 15"
16 16
17S = "${WORKDIR}/SDL_net-${PV}" 17S = "${UNPACKDIR}/SDL_net-${PV}"
18 18
19SRC_URI[md5sum] = "20e64e61d65662db66c379034f11f718"
20SRC_URI[sha256sum] = "5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4" 19SRC_URI[sha256sum] = "5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb b/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
index 797c38d8e1..2cf3e88f17 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl-ttf_2.0.11.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=22800d1b3701377aae0b61ee36f5c303"
7SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ 7SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
8 file://use.pkg-config.for.freetype2.patch \ 8 file://use.pkg-config.for.freetype2.patch \
9" 9"
10SRC_URI[md5sum] = "61e29bd9da8d245bc2471d1b2ce591aa"
11SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7" 10SRC_URI[sha256sum] = "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"
12 11
13S = "${WORKDIR}/SDL_ttf-${PV}" 12S = "${UNPACKDIR}/SDL_ttf-${PV}"
14 13
15inherit autotools pkgconfig 14inherit autotools pkgconfig
16 15
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb
deleted file mode 100644
index 57f0f99794..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1SUMMARY = "Simple DirectMedia Layer image library v2"
2SECTION = "libs"
3
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://COPYING.txt;md5=822edb694b20ff16ceef85b27f61c11f"
6
7DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp"
8
9SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
10SRC_URI[md5sum] = "f26f3a153360a8f09ed5220ef7b07aea"
11SRC_URI[sha256sum] = "bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0"
12
13S = "${WORKDIR}/SDL2_image-${PV}"
14
15inherit autotools pkgconfig
16
17# Disable the run-time loading of the libs and bring back the soname dependencies.
18EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
19
20do_configure:prepend() {
21 # make autoreconf happy
22 touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
23 # Removing these files fixes a libtool version mismatch.
24 rm -f ${S}/acinclude/libtool.m4
25 rm -f ${S}/acinclude/sdl2.m4
26 rm -f ${S}/acinclude/pkg.m4
27 rm -f ${S}/acinclude/lt~obsolete.m4
28 rm -f ${S}/acinclude/ltoptions.m4
29 rm -f ${S}/acinclude/ltsugar.m4
30 rm -f ${S}/acinclude/ltversion.m4
31}
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
new file mode 100644
index 0000000000..c15e986dc3
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
@@ -0,0 +1,16 @@
1SUMMARY = "Simple DirectMedia Layer image library v2"
2SECTION = "libs"
3
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
6
7DEPENDS = "tiff zlib libpng jpeg virtual/libsdl2 libwebp"
8
9SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz"
10SRC_URI[sha256sum] = "2213b56fdaff2220d0e38c8e420cbe1a83c87374190cba8c70af2156097ce30a"
11
12S = "${UNPACKDIR}/SDL2_image-${PV}"
13
14inherit cmake pkgconfig
15
16FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch
deleted file mode 100644
index 0605b32e30..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 9363c98528ef850235852e44f678df6b5c011ee1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 7 Feb 2021 18:08:36 -0800
4Subject: [PATCH] configure.in: Undefine AC_CONFIG_AUX_DIR
5
6This helps reconfiguring with autotools 2.70+
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 configure.in | 5 -----
12 1 file changed, 5 deletions(-)
13
14--- a/configure.in
15+++ b/configure.in
16@@ -1,7 +1,6 @@
17 dnl Process this file with autoconf to produce a configure script.
18 AC_INIT(README.txt)
19 AC_CONFIG_AUX_DIR(build-scripts)
20-
21 dnl Set various version strings - taken gratefully from the GTk sources
22
23 # Making releases:
24@@ -40,10 +39,6 @@ AC_SUBST(LT_CURRENT)
25 AC_SUBST(LT_REVISION)
26 AC_SUBST(LT_AGE)
27
28-dnl Detect the canonical build and host environments
29-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
30-dnl AC_CANONICAL_HOST
31-
32 dnl Check for tools
33 AC_PROG_LIBTOOL
34 AC_PROG_CC
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
deleted file mode 100644
index dbcb2a193b..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1SUMMARY = "Simple DirectMedia Layer mixer library V2"
2SECTION = "libs"
3DEPENDS = "libsdl2 flac libmikmod libvorbis"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f"
6
7SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \
8 file://0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch \
9 "
10SRC_URI[sha256sum] = "b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
11
12S = "${WORKDIR}/SDL2_mixer-${PV}"
13
14inherit autotools-brokensep pkgconfig
15
16EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}"
17
18PACKAGECONFIG ??= ""
19PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"
20
21do_configure:prepend () {
22 # Remove old libtool macros.
23 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
24 for i in ${MACROS}; do
25 rm -f acinclude/$i
26 done
27}
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
new file mode 100644
index 0000000000..46e6ba0774
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
@@ -0,0 +1,33 @@
1SUMMARY = "Simple DirectMedia Layer mixer library V2"
2SECTION = "libs"
3DEPENDS = "virtual/libsdl2"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
6
7SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
8SRC_URI[sha256sum] = "cb760211b056bfe44f4a1e180cc7cb201137e4d1572f2002cc1be728efd22660"
9
10S = "${UNPACKDIR}/SDL2_mixer-${PV}"
11
12inherit cmake pkgconfig
13
14do_configure:prepend() {
15 # cmake checks for these binaries. Touch them to pass the tests and add RDEPENDS
16 touch ${STAGING_BINDIR}/fluidsynth
17 touch ${STAGING_BINDIR}/wavpack
18 touch ${STAGING_BINDIR}/wvunpack
19 touch ${STAGING_BINDIR}/wvgain
20 touch ${STAGING_BINDIR}/wvtag
21}
22
23PACKAGECONFIG ?= "flac wave vorbis"
24PACKAGECONFIG[opusfile] = "-DSDL2MIXER_OPUS=ON -DSDL2MIXER_OPUS_ENABLED=ON, -DSDL2MIXER_OPUS=OFF,opusfile"
25PACKAGECONFIG[vorbis] = "-DSDL2MIXER_VORBIS=VORBISFILE -DSDL2MIXER_VORBIS_VORBISFILE=ON, -DSDL2MIXER_VORBIS=OFF,libvorbis"
26PACKAGECONFIG[flac] = "-DSDL2MIXER_FLAC=ON, -DSDL2MIXER_FLAC=OFF,flac"
27PACKAGECONFIG[xmp] = "-DSDL2MIXER_MOD=ON -DSDL2MIXER_MOD_XMP=ON, -DSDL2MIXER_MOD=OFF,libxmp,libxmp"
28PACKAGECONFIG[fluidsynth] = "-DSDL2MIXER_MIDI=ON -DSDL2MIXER_MIDI_FLUIDSYNTH_ENABLED=ON, -DSDL2MIXER_MIDI=OFF,fluidsynth,fluidsynth-bin"
29PACKAGECONFIG[wave] = "-DSDL2MIXER_WAVE=ON -DSDL2MIXER_WAVPACK=ON, -DSDL2MIXER_WAVE=OFF,wavpack,wavpack wavpack-bin"
30PACKAGECONFIG[mpg123] = "-DSDL2MIXER_MP3=ON -DSDL2MIXER_MP3_MPG123=ON, -DSDL2MIXER_MP3=OFF,mpg123"
31
32FILES:${PN} += "${datadir}/licenses"
33
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb
deleted file mode 100644
index 35369e8731..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb
+++ /dev/null
@@ -1,27 +0,0 @@
1DESCRIPTION = "Simple DirectMedia Layer networking library."
2SECTION = "libs/network"
3LICENSE = "Zlib"
4LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fe9d52a78585a65224776875510ed127"
5
6SRC_URI = " \
7 https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \
8"
9S = "${WORKDIR}/SDL2_net-${PV}"
10
11inherit autotools pkgconfig
12
13DEPENDS = "libsdl2"
14
15SRC_URI[md5sum] = "5c1d9d1cfa63301b141cb5c0de2ea7c4"
16SRC_URI[sha256sum] = "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21"
17
18do_configure:prepend() {
19 # create dummy files which autotools consider as mandatory
20 touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
21
22 # Remove old libtool macros.
23 for macro in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
24 echo ${S}/acinclude/macro
25 rm -f ${S}/acinclude/$macro
26 done
27}
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
new file mode 100644
index 0000000000..4a7ada94cb
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "Simple DirectMedia Layer networking library."
2SECTION = "libs/network"
3LICENSE = "Zlib"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315"
5
6SRC_URI = " \
7 https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \
8"
9S = "${UNPACKDIR}/SDL2_net-${PV}"
10
11inherit cmake pkgconfig
12
13DEPENDS = "virtual/libsdl2"
14
15SRC_URI[sha256sum] = "4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb"
16
17FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
deleted file mode 100644
index 8cb76c35d6..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
3Date: Fri, 28 Oct 2022 22:17:15 +0300
4Subject: [PATCH] freetype: Fix function signatures to match without casts
5
6Clang 16 has got a new stricter warning for casts of function types
7(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57).
8
9This new warning gets included as part of the existing error
10diagnostic setting of -Wcast-function-type.
11
12This fixes errors like these:
13
14../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
15 ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
16 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17
18Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169]
19---
20 src/hb-ft.cc | 10 ++++++----
21 1 file changed, 6 insertions(+), 4 deletions(-)
22
23diff --git a/src/hb-ft.cc b/src/hb-ft.cc
24index a6beb9f0f..a35e75b18 100644
25--- a/src/hb-ft.cc
26+++ b/src/hb-ft.cc
27@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face)
28 }
29
30 static void
31-hb_ft_face_finalize (FT_Face ft_face)
32+hb_ft_face_finalize (void *arg)
33 {
34+ FT_Face ft_face = (FT_Face) arg;
35 hb_face_destroy ((hb_face_t *) ft_face->generic.data);
36 }
37
38@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
39 ft_face->generic.finalizer (ft_face);
40
41 ft_face->generic.data = hb_ft_face_create (ft_face, nullptr);
42- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
43+ ft_face->generic.finalizer = hb_ft_face_finalize;
44 }
45
46 return hb_face_reference ((hb_face_t *) ft_face->generic.data);
47@@ -949,8 +950,9 @@ get_ft_library ()
48 }
49
50 static void
51-_release_blob (FT_Face ft_face)
52+_release_blob (void *arg)
53 {
54+ FT_Face ft_face = (FT_Face) arg;
55 hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
56 }
57
58@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
59 #endif
60
61 ft_face->generic.data = blob;
62- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
63+ ft_face->generic.finalizer = _release_blob;
64
65 _hb_ft_font_set_funcs (font, ft_face, true);
66 hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
67--
682.39.2
69
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch
deleted file mode 100644
index bc9371553f..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 6ec375eaafc43a2b3c30a0e0e49447d231d81a67 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 May 2017 00:57:10 -0700
4
5---
6Upstream-Status: Pending
7
8 Makefile.am | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/Makefile.am b/Makefile.am
12index 8568dd2..5efc91e 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I acinclude
16
17 lib_LTLIBRARIES = libSDL2_ttf.la
18
19+AUTOMAKE_OPTIONS = foreign
20+
21 libSDL2_ttfincludedir = $(includedir)/SDL2
22 libSDL2_ttfinclude_HEADERS = \
23 SDL_ttf.h
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb
deleted file mode 100644
index 6cd4a48aa8..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1SUMMARY = "Simple DirectMedia Layer truetype font library"
2SECTION = "libs"
3DEPENDS = "libsdl2 freetype virtual/egl"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68"
6
7SRC_URI = " \
8 git://github.com/libsdl-org/SDL_ttf.git;branch=release-2.20.x;protocol=https \
9 git://github.com/libsdl-org/freetype.git;branch=VER-2-12-1-SDL;destsuffix=git/external/freetype;name=freetype;protocol=https \
10 git://github.com/libsdl-org/harfbuzz.git;branch=2.9.1-SDL;destsuffix=git/external/harfbuzz;name=harfbuzz;protocol=https \
11 file://0001-freetype-Fix-function-signatures-to-match-without-ca.patch;patchdir=external/harfbuzz \
12 file://automake_foreign.patch \
13"
14SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23"
15SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29"
16SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0"
17
18SRCREV_FORMAT .= "_freetype_harfbuzz"
19
20S = "${WORKDIR}/git"
21
22inherit autotools pkgconfig features_check
23
24# links to libGL.so
25REQUIRED_DISTRO_FEATURES += "opengl"
26
27do_configure:prepend() {
28 # Removing these files fixes a libtool version mismatch.
29 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
30
31 for i in ${MACROS}; do
32 rm -f ${S}/acinclude/$i
33 done
34}
35ASNEEDED = ""
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb
new file mode 100644
index 0000000000..d06f41bd0e
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb
@@ -0,0 +1,14 @@
1SUMMARY = "Simple DirectMedia Layer truetype font library"
2SECTION = "libs"
3DEPENDS = "virtual/libsdl2 freetype virtual/egl"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
6
7SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz"
8SRC_URI[sha256sum] = "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd"
9
10inherit cmake pkgconfig
11
12S = "${UNPACKDIR}/SDL2_ttf-${PV}"
13
14FILES:${PN} += "${datadir}/licenses"
diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 4fc4679f7f..8122b88a68 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -15,6 +15,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
15 file://libsdl-1.2.15-xdata32.patch \ 15 file://libsdl-1.2.15-xdata32.patch \
16 file://pkgconfig.patch \ 16 file://pkgconfig.patch \
17 file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \ 17 file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \
18 file://0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch \
18 file://CVE-2019-7577.patch \ 19 file://CVE-2019-7577.patch \
19 file://CVE-2019-7574.patch \ 20 file://CVE-2019-7574.patch \
20 file://CVE-2019-7572.patch \ 21 file://CVE-2019-7572.patch \
@@ -30,9 +31,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
30 31
31UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" 32UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar"
32 33
33S = "${WORKDIR}/SDL-${PV}" 34S = "${UNPACKDIR}/SDL-${PV}"
34 35
35SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85"
36SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00" 36SRC_URI[sha256sum] = "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
37 37
38BINCONFIG = "${bindir}/sdl-config" 38BINCONFIG = "${bindir}/sdl-config"
@@ -40,7 +40,9 @@ BINCONFIG = "${bindir}/sdl-config"
40inherit autotools lib_package binconfig-disabled pkgconfig 40inherit autotools lib_package binconfig-disabled pkgconfig
41 41
42CVE_PRODUCT = "simple_directmedia_layer sdl" 42CVE_PRODUCT = "simple_directmedia_layer sdl"
43 43# GCC15/C23 results in following errors
44# ../SDL-1.2.15/src/video/Xext/XME/xme.c:218:5: error: initialization of 'int (*)(Display *, XExtCodes *)' from incompatible pointer type 'int (*)(void)' [-Wincompatible-pointer-types]
45CFLAGS += "-std=c17"
44EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ 46EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
45 --enable-file --disable-oss --disable-esd --disable-arts \ 47 --enable-file --disable-oss --disable-esd --disable-arts \
46 --disable-diskaudio --disable-nas \ 48 --disable-diskaudio --disable-nas \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-09 03:46:34 +0000