[meta-oe][PATCH 1/9] libxmp: add recipe

[meta-oe][PATCH 1/9] libxmp: add recipe

[Markus Volk]

libxmp is a requirement for libsdl2-mixer

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-multimedia/libxmp/libxmp_4.6.2.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/libxmp/libxmp_4.6.2.bb

diff --git a/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.2.bb b/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.2.bb
new file mode 100644
index 0000000000..c67b80b750
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libxmp/libxmp_4.6.2.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Extended Module Player Library"
+HOMEPAGE = "http://xmp.sourceforge.net/"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://README;beginline=59;md5=ea030bd80f99071b0d3f9a9f752d1ca8"
+
+inherit cmake pkgconfig
+
+SRC_URI = "git://github.com/libxmp/libxmp.git;protocol=https;branch=master"
+SRCREV = "828ef357943e1fbb13910e7a6fca21987c5c5827"
+
+S = "${WORKDIR}/git"
-- 
2.49.0

[meta-oe][PATCH 2/9] fluidsynth: update

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../fluidsynth/{fluidsynth_2.3.4.bb => fluidsynth_2.4.5.bb}    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-multimedia/recipes-multimedia/fluidsynth/{fluidsynth_2.3.4.bb => fluidsynth_2.4.5.bb} (97%)

diff --git a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.5.bb
similarity index 97%
rename from meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb
rename to meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.5.bb
index dc05832e80..672f4b1449 100644
--- a/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.3.4.bb
+++ b/meta-multimedia/recipes-multimedia/fluidsynth/fluidsynth_2.4.5.bb
@@ -11,7 +11,7 @@ SRC_URI = " \
     file://0002-fluid_synth_nwrite_float-Allow-zero-pointer-for-left.patch \
     file://0003-Use-ARM-NEON-accelaration-for-float-multithreaded-se.patch \
 "
-SRCREV = "5ecdc4568e45123216c6888892caad07918ef127"
+SRCREV = "9f2edaa3cbd456997cb420fb68b6f960faaafd12"
 
 S = "${WORKDIR}/git"
 
@@ -37,3 +37,4 @@ PACKAGECONFIG[readline] = "-Denable-readline=ON,-Denable-readline=OFF,readline"
 PACKAGECONFIG[sdl] = "-Denable-sdl2=ON,-Denable-sdl2=OFF,libsdl2"
 PACKAGECONFIG[sndfile] = "-Denable-libsndfile=ON,-Denable-libsndfile=OFF,libsndfile1"
 PACKAGECONFIG[systemd] = "-Denable-systemd=ON,-Denable-systemd=OFF,systemd"
+
-- 
2.49.0

[meta-oe][PATCH 3/9] libsdl2-image: build with cmake

[Markus Volk]

This allows to use with libsdl2-compat

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../libsdl/libsdl2-image_2.8.8.bb              | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

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
index bcd8e35b27..15f7b6f4b7 100644
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
@@ -11,20 +11,6 @@ SRC_URI[sha256sum] = "2213b56fdaff2220d0e38c8e420cbe1a83c87374190cba8c70af215609
 
 S = "${WORKDIR}/SDL2_image-${PV}"
 
-inherit autotools pkgconfig
+inherit cmake pkgconfig
 
-# Disable the run-time loading of the libs and bring back the soname dependencies.
-EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
-
-do_configure:prepend() {
-    # make autoreconf happy
-    touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
-    # Removing these files fixes a libtool version mismatch.
-    rm -f ${S}/acinclude/libtool.m4
-    rm -f ${S}/acinclude/sdl2.m4
-    rm -f ${S}/acinclude/pkg.m4
-    rm -f ${S}/acinclude/lt~obsolete.m4
-    rm -f ${S}/acinclude/ltoptions.m4
-    rm -f ${S}/acinclude/ltsugar.m4
-    rm -f ${S}/acinclude/ltversion.m4
-}
+FILES:${PN} += "${datadir}/licenses"
-- 
2.49.0

[meta-oe][PATCH 4/9] libsdl2-mixer: update and build with cmake

[Markus Volk]

