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

[Khem Raj <raj.khem@gmail.com>]

[-- 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 --]