Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generic: switch to OpenGL #9781

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Generic: switch to OpenGL #9781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/graphics/glu/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ PKG_DEPENDS_TARGET="toolchain libglvnd mesa"
PKG_NEED_UNPACK="$(get_pkg_directory mesa)"
PKG_LONGDESC="libglu is the The OpenGL utility library"

PKG_MESON_OPTS_TARGET="-Dgl_provider=gl"
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_MESON_OPTS_TARGET="-Dgl_provider=gl"
else
PKG_MESON_OPTS_TARGET="-Dgl_provider=glvnd"
fi
4 changes: 3 additions & 1 deletion packages/graphics/mesa/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ if listcontains "${GRAPHIC_DRIVERS}" "iris"; then
PKG_MESON_OPTS_TARGET+=" -Dintel-clc=system"
fi

if listcontains "${GRAPHIC_DRIVERS}" "(nvidia|nvidia-ng)"; then
if listcontains "${GRAPHIC_DRIVERS}" "(nvidia|nvidia-ng" ||
[ "${OPENGL_SUPPORT}" = "yes" ] &&
[ "${DISPLAYSERVER}" != "x11" ]; then
PKG_DEPENDS_TARGET+=" libglvnd"
PKG_MESON_OPTS_TARGET+=" -Dglvnd=enabled"
else
Expand Down
32 changes: 18 additions & 14 deletions packages/mediacenter/kodi/package.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@ configure_package() {
-DAPP_RENDER_SYSTEM=gles \
-DWAYLANDPP_SCANNER=${TOOLCHAIN}/bin/wayland-scanner++ \
-DWAYLANDPP_PROTOCOLS_DIR=${SYSROOT_PREFIX}/usr/share/waylandpp/protocols"
else # GBM
if [ ! "${KODIPLAYER_DRIVER}" = "default" ]; then
PKG_DEPENDS_TARGET+=" ${KODIPLAYER_DRIVER}"
fi
PKG_DEPENDS_TARGET+=" libinput libdisplay-info"
KODI_PLATFORM="-DCORE_PLATFORM_NAME=gbm"
if [ ! "${OPENGL}" = "no" ]; then
KODI_PLATFORM+=" -DAPP_RENDER_SYSTEM=gl"
else
KODI_PLATFORM+=" -DAPP_RENDER_SYSTEM=gles"
fi
CFLAGS+=" -DEGL_NO_X11"
CXXFLAGS+=" -DEGL_NO_X11"
if [ "${PROJECT}" = "Generic" ]; then
PKG_APPLIANCE_XML="${PKG_DIR}/config/appliance-gbm-generic.xml"
else
PKG_APPLIANCE_XML="${PKG_DIR}/config/appliance-gbm.xml"
fi
fi

if [ ! "${OPENGL}" = "no" ]; then
Expand Down Expand Up @@ -217,20 +235,6 @@ configure_package() {
KODI_ARCH="-DWITH_ARCH=${TARGET_ARCH}"
fi

if [ ! "${KODIPLAYER_DRIVER}" = "default" -a "${DISPLAYSERVER}" = "no" ]; then
PKG_DEPENDS_TARGET+=" ${KODIPLAYER_DRIVER} libinput libdisplay-info"
if [ "${OPENGLES_SUPPORT}" = yes -a "${KODIPLAYER_DRIVER}" = "${OPENGLES}" ]; then
KODI_PLATFORM="-DCORE_PLATFORM_NAME=gbm -DAPP_RENDER_SYSTEM=gles"
CFLAGS+=" -DEGL_NO_X11"
CXXFLAGS+=" -DEGL_NO_X11"
if [ "${PROJECT}" = "Generic" ]; then
PKG_APPLIANCE_XML="${PKG_DIR}/config/appliance-gbm-generic.xml"
else
PKG_APPLIANCE_XML="${PKG_DIR}/config/appliance-gbm.xml"
fi
fi
fi

if [ "${PROJECT}" = "Allwinner" -o "${PROJECT}" = "Rockchip" -o "${PROJECT}" = "RPi" ]; then
PKG_PATCH_DIRS+=" drmprime-filter"
fi
Expand Down
4 changes: 2 additions & 2 deletions projects/Generic/devices/gbm/options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# OpenGL(X) implementation to use (mesa / no)
OPENGL="no"
OPENGL="mesa"

# OpenGL-ES implementation to use (mesa / no)
OPENGLES="mesa"
OPENGLES="no"

# Vulkan implementation to use (vulkan-loader / no)
VULKAN="no"
Expand Down