diff --git a/dev-python/PythonQwt/Manifest b/dev-python/PythonQwt/Manifest index cc937b2733..982d64ce99 100644 --- a/dev-python/PythonQwt/Manifest +++ b/dev-python/PythonQwt/Manifest @@ -1,3 +1,3 @@ DIST pythonqwt-0.12.7.tar.gz 1217648 BLAKE2B 6c9dbaa893d6124ace07f9749d8b668fc5627269e3cabfab129fc04e3a511c971a2bd34d0bfc33da96715f7f8601e6d2d179584e8166f876296dc13d536ca710 SHA512 87af1d62e98798f5f616b7b008d704d943ae3c662b254f3243b3d9f4e5efab2f68b28c4820be6894b35852c9a5c14fa27c07868a28aacc6c9cd10ed7a674cfc2 -DIST pythonqwt-0.14.1.tar.gz 1217982 BLAKE2B 55b59568a93a8bf1d03218cfb7e79d781eb741120fcdace7d6ae7aae50b30c90283de48ba4741deb4f33f560ed7d79dbfc9a7be70d95737200d9e88833d7f012 SHA512 d032d2422b801a567cd2dc92f630cc5cfc8fd27447134381bf83033ca45c55904c859bd950ceae2efc204cbdafcce4a03045f2680f008e245fabbdde7cf115de DIST pythonqwt-0.14.2.tar.gz 1218008 BLAKE2B 7cf8e4cb5226c8c14b97000ac46d31171d111f57eeb3ecd50948746ada015e2e54bb912a93b408f8c9a3bab80c94ff7ffa7f622f8ebdca0d78a7c376072ace00 SHA512 557fed50a7d07daaeb061578c3adb08524843fb13d20ba376c65605df63ed2bc171fc536c593f146be0eca0fe9e9705e18dacb868f33178d71b4c53513a4ded8 +DIST pythonqwt-0.14.3.tar.gz 1218724 BLAKE2B e0c157167aa85b8f437b2b19fbe95524ac76168f79b536623f7311c441d68113ed931b30073598e6c0cee813f2ba73a1378caa5dddae66adfb53aed3a863313d SHA512 5fd51fd4f6e859bc5da23b2eabb5eeafa496ef6b33dce56e51a2d6abdf7184d98e390395788def8e3636938e619e6a6aee3a1b67d9c8058de960e50d437d1781 diff --git a/dev-python/PythonQwt/PythonQwt-0.14.1.ebuild b/dev-python/PythonQwt/PythonQwt-0.14.3.ebuild similarity index 100% rename from dev-python/PythonQwt/PythonQwt-0.14.1.ebuild rename to dev-python/PythonQwt/PythonQwt-0.14.3.ebuild diff --git a/dev-python/plexapi/Manifest b/dev-python/plexapi/Manifest index e26795a361..13007d708c 100644 --- a/dev-python/plexapi/Manifest +++ b/dev-python/plexapi/Manifest @@ -1,2 +1,2 @@ -DIST plexapi-4.15.16.gh.tar.gz 22524434 BLAKE2B d2166673fef5d865bf966deca16cecee40b8ed999f784a18c8d6ab17c63ba891433e29b6877c20b451bbda5ff35025cedc2515d1321fb2146411ccdc5f545999 SHA512 3b3e54340e6264be159b4380f29b2a785df3f550d14aa5a47ad628a2b09f5eaf94f1e9d472969d28bdce2feb61c1a8825a953f94a958db9a6a33d9755f57e0a4 DIST plexapi-4.16.0.gh.tar.gz 22524954 BLAKE2B 3bd88f4a05ef0573ce58526fabaa658caae4979e429619d9e98e3dba30363318d3b10d6b32a7e96df101f62799b4cdb9406b4c1556aad33982dab98240d560c1 SHA512 cd68bbd3086ccbd926058fb904027cb2c9939e57e510527667e991de23aee4e5c3e13b09906edf7f529f85e46600e134b79fac1ed2ca219d8d6a0ff17ed7f4fe +DIST plexapi-4.16.1.gh.tar.gz 22524979 BLAKE2B f8a83fc395aed0648f4b5e357934c0efaedb13d15c38cdb1740d0ed3e3fd78e0165b7958ca71b589893170cdebda2a1b1239e91df91095b9f9722f6e3b04b510 SHA512 719a2c6942d4e7b0a4aedbba05fe83ec7e4070db90e6bdb7331698c7c3ae621f96539aa89b548bc57dbb7eaf97a562b7a015746f86609ddbed09ccd5569f8ede diff --git a/dev-python/plexapi/plexapi-4.15.16.ebuild b/dev-python/plexapi/plexapi-4.16.1.ebuild similarity index 100% rename from dev-python/plexapi/plexapi-4.15.16.ebuild rename to dev-python/plexapi/plexapi-4.16.1.ebuild diff --git a/net-misc/inv_sig_helper/Manifest b/net-misc/inv_sig_helper/Manifest index de15721429..9bb78f04a4 100644 --- a/net-misc/inv_sig_helper/Manifest +++ b/net-misc/inv_sig_helper/Manifest @@ -56,6 +56,7 @@ DIST hyper-util-0.1.3.crate 61647 BLAKE2B 25821f66f7576e89b5c7a5207a4179a7e86f02 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea DIST inv_sig_helper-0_pre20241217.gh.tar.gz 34789 BLAKE2B 79d1ca73028e211faace571072d5a059beb3f32d1d113e826a86f84f2f4cf4f1d1049054f5ea968fc781355f5e52158c55d221ebd58def4982636cfd35935bf6 SHA512 abcaf546e907ecc5fd670a4cd7c48ca0bfb921bc21f4af5c2f6398644b79939b81a2ad768db30398b3915ff6ddfb1a5ad76017876658bc655869646405fd23e9 +DIST inv_sig_helper-0_pre20250103-vendor.tar.xz 16890144 BLAKE2B 57cd82c66f8ea931ed8a94706ed5293e1847679d139452c87045e485e9b35e7b26a8b149c4884dc2fad31a8f3722e20e733ee7e5214f75df1795da7d3cb14c0b SHA512 a0c97662bd23561fcd2d9a1a8d40a86ec8eaa4e23f3c571494801281b5aba76cb739852d289f9f6dec394deb94fa57c32778e48b482704a1273ef64664c9d2d7 DIST inv_sig_helper-0_pre20250103.gh.tar.gz 34754 BLAKE2B 20c0753980b5af8ea63a2a163a1fae35b071711f34bca3ffaf132713e390e26510f3da67cfad141381620c70e7f2efe6ebf4c332d552923eb0932d62e35c0a8b SHA512 9f6d52f97259c89c9a8f4b776bb474810c0f202230a7910e4a716a1202024f57f320cddd66bdfd17258cdee42221088fbeadf7731dd55a5a59efa60b50aabf0e DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54 DIST is_terminal_polyfill-1.70.1.crate 7492 BLAKE2B fa663f858ab8e5fd56202d731b572bfdd4ab0e8262100424e27360a9ffd2820182bc57d6718a305ef82d04c3798111841c0d9f9dcfe219765c0f63edb560dc1e SHA512 4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 diff --git a/net-misc/inv_sig_helper/inv_sig_helper-0_pre20250103.ebuild b/net-misc/inv_sig_helper/inv_sig_helper-0_pre20250103.ebuild index ff41cd6845..31dbd6f459 100644 --- a/net-misc/inv_sig_helper/inv_sig_helper-0_pre20250103.ebuild +++ b/net-misc/inv_sig_helper/inv_sig_helper-0_pre20250103.ebuild @@ -5,180 +5,6 @@ EAPI=8 -CRATES=" - addr2line@0.21.0 - adler@1.0.2 - aho-corasick@1.1.3 - anstream@0.6.15 - anstyle-parse@0.2.5 - anstyle-query@1.1.1 - anstyle-wincon@3.0.4 - anstyle@1.0.8 - async-lock@2.8.0 - autocfg@1.2.0 - backtrace@0.3.71 - base64@0.22.0 - bitflags@1.3.2 - bitflags@2.5.0 - bumpalo@3.16.0 - bytes@1.6.0 - cc@1.0.95 - cfg-if@1.0.0 - colorchoice@1.0.2 - core-foundation-sys@0.8.6 - core-foundation@0.9.4 - crossbeam-queue@0.3.11 - crossbeam-utils@0.8.19 - encoding_rs@0.8.34 - env_filter@0.1.2 - env_logger@0.11.5 - equivalent@1.0.1 - errno@0.3.8 - event-listener@2.5.3 - fastrand@2.1.0 - fnv@1.0.7 - foreign-types-shared@0.1.1 - foreign-types@0.3.2 - form_urlencoded@1.2.1 - futures-channel@0.3.30 - futures-core@0.3.30 - futures-executor@0.3.30 - futures-io@0.3.30 - futures-macro@0.3.30 - futures-sink@0.3.30 - futures-task@0.3.30 - futures-util@0.3.30 - futures@0.3.30 - gimli@0.28.1 - h2@0.4.4 - hashbrown@0.14.3 - hermit-abi@0.3.9 - http-body-util@0.1.1 - http-body@1.0.0 - http@1.1.0 - httparse@1.8.0 - humantime@2.1.0 - hyper-tls@0.6.0 - hyper-util@0.1.3 - hyper@1.3.1 - idna@0.5.0 - indexmap@2.2.6 - ipnet@2.9.0 - is_terminal_polyfill@1.70.1 - itoa@1.0.11 - js-sys@0.3.69 - lazy-regex-proc_macros@3.1.0 - lazy-regex@3.1.0 - lazy_static@1.4.0 - libc@0.2.153 - linux-raw-sys@0.4.13 - lock_api@0.4.12 - log@0.4.22 - memchr@2.7.2 - mime@0.3.17 - miniz_oxide@0.7.2 - mio@0.8.11 - native-tls@0.2.11 - num_cpus@1.16.0 - object@0.32.2 - once_cell@1.19.0 - openssl-macros@0.1.1 - openssl-probe@0.1.5 - parking_lot@0.12.2 - parking_lot_core@0.9.10 - percent-encoding@2.3.1 - pin-project-internal@1.1.5 - pin-project-lite@0.2.14 - pin-project@1.1.5 - pin-utils@0.1.0 - pkg-config@0.3.30 - proc-macro2@1.0.81 - quote@1.0.36 - redox_syscall@0.5.1 - regex-automata@0.4.6 - regex-syntax@0.8.3 - regex@1.10.4 - reqwest@0.12.4 - rquickjs-core@0.6.0 - rquickjs-sys@0.6.0 - rquickjs@0.6.0 - rustc-demangle@0.1.23 - rustix@0.38.34 - rustls-pemfile@2.1.2 - rustls-pki-types@1.5.0 - ryu@1.0.17 - schannel@0.1.23 - scopeguard@1.2.0 - security-framework-sys@2.10.0 - security-framework@2.10.0 - serde@1.0.199 - serde_derive@1.0.199 - serde_json@1.0.116 - serde_urlencoded@0.7.1 - signal-hook-registry@1.4.2 - slab@0.4.9 - smallvec@1.13.2 - socket2@0.5.6 - syn@2.0.60 - sync_wrapper@0.1.2 - system-configuration-sys@0.5.0 - system-configuration@0.5.1 - tempfile@3.10.1 - tinyvec@1.6.0 - tinyvec_macros@0.1.1 - tokio-macros@2.2.0 - tokio-native-tls@0.3.1 - tokio-util@0.7.10 - tokio@1.37.0 - tower-layer@0.3.2 - tower-service@0.3.2 - tower@0.4.13 - tracing-core@0.1.32 - tracing@0.1.40 - try-lock@0.2.5 - tub@0.3.7 - unicode-bidi@0.3.15 - unicode-ident@1.0.12 - unicode-normalization@0.1.23 - url@2.5.0 - utf8parse@0.2.2 - vcpkg@0.2.15 - want@0.3.1 - wasi@0.11.0+wasi-snapshot-preview1 - wasm-bindgen-backend@0.2.92 - wasm-bindgen-futures@0.4.42 - wasm-bindgen-macro-support@0.2.92 - wasm-bindgen-macro@0.2.92 - wasm-bindgen-shared@0.2.92 - wasm-bindgen@0.2.92 - web-sys@0.3.69 - windows-sys@0.48.0 - windows-sys@0.52.0 - windows-targets@0.48.5 - windows-targets@0.52.5 - windows_aarch64_gnullvm@0.48.5 - windows_aarch64_gnullvm@0.52.5 - windows_aarch64_msvc@0.48.5 - windows_aarch64_msvc@0.52.5 - windows_i686_gnu@0.48.5 - windows_i686_gnu@0.52.5 - windows_i686_gnullvm@0.52.5 - windows_i686_msvc@0.48.5 - windows_i686_msvc@0.52.5 - windows_x86_64_gnu@0.48.5 - windows_x86_64_gnu@0.52.5 - windows_x86_64_gnullvm@0.48.5 - windows_x86_64_gnullvm@0.52.5 - windows_x86_64_msvc@0.48.5 - windows_x86_64_msvc@0.52.5 - winreg@0.52.0 -" - -CRATE_PATHS_OVERRIDE=" - openssl-sys@0.9.104 - openssl@0.10.68 -" - inherit cargo systemd COMMIT="614e2e2b497f54054310571ed03733b408a1ecc1" @@ -186,7 +12,7 @@ DESCRIPTION="Rust service that decrypts YouTube signatures and manages player in HOMEPAGE="https://github.com/iv-org/inv_sig_helper" SRC_URI=" https://github.com/iv-org/inv_sig_helper/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} + https://jroy.ca/dist/${P}-vendor.tar.xz " S="${WORKDIR}/${PN}-${COMMIT}" @@ -198,9 +24,9 @@ KEYWORDS="~amd64" RDEPEND="dev-libs/openssl" -src_prepare() { - default - cargo_update_crates +src_unpack() { + cargo_src_unpack + ln -s "${WORKDIR}/vendor/"* "${CARGO_HOME}/gentoo/" || die } src_install() { diff --git a/x11-drivers/evdi/Manifest b/x11-drivers/evdi/Manifest index c4317f295a..ce159e2036 100644 --- a/x11-drivers/evdi/Manifest +++ b/x11-drivers/evdi/Manifest @@ -1 +1,2 @@ DIST evdi-1.14.7.tar.gz 95158 BLAKE2B ca640c49473b85f59fc5f510a9e59db2579878285ea9bc45ec65d6f464b5937f60cdc96ef3d25bf4e7b06e7478d3cf06b541eda986388418cd077b784db8c0da SHA512 75af080dfb110db1e98a980bba3c7edb892ec1849e368206f8841fc79f947220d8ec5f9ae74c7e3f9164ed2be9cae713270da4bdec10e8af5295d264e55af0d7 +DIST evdi-1.14.8.tar.gz 96663 BLAKE2B 2c6cb5ecad1d2b3679a08e19a3985b332c4db9a3a4b2a904479d1338e3a45ebd95428c3d751ca80df8dd9628eeb5150c6967391d7d98685fe267a14b9dd755bd SHA512 ec335b848a4ff7ed09927e8ed4cd7edc4c2ae1c25d2cee8db14928b2c93c5d68cb5946249abb0ef07dd1a4db9374b4f45bc5e2b3c5b4258158a54b426a7c2935 diff --git a/x11-drivers/evdi/evdi-1.14.7-r2.ebuild b/x11-drivers/evdi/evdi-1.14.7-r2.ebuild new file mode 100644 index 0000000000..2f7f687934 --- /dev/null +++ b/x11-drivers/evdi/evdi-1.14.7-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit linux-mod-r1 python-single-r1 flag-o-matic + +DESCRIPTION="Extensible Virtual Display Interface" +HOMEPAGE="https://github.com/DisplayLink/evdi" +SRC_URI="https://github.com/DisplayLink/evdi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0/$(ver_cut 1)" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +IUSE="python test" + +RDEPEND="${PYTHON_DEPS} + x11-libs/libdrm + python? ( + $(python_gen_cond_dep ' + dev-python/pybind11[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-mock[${PYTHON_USEDEP}] + ) + ') + ) +" + +DEPEND="${RDEPEND} + sys-kernel/linux-headers +" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +# module/Kconfig +CONFIG_CHECK="~FB_VIRTUAL ~I2C ~DRM ~USB_SUPPORT ~USB_ARCH_HAS_HCD MODULES" + +PATCHES=( + "${FILESDIR}/${PN}-1.14.4-format-truncation.patch" + "${FILESDIR}/${PN}-1.14.7-removed-output_poll_changed.patch" + "${FILESDIR}/${PN}-1.14.7-drm_fb_helper.info.patch" # backport from 1.14.8 +) + +pkg_setup() { + linux-mod-r1_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_compile() { + filter-lto + + local modlist=( + "evdi=video:module" + ) + local modargs=( + CONFIG_DRM_EVDI="m" # https://github.com/DisplayLink/evdi/issues/476 + KVER="${KV_FULL}" + KDIR="${KV_OUT_DIR}" + ) + linux-mod-r1_src_compile + + emake -C library + + use python && emake -C pyevdi +} + +src_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + + use python && emake -C pyevdi tests +} + +src_install() { + linux-mod-r1_src_install + + local -x DESTDIR="${ED}" PREFIX="${EPREFIX}" + + LIBDIR="/usr/$(get_libdir)" emake -C library install + + use python && emake -C pyevdi install +} diff --git a/x11-drivers/evdi/evdi-1.14.7-r1.ebuild b/x11-drivers/evdi/evdi-1.14.8.ebuild similarity index 96% rename from x11-drivers/evdi/evdi-1.14.7-r1.ebuild rename to x11-drivers/evdi/evdi-1.14.8.ebuild index 84b6d26db8..6107a7522e 100644 --- a/x11-drivers/evdi/evdi-1.14.7-r1.ebuild +++ b/x11-drivers/evdi/evdi-1.14.8.ebuild @@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="python test" RDEPEND="${PYTHON_DEPS} - x11-libs/libdrm python? ( $(python_gen_cond_dep ' dev-python/pybind11[${PYTHON_USEDEP}] @@ -29,6 +28,7 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND} + x11-libs/libdrm sys-kernel/linux-headers " @@ -41,7 +41,6 @@ CONFIG_CHECK="~FB_VIRTUAL ~I2C ~DRM ~USB_SUPPORT ~USB_ARCH_HAS_HCD MODULES" PATCHES=( "${FILESDIR}/${PN}-1.14.4-format-truncation.patch" - "${FILESDIR}/${PN}-1.14.7-removed-output_poll_changed.patch" ) pkg_setup() { diff --git a/x11-drivers/evdi/files/evdi-1.14.7-drm_fb_helper.info.patch b/x11-drivers/evdi/files/evdi-1.14.7-drm_fb_helper.info.patch new file mode 100644 index 0000000000..07f8879107 --- /dev/null +++ b/x11-drivers/evdi/files/evdi-1.14.7-drm_fb_helper.info.patch @@ -0,0 +1,55 @@ +https://github.com/DisplayLink/evdi/commit/88d67b63487ad484dff31d9e1355a32771787979.patch +From 88d67b63487ad484dff31d9e1355a32771787979 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C5=81ukasz=20Spintzyk?= +Date: Mon, 7 Oct 2024 09:17:43 +0200 +Subject: [PATCH] Validate build with CONFIG_FB define + +--- + ci/build_against_kernel | 2 +- + module/evdi_fb.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ci/build_against_kernel b/ci/build_against_kernel +index ebd0562..25cf174 100755 +--- a/ci/build_against_kernel ++++ b/ci/build_against_kernel +@@ -236,7 +236,7 @@ build_one() { # KVER + + local src_dir + local KTAG=v${KVER} +- local extra_cflags= ++ local extra_cflags="-DCONFIG_FB" + if [ "${KVER}" == "master" ]; then + KTAG="origin/master" + else +diff --git a/module/evdi_fb.c b/module/evdi_fb.c +index 6bd364e..d8feca6 100644 +--- a/module/evdi_fb.c ++++ b/module/evdi_fb.c +@@ -404,7 +404,7 @@ static int evdifb_create(struct drm_fb_helper *helper, + fb = &efbdev->efb.base; + + efbdev->helper.fb = fb; +-#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) ++#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) + efbdev->helper.info = info; + #else + efbdev->helper.fbdev = info; +@@ -464,7 +464,7 @@ static void evdi_fbdev_destroy(__always_unused struct drm_device *dev, + { + struct fb_info *info; + +-#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) ++#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) + if (efbdev->helper.info) { + info = efbdev->helper.info; + #else +@@ -556,7 +556,7 @@ void evdi_fbdev_unplug(struct drm_device *dev) + return; + + efbdev = evdi->fbdev; +-#if KERNEL_VERSION(6, 1, 51) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) ++#if KERNEL_VERSION(6, 2, 0) <= LINUX_VERSION_CODE || defined(EL8) || defined(EL9) + if (efbdev->helper.info) { + struct fb_info *info; +