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.

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

Added a option to use X11 for Generic builds #640

Open
wants to merge 21 commits into
base: lakka
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
13 changes: 9 additions & 4 deletions distributions/Lakka/options
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,16 @@
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia nouveau"
if [ "$TARGET_ARCH" = "i386" ]; then
# TODO: create Legacy build with OpenELEC-4.2
# install legacy drivers to i386 ARCH
GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nouveau"
GRAPHIC_DRIVERS="r200 r300 r600 i915 i965"
elif [ "$TARGET_ARCH" = "x86_64" ]; then
GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nouveau"
GRAPHIC_DRIVERS="r300 r600 i915 i965"
fi

# Use nvidia-binary drivers when using X11, otherwise use nouveau
if [ "$X11SERVER" == "yes" ]; then
GRAPHIC_DRIVERS="$GRAPHIC_DRIVERS nvidia nvidia-legacy"
else
GRAPHIC_DRIVERS="$GRAPHIC_DRIVERS nouveau"
fi

# build and install remote support (yes / no)
Expand Down
6 changes: 5 additions & 1 deletion packages/graphics/mesa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
--disable-gles1 \
--disable-gles2 \
--enable-dri \
--disable-dri3 \
--enable-dri3 \
--enable-glx \
--disable-osmesa \
--disable-gallium-osmesa \
Expand Down Expand Up @@ -97,6 +97,10 @@ PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
--with-dri-drivers=$DRI_DRIVERS \
--with-sysroot=$SYSROOT_PREFIX"

pre_configure_target() {
export LIBS="-lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence"
}

post_makeinstall_target() {
if [ "$DISPLAYSERVER" == "x11" ]; then
# rename and relink for cooperate with nvidia drivers
Expand Down
6 changes: 4 additions & 2 deletions packages/libretro/retroarch/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ if [ "$AVAHI_DAEMON" = yes ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi nss-mdns"
fi

if [ "$OPENGLES" == "no" ]; then
RETROARCH_GL="--enable-kms"
if [ "$DISPLAYSERVER" == "x11" ]; then
RETROARCH_GL="--enable-x11 --disable-kms"
elif [ "$OPENGLES" == "no" ]; then
RETROARCH_GL="--enable-kms --disable-x11"
elif [ "$OPENGLES" == "bcm2835-driver" ]; then
RETROARCH_GL="--enable-opengles --disable-kms --disable-x11"
CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads \
Expand Down
Loading