-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
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
Assorted FreeBSD fixes #13691
Assorted FreeBSD fixes #13691
Conversation
@@ -403,12 +410,16 @@ int CLinuxInputDevice::KeyboardGetSymbol(unsigned short value) | |||
break; | |||
*/ | |||
} | |||
|
|||
#else |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
@@ -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) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Hmm, the Jenkins build currently fails with this error which doesn't appear to be my fault. Any chance to fix it?
|
jenkins build this please |
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 |
cmake/platform/freebsd/gbm.cmake
Outdated
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) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
cmake/platform/freebsd/rbpi.cmake
Outdated
@@ -0,0 +1,3 @@ | |||
set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
For raspberry pi what is the point? AFAIK there is no hw accelerated video decode available on freebsd for the RPi. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is no need to link wayland-client-extra++
.
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.
This comment was marked as spam.
Sorry, something went wrong.
Well, Kodi will not link without it:
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 |
Right. This fixes it. |
Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>
Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>
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>
Description
wayland::presentation_t
,wayland::xdg_wm_base_t
, and not linking withlibwayland-client-extra++
.find_soname
will break in that case due to slightly different linker output. I'm not sure if this is appropriate for Linux socmake/scripts/linux/Macros.cmake
was copied for FreeBSD.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
Checklist: