Assorted FreeBSD fixes #13691

ghost · 2018-03-25T10:00:53Z

Description

Allow modules that use evdev to build on FreeBSD. This will allow building the GBM and Wayland platforms in addition to X11 on FreeBSD
Some fixes for the Wayland platform on FreeBSD which didn't build anymore with some of the recent changes and waylandpp 0.2.2, because of missing headers for wayland::presentation_t, wayland::xdg_wm_base_t, and not linking with libwayland-client-extra++.
FreeBSD 12.0 will switch to LLVM's lld on amd64 soon. Unfortunately find_soname will break in that case due to slightly different linker output. I'm not sure if this is appropriate for Linux so cmake/scripts/linux/Macros.cmake was copied for FreeBSD.
Let Kodi build on ARM architectures on FreeBSD. Tested on a Raspberry Pi 2 running FreeBSD 12.0-CURRENT a while ago. Using the UI and a couple of addons worked fine, but when trying to play any audio/video file Kodi simply hangs right now. But at least this allows one to build Kodi on FreeBSD/arm without jumping through any extra hoops.

I can break any of these out into separate pull requests if necessary.

Motivation and Context

I maintain the multimedia/kodi-devel port on FreeBSD. The penultimate goal would be to build it without having to apply custom patches or at least reduce them to a minimum.

How Has This Been Tested?

As part of multimedia/kodi-devel updates on FreeBSD only.

Screenshots (if appropriate):

Types of change

Bug fix (non-breaking change which fixes an issue)
Improvement (non-breaking change which improves existing functionality)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the Code guidelines of this project
My change requires a change to the documentation, either Doxygen or wiki
I have updated the documentation accordingly
I have read the CONTRIBUTING document
I have added tests to cover my change
All new and existing tests passed

xbmc/platform/linux/input/LinuxInputDevices.cpp

@@ -403,12 +410,16 @@ int CLinuxInputDevice::KeyboardGetSymbol(unsigned short value)
    break;
 */
  }
-
+#else


cmake/scripts/freebsd/ArchSetup.cmake

@@ -1,4 +1,7 @@
 set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_FREEBSD)
+if(CORE_PLATFORM_NAME_LC STREQUAL rbpi)
+  list(APPEND ARCH_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI)


ghost · 2018-03-25T11:21:00Z

Hmm, the Jenkins build currently fails with this error which doesn't appear to be my fault. Any chance to fix it?

ERROR: $GIT_COMMIT (d4540a9108a5740bd2799448333e3ee87f242ec8) doesn't match currently checked out revision (406db2b2961f355dc3e37112a8ff6de31efa9e82)

notspiff · 2018-03-25T11:23:06Z

jenkins build this please

ghost · 2018-03-25T12:17:44Z

I'm going to partially revert the Wayland fixes since they broke the Linux+Wayland build. It seems there is some sort of problem with generate-wayland-extra-protocols on FreeBSD.

cmake/platform/freebsd/gbm.cmake

+set(PLATFORM_REQUIRED_DEPS OpenGLES EGL GBM LibDRM)
+set(PLATFORM_OPTIONAL_DEPS VAAPI)
+set(APP_RENDER_SYSTEM gles)
+list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -DPLATFORM_SETTINGS_FILE=gbm.xml)


cmake/platform/freebsd/rbpi.cmake

@@ -0,0 +1,3 @@
+set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL)


lrusak · 2018-03-25T19:08:00Z

For raspberry pi what is the point? AFAIK there is no hw accelerated video decode available on freebsd for the RPi.

yol

There is no need to link wayland-client-extra++.

cmake/platform/freebsd/rbpi.cmake

@@ -0,0 +1,2 @@
+include(cmake/platform/linux/rbpi.cmake)
+list(APPEND ARCH_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI)


ghost · 2018-04-13T16:13:17Z

There is no need to link wayland-client-extra++.

Well, Kodi will not link without it:

...
/usr/bin/ld: error: undefined symbol: wayland::xdg_toplevel_t::set_fullscreen(wayland::output_t)
>>> referenced by ShellSurfaceXdgShell.cpp
>>>               ShellSurfaceXdgShell.cpp.o:(KODI::WINDOWING::WAYLAND::CShellSurfaceXdgShell::SetFullScreen(wayland::output_t const&, float)) in archive build/windowing/wayland/windowing_WAYLAND.a

/usr/bin/ld: error: undefined symbol: wayland::xdg_toplevel_t::unset_fullscreen()
>>> referenced by ShellSurfaceXdgShell.cpp
>>>               ShellSurfaceXdgShell.cpp.o:(KODI::WINDOWING::WAYLAND::CShellSurfaceXdgShell::SetWindowed()) in archive build/windowing/wayland/windowing_WAYLAND.a
...

