diff --git a/packages/asymptote/build.sh b/packages/asymptote/build.sh index 6e7dd4ab41..662de7f521 100644 --- a/packages/asymptote/build.sh +++ b/packages/asymptote/build.sh @@ -2,32 +2,17 @@ TERMUX_PKG_HOMEPAGE=https://asymptote.sourceforge.io/ TERMUX_PKG_DESCRIPTION="A powerful descriptive vector graphics language for technical drawing" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=(2.89) -TERMUX_PKG_VERSION+=(1.0.1) -TERMUX_PKG_SRCURL=(https://downloads.sourceforge.net/asymptote/asymptote-${TERMUX_PKG_VERSION}.src.tgz - https://github.com/g-truc/glm/archive/${TERMUX_PKG_VERSION[1]}.tar.gz) -TERMUX_PKG_SHA256=(f64e62b4ee4f85f1a78640c4f1e8a6f98e91f54edacab19727c7cabe94a57f5b - 9f3174561fd26904b23f0db5e560971cbf9b3cbda0b280f04d5c379d03bf234c) +TERMUX_PKG_VERSION=2.95 +TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/asymptote/asymptote-${TERMUX_PKG_VERSION}.src.tgz +TERMUX_PKG_SHA256=15604fd02cb6ddbc5b807529d2e6fc617c825a184dd0d7b71390c567aeac78e7 TERMUX_PKG_AUTO_UPDATE=false TERMUX_PKG_DEPENDS="fftw, libc++, libtirpc, zlib, ncurses, readline" +TERMUX_PKG_BUILD_DEPENDS="glm" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-gc " -termux_step_post_get_source() { - mv glm-${TERMUX_PKG_VERSION[1]} glm -} - -termux_step_pre_configure() { - touch GL/glu.h - - local glm_inc=$TERMUX_PKG_BUILDDIR/_glm/include - mkdir -p $glm_inc - cp -r glm/glm $glm_inc/ - CPPFLAGS+=" -I${glm_inc}" -} - termux_step_make_install() { install -Dm700 -t $TERMUX_PREFIX/bin asy cp -rT base $TERMUX_PREFIX/share/asymptote diff --git a/packages/asymptote/configure.patch b/packages/asymptote/configure.patch index 07dd174ad9..832ea5554a 100644 --- a/packages/asymptote/configure.patch +++ b/packages/asymptote/configure.patch @@ -1,6 +1,15 @@ ---- a/configure -+++ b/configure -@@ -5911,7 +5911,7 @@ +--- asymptote-2.95/configure 2024-11-25 14:49:19.000000000 +0530 ++++ asymptote-2.95.mod/configure 2025-01-22 20:05:44.133806620 +0530 +@@ -4591,7 +4591,7 @@ + then : + printf %s "(cached) " >&6 + else $as_nop +- test "$cross_compiling" = yes && ++ false && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$VCPKG_ROOT/vcpkg"; then + eval "$as_ac_File=yes" +@@ -6940,7 +6940,7 @@ then : printf %s "(cached) " >&6 else $as_nop @@ -9,21 +18,12 @@ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "$GCFILE.tar.gz"; then eval "$as_ac_File=yes" -@@ -5947,7 +5947,7 @@ - case _$ac_cv_use_gc in - _|_system|_*[\\/]*) - if test "x$ac_cv_use_gc" = "xsystem" ; then -- INCL="-I. -I$prefix/include/gc -I/usr/include/gc" -+ INCL="-I. -I$prefix/include/gc" - LIBS=$LIBS"-L$prefix/lib " - else - INCL="-I$ac_cv_use_gc/include/gc" -@@ -10239,7 +10239,7 @@ - fi - - --if test "x$GCDIR" != "x" ; then -+if false; then - as_ac_File=`printf "%s\n" "ac_cv_file_$GCDIR.tar.gz" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GCDIR.tar.gz" >&5 - printf %s "checking for $GCDIR.tar.gz... " >&6; } +@@ -7025,7 +7025,7 @@ + case _$ac_cv_use_gc in + _|_system|_*[\\/]*) + if test "x$ac_cv_use_gc" = "xsystem" ; then +- INCL=$INCL" -I$prefix/include/gc -I/usr/include/gc " ++ INCL=$INCL" -I$prefix/include/gc " + LIBS=$LIBS"-L$prefix/lib " + else + INCL=$INCL" -I$ac_cv_use_gc/include/gc "