---
 ...figure.in-Undefine-AC_CONFIG_AUX_DIR.patch | 34 -------------------
 .../libsdl/libsdl2-mixer_2.0.4.bb             | 27 ---------------
 .../libsdl/libsdl2-mixer_2.8.1.bb             | 25 ++++++++++++++
 3 files changed, 25 insertions(+), 61 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
 create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb

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 @@
-From 9363c98528ef850235852e44f678df6b5c011ee1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 7 Feb 2021 18:08:36 -0800
-Subject: [PATCH] configure.in: Undefine AC_CONFIG_AUX_DIR
-
-This helps reconfiguring with autotools 2.70+
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.in | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -1,7 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(README.txt)
- AC_CONFIG_AUX_DIR(build-scripts)
--
- dnl Set various version strings - taken gratefully from the GTk sources
- 
- # Making releases:
-@@ -40,10 +39,6 @@ AC_SUBST(LT_CURRENT)
- AC_SUBST(LT_REVISION)
- AC_SUBST(LT_AGE)
- 
--dnl Detect the canonical build and host environments
--AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
--dnl AC_CANONICAL_HOST
--
- dnl Check for tools
- AC_PROG_LIBTOOL
- 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 @@
-SUMMARY = "Simple DirectMedia Layer mixer library V2"
-SECTION = "libs"
-DEPENDS = "libsdl2 flac libmikmod libvorbis"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f"
-
-SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \
-           file://0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch \
-          "
-SRC_URI[sha256sum] = "b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
-
-S = "${WORKDIR}/SDL2_mixer-${PV}"
-
-inherit autotools-brokensep pkgconfig
-
-EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"
-
-do_configure:prepend () {
-    # Remove old libtool macros.
-    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-    for i in ${MACROS}; do
-        rm -f acinclude/$i
-    done
-}
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..71d3dd7f90
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Simple DirectMedia Layer mixer library V2"
+SECTION = "libs"
+DEPENDS = "libsdl2 flac libvorbis opusfile libxmp fluidsynth wavpack"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
+SRC_URI[sha256sum] = "cb760211b056bfe44f4a1e180cc7cb201137e4d1572f2002cc1be728efd22660"
+
+S = "${WORKDIR}/SDL2_mixer-${PV}"
+
+inherit cmake pkgconfig
+
+do_configure:prepend() {
+	# cmake checks for these binaries. Touch them to pass the tests and add RDEPENDS
+	touch ${STAGING_BINDIR}/fluidsynth
+	touch ${STAGING_BINDIR}/wavpack
+	touch ${STAGING_BINDIR}/wvunpack
+	touch ${STAGING_BINDIR}/wvgain
+	touch ${STAGING_BINDIR}/wvtag
+}
+
+FILES:${PN} += "${datadir}/licenses"
+
+RDEPENDS:${PN} = "fluidsynth-bin wavpack-bin"
-- 
2.49.0

[meta-oe][PATCH 5/9] libsdl2-net: update anb build with cmake

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../libsdl/libsdl2-net_2.0.1.bb               | 26 -------------------
 .../libsdl/libsdl2-net_2.2.0.bb               | 17 ++++++++++++
 2 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb
 create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb

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 d1f8905769..0000000000
--- a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.0.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer networking library."
-SECTION = "libs/network"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fe9d52a78585a65224776875510ed127"
-
-SRC_URI = " \
-  https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \
-"
-S = "${WORKDIR}/SDL2_net-${PV}"
-
-inherit autotools pkgconfig
-
-DEPENDS = "libsdl2"
-
-SRC_URI[sha256sum] = "15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21"
-
-do_configure:prepend() {
-    # create dummy files which autotools consider as mandatory
-    touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog  
-
-    # Remove old libtool macros.
-    for macro in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
-        echo ${S}/acinclude/macro
-        rm -f ${S}/acinclude/$macro
-    done
-}
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..25a7dad86b
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.2.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Simple DirectMedia Layer networking library."
+SECTION = "libs/network"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=68a088513da90254b2fbe664f42af315"
+
+SRC_URI = " \
+  https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \
+"
+S = "${WORKDIR}/SDL2_net-${PV}"
+
+inherit cmake pkgconfig
+
+DEPENDS = "libsdl2"
+
+SRC_URI[sha256sum] = "4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb"
+
+FILES:${PN} += "${datadir}/licenses"
-- 
2.49.0

[meta-oe][PATCH 6/9] libsdl2-ttf: update and build with cmake

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...ction-signatures-to-match-without-ca.patch | 69 -------------------
 .../libsdl/libsdl2-ttf/automake_foreign.patch | 23 -------
 .../libsdl/libsdl2-ttf_2.20.2.bb              | 35 ----------
 .../libsdl/libsdl2-ttf_2.24.0.bb              | 14 ++++
 4 files changed, 14 insertions(+), 127 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch
 delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb
 create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb

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 @@
-From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
-Date: Fri, 28 Oct 2022 22:17:15 +0300
-Subject: [PATCH] freetype: Fix function signatures to match without casts
-
-Clang 16 has got a new stricter warning for casts of function types
-(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57).
-
-This new warning gets included as part of the existing error
-diagnostic setting of -Wcast-function-type.
-
-This fixes errors like these:
-
-../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]
-    ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
-                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169]
----
- src/hb-ft.cc | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/hb-ft.cc b/src/hb-ft.cc
-index a6beb9f0f..a35e75b18 100644
---- a/src/hb-ft.cc
-+++ b/src/hb-ft.cc
-@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face)
- }
- 
- static void
--hb_ft_face_finalize (FT_Face ft_face)
-+hb_ft_face_finalize (void *arg)
- {
-+  FT_Face ft_face = (FT_Face) arg;
-   hb_face_destroy ((hb_face_t *) ft_face->generic.data);
- }
- 
-@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
-       ft_face->generic.finalizer (ft_face);
- 
-     ft_face->generic.data = hb_ft_face_create (ft_face, nullptr);
--    ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize;
-+    ft_face->generic.finalizer = hb_ft_face_finalize;
-   }
- 
-   return hb_face_reference ((hb_face_t *) ft_face->generic.data);
-@@ -949,8 +950,9 @@ get_ft_library ()
- }
- 
- static void
--_release_blob (FT_Face ft_face)
-+_release_blob (void *arg)
- {
-+  FT_Face ft_face = (FT_Face) arg;
-   hb_blob_destroy ((hb_blob_t *) ft_face->generic.data);
- }
- 
-@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font)
- #endif
- 
-   ft_face->generic.data = blob;
--  ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob;
-+  ft_face->generic.finalizer = _release_blob;
- 
-   _hb_ft_font_set_funcs (font, ft_face, true);
-   hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
--- 
-2.39.2
-
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 @@
-From 6ec375eaafc43a2b3c30a0e0e49447d231d81a67 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 May 2017 00:57:10 -0700
-
----
-Upstream-Status: Pending
-
- Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8568dd2..5efc91e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,6 +3,8 @@ ACLOCAL_AMFLAGS = -I acinclude
- 
- lib_LTLIBRARIES = libSDL2_ttf.la
- 
-+AUTOMAKE_OPTIONS = foreign
-+
- libSDL2_ttfincludedir = $(includedir)/SDL2
- libSDL2_ttfinclude_HEADERS =	\
- 	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 @@
-SUMMARY = "Simple DirectMedia Layer truetype font library"
-SECTION = "libs"
-DEPENDS = "libsdl2 freetype virtual/egl"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68"
-
-SRC_URI = " \
-    git://github.com/libsdl-org/SDL_ttf.git;branch=release-2.20.x;protocol=https \
-    git://github.com/libsdl-org/freetype.git;branch=VER-2-12-1-SDL;destsuffix=git/external/freetype;name=freetype;protocol=https \
-    git://github.com/libsdl-org/harfbuzz.git;branch=2.9.1-SDL;destsuffix=git/external/harfbuzz;name=harfbuzz;protocol=https \
-    file://0001-freetype-Fix-function-signatures-to-match-without-ca.patch;patchdir=external/harfbuzz \
-    file://automake_foreign.patch \
-"
-SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23"
-SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29"
-SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0"
-
-SRCREV_FORMAT .= "_freetype_harfbuzz"
-
-S = "${WORKDIR}/git"
-
-inherit autotools pkgconfig features_check
-
-# links to libGL.so
-REQUIRED_DISTRO_FEATURES += "opengl"
-
-do_configure:prepend() {
-    # Removing these files fixes a libtool version mismatch.
-    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-
-    for i in ${MACROS}; do
-        rm -f ${S}/acinclude/$i
-    done
-}
-ASNEEDED = ""
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..ae9a430cf5
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.24.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Simple DirectMedia Layer truetype font library"
+SECTION = "libs"
+DEPENDS = "libsdl2 freetype virtual/egl"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${PV}.tar.gz"
+SRC_URI[sha256sum] = "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd"
+
+inherit cmake pkgconfig
+
+S = "${UNPACKDIR}/SDL2_ttf-${PV}"
+
+FILES:${PN} += "${datadir}/licenses"
-- 
2.49.0

