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

[Wayland] updated all Wayland packages, dependencies & patches #3497

Merged
merged 10 commits into from May 13, 2019
@@ -0,0 +1,27 @@
From 5efef48d74d772cb5318345aa61d94d27e0c42d1 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Fri, 22 Feb 2019 18:43:25 -0800
Subject: [PATCH] only build sfcsample when x11 is enabled

Signed-off-by: Lukas Rusak <lorusak@gmail.com>
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d28175a..12da79e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,10 +24,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

AUTOMAKE_OPTIONS = foreign

-SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample
+SUBDIRS = common decode encode vainfo videoprocess vendor/intel

if USE_X11
-SUBDIRS += putsurface
+SUBDIRS += putsurface vendor/intel/sfcsample
else
if USE_WAYLAND
SUBDIRS += putsurface
@@ -1,87 +1,91 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="cairo"
PKG_VERSION="1.14.10"
PKG_SHA256="7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"
PKG_VERSION="1.16.0"
PKG_SHA256="5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"
PKG_LICENSE="LGPL"
PKG_SITE="http://cairographics.org/"
PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_URL="http://cairographics.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain zlib freetype fontconfig glib libpng pixman"
PKG_LONGDESC="Cairo is a vector graphics library with cross-device output support."
PKG_TOOLCHAIN="configure" # ToDo
PKG_TOOLCHAIN="configure"

if [ "$OPENGL" != "no" ]; then
PKG_DEPENDS_TARGET+=" $OPENGL"
fi
configure_package() {
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" libXrender libX11 mesa"
fi

if [ "$OPENGLES" != "no" ]; then
PKG_DEPENDS_TARGET+=" $OPENGLES"
fi
if [ "${OPENGL_SUPPORT}" = "yes" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGL}"
elif [ "${OPENGLES_SUPPORT}" = "yes" ]; then
PKG_DEPENDS_TARGET+=" ${OPENGLES}"
fi
}

