Merge pull request #905 from midoks/dev

常规更新
This commit is contained in:
Mr Chen
2026-06-17 18:21:27 +08:00
committed by GitHub
3 changed files with 27 additions and 11 deletions
+8 -8
View File
@@ -16,19 +16,19 @@ SOURCE_ROOT=$rootPath/source/lib
if [ ! -d ${SERVER_ROOT}/freetype_old ];then if [ ! -d ${SERVER_ROOT}/freetype_old ];then
cd $SOURCE_ROOT cd $SOURCE_ROOT
if [ ! -f $SOURCE_ROOT/freetype-2.7.1.tar.gz ];then if [ ! -f $SOURCE_ROOT/freetype-2.8.1.tar.gz ];then
wget -O freetype-2.7.1.tar.gz --no-check-certificate https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.gz -T 5 wget -O freetype-2.8.1.tar.gz --no-check-certificate https://download.savannah.gnu.org/releases/freetype/freetype-2.8.1.tar.gz -T 5
fi fi
if [ ! -d $SOURCE_ROOT/freetype-2.7.1 ];then if [ ! -d $SOURCE_ROOT/freetype-2.8.1 ];then
tar zxvf freetype-2.7.1.tar.gz tar zxvf freetype-2.8.1.tar.gz
cd freetype-2.7.1 cd freetype-2.8.1
else else
cd freetype-2.7.1 cd freetype-2.8.1
fi fi
./configure --prefix=${SERVER_ROOT}/freetype_old && make && make install ./configure --prefix=${SERVER_ROOT}/freetype_old && make && make install
cd $SOURCE_ROOT && rm -rf freetype-2.7.1 cd $SOURCE_ROOT && rm -rf freetype-2.8.1
cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/freetype-2.7.1 cd $SOURCE_ROOT && rm -rf $SOURCE_ROOT/freetype-2.8.1
#rm -rf freetype-2.7.1.tar.gz #rm -rf freetype-2.7.1.tar.gz
fi fi
+18 -2
View File
@@ -17,6 +17,9 @@ version=$2
LIBNAME=gd LIBNAME=gd
LIBV=0 LIBV=0
bash ${rootPath}/scripts/getos.sh
OSNAME=`cat ${rootPath}/data/osname.pl`
OSNAME_ID=`cat /etc/*-release | grep VERSION_ID | awk -F = '{print $2}' | awk -F "\"" '{print $2}'`
# if [ "$version" -lt "74" ];then # if [ "$version" -lt "74" ];then
@@ -79,11 +82,24 @@ Install_lib()
OPTIONS="$OPTIONS --with-xpm-dir" OPTIONS="$OPTIONS --with-xpm-dir"
fi fi
# if [ "debian" == "$OSNAME" ]; then
# OPTIONS="$OPTIONS --with-freetype"
# else
# find_ft2=`pkg-config --list-all | grep freetype2`
# if [ "$find_ft2" != "" ];then
# OPTIONS="$OPTIONS --with-freetype-dir=${serverPath}/lib/freetype_old"
# fi
# fi
if [ ! -f ${serverPath}/lib/freetype_old ];then
echo "freetype_old not install , check!!"
return
fi
find_ft2=`pkg-config --list-all | grep freetype2` find_ft2=`pkg-config --list-all | grep freetype2`
if [ "$find_ft2" == "" ];then if [ "$find_ft2" != "" ];then
OPTIONS="$OPTIONS --with-freetype-dir=${serverPath}/lib/freetype_old" OPTIONS="$OPTIONS --with-freetype-dir=${serverPath}/lib/freetype_old"
fi fi
#--with-xpm #--with-xpm
# =${serverPath}/lib/freetype_old # =${serverPath}/lib/freetype_old
+1 -1
View File
@@ -1,4 +1,4 @@
cryptography==36.0.1 cryptography>=46.0.7
flask==2.0.3 flask==2.0.3
pyOpenSSL==22.0.0 pyOpenSSL==22.0.0
requests==2.27.1 requests==2.27.1