[meta-oe][PATCH 7/9] libsdl3-ttf: add recipe

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb

diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb
new file mode 100644
index 0000000000..f914d1dcff
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-ttf_3.2.2.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Simple DirectMedia Layer truetype font library"
+SECTION = "libs"
+DEPENDS = "libsdl3 freetype"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL3_ttf-${PV}.tar.gz \
+"
+SRC_URI[sha256sum] = "63547d58d0185c833213885b635a2c0548201cc8f301e6587c0be1a67e1e045d"
+
+S = "${WORKDIR}/SDL3_ttf-${PV}"
+
+inherit cmake pkgconfig
+
+FILES:${PN} += "${datadir}/licenses"
-- 
2.49.0

[meta-oe][PATCH 8/9] libsdl2-compat: make mutually exclusive with libsdl2

[Markus Volk]

libsdl2 and libsdl2-compat share the same headers.
Therefore, using one or the other is an either-or decision

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.52.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.52.bb b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.52.bb
index de47f174b1..80334e9ad8 100644
--- a/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.52.bb
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl2-compat_2.32.52.bb
@@ -16,8 +16,13 @@ S = "${WORKDIR}/sdl2-compat-${PV}"
 
 DEPENDS += "libsdl3"
 
+PROVIDES = "libsdl2"
+
 inherit cmake pkgconfig upstream-version-is-even features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
 FILES:${PN} += "${datadir}/licenses"
+
+RCONFLICTS:${PN} = "libsdl2"
+RPROVIDES:${PN} = "libsdl2"
-- 
2.49.0

[meta-oe][PATCH 9/9] libsdl3-image: add recipe

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../libsdl3/libsdl3-image_3.2.4.bb               | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb

diff --git a/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
new file mode 100644
index 0000000000..fa0f3cf45d
--- /dev/null
+++ b/meta-oe/recipes-graphics/libsdl3/libsdl3-image_3.2.4.bb
@@ -0,0 +1,16 @@
+SUMMARY = "Simple DirectMedia Layer image library v2"
+SECTION = "libs"
+
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
+
+DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp"
+
+SRC_URI = "git://github.com/libsdl-org/SDL_image.git;protocol=https;branch=release-3.2.x"
+SRCREV = "11154afb7855293159588b245b446a4ef09e574f"
+
+S = "${WORKDIR}/git"
+
+inherit cmake pkgconfig
+
+FILES:${PN} += "${datadir}/licenses"
-- 
2.49.0

Re: [oe] [meta-oe][PATCH 1/9] libxmp: add recipe

[Gyorgy Sarvari]

On 4/21/25 11:48, Markus Volk via lists.openembedded.org wrote:
> +LICENSE = "LGPL-2.1-only"
> +LIC_FILES_CHKSUM = "file://README;beginline=59;md5=ea030bd80f99071b0d3f9a9f752d1ca8"
Is that correct as it is? That README;beginline=59 seems to be a
standard MIT license.

Re: [oe] [meta-oe][PATCH 1/9] libxmp: add recipe

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 665 bytes --]

