diff options
| -rw-r--r-- | groups/231.native_packages_etc.group | 10 | ||||
| -rw-r--r-- | patches/ltris-1.2.2_pre.local.patch | 25 |
2 files changed, 34 insertions, 1 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group index c51b2339..72f27e17 100644 --- a/groups/231.native_packages_etc.group +++ b/groups/231.native_packages_etc.group @@ -6,7 +6,7 @@ NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " alsa_lib apr apr_util bdwgc bmake bochs bzip2 cherokee clzip cmake cron dante dbus dosbox doomgeneric emacs enscript expat ffmpeg file gdbm geoip gettext_tiny ghostpdl giflib gnuchess graphicsmagick gzip hastyhex hexcurse hexer htop icoutils imagemagick infounzip infozip -john lcms2 less libmetalink lolcode minizip mintty mlogin musl_compat musl_fts ncdu +john lcms2 less libmetalink lolcode ltris minizip mintty mlogin musl_compat musl_fts ncdu ncurses ncursestw ncursesw npth openjazz openjpeg p7zip pcre pcre2 popt potrace procps_ng qemu qpdf qrencode rpm rw shared_mime_info slang sqlite3 tcl tdnf texinfo tiff tmux tzdb utf8proc util_linux vim vorbis_tools w32api w32lib xorriso xpdf xz yabasic @@ -218,6 +218,14 @@ zstd")"; : ${PKG_LIBMETALINK_URL:=https://launchpad.net/libmetalink/trunk/libmetalink-${PKG_LIBMETALINK_VERSION}/+download/libmetalink-${PKG_LIBMETALINK_VERSION}.tar.bz2}; : ${PKG_LOLCODE_URLS_GIT:="lci=https://github.com/justinmeza/lci.git@master"}; : ${PKG_LOLCODE_BUILD_DIR:=lci}; +: ${PKG_LTRIS_SHA256SUM:=cf50aa5a4b7167c61fae85cdd9ea8ffbefc58b84dee756a1e279b13fb3c1b1a6}; +: ${PKG_LTRIS_VERSION:=1.2.2}; +: ${PKG_LTRIS_URL:=https://sources.voidlinux.org/ltris-${PKG_LTRIS_VERSION}/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"}; +: ${PKG_LTRIS_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib -L${PREFIX_NATIVE}/lib/w32lib"}; +: ${PKG_LTRIS_ENV_VARS_EXTRA:="LIBS=-lSDL"}; +: ${PKG_LTRIS_IN_TREE:=1}; : ${PKG_MINIZIP_DEPENDS:="bzip2 libressl libz xz"}; : ${PKG_MINIZIP_SHA256SUM:=6ef3d2e0c15352fe87a4a658b2e8f665fb0c21ddfb57a2e0a515658389d2e850}; : ${PKG_MINIZIP_VERSION:=2.10.4}; diff --git a/patches/ltris-1.2.2_pre.local.patch b/patches/ltris-1.2.2_pre.local.patch new file mode 100644 index 00000000..9d7be779 --- /dev/null +++ b/patches/ltris-1.2.2_pre.local.patch @@ -0,0 +1,25 @@ +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; } |