commit: 4012f0c17431071322b37b09006a6f6aa7334735 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sat Jun 1 16:58:08 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 2 07:09:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4012f0c1
media-tv/kodi: fix issue that breaks playing DVDs and BluRays Bug: https://bugs.gentoo.org/933370 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-tv/kodi/files/kodi-21-fix-dvd-playing.patch | 50 +++ media-tv/kodi/kodi-21.0-r2.ebuild | 516 ++++++++++++++++++++++ 2 files changed, 566 insertions(+) diff --git a/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch new file mode 100644 index 000000000000..febcdc2197e4 --- /dev/null +++ b/media-tv/kodi/files/kodi-21-fix-dvd-playing.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/933370 +https://github.com/xbmc/xbmc/issues/24955 +https://github.com/xbmc/xbmc/pull/24968 + +From e8493d3ac390bac4ca74fa5435bb258d6764dae5 Mon Sep 17 00:00:00 2001 +From: Jose Luis Marti <[email protected]> +Date: Tue, 9 Apr 2024 23:06:10 +0200 +Subject: [PATCH] [DllLoader] Remove fstatvfs64 wrapper + +Co-authored-by: fuzzard <[email protected]> +--- a/xbmc/cores/DllLoader/exports/wrapper.c ++++ b/xbmc/cores/DllLoader/exports/wrapper.c +@@ -36,7 +36,6 @@ typedef fpos_t fpos64_t; + #endif + + struct mntent; +-struct statvfs64; + + void* dllmalloc(size_t ); + void* dllcalloc( size_t , size_t ); +@@ -92,7 +91,6 @@ int dll_ftrylockfile(FILE *file); + void dll_funlockfile(FILE *file); + int dll_fstat64(int fd, struct stat64 *buf); + int dll_fstat(int fd, struct _stat *buf); +-int dll_fstatvfs64(int fildes, struct statvfs64 *buf); + FILE* dll_popen(const char *command, const char *mode); + void* dll_dlopen(const char *filename, int flag); + int dll_setvbuf(FILE *stream, char *buf, int type, size_t size); +@@ -445,11 +443,6 @@ int __wrap_fstat64(int fd, struct stat64* buf) + return dll_fstat64(fd, buf); + } + +-int __wrap_fstatvfs64(int fd, struct statvfs64* buf) +-{ +- return dll_fstatvfs64(fd, buf); +-} +- + int __wrap_setvbuf(FILE *stream, char *buf, int type, size_t size) + { + return dll_setvbuf(stream, buf, type, size); +--- a/xbmc/cores/DllLoader/exports/wrapper_mach_alias ++++ b/xbmc/cores/DllLoader/exports/wrapper_mach_alias +@@ -20,7 +20,6 @@ ___wrap_fread _fread + ___wrap_freopen _freopen + ___wrap_fseek _fseek + ___wrap_fsetpos _fsetpos +-___wrap_fstatvfs64 _fstatvfs64 + ___wrap_ftell _ftell + ___wrap_ftrylockfile _ftrylockfile + ___wrap_funlockfile _funlockfile diff --git a/media-tv/kodi/kodi-21.0-r2.ebuild b/media-tv/kodi/kodi-21.0-r2.ebuild new file mode 100644 index 000000000000..f975ad26a22a --- /dev/null +++ b/media-tv/kodi/kodi-21.0-r2.ebuild @@ -0,0 +1,516 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CODENAME="Omega" + +# libdvd{css,read,nav} are not unbundlable without patching the buildsystem. + +# Versions for the forked projects that are bundled +# See tools/depends/target/<project>/<project>-VERSION +LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2" +LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2" +LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2" +FFMPEG_VERSION="6.0.1" + +# Java bundles from xbmc/interfaces/swig/CMakeLists.txt +GROOVY_VERSION="4.0.16" +APACHE_COMMON_LANG_VERSION="3.14.0" +APACHE_COMMON_TEXT_VERSION="1.11.0" + +# Doesn't build with jdk-21 +_JAVA_PKG_WANT_BUILD_VM=( {openjdk{,-jre},icedtea}{,-bin}-{8,11,17} ) +JAVA_PKG_WANT_BUILD_VM=${_JAVA_PKG_WANT_BUILD_VM[@]} +# Required to be set, but not used. +JAVA_PKG_WANT_SOURCE="17" +JAVA_PKG_WANT_TARGET="17" + +PYTHON_REQ_USE="sqlite,ssl" +PYTHON_COMPAT=( python3_{10..12} ) + +CPU_FLAGS="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" + +inherit autotools cmake desktop flag-o-matic java-pkg-2 libtool linux-info optfeature pax-utils python-single-r1 \ + toolchain-funcs xdg + +DESCRIPTION="A free and open source media-player and entertainment hub" +HOMEPAGE="https://kodi.tv/"; + +SRC_URI=" + https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz + -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz + https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz + -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz + https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-${GROOVY_VERSION}.zip + https://mirrors.kodi.tv/build-deps/sources/commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz + https://mirrors.kodi.tv/build-deps/sources/commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz + css? ( + https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz + -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz + ) + !system-ffmpeg? ( + https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz + ) +" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"; + if [[ ${PV} != "9999" ]]; then + EGIT_BRANCH="${CODENAME}" + fi + inherit git-r3 +else + MY_PV=${PV/_p/_r} + MY_PV=${MY_PV/_alpha/a} + MY_PV=${MY_PV/_beta/b} + MY_PV=${MY_PV/_rc/rc} + MY_PV="${MY_PV}-${CODENAME}" + MY_P="${PN}-${MY_PV}" + SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + S=${WORKDIR}/xbmc-${MY_PV} +fi + +LICENSE="GPL-2+" +SLOT="0" +# use flag is called libusb so that it doesn't fool people in thinking that +# it is _required_ for USB support. Otherwise they'll disable udev and +# that's going to be worse. +IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio samba soc +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ^^ ( gbm wayland X ) + ?? ( mariadb mysql ) + bluray? ( udf ) + gbm? ( udev ) + soc? ( system-ffmpeg ) + udev? ( !libusb ) + vdpau? ( X !gles !gbm ) + zeroconf? ( dbus ) +" +RESTRICT="!test? ( test )" + +# dev-libs/libcec[-cubox] bug #818262 +COMMON_DEPEND=" + >=dev-libs/flatbuffers-23.3.3:= + >=dev-libs/lzo-2.04:2 + media-libs/giflib:= + >=media-libs/libjpeg-turbo-2.0.4:= + >=media-libs/libpng-1.6.26:0= + wayland? ( + dev-cpp/waylandpp:= + ) +" +COMMON_TARGET_DEPEND="${PYTHON_DEPS} + >=net-misc/curl-7.68.0[http2] + >=sys-libs/zlib-1.2.11 + dev-db/sqlite:3 + dev-libs/crossguid + >=dev-libs/fribidi-1.0.5 + >=dev-libs/libcdio-2.1.0:=[cxx] + >=dev-libs/libfmt-6.1.2:= + dev-libs/libfstrcmp + dev-libs/libpcre[cxx] + >=dev-libs/openssl-1.1.1k:0= + >=dev-libs/spdlog-1.5.0:= + dev-libs/tinyxml[stl] + dev-libs/tinyxml2:= + media-fonts/roboto + media-libs/libglvnd[X?] + >=media-libs/freetype-2.10.1 + media-libs/harfbuzz:= + >=media-libs/libass-0.15.0:= + media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] + >=media-libs/taglib-1.9.0 + =media-video/ffmpeg-6*:=[encode,soc(-)?,postproc,vaapi?,vdpau?,X?] + sci-libs/kissfft + virtual/libiconv + virtual/ttf-fonts + x11-libs/libdrm + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ') + airplay? ( + >=app-pda/libplist-2.0.0:= + net-libs/shairplay + ) + alsa? ( + >=media-libs/alsa-lib-1.1.4.1 + ) + bluetooth? ( + net-wireless/bluez:= + ) + bluray? ( + >=media-libs/libbluray-1.1.2:= + ) + caps? ( + sys-libs/libcap + ) + cec? ( + >=dev-libs/libcec-4.0[-cubox] + ) + dbus? ( + sys-apps/dbus + ) + gbm? ( + >=dev-libs/libinput-1.10.5:= + media-libs/libdisplay-info + x11-libs/libxkbcommon + ) + gles? ( + || ( + >=media-libs/mesa-24.1.0_rc1[opengl] + <media-libs/mesa-24.1.0_rc1[gles2] + ) + ) + !gles? ( + media-libs/glu + ) + lcms? ( + >=media-libs/lcms-2.10:2 + ) + libusb? ( + virtual/libusb:1 + ) + lirc? ( + app-misc/lirc + ) + mariadb? ( + dev-db/mariadb-connector-c:= + ) + mysql? ( + dev-db/mysql-connector-c:= + ) + nfs? ( + >=net-fs/libnfs-2.0.0:= + ) + pipewire? ( + >=media-video/pipewire-0.3.50:= + ) + pulseaudio? ( + media-libs/libpulse + ) + samba? ( + >=net-fs/samba-3.4.6[smbclient(+)] + ) + udf? ( + >=dev-libs/libudfread-1.0.0 + ) + udev? ( + virtual/libudev:= + ) + vaapi? ( + media-libs/libva:=[wayland?,X?] + ) + vdpau? ( + || ( + >=x11-libs/libvdpau-1.1 + >=x11-drivers/nvidia-drivers-180.51 + ) + ) + wayland? ( + >=x11-libs/libxkbcommon-0.4.1[wayland] + ) + webserver? ( + >=net-libs/libmicrohttpd-0.9.77:=[messages(+)] + ) + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + ) + xslt? ( + dev-libs/libxslt + >=dev-libs/libxml2-2.9.4 + ) + zeroconf? ( + net-dns/avahi[dbus] + ) +" +RDEPEND=" + ${COMMON_DEPEND} + ${COMMON_TARGET_DEPEND} +" +DEPEND=" + ${COMMON_DEPEND} + ${COMMON_TARGET_DEPEND} + >=dev-libs/rapidjson-1.0.2 + test? ( + >=dev-cpp/gtest-1.10.0 + ) + wayland? ( + >=dev-libs/wayland-protocols-1.7 + ) + X? ( + x11-base/xorg-proto + x11-libs/libXrender + ) +" +BDEPEND=" + ${COMMON_DEPEND} + app-arch/unzip + dev-build/cmake + dev-lang/swig + virtual/pkgconfig + <=virtual/jre-17:* + doc? ( + app-text/doxygen + ) +" + +PATCHES=( + "${FILESDIR}"/kodi-21-fix-gcc14.patch + "${FILESDIR}"/kodi-21-fix-dvd-playing.patch +) + +# bug #544020 +CONFIG_CHECK="~IP_MULTICAST" +ERROR_IP_MULTICAST=" +In some cases Kodi needs to access multicast addresses. +Please consider enabling IP_MULTICAST under Networking options. +" + +pkg_setup() { + check_extra_config + java-pkg-2_pkg_setup + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + else + unpack ${MY_P}.tar.gz + fi + + unpack apache-groovy-binary-${GROOVY_VERSION}.zip + unpack commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz + unpack commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz +} + +src_prepare() { + cmake_src_prepare + + # avoid long delays when powerkit isn't running #348580 + sed -i \ + -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ + xbmc/platform/linux/*.cpp || die + + # Add all possible names for kissfft libraries + for datatype in {float,int16,int32,simd}; do + sed -i \ + -e "s/\(find_library(KISSFFT_LIBRARY NAMES .*\)/\1 kissfft-${datatype} kissfft-${datatype}-openmp/" \ + cmake/modules/FindKissFFT.cmake || die + done + + if tc-is-cross-compiler; then + # These tools are automatically built with CMake during a native build + # but need to be built in advance using Autotools for a cross build. + NATIVE_TOOLS=( + TexturePacker + JsonSchemaBuilder + ) + + local t + for t in "${NATIVE_TOOLS[@]}" ; do + pushd "${S}/tools/depends/native/$t/src" >/dev/null || die + AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf + popd >/dev/null || die + done + elibtoolize + fi +} + +src_configure() { + local mycmakeargs=( + -Wno-dev # less noise + + -DAPP_RENDER_SYSTEM=$(usex gles gles gl) + -DCORE_PLATFORM_NAME=$(usev gbm)$(usev wayland)$(usev X x11) + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -DENABLE_TESTING=$(usex test) + -DVERBOSE=ON + + # Enforce use of configured python interpeter + -DPYTHON_PATH=$(python_get_library_path) + -DPYTHON_VER=${EPYTHON##python} # wont work for pypy + + # Toolchain + -DENABLE_CCACHE=OFF + -DENABLE_CLANGFORMAT=OFF + -DENABLE_CLANGTIDY=OFF + -DENABLE_CPPCHECK=OFF + -DENABLE_INCLUDEWHATYOUUSE=OFF + # https://bugs.gentoo.org/show_bug.cgi?id=606124 + -DENABLE_GOLD=OFF + -DENABLE_LLD=OFF + -DENABLE_MOLD=OFF + -DUSE_LTO=OFF + + # Features + -DENABLE_AIRTUNES=$(usex airplay) + -DENABLE_ALSA=$(usex alsa) + -DENABLE_AVAHI=$(usex zeroconf) + -DENABLE_BLUETOOTH=$(usex bluetooth) + -DENABLE_BLURAY=$(usex bluray) + -DENABLE_CAP=$(usex caps) + -DENABLE_CEC=$(usex cec) + -DENABLE_DBUS=$(usex dbus) + -DENABLE_DVDCSS=$(usex css) + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' + -DENABLE_ISO9660PP=$(usex optical) + -DENABLE_LCMS2=$(usex lcms) + -DENABLE_LIRCCLIENT=$(usex lirc) + -DENABLE_MARIADBCLIENT=$(usex mariadb) + -DENABLE_MDNS=OFF # used only on Android + -DENABLE_MICROHTTPD=$(usex webserver) + -DENABLE_MYSQLCLIENT=$(usex mysql) + -DENABLE_NFS=$(usex nfs) + -DENABLE_OPENGL=$(usex !gles) + -DENABLE_OPENGLES=$(usex gles) + -DENABLE_OPTICAL=$(usex optical) + -DENABLE_PIPEWIRE=$(usex pipewire) + -DENABLE_PLIST=$(usex airplay) + -DENABLE_PULSEAUDIO=$(usex pulseaudio) + -DENABLE_SMBCLIENT=$(usex samba) + -DENABLE_SNDIO=OFF + -DENABLE_UDEV=$(usex udev) + -DENABLE_UDFREAD=$(usex udf) + -DENABLE_UPNP=$(usex upnp) + -DENABLE_VAAPI=$(usex vaapi) + -DENABLE_VDPAU=$(usex vdpau) + -DENABLE_XSLT=$(usex xslt) + + -DWITH_FFMPEG=$(usex system-ffmpeg) + + #To bundle or not + -DENABLE_INTERNAL_CROSSGUID=OFF + -DENABLE_INTERNAL_DAV1D=OFF + -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" + -DENABLE_INTERNAL_FLATBUFFERS=OFF + -DENABLE_INTERNAL_FMT=OFF + -DENABLE_INTERNAL_FSTRCMP=OFF + -DENABLE_INTERNAL_GTEST=OFF + -DENABLE_INTERNAL_KISSFFT=OFF + -DENABLE_INTERNAL_PCRE=OFF + -DENABLE_INTERNAL_RapidJSON=OFF + -DENABLE_INTERNAL_SPDLOG=OFF + -DENABLE_INTERNAL_TAGLIB=OFF + -DENABLE_INTERNAL_UDFREAD=OFF + + -DTARBALL_DIR="${DISTDIR}" + -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" + -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" + -Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}" + -Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMON_LANG_VERSION}" + -Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMON_TEXT_VERSION}" + ) + + # Separated to avoid "Manually-specified variables were not used by the project:" + use cec && mycmakeargs+=( -DENABLE_INTERNAL_CEC=OFF ) + use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" ) + use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF ) + use !system-ffmpeg && mycmakeargs+=( + -DFFMPEG_URL="${DISTDIR}/ffmpeg-${FFMPEG_VERSION}.tar.gz" + ) + use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON ) + + for flag in ${CPU_FLAGS[@]} ; do + local name=${flag#cpu_flags_*_} + mycmakeargs+=( -DENABLE_${name^^}=$(usex ${flag}) ) + done + + if ! is-flag -DNDEBUG && ! is-flag -D_DEBUG ; then + # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines + append-cflags -DNDEBUG + append-cxxflags -DNDEBUG + fi + + # Violates ODR (bug #860984) and USE_LTO does spooky stuff + # https://github.com/xbmc/xbmc/commit/cb72a22d54a91845b1092c295f84eeb48328921e + filter-lto + + if tc-is-cross-compiler; then + for t in "${NATIVE_TOOLS[@]}" ; do + pushd "${S}/tools/depends/native/$t/src" >/dev/null || die + econf_build + install -m0755 /dev/null "$t" || die # Actually build later. + mycmakeargs+=( -DWITH_${t^^}="${PWD}/$t" ) + popd >/dev/null || die + done + fi + + cmake_src_configure +} + +src_compile() { + if tc-is-cross-compiler; then + for t in "${NATIVE_TOOLS[@]}" ; do + emake -C "${S}/tools/depends/native/$t/src" + done + fi + + cmake_src_compile all + use doc && cmake_build doc + use test && cmake_build kodi-test +} + +src_test() { + local -x CMAKE_SKIP_TESTS=( + # Known failing, unreliable test + # bug #743938 + TestCPUInfo.GetCPUFrequency + # Test failure stemming from sci-libs/kissfft + # The difference between output[2i] and (i==freq1?1.0:0.0) is inf, which exceeds 1e-7, where output[2i] + # evaluates to inf,(i==freq1?1.0:0.0) evaluates to 0, and 1e-7 evaluates to 9.9999999999999995e-08. + TestRFFT.SimpleSignal + # bug #779184 + # https://github.com/xbmc/xbmc/issues/18594 + $(usev x86 TestDateTime.SetFromDBTime) + # Tries to ping localhost, naturally breaking network-sandbox + TestNetwork.PingHost + ) + + # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 + local -x KODI_HOME="${BUILD_DIR}" + + cmake_src_test +} + +src_install() { + cmake_src_install + + # bug #457588 + pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin + + newicon media/icon48x48.png kodi.png + + rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die + dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ + usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf + + if use !eventclients ; then + rm -f "${ED}"/usr/bin/kodi-ps3remote || die + rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die + rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die + rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die + rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die + fi + + python_optimize "${D}$(python_get_sitedir)" + + einstalldocs + use doc && dodoc -r "${S}"/docs/html/ +} + +pkg_postinst() { + xdg_pkg_postinst + + if use dbus ; then + optfeature "getting battery level and active power source" sys-power/upower + optfeature "control of shutdown, reboot, suspend, and hibernate" sys-auth/elogind sys-apps/systemd + optfeature "storage management support (automounting, volume monitoring, etc)" sys-fs/udisks:2 + fi +}
