diff --git a/groups.d/231.native_packages_etc.d/ltris.package b/groups.d/231.native_packages_etc.d/ltris.package index 3bfc9be..810389f 100644 --- a/groups.d/231.native_packages_etc.d/ltris.package +++ b/groups.d/231.native_packages_etc.d/ltris.package @@ -1,7 +1,7 @@ : ${PKG_LTRIS_DEPENDS:="sdl1"}; -: ${PKG_LTRIS_SHA256SUM:=0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8}; -: ${PKG_LTRIS_VERSION:=1.2.3}; -: ${PKG_LTRIS_URL:=https://sources.voidlinux-ppc.org/ltris-${PKG_LTRIS_VERSION}/ltris-${PKG_LTRIS_VERSION}.tar.gz}; +: ${PKG_LTRIS_SHA256SUM:=ff28c55a18c61f28a86ba7f30f13222dfed0f7fbeb492acd95c97de9c659cec9}; +: ${PKG_LTRIS_VERSION:=1.3.2}; +: ${PKG_LTRIS_URL:=https://mirror.midipix.org/ltris/ltris-${PKG_LTRIS_VERSION}.tar.gz}; : ${PKG_LTRIS_CONFIGURE_ARGS_EXTRA:="--with-sdl-prefix=${PREFIX_NATIVE} SDL_LIBS=-L${PREFIX_NATIVE}/lib SDL_CFLAGS=-I${PREFIX_NATIVE}/include"}; : ${PKG_LTRIS_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/SDL -std=gnu99"}; : ${PKG_LTRIS_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib -L${PREFIX_NATIVE}/lib/w32lib"}; diff --git a/patches/ltris-1.2.2_pre.local.patch b/patches/ltris-1.2.2_pre.local.patch deleted file mode 100644 index 9d7be77..0000000 --- a/patches/ltris-1.2.2_pre.local.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ru ltris-1.2.2.orig/configure ltris-1.2.2/configure ---- ltris-1.2.2.orig/configure 2020-12-28 12:58:30.000000000 +0100 -+++ ltris-1.2.2/configure 2021-01-12 16:47:35.063828462 +0100 -@@ -9089,8 +9089,8 @@ - if test "$SDL_CONFIG" = "no" ; then - no_sdl=yes - else -- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ SDL_CFLAGS=`$PKG_CONFIG --cflags sdl` -+ SDL_LIBS=`$PKG_CONFIG --libs sdl` - - sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -@@ -9249,8 +9249,8 @@ - - rm -f conf.sdltest - --CFLAGS="$CFLAGS $(sdl-config --cflags)" --LIBS="$LIBS $(sdl-config --libs)" -+CFLAGS="$CFLAGS $(PKG_CONFIG --cflags sdl)" -+LIBS="$LIBS $(PKG_CONFIG --libs sdl)" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lSDL_mixer" >&5 - $as_echo_n "checking for main in -lSDL_mixer... " >&6; } diff --git a/patches/ltris-1.3.2_pre.local.patch b/patches/ltris-1.3.2_pre.local.patch new file mode 100644 index 0000000..2128587 --- /dev/null +++ b/patches/ltris-1.3.2_pre.local.patch @@ -0,0 +1,25 @@ +diff -ru ltris-1.3.2.orig/configure ltris-1.3.2/configure +--- ltris-1.3.2.orig/configure 2024-06-08 11:24:48.000000000 +0200 ++++ ltris-1.3.2/configure 2024-08-09 10:45:55.135090962 +0200 +@@ -7320,8 +7320,8 @@ + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else +- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags` +- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs` ++ SDL_CFLAGS=`$PKG_CONFIG --cflags sdl` ++ SDL_LIBS=`$PKG_CONFIG --libs sdl` + + sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -7514,8 +7514,8 @@ + + else + +- CFLAGS="$CFLAGS $($SDL_CONFIG --cflags)" +- LIBS="$LIBS $($SDL_CONFIG --libs)" ++ CFLAGS="$CFLAGS $($PKG_CONFIG --cflags sdl)" ++ LIBS="$LIBS $($PKG_CONFIG --libs sdl)" + + fi +