From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4EB715838C for ; Sun, 21 Jan 2024 04:41:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56776E29B3; Sun, 21 Jan 2024 04:41:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E3F3E29B3 for ; Sun, 21 Jan 2024 04:41:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B04123432FB for ; Sun, 21 Jan 2024 04:41:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E5B797B for ; Sun, 21 Jan 2024 04:41:40 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705812068.8f454c9a9c209a829a4066c71aad5845e58ce720.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/files/, media-tv/kodi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/kodi/Manifest media-tv/kodi/files/kodi-20.2-binutils-2.41.patch media-tv/kodi/kodi-20.3.ebuild X-VCS-Directories: media-tv/kodi/ media-tv/kodi/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8f454c9a9c209a829a4066c71aad5845e58ce720 X-VCS-Branch: master Date: Sun, 21 Jan 2024 04:41:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aad38341-e737-439b-89cd-55dcba99fdf4 X-Archives-Hash: 034c412bf27826873eeb7e609e134579 commit: 8f454c9a9c209a829a4066c71aad5845e58ce720 Author: Alfred Wingate protonmail com> AuthorDate: Sun Dec 24 14:09:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 21 04:41:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f454c9a media-tv/kodi: add 20.3 * Drop riscv due to new dependency sci-libs/kissfft. Bug: https://bugs.gentoo.org/779184 Bug: https://bugs.gentoo.org/818262 Bug: https://bugs.gentoo.org/860984 Closes: https://bugs.gentoo.org/892547 Signed-off-by: Alfred Wingate protonmail.com> Signed-off-by: Sam James gentoo.org> media-tv/kodi/Manifest | 2 + media-tv/kodi/files/kodi-20.2-binutils-2.41.patch | 103 +++++ media-tv/kodi/kodi-20.3.ebuild | 474 ++++++++++++++++++++++ 3 files changed, 579 insertions(+) diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index d37004f2967f..6e9e7f54540a 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,6 +1,8 @@ DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a +DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5 DIST ffmpeg-kodi-5.1.2-Nexus-Alpha3.tar.gz 14416966 BLAKE2B fe35ef6a9aa2d60a2b34432ae8063850003d550208f223ea43af8ebcaa73e6993639e8cfe8a38676bac79e6b1816bd791b75b66ef58ff4d740bc9a5e0e7f9b78 SHA512 ce60852b8456d6f4bfc60de0ceadb33034d9b3eea8c0bc84d8b7199984ecbf334a2c4d9b42eade439d0ef30ce22e3b2ca0a49d4df837a18cd3136b4343ed3113 DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f +DIST kodi-20.3-Nexus.tar.gz 54567232 BLAKE2B 956be2d1bef16910d88f244331bdff60cce309d9596ec7939a459489b7fa7ab3ca7b29e2aca0de542f48f95321d86c9d7a606ac311a7a3c69e0e6f901511982e SHA512 cdec1383d33f421828f0249ac2929980c6eaa39e345a8a364d9f3479f873029a15f3f6e6d40707fd2df2067a71bdaa3c6a1e26277074c31c631c71afe7465cb4 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e DIST libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz 102124 BLAKE2B 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c SHA512 d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 diff --git a/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch b/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch new file mode 100644 index 000000000000..6ee7a55ee1de --- /dev/null +++ b/media-tv/kodi/files/kodi-20.2-binutils-2.41.patch @@ -0,0 +1,103 @@ +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/effadce6c756247ea8bae32dc13bb3e6f464f0eb + +From db99a6e0ed9490478a7af7b6a3299688b1a329e1 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Sun, 24 Dec 2023 14:02:37 +0200 +Subject: [PATCH] ffmpeg: add patch to fix build against binutils-2.41 + +Signed-off-by: Alfred Wingate +--- a/cmake/modules/FindFFMPEG.cmake ++++ b/cmake/modules/FindFFMPEG.cmake +@@ -96,7 +96,9 @@ macro(buildFFMPEG) + -DPKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig) + set(PATCH_COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt +- ) ++ && ++ # patch internal ffmpeg, fix build against binutils 2.41 ++ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-binutils-2.41.patch) + + if(CMAKE_GENERATOR STREQUAL Xcode) + set(FFMPEG_GENERATOR CMAKE_GENERATOR "Unix Makefiles") +--- /dev/null ++++ b/tools/depends/target/ffmpeg/build-fix-for-binutils-2.41.patch +@@ -0,0 +1,76 @@ ++From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 ++From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= ++Date: Sun, 16 Jul 2023 18:18:02 +0300 ++Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift ++ instructions within inline assembly ++ ++Fixes assembling with binutil as >= 2.41 ++ ++Signed-off-by: James Almer ++--- ++ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- ++ 1 file changed, 23 insertions(+), 3 deletions(-) ++ ++diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h ++index 6298f5ed19..ca7e2dffc1 100644 ++--- a/libavcodec/x86/mathops.h +++++ b/libavcodec/x86/mathops.h ++@@ -35,12 +35,20 @@ ++ static av_always_inline av_const int MULL(int a, int b, unsigned shift) ++ { ++ int rt, dummy; +++ if (__builtin_constant_p(shift)) ++ __asm__ ( ++ "imull %3 \n\t" ++ "shrdl %4, %%edx, %%eax \n\t" ++ :"=a"(rt), "=d"(dummy) ++- :"a"(a), "rm"(b), "ci"((uint8_t)shift) +++ :"a"(a), "rm"(b), "i"(shift & 0x1F) ++ ); +++ else +++ __asm__ ( +++ "imull %3 \n\t" +++ "shrdl %4, %%edx, %%eax \n\t" +++ :"=a"(rt), "=d"(dummy) +++ :"a"(a), "rm"(b), "c"((uint8_t)shift) +++ ); ++ return rt; ++ } ++ ++@@ -113,19 +121,31 @@ __asm__ volatile(\ ++ // avoid +32 for shift optimization (gcc should do that ...) ++ #define NEG_SSR32 NEG_SSR32 ++ static inline int32_t NEG_SSR32( int32_t a, int8_t s){ +++ if (__builtin_constant_p(s)) ++ __asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++ else +++ __asm__ ("sarl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++ ); ++ return a; ++ } ++ ++ #define NEG_USR32 NEG_USR32 ++ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ +++ if (__builtin_constant_p(s)) ++ __asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++ else +++ __asm__ ("shrl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++ ); ++ return a; ++ } ++ ++-- ++2.25.1 ++ +-- +2.43.0 + diff --git a/media-tv/kodi/kodi-20.3.ebuild b/media-tv/kodi/kodi-20.3.ebuild new file mode 100644 index 000000000000..893bd5d6c5b5 --- /dev/null +++ b/media-tv/kodi/kodi-20.3.ebuild @@ -0,0 +1,474 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# FFmpeg can be unbundled, but is currently stuck at a very old version. +# libdvd{css,read,nav} are not unbundlable without patching the buildsystem. + +# Versions for the forked projects that are bundled +# See tools/depends/target//-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="4.4.1" +CODENAME="Nexus" +FFMPEG_KODI_VERSION="Alpha1" + +# 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..11} ) # python3.12 support added in 21 + +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 cmake desktop flag-o-matic java-pkg-2 linux-info optfeature pax-utils python-single-r1 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 + css? ( + https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz + -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz + ) + !system-ffmpeg? ( + https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz + -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_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 ~arm ~arm64 ~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 raspberry-pi samba 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 ) + udev? ( !libusb ) + vdpau? ( X !gles !gbm ) + zeroconf? ( dbus ) +" +RESTRICT="!test? ( test )" + +# dev-libs/libcec[-cubox] bug #818262 +COMMON_DEPEND=" + >=dev-libs/flatbuffers-1.12.0:= + >=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] + media-fonts/roboto + media-libs/libglvnd[X?] + >=media-libs/freetype-2.10.1 + media-libs/harfbuzz:= + >=media-libs/libass-0.13.4:= + media-libs/mesa[egl(+),gbm(+)?,wayland?,X?] + >=media-libs/taglib-1.9.0 + 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,raspberry-pi?] + ) + dbus? ( + sys-apps/dbus + ) + gbm? ( + >=dev-libs/libinput-1.10.5:= + x11-libs/libxkbcommon + ) + gles? ( + !raspberry-pi? ( + media-libs/mesa[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.24:= + ) + pulseaudio? ( + media-libs/libpulse + ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland + media-libs/raspberrypi-userland-bin + media-libs/mesa[gles2,video_cards_vc4] + ) + ) + samba? ( + >=net-fs/samba-3.4.6[smbclient(+)] + ) + system-ffmpeg? ( + >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc,vaapi?,vdpau?,X?] + =media-video/ffmpeg-4*[openssl] + ) + !system-ffmpeg? ( + app-arch/bzip2 + media-libs/dav1d:= + ) + 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.55:=[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 + test? ( + >=dev-cpp/gtest-1.10.0 + ) + wayland? ( + >=dev-libs/wayland-protocols-1.7 + ) + X? ( + x11-base/xorg-proto + x11-libs/libXrender + ) +" +#