diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 837e38076c..b6cf1e27ba 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -211,11 +211,6 @@ # Windowmanager to use (fluxbox / none) WINDOWMANAGER="fluxbox" -# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) -# Space separated list is supported, -# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia" - GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia nvidia-legacy vmware virtio" - # build and install remote support (yes / no) REMOTE_SUPPORT="yes" diff --git a/packages/mediacenter/kodi/config/appliance-gbm-generic.xml b/packages/mediacenter/kodi/config/appliance-gbm-generic.xml new file mode 100644 index 0000000000..4631db78b3 --- /dev/null +++ b/packages/mediacenter/kodi/config/appliance-gbm-generic.xml @@ -0,0 +1,12 @@ + + +
+ + + + true + + + +
+ diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 6ab0c92e48..bf16236492 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -178,7 +178,11 @@ configure_package() { KODI_PLAYER="-DCORE_PLATFORM_NAME=gbm -DAPP_RENDER_SYSTEM=gles" CFLAGS+=" -DEGL_NO_X11" CXXFLAGS+=" -DEGL_NO_X11" - PKG_APPLIANCE_XML="${PKG_DIR}/config/appliance-gbm.xml" + 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 diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 614515e64c..71ff9b1ff7 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -64,6 +64,12 @@ else PKG_FFMPEG_VAAPI="--disable-vaapi" fi +if [ "${DISPLAYSERVER}" != "x11" ]; then + PKG_DEPENDS_TARGET+=" libdrm" + PKG_NEED_UNPACK+=" $(get_pkg_directory libdrm)" + PKG_FFMPEG_VAAPI=" --enable-libdrm" +fi + if [ "${VDPAU_SUPPORT}" = "yes" -a "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET+=" libvdpau" PKG_NEED_UNPACK+=" $(get_pkg_directory libvdpau)" diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch new file mode 100644 index 0000000000..a75bc13437 --- /dev/null +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch @@ -0,0 +1,39 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2018-01-31 11:06:08.000000000 -0800 ++++ b/configure.ac 2018-12-05 16:32:04.016734637 -0800 +@@ -2,13 +2,6 @@ + AC_CONFIG_SRCDIR(rules/base.xml.in) + AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +-# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC +-m4_ifndef([XORG_MACROS_VERSION], +- [m4_fatal([must install xorg-macros 1.12 or later before +- running autoconf/autogen])]) +-XORG_MACROS_VERSION(1.12) +-XORG_MANPAGE_SECTIONS +-XORG_WITH_XSLTPROC + AC_PROG_SED + + AC_SUBST(VERSION) +diff -Naur a/man/Makefile.am b/man/Makefile.am +--- a/man/Makefile.am 2018-01-31 11:06:08.000000000 -0800 ++++ b/man/Makefile.am 2018-12-05 16:35:35.787618428 -0800 +@@ -1,18 +1,2 @@ + EXTRA_DIST = man.xsl + +-if HAVE_XSLTPROC +-miscmandir = $(MISC_MAN_DIR) +-miscman_PRE = xkeyboard-config.man +-miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@) +-CLEANFILES = $(miscman_DATA) $(miscman_PRE) +-SUFFIXES = .$(MISC_MAN_SUFFIX) .man +-MAN_SUBSTS += -e 's|__xkb_base__|$(xkb_base)|g' +- +-xkeyboard-config.man: $(top_srcdir)/rules/evdev.xml $(srcdir)/man.xsl +- $(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_srcdir)/rules/evdev.xml > $@ +- +-# First sed swaps @appmansuffix@ back to __appmansuffix__ for the MAN_SUBSTS +-.man.$(MISC_MAN_SUFFIX): +- $(SED) -e 's|@\(\<[a-z_]*\>\)@|__\1__|g' < $< | $(SED) $(MAN_SUBSTS) > $@ +- +-endif diff --git a/projects/Generic/filesystem/etc/X11/xorg-i915.conf b/projects/Generic/devices/Generic-legacy/filesystem/etc/X11/xorg-i915.conf similarity index 100% rename from projects/Generic/filesystem/etc/X11/xorg-i915.conf rename to projects/Generic/devices/Generic-legacy/filesystem/etc/X11/xorg-i915.conf diff --git a/projects/Generic/filesystem/usr/bin/intel-fullrange.sh b/projects/Generic/devices/Generic-legacy/filesystem/usr/bin/intel-fullrange.sh similarity index 100% rename from projects/Generic/filesystem/usr/bin/intel-fullrange.sh rename to projects/Generic/devices/Generic-legacy/filesystem/usr/bin/intel-fullrange.sh diff --git a/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service b/projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service similarity index 100% rename from projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service rename to projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange-resume.service diff --git a/projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange.service b/projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange.service similarity index 100% rename from projects/Generic/filesystem/usr/lib/systemd/system/intel-fullrange.service rename to projects/Generic/devices/Generic-legacy/filesystem/usr/lib/systemd/system/intel-fullrange.service diff --git a/projects/Generic/devices/Generic-legacy/options b/projects/Generic/devices/Generic-legacy/options new file mode 100644 index 0000000000..e4a7104fa6 --- /dev/null +++ b/projects/Generic/devices/Generic-legacy/options @@ -0,0 +1,19 @@ +# OpenGL(X) implementation to use (no / mesa) + OPENGL="mesa" + +# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) + OPENGLES="no" + +# Displayserver to use (x11 / no) + DISPLAYSERVER="x11" + +# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) + KODIPLAYER_DRIVER="default" + +# set the addon project + ADDON_PROJECT="Generic" + +# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) +# Space separated list is supported, +# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia" + GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 nvidia nvidia-legacy vmware virtio" diff --git a/projects/Generic/devices/Generic/options b/projects/Generic/devices/Generic/options new file mode 100644 index 0000000000..4498372421 --- /dev/null +++ b/projects/Generic/devices/Generic/options @@ -0,0 +1,19 @@ +# OpenGL(X) implementation to use (no / mesa) + OPENGL="no" + +# OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) + OPENGLES="mesa" + +# Displayserver to use (x11 / no) + DISPLAYSERVER="no" + +# KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) + KODIPLAYER_DRIVER="mesa" + +# set the addon project + ADDON_PROJECT="Generic" + +# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia) +# Space separated list is supported, +# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia" + GRAPHIC_DRIVERS="r300 r600 radeonsi iris i915 i965 vmware virtio" diff --git a/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh b/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh index 0e4f1fac42..cc25de5bfe 100644 --- a/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh +++ b/projects/Generic/filesystem/usr/share/bootloader/canupdate.sh @@ -1,2 +1,9 @@ -# Allow upgrades from Virtual to Generic -[ "$1" = "Virtual.x86_64" ] && exit 0 || exit 1 +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) + +# Allow upgrades between different Generic builds +if [ "$1" = "Virtual.x86_64" -o "$1" = "Generic-legacy.x86_64" -o "$1" = "Generic.x86_64" ]; then + exit 0 +else + exit 1 +fi diff --git a/projects/Generic/options b/projects/Generic/options index 0dabb88226..dca9b367d2 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -50,18 +50,6 @@ # build and install ALSA Audio support (yes / no) ALSA_SUPPORT="yes" - # OpenGL(X) implementation to use (no / mesa) - OPENGL="mesa" - - # OpenGL-ES implementation to use (no / bcm2835-driver / gpu-viv-bin-mx6q) - OPENGLES="no" - - # Displayserver to use (x11 / no) - DISPLAYSERVER="x11" - - # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap) - KODIPLAYER_DRIVER="default" - # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"