Thanks. I just copied the line from:
<https://github.com/schnitzeltony/meta-qt5-extra/blob/c16ba209a93c3e55f5aef07fbb1d584e228765b3/recipes-misc/recipes-multimedia/libxmp/libxmp_4.4.1.bb#L3>

I'll send a v2 to fix it

On Mon, Apr 21 2025 at 12:01:54 +02:00:00, Gyorgy Sarvari 
<skandigraun@gmail.com> wrote:
> 
> On 4/21/25 11:48, Markus Volk via lists.openembedded.org wrote:
>>  +LICENSE = "LGPL-2.1-only"
>>  +LIC_FILES_CHKSUM = 
>> "file://README;beginline=59;md5=ea030bd80f99071b0d3f9a9f752d1ca8" 
>> <file://readme;beginline=59;md5=ea030bd80f99071b0d3f9a9f752d1ca8/>
> Is that correct as it is? That README;beginline=59 seems to be a
> standard MIT license.


[-- Attachment #2: Type: text/html, Size: 1080 bytes --]

Re: [oe] [meta-oe][PATCH 3/9] libsdl2-image: build with cmake

[Khem Raj]

[-- Attachment #1.1.1: Type: text/plain, Size: 2021 bytes --]

On 4/21/25 2:48 AM, Markus Volk via lists.openembedded.org wrote:
> This allows to use with libsdl2-compat
> 
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>   .../libsdl/libsdl2-image_2.8.8.bb              | 18 ++----------------
>   1 file changed, 2 insertions(+), 16 deletions(-)
> 
> 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
> index bcd8e35b27..15f7b6f4b7 100644
> --- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
> +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.8.bb
> @@ -11,20 +11,6 @@ SRC_URI[sha256sum] = "2213b56fdaff2220d0e38c8e420cbe1a83c87374190cba8c70af215609
>   
>   S = "${WORKDIR}/SDL2_image-${PV}"
>   
> -inherit autotools pkgconfig
> +inherit cmake pkgconfig
>  

fails to configure see http://0x0.st/8Vz4.7805


> -# Disable the run-time loading of the libs and bring back the soname dependencies.
> -EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
> -
> -do_configure:prepend() {
> -    # make autoreconf happy
> -    touch ${S}/NEWS ${S}/README ${S}/AUTHORS ${S}/ChangeLog
> -    # Removing these files fixes a libtool version mismatch.
> -    rm -f ${S}/acinclude/libtool.m4
> -    rm -f ${S}/acinclude/sdl2.m4
> -    rm -f ${S}/acinclude/pkg.m4
> -    rm -f ${S}/acinclude/lt~obsolete.m4
> -    rm -f ${S}/acinclude/ltoptions.m4
> -    rm -f ${S}/acinclude/ltsugar.m4
> -    rm -f ${S}/acinclude/ltversion.m4
> -}
> +FILES:${PN} += "${datadir}/licenses"
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#116997): https://lists.openembedded.org/g/openembedded-devel/message/116997
> Mute This Topic: https://lists.openembedded.org/mt/112372489/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 2613 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 203 bytes --]

Re: [oe] [meta-oe][PATCH 4/9] libsdl2-mixer: update and build with cmake

[Khem Raj]

[-- Attachment #1.1.1: Type: text/plain, Size: 5343 bytes --]

On 4/21/25 2:48 AM, Markus Volk via lists.openembedded.org wrote:
> ---
>   ...figure.in-Undefine-AC_CONFIG_AUX_DIR.patch | 34 -------------------
>   .../libsdl/libsdl2-mixer_2.0.4.bb             | 27 ---------------
>   .../libsdl/libsdl2-mixer_2.8.1.bb             | 25 ++++++++++++++
>   3 files changed, 25 insertions(+), 61 deletions(-)
>   delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-mixer/0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch
>   delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.0.4.bb
>   create mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
> 
> 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 @@
> -From 9363c98528ef850235852e44f678df6b5c011ee1 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Sun, 7 Feb 2021 18:08:36 -0800
> -Subject: [PATCH] configure.in: Undefine AC_CONFIG_AUX_DIR
> -
> -This helps reconfiguring with autotools 2.70+
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - configure.in | 5 -----
> - 1 file changed, 5 deletions(-)
> -
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -1,7 +1,6 @@
> - dnl Process this file with autoconf to produce a configure script.
> - AC_INIT(README.txt)
> - AC_CONFIG_AUX_DIR(build-scripts)
> --
> - dnl Set various version strings - taken gratefully from the GTk sources
> -
> - # Making releases:
> -@@ -40,10 +39,6 @@ AC_SUBST(LT_CURRENT)
> - AC_SUBST(LT_REVISION)
> - AC_SUBST(LT_AGE)
> -
> --dnl Detect the canonical build and host environments
> --AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
> --dnl AC_CANONICAL_HOST
> --
> - dnl Check for tools
> - AC_PROG_LIBTOOL
> - 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 @@
> -SUMMARY = "Simple DirectMedia Layer mixer library V2"
> -SECTION = "libs"
> -DEPENDS = "libsdl2 flac libmikmod libvorbis"
> -LICENSE = "Zlib"
> -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=516daf7a177ad4c8874bb9efa1a69c1f"
> -
> -SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz \
> -           file://0001-configure.in-Undefine-AC_CONFIG_AUX_DIR.patch \
> -          "
> -SRC_URI[sha256sum] = "b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419"
> -
> -S = "${WORKDIR}/SDL2_mixer-${PV}"
> -
> -inherit autotools-brokensep pkgconfig
> -
> -EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --disable-music-ogg-shared LIBS=-L${STAGING_LIBDIR}"
> -
> -PACKAGECONFIG ??= ""
> -PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"
> -
> -do_configure:prepend () {
> -    # Remove old libtool macros.
> -    MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
> -    for i in ${MACROS}; do
> -        rm -f acinclude/$i
> -    done
> -}
> 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..71d3dd7f90
> --- /dev/null
> +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-mixer_2.8.1.bb
> @@ -0,0 +1,25 @@
> +SUMMARY = "Simple DirectMedia Layer mixer library V2"
> +SECTION = "libs"
> +DEPENDS = "libsdl2 flac libvorbis opusfile libxmp fluidsynth wavpack"

its failing compatibility check - 
https://autobuilder.yoctoproject.org/valkyrie/#/builders/81/builds/600/steps/12/logs/errors

opusfile comes from meta-multimedia, meta-oe does not depend upon any 
layer except core

> +LICENSE = "Zlib"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fbb0010b2f7cf6e8a13bcac1ef4d2455"
> +
> +SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${PV}.tar.gz"
> +SRC_URI[sha256sum] = "cb760211b056bfe44f4a1e180cc7cb201137e4d1572f2002cc1be728efd22660"
> +
> +S = "${WORKDIR}/SDL2_mixer-${PV}"
> +
> +inherit cmake pkgconfig
> +
> +do_configure:prepend() {
> +	# cmake checks for these binaries. Touch them to pass the tests and add RDEPENDS
> +	touch ${STAGING_BINDIR}/fluidsynth
> +	touch ${STAGING_BINDIR}/wavpack
> +	touch ${STAGING_BINDIR}/wvunpack
> +	touch ${STAGING_BINDIR}/wvgain
> +	touch ${STAGING_BINDIR}/wvtag
> +}
> +
> +FILES:${PN} += "${datadir}/licenses"
> +
> +RDEPENDS:${PN} = "fluidsynth-bin wavpack-bin"
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#116992): https://lists.openembedded.org/g/openembedded-devel/message/116992
> Mute This Topic: https://lists.openembedded.org/mt/112372480/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 2613 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 203 bytes --]

Re: [oe] [meta-oe][PATCH 3/9] libsdl2-image: build with cmake

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

On Mon, Apr 21 2025 at 13:54:20 -07:00:00, Khem Raj via 
lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> 
wrote:
> fails to configure see <http://0x0.st/8Vz4.7805>

Yes, I accidentially added libsdl2 instead of libsdl3 as a dependency 
and (probably) because I also
had set PREFERRED_PROVIDER_libsdl2 = "libsdl2-compat" it didn't fail 
for me. Thanks for fixing this.


[-- Attachment #2: Type: text/html, Size: 599 bytes --]