diff --git a/eu.usdx.UltraStarDeluxe.yaml b/eu.usdx.UltraStarDeluxe.yaml index 7ad4b8b..abf0137 100644 --- a/eu.usdx.UltraStarDeluxe.yaml +++ b/eu.usdx.UltraStarDeluxe.yaml @@ -1,7 +1,7 @@ id: eu.usdx.UltraStarDeluxe runtime: org.freedesktop.Platform sdk: org.freedesktop.Sdk -runtime-version: '24.08' +runtime-version: '25.08' separate-locales: false rename-desktop-file: ultrastardx.desktop rename-icon: ultrastardx @@ -36,11 +36,6 @@ add-extensions: subdirectories: true no-autodownload: true - org.freedesktop.Platform.ffmpeg-full: - directory: lib/ffmpeg - version: '24.08' - add-ld-path: . - sdk-extensions: - org.freedesktop.Sdk.Extension.freepascal @@ -100,8 +95,8 @@ modules: - /share/opencv4/valgrind*.supp sources: - type: archive - url: https://github.com/opencv/opencv/archive/4.7.0.tar.gz - sha256: 8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973 + url: https://github.com/opencv/opencv/archive/refs/tags/4.12.0.tar.gz + sha256: 44c106d5bb47efec04e531fd93008b3fcd1d27138985c5baf4eafac0e1ec9e9d - name: projectm buildsystem: autotools @@ -121,6 +116,9 @@ modules: - type: patch paths: - patches/projectM-2.2.1.patch + - type: patch + paths: + - patches/projectM-ax-check-gl.patch - shared-modules/lua5.4/lua-5.4.json @@ -128,6 +126,7 @@ modules: buildsystem: cmake-ninja config-opts: - -DCMAKE_BUILD_TYPE=Release + - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 cleanup: - "*.a" - "libporttime.*" @@ -153,6 +152,24 @@ modules: - patches/41-pm_linux.diff - patches/50-change_assert.diff - patches/51-remove_assert.diff + - patches/52-pt-time-no-arg.diff + +- name: SDL2_image + buildsystem: cmake-ninja + builddir: true + config-opts: + - -DSDL2IMAGE_BACKEND_STB=OFF + - -DSDL2IMAGE_DEPS_SHARED=OFF + - -DSDL2IMAGE_STRICT=ON + sources: + - type: archive + url: https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.10/SDL2_image-2.8.10.tar.gz + sha256: ebc059d01c007a62f4b04f10cf858527c875062532296943174df9a80264fd65 + x-checker-data: + type: anitya + project-id: 382729 + stable-only: true + url-template: https://github.com/libsdl-org/SDL_image/releases/download/release-$version/SDL2_image-$version.tar.gz - name: ultrastardx buildsystem: autotools diff --git a/patches/52-pt-time-no-arg.diff b/patches/52-pt-time-no-arg.diff new file mode 100644 index 0000000..7057b8a --- /dev/null +++ b/patches/52-pt-time-no-arg.diff @@ -0,0 +1,32 @@ +diff --git a/pm_linux/pmlinuxalsa.c b/pm_linux/pmlinuxalsa.c +index bdc43c0..ea90237 100644 +--- a/pm_linux/pmlinuxalsa.c ++++ b/pm_linux/pmlinuxalsa.c +@@ -204,4 +204,4 @@ static PmError alsa_write_byte(PmInternal *midi, unsigned char byte, PmTimestamp +- Pt_Time(NULL)); ++ Pt_Time()); + int when = timestamp; + /* if timestamp is zero, send immediately */ + /* otherwise compute time delay and use delay if positive */ +diff --git a/pm_test/latency.c b/pm_test/latency.c +index bfcdc0c..ee836e4 100644 +--- a/pm_test/latency.c ++++ b/pm_test/latency.c +@@ -116,7 +116,7 @@ void receive_poll(PtTimestamp timestamp, void *userData) + if (test_out && (iteration % output_period == 0)) { + PmEvent buffer[1]; +- buffer[0].timestamp = Pt_Time(NULL); ++ buffer[0].timestamp = Pt_Time(); + if (note_on) { + /* note off */ + buffer[0].message = Pm_Message(0x90, 60, 0); + note_on = 0; +@@ -241,7 +241,7 @@ int main(int argc, char **argv) + /* courteously turn off the last note, if necessary */ + if (note_on) { + PmEvent buffer[1]; +- buffer[0].timestamp = Pt_Time(NULL); ++ buffer[0].timestamp = Pt_Time(); + buffer[0].message = Pm_Message(0x90, 60, 0); + Pm_Write(out, buffer, 1); + } diff --git a/patches/projectM-ax-check-gl.patch b/patches/projectM-ax-check-gl.patch new file mode 100644 index 0000000..cb27ffc --- /dev/null +++ b/patches/projectM-ax-check-gl.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 31c9e37..28f6658 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,3 +8,3 @@ AC_PROG_CXX + AC_CONFIG_MACRO_DIRS([m4 m4/autoconf-archive]) +-AX_CHECK_GL ++USDX_AX_CHECK_GL + AC_CHECK_LIB(c, dlopen, LIBDL="", AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")) +diff --git a/m4/autoconf-archive/ax_check_gl.m4 b/m4/autoconf-archive/ax_check_gl.m4 +index 92c8919..0c6f7d2 100644 +--- a/m4/autoconf-archive/ax_check_gl.m4 ++++ b/m4/autoconf-archive/ax_check_gl.m4 +@@ -251,7 +251,7 @@ AC_DEFUN_ONCE([_WITH_XQUARTZ_GL],[ + # [CFLAGS="$GL_CFLAGS $CFLAGS" + # LIBS="$GL_LIBS $LIBS"] + # ) +-AC_DEFUN([AX_CHECK_GL], ++AC_DEFUN([USDX_AX_CHECK_GL], + [AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR([GL_CFLAGS],[C compiler flags for GL, overriding configure script defaults])