diff mbox series

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

Message ID 20250421094832.67450-3-f_l_k@t-online.de
State Accepted, archived
Headers show
Series [meta-oe,1/9] libxmp: add recipe | expand

Commit Message

Markus Volk April 21, 2025, 9:48 a.m. UTC
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(-)

Comments

Khem Raj April 21, 2025, 8:54 p.m. UTC | #1
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]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk April 22, 2025, 3:48 a.m. UTC | #2
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.
diff mbox series

Patch

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"