From f2551d8a330f49451f2b68aa2f2a21995b2b6d7a Mon Sep 17 00:00:00 2001 From: linsui <2873532-linsui@users.noreply.gitlab.com> Date: Tue, 25 Jun 2024 13:59:15 +0800 Subject: [PATCH] videlibri: pin fpc to 3.2.2 --- metadata/de.benibela.videlibri.yml | 35 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/metadata/de.benibela.videlibri.yml b/metadata/de.benibela.videlibri.yml index 74c03276e2..168e9b0007 100644 --- a/metadata/de.benibela.videlibri.yml +++ b/metadata/de.benibela.videlibri.yml @@ -1069,7 +1069,6 @@ Builds: - versionName: '2.850' versionCode: 2850 - disable: https://github.com/benibela/videlibri/issues/13 commit: bad6155c2cf766cc1063bc085ef846c7de7900a8 subdir: android/android sudo: @@ -1078,7 +1077,7 @@ Builds: gradle: - yes srclibs: - - fpc@fixes_3_2 + - fpc@release_3_2_2 build: - releasedate="$(git show -s --format=%cs) 23:59:59-12" - pushd .. @@ -1102,39 +1101,39 @@ Builds: - export PATH=$$NDK$$/toolchains/x86_64-4.9/prebuilt/linux-x86_64/bin:$PATH - echo $PATH > path.txt - make crossinstall OS_TARGET=android CPU_TARGET=arm INSTALL_PREFIX=$(pwd)/install - PP=$$fpc$$/install/lib/fpc/3.2.0/ppcx64 + PP=$$fpc$$/install/lib/fpc/3.2.2/ppcx64 - make crossinstall OS_TARGET=android CPU_TARGET=aarch64 INSTALL_PREFIX=$(pwd)/install - PP=$$fpc$$/install/lib/fpc/3.2.0/ppcx64 + PP=$$fpc$$/install/lib/fpc/3.2.2/ppcx64 - make crossinstall OS_TARGET=android CPU_TARGET=i386 INSTALL_PREFIX=$(pwd)/install - PP=$$fpc$$/install/lib/fpc/3.2.0/ppcx64 + PP=$$fpc$$/install/lib/fpc/3.2.2/ppcx64 - make crossinstall OS_TARGET=android CPU_TARGET=x86_64 INSTALL_PREFIX=$(pwd)/install - PP=$$fpc$$/install/lib/fpc/3.2.0/ppcx64 + PP=$$fpc$$/install/lib/fpc/3.2.2/ppcx64 - popd - mkdir -p libs/armeabi/ libs/x86/ libs/arm64-v8a/ libs/x86_64/ - cd .. - sed -i -e '/PASDBL/d' internettools/internettoolsconfig.inc - echo "'f-droid'" > ../videlibribuildid.inc - - $$fpc$$/install/lib/fpc/3.2.3/ppcrossarm -Parm -B -Tandroid -MObjFPC -Scghi - -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.3/units/* - -Fu$$fpc$$/install/lib/fpc/3.2.3/units/arm-android/* -Fuinternettools/data + - $$fpc$$/install/lib/fpc/3.2.2/ppcrossarm -Parm -B -Tandroid -MObjFPC -Scghi + -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.2/units/* + -Fu$$fpc$$/install/lib/fpc/3.2.2/units/arm-android/* -Fuinternettools/data -Fiinternettools/data -Fuinternettools/internet -Fuinternettools/system -Fuflre/src -Furcmdline -Fl$$NDK$$/platforms/android-21/arch-arm/usr/lib -oandroid/libs/armeabi/liblclapp.so videlibriandroid.pas - - $$fpc$$/install/lib/fpc/3.2.3/ppcrossa64 -Paarch64 -B -Tandroid -MObjFPC -Scghi - -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.3/units/* - -Fu$$fpc$$/install/lib/fpc/3.2.3/units/aarch64-android/* -Fuinternettools/data + - $$fpc$$/install/lib/fpc/3.2.2/ppcrossa64 -Paarch64 -B -Tandroid -MObjFPC -Scghi + -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.2/units/* + -Fu$$fpc$$/install/lib/fpc/3.2.2/units/aarch64-android/* -Fuinternettools/data -Fiinternettools/data -Fuinternettools/internet -Fuinternettools/system -Fuflre/src -Furcmdline -Fl$$NDK$$/platforms/android-21/arch-arm64/usr/lib -oandroid/libs/arm64-v8a/liblclapp.so videlibriandroid.pas - - $$fpc$$/install/lib/fpc/3.2.3/ppcross386 -Pi386 -B -Tandroid -MObjFPC -Scghi - -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.3/units/* - -Fu$$fpc$$/install/lib/fpc/3.2.3/units/i386-android/* -Fuinternettools/data + - $$fpc$$/install/lib/fpc/3.2.2/ppcross386 -Pi386 -B -Tandroid -MObjFPC -Scghi + -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.2/units/* + -Fu$$fpc$$/install/lib/fpc/3.2.2/units/i386-android/* -Fuinternettools/data -Fiinternettools/data -Fuinternettools/internet -Fuinternettools/system -Fuflre/src -Furcmdline -Fl$$NDK$$/platforms/android-21/arch-x86/usr/lib -oandroid/libs/x86/liblclapp.so videlibriandroid.pas - - $$fpc$$/install/lib/fpc/3.2.3/ppcrossx64 -Px86_64 -B -Tandroid -MObjFPC -Scghi - -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.3/units/* - -Fu$$fpc$$/install/lib/fpc/3.2.3/units/x86_64-android/* -Fuinternettools/data + - $$fpc$$/install/lib/fpc/3.2.2/ppcrossx64 -Px86_64 -B -Tandroid -MObjFPC -Scghi + -O1 -Xs -XX -l -vewnhibq -dANDROID -Xd -gl -Fu.. -Fu$$fpc$$/install/lib/fpc/3.2.2/units/* + -Fu$$fpc$$/install/lib/fpc/3.2.2/units/x86_64-android/* -Fuinternettools/data -Fiinternettools/data -Fuinternettools/internet -Fuinternettools/system -Fuflre/src -Furcmdline -Fl$$NDK$$/platforms/android-21/arch-x86_64/usr/lib64 -oandroid/libs/x86_64/liblclapp.so videlibriandroid.pas