Date: Wed, 23 May 2018 10:55:50 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470692 - in head/multimedia/kodi-devel: . files Message-ID: <201805231055.w4NAtoBi064257@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed May 23 10:55:50 2018 New Revision: 470692 URL: https://svnweb.freebsd.org/changeset/ports/470692 Log: multimedia/kodi-devel: Update to latest commit - Drop upstreamed patches Regressions on FreeBSD: - Kodi segfaults on startup when VAAPI and VDPAU are enabled. Disable them by default for now and mark them as broken. - For GBM and WAYLAND Kodi has switched to using libinput for input device support and now aborts with a bus error on startup. Deleted: head/multimedia/kodi-devel/files/patch-evdev head/multimedia/kodi-devel/files/patch-lld head/multimedia/kodi-devel/files/patch-oss head/multimedia/kodi-devel/files/patch-wayland Modified: head/multimedia/kodi-devel/Makefile head/multimedia/kodi-devel/distinfo head/multimedia/kodi-devel/files/patch-rbpi Modified: head/multimedia/kodi-devel/Makefile ============================================================================== --- head/multimedia/kodi-devel/Makefile Wed May 23 09:34:15 2018 (r470691) +++ head/multimedia/kodi-devel/Makefile Wed May 23 10:55:50 2018 (r470692) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= kodi -DISTVERSION= 18.0.g201804180937 -PORTREVISION= 1 +DISTVERSION= 18.0.g201805221344 CATEGORIES= multimedia PKGNAMESUFFIX?= -devel @@ -43,6 +42,7 @@ LIB_DEPENDS= libass.so:multimedia/libass \ libswscale.so:multimedia/ffmpeg \ libtag.so:audio/taglib \ libtinyxml.so:textproc/tinyxml \ + libudev.so:devel/libudev-devd \ libuuid.so:misc/e2fsprogs-libuuid # Building libcpluff.a requires autoreconf and gmake. Using ninja @@ -54,7 +54,7 @@ USES= autoreconf:build cmake:outsource,noninja compil USE_GITHUB= yes GH_ACCOUNT= xbmc GH_PROJECT= xbmc -GH_TAGNAME= f4489bffe22487bc906e79130832c14360a42a8a +GH_TAGNAME= d2b10e2bb0650d8d47caf8a5d15fa4b6f2cb7254 USE_GNOME= libxslt libxml2 USE_JAVA= yes JAVA_BUILD= yes @@ -78,7 +78,7 @@ PLIST_SUB= ARCH=${KODIARCH_${ARCH}:U${ARCH}} OPSYS=${O OPTIONS_DEFINE= AVAHI CEC DBUS LIBBLURAY MYSQL NFS SMB SSH UPNP VAAPI \ VDPAU WEBSERVER -OPTIONS_DEFAULT= LIBBLURAY SSH UPNP VAAPI VDPAU WEBSERVER X11 +OPTIONS_DEFAULT= LIBBLURAY SSH UPNP WEBSERVER X11 OPTIONS_SINGLE= PLATFORM OPTIONS_SINGLE_PLATFORM= GBM RPI WAYLAND X11 OPTIONS_EXCLUDE_amd64= RPI @@ -102,7 +102,10 @@ CEC_CMAKE_BOOL= ENABLE_CEC DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS +GBM_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat GBM_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="gbm" +GBM_LIB_DEPENDS= libinput.so:x11/libinput \ + libxkbcommon.so:x11/libxkbcommon LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CMAKE_BOOL= ENABLE_BLURAY @@ -145,16 +148,20 @@ UPNP_CXXFLAGS= -DNPT_CONFIG_HAVE_ARPA_INET_H \ -DNPT_CONFIG_HAVE_SOCKADDR_DL \ -DNPT_CONFIG_HAVE_SOCKADDR_IN_SIN_LEN -VAAPI_LIB_DEPENDS= libva.so:multimedia/libva +VAAPI_BROKEN= Crashes at startup with VAAPI enabled VAAPI_CMAKE_BOOL= ENABLE_VAAPI +VAAPI_LIB_DEPENDS= libva.so:multimedia/libva -VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau +VDPAU_BROKEN= Crashes at startup with VDPAU enabled VDPAU_CMAKE_BOOL= ENABLE_VDPAU +VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau -WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols +WAYLAND_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat \ + wayland-protocols>=0:graphics/wayland-protocols WAYLAND_CMAKE_ON= -DCORE_PLATFORM_NAME:STRING="wayland" \ -DWAYLAND_RENDER_SYSTEM:STRING="gl" -WAYLAND_LIB_DEPENDS= libwayland-client++.so:graphics/waylandpp \ +WAYLAND_LIB_DEPENDS= libinput.so:x11/libinput \ + libwayland-client++.so:graphics/waylandpp \ libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon @@ -176,13 +183,6 @@ post-patch: # (see CMAKE_ARGS). @${REINPLACE_CMD} 's@KODI_DEPENDSBUILD@true@' \ ${WRKSRC}/cmake/modules/FindLibDvd.cmake - @${CP} ${WRKSRC}/cmake/platform/linux/gbm.cmake \ - ${WRKSRC}/cmake/platform/linux/rbpi.cmake \ - ${WRKSRC}/cmake/platform/freebsd - @${CP} ${WRKSRC}/cmake/scripts/linux/ExtraTargets.cmake \ - ${WRKSRC}/cmake/scripts/freebsd/ExtraTargets.cmake - @${CP} ${WRKSRC}/system/settings/linux.xml \ - ${WRKSRC}/system/settings/freebsd.xml .if ${SLAVE_PORT} == no post-install: @@ -191,7 +191,9 @@ post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/TexturePacker @${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -name '*.so' | ${XARGS} ${STRIP_CMD} # Nothing useful here... - @${RM} -rf ${STAGEDIR}${DOCSDIR} + @${RM} -r ${STAGEDIR}${DOCSDIR} +# No firewalld on FreeBSD... + @${RM} -r ${STAGEDIR}${PREFIX}/lib/firewalld .endif .include <bsd.port.mk> Modified: head/multimedia/kodi-devel/distinfo ============================================================================== --- head/multimedia/kodi-devel/distinfo Wed May 23 09:34:15 2018 (r470691) +++ head/multimedia/kodi-devel/distinfo Wed May 23 10:55:50 2018 (r470692) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524056987 -SHA256 (xbmc-xbmc-18.0.g201804180937-f4489bffe22487bc906e79130832c14360a42a8a_GH0.tar.gz) = 8f77f6cff2bcab9b31c1df120b3e044acbd55c93cb96ecb63830e37aeaf30bc5 -SIZE (xbmc-xbmc-18.0.g201804180937-f4489bffe22487bc906e79130832c14360a42a8a_GH0.tar.gz) = 41117210 +TIMESTAMP = 1526990379 +SHA256 (xbmc-xbmc-18.0.g201805221344-d2b10e2bb0650d8d47caf8a5d15fa4b6f2cb7254_GH0.tar.gz) = eca079ce1fbdabb6534b9692c9fd6cd7aa5d57981c4a1a2af61f56cfecb05773 +SIZE (xbmc-xbmc-18.0.g201805221344-d2b10e2bb0650d8d47caf8a5d15fa4b6f2cb7254_GH0.tar.gz) = 41106732 Modified: head/multimedia/kodi-devel/files/patch-rbpi ============================================================================== --- head/multimedia/kodi-devel/files/patch-rbpi Wed May 23 09:34:15 2018 (r470691) +++ head/multimedia/kodi-devel/files/patch-rbpi Wed May 23 10:55:50 2018 (r470692) @@ -1,37 +1,10 @@ ---- cmake/scripts/freebsd/ArchSetup.cmake.orig 2018-04-18 09:37:24 UTC -+++ 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) -+endif() - set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE - -D_FILE_OFFSET_BITS=64) - set(PLATFORM_DIR platform/linux) -@@ -10,6 +13,15 @@ else() - set(ARCH x86_64-freebsd) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i.86") - set(ARCH x86-freebsd) -+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv6) -+ set(ARCH armv6-freebsd) -+ set(NEON True) -+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7) -+ set(ARCH armv7-freebsd) -+ set(NEON True) -+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) -+ set(ARCH aarch64-freebsd) -+ set(NEON True) - else() - message(WARNING "unknown CPU: ${CPU}") - endif() ---- xbmc/windowing/rpi/WinSystemRpi.cpp.orig 2018-04-18 09:37:24 UTC +--- xbmc/windowing/rpi/WinSystemRpi.cpp.orig 2018-05-22 11:44:17 UTC +++ xbmc/windowing/rpi/WinSystemRpi.cpp -@@ -32,9 +32,16 @@ +@@ -32,8 +32,15 @@ #include "settings/DisplaySettings.h" #include "guilib/DispResource.h" #include "utils/log.h" +#include "utils/StringUtils.h" - #include "../WinEventsLinux.h" #include "cores/AudioEngine/AESinkFactory.h" #include "cores/AudioEngine/Sinks/AESinkPi.h" +#ifdef HAS_PULSEAUDIO @@ -43,9 +16,9 @@ #include "platform/linux/powermanagement/LinuxPowerSyscall.h" #include <EGL/egl.h> -@@ -55,7 +62,36 @@ CWinSystemRpi::CWinSystemRpi() +@@ -54,7 +61,36 @@ CWinSystemRpi::CWinSystemRpi() : + m_rpi = new CRPIUtils(); - m_winEvents.reset(new CWinEventsLinux()); AE::CAESinkFactory::ClearSinks(); - CAESinkPi::Register(); + @@ -80,4 +53,4 @@ + } CLinuxPowerSyscall::Register(); m_lirc.reset(OPTIONALS::LircRegister()); - } + m_libinput->Start();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805231055.w4NAtoBi064257>