diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile index fa4bf0275182..6bf4f7e657b5 100644 --- a/multimedia/kodi/Makefile +++ b/multimedia/kodi/Makefile @@ -1,293 +1,300 @@ PORTNAME= kodi -DISTVERSION= 19.5 -PORTREVISION= 2 +DISTVERSION= 20.0 CATEGORIES= multimedia java MAINTAINER= yzrh@noema.org COMMENT= Award winning media center application WWW= https://kodi.tv/ LICENSE= GPLv2+ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le BUILD_DEPENDS= flatbuffers>0:devel/flatbuffers \ rapidjson>0:devel/rapidjson \ swig>0:devel/swig LIB_DEPENDS= libass.so:multimedia/libass \ libavcodec.so:multimedia/ffmpeg \ libavfilter.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libcdio.so:sysutils/libcdio \ libcrossguid.so:devel/libcrossguid \ libcurl.so:ftp/curl \ - libdav1d.so:multimedia/dav1d \ libexpat.so:textproc/expat2 \ libfmt.so:devel/libfmt \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libfstrcmp.so:devel/fstrcmp \ libgif.so:graphics/giflib \ + libharfbuzz.so:print/harfbuzz \ liblzo2.so:archivers/lzo2 \ libpcre.so:devel/pcre \ libpng.so:graphics/png \ libpostproc.so:multimedia/ffmpeg \ libspdlog.so:devel/spdlog \ libswresample.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg \ libtag.so:audio/taglib \ libtinyxml.so:textproc/tinyxml \ libuuid.so:misc/e2fsprogs-libuuid USES= autoreconf:build cmake:noninja compiler:c++17-lang cpe \ desktop-file-utils gettext gmake gnome iconv jpeg libtool \ pkgconfig python:3.7+ sqlite ssl -KODI_CODENAME= Matrix -LIBDVDCSS_VERSION= 1.4.2-Leia-Beta-5 -LIBDVDNAV_VERSION= 6.0.0-Leia-Alpha-3 -LIBDVDREAD_VERSION= 6.0.0-Leia-Alpha-3 +KODI_CODENAME= Nexus +LIBDVDCSS_VERSION= 1.4.3-Next-Nexus-Alpha2-2 +LIBDVDNAV_VERSION= 6.1.1-Next-Nexus-Alpha2-2 +LIBDVDREAD_VERSION= 6.1.3-Next-Nexus-Alpha2-2 USE_GITHUB= yes GH_TUPLE= xbmc:xbmc:${DISTVERSION}-${KODI_CODENAME} \ xbmc:libdvdcss:${LIBDVDCSS_VERSION}:libdvdcss/tools/depends/target/libdvdcss/native \ xbmc:libdvdnav:${LIBDVDNAV_VERSION}:libdvdnav/tools/depends/target/libdvdnav/native \ xbmc:libdvdread:${LIBDVDREAD_VERSION}:libdvdread/tools/depends/target/libdvdread/native KODI_ARCH_aarch64= aarch64 KODI_ARCH_amd64= x86_64 KODI_ARCH_i386= x86 KODI_ARCH_armv7= armv7 KODI_ARCH_armv6= armv6 KODI_ARCH_powerpc64= powerpc64 KODI_ARCH_powerpc64le= powerpc64le PLIST_SUB= ARCH=${KODI_ARCH_${ARCH}} USE_LDCONFIG= yes USE_JAVA= yes JAVA_BUILD= jre USE_GNOME= libxml2 CMAKE_ARGS= -DGIT_VERSION="${DISTVERSION}-${KODI_CODENAME}" \ -DLIBDVDCSS_URL="${DISTDIR}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \ -DLIBDVDNAV_URL="${DISTDIR}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \ - -DLIBDVDREAD_URL="${DISTDIR}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" -CMAKE_OFF= ENABLE_INTERNAL_CROSSGUID + -DLIBDVDREAD_URL="${DISTDIR}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" \ + -DCROSSGUID_INCLUDE_DIR="${LOCALBASE}/include" +CMAKE_OFF= ENABLE_INTERNAL_CROSSGUID ENABLE_INTERNAL_RapidJSON CONFIGURE_ENV= _CPU_FEATURE="${CPU_FEATURE}" OPTIONS_SUB= yes # Broken: BLUETOOTH -OPTIONS_DEFINE= AIRPLAY AVAHI LIBBLURAY CEC DBUS DVDCSS LCMS2 \ - LIRC WEBSERVER NFS DVD SMB TEST UDEV UPNP \ - VAAPI VDPAU XSLT DOCS -OPTIONS_DEFAULT= LIBBLURAY CEC LCMS2 WEBSERVER \ +OPTIONS_DEFINE= AIRPLAY AVAHI LIBBLURAY CEC DAV1D DBUS \ + DVDCSS LCMS2 LIRC WEBSERVER MYSQL NFS DVD SMB TEST \ + UDEV UPNP VAAPI VDPAU XSLT DOCS +OPTIONS_DEFAULT= LIBBLURAY CEC LCMS2 WEBSERVER DAV1D \ DVD UPNP VAAPI VDPAU XSLT WAYLAND X11 GL OPTIONS_DEFAULT_amd64= SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 OPTIONS_DEFAULT_i386= SSE SSE2 SSE3 OPTIONS_SINGLE= RENDER OPTIONS_SINGLE_RENDER= GL GLES -OPTIONS_RADIO= DATABASE -OPTIONS_RADIO_DATABASE= MARIADB MYSQL OPTIONS_GROUP= SOUND FEATURE PLATFORM -# Broken: ALSA -OPTIONS_GROUP_SOUND= PULSEAUDIO SNDIO +OPTIONS_GROUP_SOUND= ALSA PIPEWIRE PULSEAUDIO SNDIO OPTIONS_GROUP_FEATURE= SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2 -OPTIONS_GROUP_PLATFORM=GBM WAYLAND X11 +OPTIONS_GROUP_PLATFORM= GBM WAYLAND X11 OPTIONS_EXCLUDE_aarch64=FEATURE OPTIONS_EXCLUDE_armv7= FEATURE OPTIONS_EXCLUDE_armv6= FEATURE PLATFORM_DESC= Kodi platform -DATABASE_DESC= Database FEATURE_DESC= X86 CPU feature AIRPLAY_DESC= AirPlay support BLUETOOTH_DESC= Bluetooth support CEC_DESC= CEC adapter support +DAV1D_DESC= Use dav1d as AV1 decoder DVD_DESC= DVD support UDEV_DESC= Use libudev-devd XSLT_DESC= Use libxslt RENDER_DESC= Render system GL_DESC= OpenGL GLES_DESC= OpenGL ES GBM_DESC= GBM support -MARIADB_DESC= MariaDB database support +PIPEWIRE_DESC= PipeWire support SSE2_DESC= Use SSE2 optimized routines SSE3_DESC= Use SSE3 optimized routines SSSE3_DESC= Use SSSE3 optimized routines SSE4_1_DESC= Use SSE4.1 optimized routines SSE4_2_DESC= Use SSE4.2 optimized routines AVX_DESC= Use AVX optimized routines AVX2_DESC= Use AVX2 optimized routines AIRPLAY_LIB_DEPENDS= libplist-2.0.so:devel/libplist \ libshairplay.so:audio/shairplay AIRPLAY_CMAKE_BOOL= ENABLE_PLIST \ ENABLE_AIRTUNES AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_CMAKE_BOOL= ENABLE_AVAHI BLUETOOTH_CMAKE_BOOL= ENABLE_BLUETOOTH BLUETOOTH_CMAKE_ON= -DBLUETOOTH_INCLUDE_DIR="${LOCALBASE}/include" LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CMAKE_BOOL= ENABLE_BLURAY CEC_LIB_DEPENDS= libcec.so:multimedia/libcec CEC_CMAKE_BOOL= ENABLE_CEC +DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d +DAV1D_CMAKE_BOOL= ENABLE_DAV1D + DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CMAKE_BOOL= ENABLE_DBUS DVDCSS_CMAKE_BOOL= ENABLE_DVDCSS LCMS2_LIB_DEPENDS= liblcms2.so.2:graphics/lcms2 LCMS2_CMAKE_BOOL= ENABLE_LCMS2 LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CMAKE_BOOL= ENABLE_LIRCCLIENT WEBSERVER_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd WEBSERVER_CMAKE_BOOL= ENABLE_MICROHTTPD NFS_LIB_DEPENDS= libnfs.so:net/libnfs NFS_CMAKE_BOOL= ENABLE_NFS DVD_CMAKE_BOOL= ENABLE_OPTICAL SMB_USES= samba:lib SMB_CMAKE_BOOL= ENABLE_SMBCLIENT TEST_LIB_DEPENDS= libgtest.so:devel/googletest TEST_CMAKE_BOOL= ENABLE_TESTING UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd UDEV_CMAKE_BOOL= ENABLE_UDEV UPNP_CMAKE_BOOL= ENABLE_UPNP VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CMAKE_BOOL= ENABLE_VAAPI VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CMAKE_BOOL= ENABLE_VDPAU XSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt XSLT_CMAKE_BOOL= ENABLE_XSLT GL_CMAKE_ON= -DAPP_RENDER_SYSTEM:STRING="gl" +GL_USES= gl +GL_USE= GL=gl GLES_CMAKE_ON= -DAPP_RENDER_SYSTEM:STRING="gles" - -MARIADB_USES= mysql:105m -MARIADB_CMAKE_BOOL= ENABLE_MARIADBCLIENT -MARIADB_CMAKE_ON= -DMARIADBCLIENT_INCLUDE_DIR="${LOCALBASE}/include" +GLES_USES= gl +GLES_USE= GL=glesv2 MYSQL_USES= mysql MYSQL_CMAKE_BOOL= ENABLE_MYSQLCLIENT ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= ENABLE_ALSA +PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire +PIPEWIRE_CMAKE_BOOL= ENABLE_PIPEWIRE + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CMAKE_BOOL= ENABLE_SNDIO SSE_VARS= CPU_FEATURE+=SSE SSE2_VARS= CPU_FEATURE+=SSE2 SSE3_VARS= CPU_FEATURE+=SSE3 SSSE3_VARS= CPU_FEATURE+=SSSE3 SSE4_1_VARS= CPU_FEATURE+=SSE4.1 SSE4_2_VARS= CPU_FEATURE+=SSE4.2 AVX_VARS= CPU_FEATURE+=AVX AVX2_VARS= CPU_FEATURE+=AVX2 GBM_IMPLIES= UDEV GBM_USES= gl GBM_USE= GL=egl,gbm,glu GBM_CFLAGS= -I${LOCALBASE}/include/libepoll-shim GBM_LDFLAGS= -L${LOCALBASE}/lib -lepoll-shim GBM_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto GBM_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libdrm.so:graphics/libdrm \ libxkbcommon.so:x11/libxkbcommon \ libinput.so:x11/libinput WAYLAND_CATEGORIES= wayland WAYLAND_USES= gl WAYLAND_USE= GL=egl,glu WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libdrm.so:graphics/libdrm \ libxkbcommon.so:x11/libxkbcommon \ libinput.so:x11/libinput \ libwayland-client++.so:graphics/waylandpp X11_USES= xorg gl -X11_USE= XORG=x11,xext,xrandr GL=egl,gbm,gl,glu +X11_USE= XORG=x11,xext,xrandr GL=egl,gbm,glu X11_LIB_DEPENDS= libdrm.so:graphics/libdrm .include +.if (!empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)) && !empty(PORT_OPTIONS:MGLES) +BROKEN= option GLES does not build with multiple PLATFORM +.endif + .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11) CMAKE_ARGS+= -DCORE_PLATFORM_NAME:STRING="gbm wayland x11" .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11) CMAKE_ARGS+= -DCORE_PLATFORM_NAME:STRING="wayland x11" .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11) CMAKE_ARGS+= -DCORE_PLATFORM_NAME:STRING="gbm x11" .elif !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11) CMAKE_ARGS+= -DCORE_PLATFORM_NAME:STRING="gbm wayland" .elif empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11) CMAKE_ARGS+= -DCORE_PLATFORM_NAME:STRING="x11" .elif empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11) CMAKE_ARGS+= -DCORE_PLATFORM_NAME:STRING="wayland" .elif !empty(PORT_OPTIONS:MGBM) && empty(PORT_OPTIONS:MWAYLAND) && empty(PORT_OPTIONS:MX11) CMAKE_ARGS+= -DCORE_PLATFORM_NAME:STRING="gbm" .endif .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11) PLIST_SUB+= KODICOMBINED="" \ KODIGBM="@comment " \ KODIWAYLAND="@comment " \ KODIX11="@comment " .else PLIST_SUB+= KODICOMBINED="@comment " .if !empty(PORT_OPTIONS:MGBM) PLIST_SUB+= KODIGBM="" .else PLIST_SUB+= KODIGBM="@comment " .endif .if !empty(PORT_OPTIONS:MWAYLAND) PLIST_SUB+= KODIWAYLAND="" .else PLIST_SUB+= KODIWAYLAND="@comment " .endif .if !empty(PORT_OPTIONS:MX11) PLIST_SUB+= KODIX11="" .else PLIST_SUB+= KODIX11="@comment " .endif .endif post-patch: ${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp post-install: ${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1 cd ${STAGEDIR}${MAN1PREFIX}/share/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz - cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} TexturePacker JsonSchemaBuilder + cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} JsonSchemaBuilder kodi-TexturePacker ${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD} - ${RM} -rf ${STAGEDIR}${PREFIX}/lib/firewalld + ${RM} -r ${STAGEDIR}${PREFIX}/lib/firewalld .include diff --git a/multimedia/kodi/distinfo b/multimedia/kodi/distinfo index e34c61dd9ded..5bcbfcd79ab6 100644 --- a/multimedia/kodi/distinfo +++ b/multimedia/kodi/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1672024779 -SHA256 (xbmc-xbmc-19.5-19.5-Matrix_GH0.tar.gz) = 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 -SIZE (xbmc-xbmc-19.5-19.5-Matrix_GH0.tar.gz) = 53496968 -SHA256 (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d -SIZE (xbmc-libdvdcss-1.4.2-Leia-Beta-5_GH0.tar.gz) = 101068 -SHA256 (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a -SIZE (xbmc-libdvdnav-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 137942 -SHA256 (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf -SIZE (xbmc-libdvdread-6.0.0-Leia-Alpha-3_GH0.tar.gz) = 130649 +TIMESTAMP = 1673876226 +SHA256 (xbmc-xbmc-20.0-20.0-Nexus_GH0.tar.gz) = 4c75add8b9ea44924b6ee45f94439545676033f35f5993908871e3dded527b79 +SIZE (xbmc-xbmc-20.0-20.0-Nexus_GH0.tar.gz) = 54562027 +SHA256 (xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e +SIZE (xbmc-libdvdcss-1.4.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 102124 +SHA256 (xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc +SIZE (xbmc-libdvdnav-6.1.1-Next-Nexus-Alpha2-2_GH0.tar.gz) = 128547 +SHA256 (xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 +SIZE (xbmc-libdvdread-6.1.3-Next-Nexus-Alpha2-2_GH0.tar.gz) = 110513 diff --git a/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake b/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake new file mode 100644 index 000000000000..4fd05dca7c94 --- /dev/null +++ b/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake @@ -0,0 +1,29 @@ +--- cmake/modules/FindCrossGUID.cmake.orig 2022-07-08 10:04:52 UTC ++++ cmake/modules/FindCrossGUID.cmake +@@ -45,7 +45,7 @@ else() + endif() + + if(CROSSGUID_FOUND) +- find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h ++ find_path(CROSSGUID_INCLUDE_DIR NAMES guid.hpp guid.h + PATHS ${PC_CROSSGUID_INCLUDEDIR}) + + find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid +@@ -53,7 +53,7 @@ else() + find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb + PATHS ${PC_CROSSGUID_LIBDIR}) + else() +- find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h) ++ find_path(CROSSGUID_INCLUDE_DIR NAMES guid.hpp guid.h) + find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid) + find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd) + endif() +@@ -73,7 +73,7 @@ if(CROSSGUID_FOUND) + set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR}) + + # NEW_CROSSGUID >= 0.2.0 release +- if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp") ++ if(EXISTS "${CROSSGUID_INCLUDE_DIR}/guid.hpp") + list(APPEND CROSSGUID_DEFINITIONS -DHAVE_NEW_CROSSGUID) + endif() + diff --git a/multimedia/kodi/files/patch-cmake_modules_FindEGL.cmake b/multimedia/kodi/files/patch-cmake_modules_FindEGL.cmake new file mode 100644 index 000000000000..6047f2f4c7e6 --- /dev/null +++ b/multimedia/kodi/files/patch-cmake_modules_FindEGL.cmake @@ -0,0 +1,15 @@ +--- cmake/modules/FindEGL.cmake.orig 2023-01-16 15:23:00 UTC ++++ cmake/modules/FindEGL.cmake +@@ -36,11 +36,7 @@ if(EGL_FOUND) + set(EGL_LIBRARIES ${EGL_LIBRARY}) + set(EGL_INCLUDE_DIRS ${EGL_INCLUDE_DIR}) + set(EGL_DEFINITIONS -DHAS_EGL=1) +- include(CheckIncludeFiles) +- check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE) +- if(HAVE_EGLEXTANGLE) +- list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1") +- endif() ++ list(APPEND EGL_DEFINITIONS "-DHAVE_EGLEXTANGLE=1") + + if(NOT TARGET EGL::EGL) + add_library(EGL::EGL UNKNOWN IMPORTED) diff --git a/multimedia/kodi/files/patch-cmake_modules_FindLibDvdCSS.cmake b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdCSS.cmake new file mode 100644 index 000000000000..450c48a9ed4d --- /dev/null +++ b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdCSS.cmake @@ -0,0 +1,11 @@ +--- cmake/modules/FindLibDvdCSS.cmake.orig 2022-08-18 23:36:30 UTC ++++ cmake/modules/FindLibDvdCSS.cmake +@@ -63,7 +63,7 @@ if(ENABLE_DVDCSS) + ${LIBDVD_ADDITIONAL_ARGS}) + else() + find_program(AUTORECONF autoreconf REQUIRED) +- find_program(MAKE_EXECUTABLE make REQUIRED) ++ find_program(MAKE_EXECUTABLE gmake REQUIRED) + + set(CONFIGURE_COMMAND ${AUTORECONF} -vif + COMMAND ac_cv_path_GIT= ./configure diff --git a/multimedia/kodi/files/patch-cmake_modules_FindLibDvdNav.cmake b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdNav.cmake new file mode 100644 index 000000000000..c8efbe69cbc6 --- /dev/null +++ b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdNav.cmake @@ -0,0 +1,11 @@ +--- cmake/modules/FindLibDvdNav.cmake.orig 2022-08-18 23:36:26 UTC ++++ cmake/modules/FindLibDvdNav.cmake +@@ -76,7 +76,7 @@ if(NOT TARGET LibDvdNav::LibDvdNav) + string(APPEND LIBDVDNAV_CFLAGS " -I$ $") + + find_program(AUTORECONF autoreconf REQUIRED) +- find_program(MAKE_EXECUTABLE make REQUIRED) ++ find_program(MAKE_EXECUTABLE gmake REQUIRED) + + set(CONFIGURE_COMMAND ${AUTORECONF} -vif + COMMAND ac_cv_path_GIT= ./configure diff --git a/multimedia/kodi/files/patch-cmake_modules_FindLibDvdRead.cmake b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdRead.cmake new file mode 100644 index 000000000000..44208f126053 --- /dev/null +++ b/multimedia/kodi/files/patch-cmake_modules_FindLibDvdRead.cmake @@ -0,0 +1,11 @@ +--- cmake/modules/FindLibDvdRead.cmake.orig 2022-08-18 23:36:34 UTC ++++ cmake/modules/FindLibDvdRead.cmake +@@ -81,7 +81,7 @@ if(NOT TARGET LibDvdRead::LibDvdRead) + endif() + + find_program(AUTORECONF autoreconf REQUIRED) +- find_program(MAKE_EXECUTABLE make REQUIRED) ++ find_program(MAKE_EXECUTABLE gmake REQUIRED) + + set(CONFIGURE_COMMAND ${AUTORECONF} -vif + COMMAND ac_cv_path_GIT= ./configure diff --git a/multimedia/kodi/files/patch-cmake_scripts_freebsd_ArchSetup.cmake b/multimedia/kodi/files/patch-cmake_scripts_freebsd_ArchSetup.cmake index 6d67864bef88..ea9243d5897c 100644 --- a/multimedia/kodi/files/patch-cmake_scripts_freebsd_ArchSetup.cmake +++ b/multimedia/kodi/files/patch-cmake_scripts_freebsd_ArchSetup.cmake @@ -1,13 +1,13 @@ ---- cmake/scripts/freebsd/ArchSetup.cmake.orig 2021-01-15 12:42:30 UTC +--- cmake/scripts/freebsd/ArchSetup.cmake.orig 2022-07-08 10:04:52 UTC +++ cmake/scripts/freebsd/ArchSetup.cmake -@@ -20,6 +20,10 @@ else() +@@ -23,6 +23,10 @@ else() elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) set(ARCH aarch64-freebsd) set(NEON True) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL powerpc64) + set(ARCH powerpc64-freebsd) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL powerpc64le) + set(ARCH powerpc64le-freebsd) else() message(WARNING "unknown CPU: ${CPU}") endif() diff --git a/multimedia/kodi/files/patch-libfmt b/multimedia/kodi/files/patch-libfmt deleted file mode 100644 index 5a9f248df936..000000000000 --- a/multimedia/kodi/files/patch-libfmt +++ /dev/null @@ -1,13 +0,0 @@ ---- xbmc/utils/StringUtils.h.orig 2021-05-08 16:20:52 UTC -+++ xbmc/utils/StringUtils.h -@@ -37,6 +37,10 @@ - #include - #endif - -+#if FMT_VERSION >= 80000 -+#include -+#endif -+ - #include "XBDateTime.h" - #include "utils/params_check_macros.h" - diff --git a/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA.cpp b/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA.cpp new file mode 100644 index 000000000000..4dc4300bfee4 --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA.cpp @@ -0,0 +1,16 @@ +--- xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp.orig 2022-05-22 10:57:33 UTC ++++ xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp +@@ -949,13 +949,6 @@ void CAESinkALSA::HandleError(const char* name, int er + { + case -EPIPE: + CLog::Log(LOGERROR, "CAESinkALSA::HandleError({}) - underrun", name); +- if ((err = snd_pcm_prepare(m_pcm)) < 0) +- CLog::Log(LOGERROR, "CAESinkALSA::HandleError({}) - snd_pcm_prepare returned {} ({})", name, +- err, snd_strerror(err)); +- break; +- +- case -ESTRPIPE: +- CLog::Log(LOGINFO, "CAESinkALSA::HandleError({}) - Resuming after suspend", name); + + /* try to resume the stream */ + while((err = snd_pcm_resume(m_pcm)) == -EAGAIN) diff --git a/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Utils_AEELDParser.cpp b/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Utils_AEELDParser.cpp new file mode 100644 index 000000000000..05038e7087d1 --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_cores_AudioEngine_Utils_AEELDParser.cpp @@ -0,0 +1,11 @@ +--- xbmc/cores/AudioEngine/Utils/AEELDParser.cpp.orig 2022-05-22 11:38:07 UTC ++++ xbmc/cores/AudioEngine/Utils/AEELDParser.cpp +@@ -72,7 +72,7 @@ typedef struct + #define CEA_861_FORMAT_WMAPRO 14 + #define CEA_861_FORMAT_RESERVED2 15 + +-#define rtrim(s) s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun(std::isspace))).base(), s.end()) ++#define rtrim(s) s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char c) { return !std::isspace(c); }).base(), s.end()) + + void CAEELDParser::Parse(const uint8_t *data, size_t length, CAEDeviceInfo& info) + { diff --git a/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.cpp b/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.cpp deleted file mode 100644 index 462b382cced0..000000000000 --- a/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- xbmc/dbwrappers/mysqldataset.cpp.orig 2021-01-18 00:42:21 UTC -+++ xbmc/dbwrappers/mysqldataset.cpp -@@ -18,10 +18,8 @@ - #include - #include - #include --#ifdef HAS_MYSQL -+#if defined(HAS_MYSQL) || defined(HAS_MARIADB) - #include --#elif defined(HAS_MARIADB) --#include - #endif - - #ifdef TARGET_POSIX diff --git a/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.h b/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.h deleted file mode 100644 index a8e8cbef8062..000000000000 --- a/multimedia/kodi/files/patch-xbmc_dbwrappers_mysqldataset.h +++ /dev/null @@ -1,14 +0,0 @@ ---- xbmc/dbwrappers/mysqldataset.h.orig 2020-10-04 17:37:02 UTC -+++ xbmc/dbwrappers/mysqldataset.h -@@ -10,10 +10,8 @@ - - #include - #include "dataset.h" --#ifdef HAS_MYSQL -+#if defined(HAS_MYSQL) || defined(HAS_MARIADB) - #include --#elif defined(HAS_MARIADB) --#include - #endif - - namespace dbiplus { diff --git a/multimedia/kodi/files/patch-xbmc_platform_linux_peripherals_PeripheralBusUSBLibUSB.cpp b/multimedia/kodi/files/patch-xbmc_platform_linux_peripherals_PeripheralBusUSBLibUSB.cpp new file mode 100644 index 000000000000..e28fc5a7e1d2 --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_platform_linux_peripherals_PeripheralBusUSBLibUSB.cpp @@ -0,0 +1,11 @@ +--- xbmc/platform/linux/peripherals/PeripheralBusUSBLibUSB.cpp.orig 2022-05-22 14:00:05 UTC ++++ xbmc/platform/linux/peripherals/PeripheralBusUSBLibUSB.cpp +@@ -42,7 +42,7 @@ bool CPeripheralBusUSB::PerformDeviceScan(PeripheralSc + GetType(dev->config[0].interface[0].altsetting[0].bInterfaceClass) : + GetType(dev->descriptor.bDeviceClass); + #ifdef TARGET_FREEBSD +- result.m_strLocation = std::to_string(dev->filename); ++ result.m_strLocation = dev->filename; + #else + result.m_strLocation = StringUtils::Format("/bus{}/dev{}", bus->dirname, dev->filename); + #endif diff --git a/multimedia/kodi/files/patch-xbmc_platform_linux_storage_UDisks2Provider.h b/multimedia/kodi/files/patch-xbmc_platform_linux_storage_UDisks2Provider.h index b7cddf6e9e73..5c99282ac118 100644 --- a/multimedia/kodi/files/patch-xbmc_platform_linux_storage_UDisks2Provider.h +++ b/multimedia/kodi/files/patch-xbmc_platform_linux_storage_UDisks2Provider.h @@ -1,11 +1,11 @@ ---- xbmc/platform/linux/storage/UDisks2Provider.h.orig 2020-07-16 09:15:42 UTC +--- xbmc/platform/linux/storage/UDisks2Provider.h.orig 2022-07-08 10:04:52 UTC +++ xbmc/platform/linux/storage/UDisks2Provider.h -@@ -40,7 +40,7 @@ class CUDisks2Provider : public IStorageProvider +@@ -46,7 +46,7 @@ class CUDisks2Provider : public IStorageProvider std::string m_label; std::string m_device; bool m_isSystem = false; - u_int64_t m_size = 0; + uint64_t m_size = 0; explicit Block(const char *object); ~Block() = default; diff --git a/multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp b/multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp new file mode 100644 index 000000000000..81127dba644b --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_platform_posix_filesystem_SMBWSDiscoveryListener.cpp @@ -0,0 +1,10 @@ +--- xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp.orig 2022-05-22 10:20:23 UTC ++++ xbmc/platform/posix/filesystem/SMBWSDiscoveryListener.cpp +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + + using namespace WSDiscovery; diff --git a/multimedia/kodi/files/patch-xbmc_utils_StringUtils.cpp b/multimedia/kodi/files/patch-xbmc_utils_StringUtils.cpp new file mode 100644 index 000000000000..48614eccf725 --- /dev/null +++ b/multimedia/kodi/files/patch-xbmc_utils_StringUtils.cpp @@ -0,0 +1,11 @@ +--- xbmc/utils/StringUtils.cpp.orig 2022-05-22 09:59:08 UTC ++++ xbmc/utils/StringUtils.cpp +@@ -17,7 +17,7 @@ + //------------------------------------------------------------------------ + + #ifdef HAVE_NEW_CROSSGUID +-#include ++#include + #else + #include + #endif diff --git a/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h b/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h deleted file mode 100644 index ee0df4979024..000000000000 --- a/multimedia/kodi/files/patch-xbmc_windowing_X11_GLContextEGL.h +++ /dev/null @@ -1,11 +0,0 @@ ---- xbmc/windowing/X11/GLContextEGL.h.orig 2022-03-02 18:38:51 UTC -+++ xbmc/windowing/X11/GLContextEGL.h -@@ -13,7 +13,7 @@ - #include "threads/CriticalSection.h" - - #include --#include -+#include - #include - - class CGLContextEGL : public CGLContext diff --git a/multimedia/kodi/pkg-message b/multimedia/kodi/pkg-message index 47e2beb4c994..3cf73d07d67d 100644 --- a/multimedia/kodi/pkg-message +++ b/multimedia/kodi/pkg-message @@ -1,19 +1,19 @@ [ { type: install message: <