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

WIP RPi2 port #1

Merged
merged 20 commits into from
Jan 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions packages/mediacenter/ludo/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PKG_LICENSE="GPL"
PKG_SITE="https://github.com/libretro/ludo"
PKG_DEPENDS_TARGET="toolchain openal-soft"
PKG_LONGDESC="A libretro frontend written in golang."
PKG_VERSION="0.2.4"
PKG_VERSION="0.2.5"
PKG_URL="https://github.com/libretro/ludo/releases/download/v$PKG_VERSION/Ludo-Linux-$ARCH-$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="Ludo-Linux-$ARCH-$PKG_VERSION.tar.gz"
PKG_TOOLCHAIN="manual"
Expand All @@ -33,6 +33,11 @@ makeinstall_target() {
mkdir -p $INSTALL/usr/lib/libretro
cp -r ./cores/* $INSTALL/usr/lib/libretro

GLVERSION="3.2"
if [ "$GRAPHIC_DRIVERS" = "vc4" ]; then
GLVERSION="2.1"
fi

mkdir -p $INSTALL/etc
echo '{
"video_fullscreen": true,
Expand All @@ -44,7 +49,8 @@ makeinstall_target() {
"screenshots_dir": "/storage/screenshots",
"system_dir": "/storage/system",
"playlists_dir": "/storage/playlists",
"thumbnail_dir": "/storage/thumbnails"
"thumbnail_dir": "/storage/thumbnails",
"video_gl_version": "'${GLVERSION}'"
}' > $INSTALL/etc/ludo.json
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

# WARNING: DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN WHEN UPGRADING!

disable_splash=1
dtparam=audio=on
dtoverlay=vc4-kms-v3d
8 changes: 7 additions & 1 deletion packages/x11/lib/libX11/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PKG_SHA256="4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d"
PKG_LICENSE="OSS"
PKG_SITE="http://www.x.org/"
PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_TARGET="toolchain util-macros xtrans libXau libxcb"
PKG_DEPENDS_TARGET="toolchain util-macros xtrans libXau libxcb xorgproto:host"
PKG_LONGDESC="LibX11 is the main X11 library containing all the client-side code to access the X11 windowing system."
PKG_TOOLCHAIN="autotools"

Expand All @@ -30,3 +30,9 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-loadable-i18n \
--disable-ipv6 \
--without-launchd \
--without-lint"

pre_make_target() {
echo '' > $PKG_BUILD/src/util/Makefile.am
$HOST_CC $HOST_CFLAGS -I$PKG_BUILD/include $PKG_BUILD/src/util/makekeys.c -o $PKG_BUILD/.$TARGET_NAME/src/util/makekeys
}

3 changes: 3 additions & 0 deletions packages/x11/xserver/xorg-server/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,8 @@ post_makeinstall_target() {
}

post_install() {
if listcontains "$GRAPHIC_DRIVERS" "vc4"; then
enable_service xorg-configure-modesetting.service
fi
enable_service xorg.service
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Unit]
Description=configure Xorg Server for modesetting

ConditionKernelCommandLine=!installer

[Service]
Type=oneshot
ExecStart=/usr/lib/xorg/xorg-configure modesetting
RemainAfterExit=yes

[Install]
WantedBy=graphical.target
2 changes: 1 addition & 1 deletion packages/x11/xserver/xorg-server/system.d/xorg.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=Xorg Server
Before=graphical.target kodi.service
Before=graphical.target ludo.service
After=multi-user.target
ConditionKernelCommandLine=!installer

Expand Down
10 changes: 6 additions & 4 deletions projects/RPi/options
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,24 @@
ALSA_SUPPORT="yes"

# OpenGL(X) implementation to use (no / mesa)
OPENGL="no"
OPENGL="mesa"

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

# include uvesafb support (yes / no)
UVESAFB_SUPPORT="no"

# Displayserver to use (x11 / no)
DISPLAYSERVER="no"
DISPLAYSERVER="x11"

# Windowmanager to use (fluxbox / none)
WINDOWMANAGER="none"

# Xorg Graphic drivers to use (all / vc4 / none)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="vc4"
GRAPHIC_DRIVERS=""
GRAPHIC_DRIVERS="vc4"

# Use a vendor specific KODI repo
KODI_VENDOR="raspberrypi"
Expand Down Expand Up @@ -137,3 +137,5 @@
# for a list of additional drivers see packages/linux-driver-addons
# Space separated list is supported,
DRIVER_ADDONS="crazycat dvb-latest"

EXTRA_CMDLINE="ssh"