But this is probably related to the other Wayland trouble I mentioned earlier. I've removed this from the PR too until I can figure out what the real problem is. Clearly something else is going wrong. Maybe my graphics/waylandpp port is broken in some way.

yol · 2018-04-13T16:23:00Z

https://github.com/xbmc/xbmc/blob/master/cmake/scripts/linux/ExtraTargets.cmake#L21

ghost · 2018-04-13T17:02:23Z

Right. This fixes it.

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

…tform on FreeBSD Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

cmake/scripts/freebsd/ExtraTargets.cmake is just a clone of Linux' ExtraTargets.cmake, so just include it instead. This way things cannot go out of sync in the future.

DEBUG: CSettings: loaded settings definition from special://xbmc/system/settings/freebsd.xml FATAL: Unable to load freebsd-specific settings definitions Also fixes a crash when libva-intel-driver is installed Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

Rechi reviewed Mar 25, 2018

View reviewed changes

yol requested changes Apr 3, 2018

View reviewed changes

Rechi mentioned this pull request Apr 3, 2018

[cmake] move rbpi platform defines into platform file #13730

Merged

10 tasks

Rechi reviewed Apr 5, 2018

View reviewed changes

cmake/platform/freebsd/rbpi.cmake Outdated

@@ -0,0 +1,2 @@

include(cmake/platform/linux/rbpi.cmake)

list(APPEND ARCH_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI)

This comment was marked as spam.

Sign in to view

jenkins4kodi added Rebase needed PR that does not apply/merge cleanly to current base branch and removed Rebase needed PR that does not apply/merge cleanly to current base branch labels Apr 6, 2018

Rechi added Type: Improvement non-breaking change which improves existing functionality v18 Leia Platform: FreeBSD labels Apr 10, 2018

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Apr 11, 2018

jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Apr 13, 2018

ghost mentioned this pull request Apr 20, 2018

AE: Reenable AESinkOSS on FreeBSD #13793

Merged

10 tasks

Rechi requested a review from yol April 22, 2018 08:40

yol approved these changes Apr 22, 2018

View reviewed changes

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Apr 25, 2018

Tobias Kortkamp added 7 commits April 25, 2018 22:49

Let WinSystemWayland build with Clang on FreeBSD

9c62daa

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

Fix find_soname when lld is the system linker

e016be1

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

Create cmake/platform/linux/{gbm,rbpi}.cmake for FreeBSD

91d7456

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

Allow Kodi to build on ARM architectures and also enable the rbpi pla…

9588b13

…tform on FreeBSD Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

Enable build of OSScreenSaverFreedesktop on FreeBSD

09dd665

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>

Fix build of Wayland platform on FreeBSD

0df8e02

cmake/scripts/freebsd/ExtraTargets.cmake is just a clone of Linux' ExtraTargets.cmake, so just include it instead. This way things cannot go out of sync in the future.

jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Apr 25, 2018

Rechi merged commit 650b5f2 into xbmc:master Apr 26, 2018

Rechi added this to the Leia 18.0-alpha2 milestone Apr 26, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Assorted FreeBSD fixes #13691

Assorted FreeBSD fixes #13691

ghost commented Mar 25, 2018 •

edited by ghost

Loading

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ghost commented Mar 25, 2018

notspiff commented Mar 25, 2018

ghost commented Mar 25, 2018

This comment was marked as spam.

This comment was marked as spam.

lrusak commented Mar 25, 2018 •

edited

Loading

yol left a comment

This comment was marked as spam.

ghost commented Apr 13, 2018

yol commented Apr 13, 2018

ghost commented Apr 13, 2018

                   break;
               */
                 }
+              #else

		@@ -0,0 +1,3 @@
		set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL)

		@@ -0,0 +1,2 @@
		include(cmake/platform/linux/rbpi.cmake)
		list(APPEND ARCH_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI)

Assorted FreeBSD fixes #13691

Assorted FreeBSD fixes #13691

Conversation

ghost commented Mar 25, 2018 • edited by ghost Loading

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of change

Checklist:

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ghost commented Mar 25, 2018

notspiff commented Mar 25, 2018

ghost commented Mar 25, 2018

This comment was marked as spam.

This comment was marked as spam.

lrusak commented Mar 25, 2018 • edited Loading

yol left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

ghost commented Apr 13, 2018

yol commented Apr 13, 2018

ghost commented Apr 13, 2018

ghost commented Mar 25, 2018 •

edited by ghost

Loading

lrusak commented Mar 25, 2018 •

edited

Loading