Merge pull request #5313 from ToKe79/libreelec-master/fixes

cairo: set options based on OPENGL/ES
This commit is contained in:
CvH 2021-12-27 08:10:39 +01:00 committed by GitHub
commit 14ef0e70e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -74,18 +74,27 @@ pre_configure_target() {
--x-libraries="${SYSROOT_PREFIX}/usr/lib" \ --x-libraries="${SYSROOT_PREFIX}/usr/lib" \
--enable-xlib \ --enable-xlib \
--enable-xlib-xrender \ --enable-xlib-xrender \
--enable-gl \
--enable-glx \
--disable-glesv2 \
--disable-egl \
--with-x" --with-x"
else else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-xlib \ PKG_CONFIGURE_OPTS_TARGET+=" --disable-xlib \
--disable-xlib-xrender \ --disable-xlib-xrender \
--disable-gl \
--disable-glx \
--enable-glesv2 \
--enable-egl \
--without-x" --without-x"
fi fi
if [ "${OPENGL_SUPPORT}" = "yes" ]; then
PKG_CONFIGURE_OPTS_TARGET+=" --enable-gl \
--enable-glx \
--disable-glesv2 \
--disable-egl"
elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then
PKG_CONFIGURE_OPTS_TARGET+=" --disable-gl \
--disable-glx \
--enable-glesv2 \
--enable-egl"
else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-gl \
--disable-glx \
--disable-glesv2 \
--disable-egl"
fi
} }