misc fixes

This commit is contained in:
linsui 2023-12-06 01:21:17 +08:00
parent b7e9097205
commit 969566aa75
5 changed files with 37 additions and 15 deletions

View file

@ -653,6 +653,7 @@ Builds:
- versionName: 3.1.9 - versionName: 3.1.9
versionCode: 104202 versionCode: 104202
disable: https://codeberg.org/NullPointerException/PipePipe/issues/96
commit: 935244400b3b44aa04c29bb2266f271a83a7c12a commit: 935244400b3b44aa04c29bb2266f271a83a7c12a
subdir: PipePipeClient/app subdir: PipePipeClient/app
submodules: true submodules: true

View file

@ -934,24 +934,25 @@ Builds:
gradle: gradle:
- fdroid - fdroid
srclibs: srclibs:
- MuPDF@1.23.5 - MuPDF@1.23.7
rm: rm:
- Builder/src/libs - Builder/src/libs
prebuild: prebuild:
- export MUPDF_VERSION=1.23.7
- sed -i -e '/^if.*Fdroid/,/^}/d' -e '/enable true/d' -e '/_appGdriveKey/d' - sed -i -e '/^if.*Fdroid/,/^}/d' -e '/enable true/d' -e '/_appGdriveKey/d'
-e '/_admob/d' build.gradle -e '/_admob/d' build.gradle
- mkdir src/main/jniLibs - mkdir src/main/jniLibs
- cd ../Builder - cd ../Builder
- sed -i -e '/^#!/a\set -e' -e '/git clone/d' -e 's/mkdir/mkdir -p/g' -e 's|".*ndk-build"|"$$NDK$$/ndk-build"|' - sed -i -e '/^#!/a\set -e' -e '/git clone/d' -e 's/mkdir/mkdir -p/g' -e 's|".*ndk-build"|"$$NDK$$/ndk-build"|'
-e 's|^.*ndk-build$|$$NDK$$/ndk-build -j`nproc`|' link_to_mupdf_1.23.5.sh -e 's|^.*ndk-build$|$$NDK$$/ndk-build -j`nproc`|' link_to_mupdf_$MUPDF_VERSION.sh
- cp -r $$MuPDF$$ mupdf-1.23.5 - cp -r $$MuPDF$$ mupdf-$MUPDF_VERSION
- rm -rf mupdf-1.23.5/thirdparty/{harfbuzz/test,curl/tests,leptonica/prog/fuzzing} - rm -rf mupdf-$MUPDF_VERSION/thirdparty/{harfbuzz/test,curl/tests,leptonica/prog/fuzzing}
scanignore: scanignore:
- Builder/fonts/fonts.zip - Builder/fonts/fonts.zip
- app/src/fdroid/assets/fonts.zip - app/src/fdroid/assets/fonts.zip
build: build:
- pushd ../Builder/ - pushd ../Builder/
- ./link_to_mupdf_1.23.5.sh - ./link_to_mupdf_1.23.7.sh
ndk: r26b ndk: r26b
MaintainerNotes: |- MaintainerNotes: |-

View file

@ -167,24 +167,44 @@ Builds:
- versionName: 4.12.0 - versionName: 4.12.0
versionCode: 87 versionCode: 87
disable: No native libs
commit: 8a42a3327d76649d70a7c17c46e926e3275079c3 commit: 8a42a3327d76649d70a7c17c46e926e3275079c3
subdir: app subdir: app
sudo:
- apt-get update
- apt-get install -y make autoconf automake gcc-multilib libc-dev
gradle: gradle:
- yes - yes
srclibs: srclibs:
- Volley@1.1.0 - Libxmp@libxmp-4.6.0
- Volley@1.2.0
- Groundy@e90baf9901a8be20b348bd1575d5ad782560cec8 - Groundy@e90baf9901a8be20b348bd1575d5ad782560cec8
prebuild: mv $$Volley$$/* ../volley prebuild:
- sed -i -e 's/3.1.4/4.0.1/' ../build.gradle
- sed -i -e 's/4.4/6.1.1/' ../gradle/wrapper/gradle-wrapper.properties
- sed -i -e '/groundy/d' build.gradle
- mv $$Volley$$/* ../volley
- cp -a $$Groundy$$/src .
- ln -s $$Libxmp$$ src/main/jni/libxmp
- sed -i -e 's|\.\./../../../../../||g' src/main/jni/Android.mk
- sed -i -e 's/armeabi armeabi-v7a x86/armeabi-v7a arm64-v8a x86 x86_64/' src/main/jni/{.,libxmp/jni}/Application.mk
- sed -i -e '5a#include <string.h>' -e 's/return drop_audio();/drop_audio();return
0;/' src/main/jni/xmp-jni.c
- sed -i -e '/close_audio/avoid drop_audio(void);' src/main/jni/audio.h
- sed -i -e '1a#include <unistd.h>' src/main/jni/opensl.c
scandelete: scandelete:
- app/libs - app/libs
build: build:
- pushd $$Groundy$$ - pushd src/main/jni/libxmp
- sed -i -e "s/, 'compiler', 'examples'//" -e '/compiler/d' ../settings.gradle - autoconf
- sed -i -e '/repo.maven.apache.org/a jcenter()' ../build.gradle - ./configure
- gradle build - $$NDK$$/ndk-build
- popd - popd
- mv $$Groundy$$/build/libs/groundy-1.5.jar libs - cd src/main
ndk: r21e - $$NDK$$/ndk-build
ndk: r26b
gradleprops:
- android.useAndroidX=true
MaintainerNotes: The most recent libxmp version should be fine for all builds. MaintainerNotes: The most recent libxmp version should be fine for all builds.

View file

@ -340,6 +340,7 @@ Builds:
- versionName: 1.13.0 - versionName: 1.13.0
versionCode: 40 versionCode: 40
disable: https://github.com/localsend/localsend/issues/995
commit: 13face1eda730aabb90af9cf5e2be94d2c60821d commit: 13face1eda730aabb90af9cf5e2be94d2c60821d
subdir: app subdir: app
submodules: true submodules: true

View file

@ -1,3 +1,2 @@
RepoType: git RepoType: git
Repo: git://git.code.sf.net/p/xmp/libxmp Repo: https://github.com/libxmp/libxmp.git