diff --git a/libs/_autotools/libsdl2/libsdl2.py b/libs/_autotools/libsdl2/libsdl2.py index 6900b19b..b74e22e2 100644 --- a/libs/_autotools/libsdl2/libsdl2.py +++ b/libs/_autotools/libsdl2/libsdl2.py @@ -1,23 +1,25 @@ import info class subinfo(info.infoclass): def setTargets(self): self.description = "Simple DirectMedia Layer" self.webpage = "https://www.libsdl.org" - for ver in ['2.0.8']: + for ver in ['2.0.9']: self.targets[ver] = f"https://www.libsdl.org/release/SDL2-{ver}.tar.gz" self.targetInstSrc[ ver ] = f"SDL2-{ver}" - self.targetDigests['2.0.8'] = (['edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec'], CraftHash.HashAlgorithm.SHA256) - self.defaultTarget = '2.0.8' + self.patchToApply[ ver ] = [("libtool_windres.patch", 1)] + self.targetDigests['2.0.9'] =(['255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1'], CraftHash.HashAlgorithm.SHA256) + self.defaultTarget = '2.0.9' def setDependencies(self): self.runtimeDependencies["libs/libsamplerate"] = None self.runtimeDependencies["libs/iconv"] = None from Package.AutoToolsPackageBase import * class Package(AutoToolsPackageBase): def __init__(self, **args): AutoToolsPackageBase.__init__(self) - self.subinfo.options.configure.args = "--enable-threads --enable-directx --enable-libsamplerate" + self.subinfo.options.configure.autoreconf = False + self.subinfo.options.configure.args = " --disable-static --enable-threads --enable-directx --enable-libsamplerate " diff --git a/libs/_autotools/libsdl2/libtool_windres.patch b/libs/_autotools/libsdl2/libtool_windres.patch new file mode 100644 index 00000000..d5a9710a --- /dev/null +++ b/libs/_autotools/libsdl2/libtool_windres.patch @@ -0,0 +1,24 @@ +--- a/configure.in ++++ b/configure.in +@@ -56,6 +56,7 @@ + AC_PROG_INSTALL + AC_PROG_MAKE_SET + AC_CHECK_TOOL(WINDRES, [windres], [:]) ++LT_PROG_RC + + dnl Make sure that srcdir is a full pathname + case "$host" in +@@ -4094,10 +4095,10 @@ + + VERSION_OBJECTS=`echo $VERSION_SOURCES` + VERSION_DEPENDS=`echo $VERSION_SOURCES` +-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` ++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` + VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ +-\\$(objects)/\\2.o: \\1/\\2.rc\\\\ +- \\$(WINDRES) \\$< \\$@,g"` ++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ ++ \\$(LIBTOOL) --tag=RC --mode=compile \\$(WINDRES) \\$< \\$@,g"` + + SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` + SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`