if [ "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXrender libX11 mesa"
PKG_CAIRO_CONFIG="--x-includes="$SYSROOT_PREFIX/usr/include" \
--x-libraries="$SYSROOT_PREFIX/usr/lib" \
--enable-xlib \
--enable-xlib-xrender \
--enable-gl \
--enable-glx \
--disable-glesv2 \
--disable-egl \
--with-x"
else
PKG_CAIRO_CONFIG="--disable-xlib \
--disable-xlib-xrender \
--disable-gl \
--disable-glx \
--enable-glesv2 \
--enable-egl \
--without-x"
fi
pre_configure_target() {
PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
--enable-shared \
--disable-static \
--disable-gtk-doc \
--enable-largefile \
--enable-atomic \
--disable-gcov \
--disable-valgrind \
--disable-xcb \
--disable-xlib-xcb \
--disable-xcb-shm \
--disable-qt \
--disable-quartz \
--disable-quartz-font \
--disable-quartz-image \
--disable-win32 \
--disable-win32-font \
--disable-os2 \
--disable-beos \
--disable-cogl \
--disable-drm \
--disable-gallium \
--enable-png \
--disable-directfb \
--disable-vg \
--disable-wgl \
--disable-script \
--enable-ft \
--enable-fc \
--enable-ps \
--enable-pdf \
--enable-svg \
--disable-test-surfaces \
--disable-tee \
--disable-xml \
--enable-pthread \
--enable-gobject=yes \
--disable-full-testing \
--disable-trace \
--enable-interpreter \
--disable-symbol-lookup \
--enable-some-floating-point \
--with-gnu-ld"

PKG_CONFIGURE_OPTS_TARGET="$PKG_CAIRO_CONFIG \
--disable-silent-rules \
--enable-shared \
--disable-static \
--disable-gtk-doc \
--enable-largefile \
--enable-atomic \
--disable-gcov \
--disable-valgrind \
--disable-xcb \
--disable-xlib-xcb \
--disable-xcb-shm \
--disable-qt \
--disable-quartz \
--disable-quartz-font \
--disable-quartz-image \
--disable-win32 \
--disable-win32-font \
--disable-skia \
--disable-os2 \
--disable-beos \
--disable-cogl \
--disable-drm \
--disable-gallium \
--enable-png \
--disable-directfb \
--disable-vg \
--disable-wgl \
--disable-script \
--enable-ft \
--enable-fc \
--enable-ps \
--enable-pdf \
--enable-svg \
--disable-test-surfaces \
--disable-tee \
--disable-xml \
--enable-pthread \
--enable-gobject=yes \
--disable-full-testing \
--disable-trace \
--enable-interpreter \
--disable-symbol-lookup \
--enable-some-floating-point \
--with-gnu-ld"
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_CONFIGURE_OPTS_TARGET+=" --x-includes="${SYSROOT_PREFIX}/usr/include" \
--x-libraries="${SYSROOT_PREFIX}/usr/lib" \
--enable-xlib \
--enable-xlib-xrender \
--enable-gl \
--enable-glx \
--disable-glesv2 \
--disable-egl \
--with-x"
else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-xlib \
--disable-xlib-xrender \
--disable-gl \
--disable-glx \
--enable-glesv2 \
--enable-egl \
--without-x"
fi
}
@@ -52,7 +52,9 @@ configure_package() {
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wayland waylandpp"
CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS"
CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS"
KODI_XORG="-DCORE_PLATFORM_NAME=wayland -DWAYLAND_RENDER_SYSTEM=gles"
KODI_XORG="-DCORE_PLATFORM_NAME=wayland \
-DWAYLAND_RENDER_SYSTEM=gles \
-DWAYLANDPP_PROTOCOLS_DIR=${SYSROOT_PREFIX}/usr/share/waylandpp/protocols"
fi

if [ ! "$OPENGL" = "no" ]; then
@@ -1,17 +1,18 @@
From 0bb21ebfe5f26545ccc9f105560c6c0fcbce77b3 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 26 Sep 2018 02:47:03 +0100
From 2e7de29a69b37ad0a7d8632c5aafcdd02a4f550d Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Tue, 7 May 2019 01:30:10 +0200
Subject: [PATCH] allow using alsa and pulse together

---
xbmc/windowing/X11/WinSystemX11GLContext.cpp | 35 ++--------------------------
xbmc/windowing/X11/WinSystemX11GLContext.cpp | 35 ++------------------
xbmc/windowing/amlogic/WinSystemAmlogic.cpp | 2 ++
xbmc/windowing/gbm/WinSystemGbm.cpp | 34 ++-------------------------
xbmc/windowing/rpi/WinSystemRpi.cpp | 17 ++++----------
4 files changed, 10 insertions(+), 78 deletions(-)
xbmc/windowing/gbm/WinSystemGbm.cpp | 34 ++-----------------
xbmc/windowing/rpi/WinSystemRpi.cpp | 17 +++-------
xbmc/windowing/wayland/WinSystemWayland.cpp | 35 ++------------------
5 files changed, 13 insertions(+), 110 deletions(-)

diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
index 1980916..2524716 100644
index 5b0b155736b9..a3a3251a5d10 100644
--- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
@@ -40,39 +40,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
@@ -57,7 +58,7 @@ index 1980916..2524716 100644
}

diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
index 9df83a6..5d41c1f 100644
index 0637f83fc0fd..b1b41b05039e 100644
--- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
+++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
@@ -20,6 +20,7 @@
@@ -68,7 +69,7 @@ index 9df83a6..5d41c1f 100644
#include "windowing/GraphicContext.h"
#include "windowing/Resolution.h"
#include "platform/linux/powermanagement/LinuxPowerSyscall.h"
@@ -66,6 +67,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() :
@@ -67,6 +68,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() :
// Register sink
AE::CAESinkFactory::ClearSinks();
CAESinkALSA::Register();
@@ -77,10 +78,10 @@ index 9df83a6..5d41c1f 100644
m_lirc.reset(OPTIONALS::LircRegister());
m_libinput->Start();
diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
index 12f2da6..c2bdd0e 100644
index 4a3291a55045..9ad1f2daf1af 100644
--- a/xbmc/windowing/gbm/WinSystemGbm.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
@@ -31,38 +31,8 @@ CWinSystemGbm::CWinSystemGbm() :
@@ -33,38 +33,8 @@ CWinSystemGbm::CWinSystemGbm() :
m_GBM(new CGBMUtils),
m_libinput(new CLibInputHandler)
{
@@ -122,10 +123,10 @@ index 12f2da6..c2bdd0e 100644
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
index a403464..6a68d9f 100644
index bdeb68c8c006..f5bc22c3cbdb 100644
--- a/xbmc/windowing/rpi/WinSystemRpi.cpp
+++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
@@ -21,7 +21,9 @@
@@ -22,7 +22,9 @@
#include "guilib/DispResource.h"
#include "utils/log.h"
#include "cores/AudioEngine/AESinkFactory.h"
@@ -135,7 +136,7 @@ index a403464..6a68d9f 100644
#include "platform/linux/powermanagement/LinuxPowerSyscall.h"

#include <EGL/egl.h>
@@ -44,19 +46,8 @@ CWinSystemRpi::CWinSystemRpi() :
@@ -45,19 +47,8 @@ CWinSystemRpi::CWinSystemRpi() :
AE::CAESinkFactory::ClearSinks();

CAESinkPi::Register();
@@ -157,6 +158,49 @@ index a403464..6a68d9f 100644
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
m_libinput->Start();
--
2.14.1

diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
index 9d0031239c6e..2b76e773f329 100644
--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
+++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
@@ -137,38 +137,9 @@ struct MsgBufferScale
CWinSystemWayland::CWinSystemWayland()
: CWinSystemBase{}, m_protocol{"WinSystemWaylandInternal"}
{
- std::string envSink;
- if (getenv("KODI_AE_SINK"))
- envSink = getenv("KODI_AE_SINK");
- if (StringUtils::EqualsNoCase(envSink, "ALSA"))
- {
- OPTIONALS::ALSARegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
- {
- OPTIONALS::PulseAudioRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "OSS"))
- {
- OPTIONALS::OSSRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
- {
- OPTIONALS::SndioRegister();
- }
- else
- {
- if (!OPTIONALS::PulseAudioRegister())
- {
- if (!OPTIONALS::ALSARegister())
- {
- if (!OPTIONALS::SndioRegister())
- {
- OPTIONALS::OSSRegister();
- }
- }
- }
- }
+ OPTIONALS::ALSARegister();
+ OPTIONALS::PulseAudioRegister();
+
m_winEvents.reset(new CWinEventsWayland());
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
Oops, something went wrong.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.