python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-29 11:26:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200 from radarhere/xcb

Browse Source 
Migrated from deprecated xproto to xorgproto
This commit is contained in:
Andrew Murray 2021-05-16 11:02:06 +10:00 committed by GitHub
commit 70fb68c093
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.sh
View File

@ -49,17 +49,16 @@ function pre_build {
BUILD_PREFIX=`dirname $(dirname $(which python))` BUILD_PREFIX=`dirname $(dirname $(which python))`
PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig" PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig"
fi fi
if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then
build_simple xcb-proto 1.14.1 https://xcb.freedesktop.org/dist build_simple xcb-proto 1.14.1 https://xcb.freedesktop.org/dist
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
build_simple xproto 7.0.31 https://www.x.org/pub/individual/proto build_simple xorgproto 2021.4 https://www.x.org/pub/individual/proto
cp venv/share/pkgconfig/xproto.pc venv/lib/pkgconfig/xproto.pc
build_simple libXau 1.0.9 https://www.x.org/pub/individual/lib build_simple libXau 1.0.9 https://www.x.org/pub/individual/lib
build_simple libpthread-stubs 0.4 https://xcb.freedesktop.org/dist build_simple libpthread-stubs 0.4 https://xcb.freedesktop.org/dist
else else
sed -i s/\${pc_sysrootdir\}// /usr/local/lib/pkgconfig/xcb-proto.pc sed -i s/\${pc_sysrootdir\}// /usr/local/lib/pkgconfig/xcb-proto.pc
fi fi
build_simple libxcb $LIBXCB_VERSION https://xcb.freedesktop.org/dist build_simple libxcb $LIBXCB_VERSION https://xcb.freedesktop.org/dist
fi
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
BUILD_PREFIX=$ORIGINAL_BUILD_PREFIX BUILD_PREFIX=$ORIGINAL_BUILD_PREFIX
PKG_CONFIG_PATH=$ORIGINAL_PKG_CONFIG_PATH PKG_CONFIG_PATH=$ORIGINAL_PKG_CONFIG_PATH
@ -132,13 +131,10 @@ EXP_CODECS="jpg jpg_2000"
EXP_CODECS="$EXP_CODECS libtiff zlib" EXP_CODECS="$EXP_CODECS libtiff zlib"
EXP_MODULES="freetype2 littlecms2 pil tkinter webp" EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
if [ -z "$IS_MACOS" ] && [[ "$MB_PYTHON_VERSION" != pypy3* ]] && [[ "$MACHTYPE" != aarch64* ]]; then if [ -z "$IS_MACOS" ] && [[ "$MB_PYTHON_VERSION" != pypy3* ]] && [[ "$MACHTYPE" != aarch64* ]]; then
EXP_FEATURES="fribidi harfbuzz raqm transp_webp webp_anim webp_mux" EXP_FEATURES="fribidi harfbuzz raqm transp_webp webp_anim webp_mux xcb"
else else
# can't find FriBiDi # can't find FriBiDi
EXP_FEATURES="transp_webp webp_anim webp_mux" EXP_FEATURES="transp_webp webp_anim webp_mux xcb"
fi
if [[ $MACOSX_DEPLOYMENT_TARGET != "11.0" ]]; then
EXP_FEATURES="$EXP_FEATURES xcb"
fi fi
function run_tests { function run_tests {