diff options
132 files changed, 1859 insertions, 2626 deletions
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest index a4da6050d14d..fa98f8effcba 100644 --- a/app-arch/patool/Manifest +++ b/app-arch/patool/Manifest @@ -1,2 +1,3 @@ DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc DIST patool-1.12_p20230424.gh.tar.gz 1990425 BLAKE2B dd0ae58fd26ef1849c26cb681839536b0499d666faf48cb7028adc12840055d72e70a85db99c615c79b076671f16e1371ee5ddbb24228248cd3c1b0daf2dc496 SHA512 c2974bad22ab57aca3aab32e51aeac0c2a2aa3ffee41241d3220151206b8a5d709ec72ea1b4a73a218c03b9fad64297ecd2ab44cc20da5f4d0e4a3ecd5589d43 +DIST patool-1.14.1.tar.gz 1992559 BLAKE2B 3468c6b7779806ecb906830043964f2fa88384569af4cad857d8519568a7670a403ce17ca5b495fae6ad129f109bfac38693bfe651bad54dc5e6a46b5b58ea4f SHA512 df5ce0f5275fcc0b653775b9fbc36e11dfff1fcf30e5caf78bbebbf2c169125c7d27e71481c7ba108d39fb12cebdf3d84ab8c40f1a5f061dea5e5304e2306481 diff --git a/app-arch/patool/metadata.xml b/app-arch/patool/metadata.xml index 143d6f45cf1c..198fc346c99a 100644 --- a/app-arch/patool/metadata.xml +++ b/app-arch/patool/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>parona@protonmail.com</email> + <name>Alfred Wingate</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="pypi">patool</remote-id> <remote-id type="github">wummel/patool</remote-id> diff --git a/app-arch/patool/patool-1.14.1.ebuild b/app-arch/patool/patool-1.14.1.ebuild new file mode 100644 index 000000000000..86b157acb084 --- /dev/null +++ b/app-arch/patool/patool-1.14.1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="Portable archive file manager" +HOMEPAGE="https://wummel.github.io/patool/" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND=" + test? ( + app-arch/arj + app-arch/bzip2 + app-arch/bzip3 + app-arch/cabextract + app-arch/cpio + app-arch/dpkg + app-arch/gzip + app-arch/lbzip2 + app-arch/lcab + app-arch/lha + app-arch/libarchive + app-arch/lrzip + app-arch/lzip + app-arch/lzop + app-arch/ncompress + app-arch/p7zip[rar] + app-arch/pbzip2 + app-arch/pdlzip + app-arch/pigz + app-arch/rpm + app-arch/sharutils + app-arch/tar + app-arch/unace + app-arch/unadf + app-arch/unzip + app-arch/xdms + app-arch/xz-utils + app-arch/zip + app-arch/zpaq + app-arch/zstd + app-cdr/cdrtools + dev-libs/chmlib + media-libs/flac + media-sound/shorten + sys-apps/diffutils + sys-apps/file + sys-apps/grep + !elibc_musl? ( app-arch/rar ) + !x86? ( app-arch/clzip ) + ) +" +# Test dependencies which are packaged but can't be tested for various reasons. +# app-arch/arc +# app-arch/zoo +# app-arch/zopfli +# media-sound/mac + +# app-arch/rar is masked on musl +# app-arch/clzip is unkeyworded on x86 + +# Unpackaged testable dependencies +# archmage +# genisoimage +# lhasa +# nomarch +# pdzip2 +# py_{bz2,echo,gzip,tarfile,zipfile} +# rpm2cpio +# rzip +# star +# unalz +# uncompress.real + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + + newdoc doc/README.txt README.md + doman doc/patool.1 +} + +python_test() { + local EPYTEST_IGNORE=( + # zoo emits a non-zero exit status on a possibly false consistency check + # Zoo: WARNING: Archive header failed consistency check. + "tests/archives/test_zoo.py" + # Doesn't accept long arguments, such as those that files in ${S} would have. + # Too long argument: /var/tmp/portage/app-arch/patool-1.12_p20230424/work/patool-ab64562c8cdac34dfd69fcb6e30c8c0014282d11/tests/data/p.arc.foo + "tests/archives/test_arc.py" + # Error: 1002 (invalid input file) + "tests/archives/test_mac.py" + # AttributeError: module 'patoolib.programs.zopfli' has no attribute 'extract_gzip' + "tests/archives/test_zopfli.py" + ) + + if use elibc_musl; then + EPYTEST_IGNORE+=( + "tests/archives/test_rar.py" + ) + fi + + if use x86; then + EPYTEST_IGNORE+=( + "tests/archives/test_clzip.py" + ) + fi + + epytest +} diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild b/app-office/calligra/calligra-3.2.1-r8.ebuild index 0e5e0c94e6e7..49aba50d91f5 100644 --- a/app-office/calligra/calligra-3.2.1-r8.ebuild +++ b/app-office/calligra/calligra-3.2.1-r8.ebuild @@ -102,7 +102,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-libs/boost - lcms? ( dev-libs/Imath:3 ) + lcms? ( dev-libs/imath:3 ) test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) " RDEPEND="${COMMON_DEPEND} diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild index b5a9ac5db2ba..ef31dfac302f 100644 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild +++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115.ebuild @@ -65,7 +65,7 @@ RDEPEND=" las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( ${LUA_DEPS} ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild index 779e46ec2109..787f6cda77eb 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild @@ -66,7 +66,7 @@ RDEPEND=" las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( ${LUA_DEPS} ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= >=media-libs/openexr-3:= ) openinventor? ( media-libs/coin ) diff --git a/dev-lang/zig-bin/files/zig-0.11.0-first-try-getconf.patch b/dev-lang/zig-bin/files/zig-0.11.0-first-try-getconf.patch new file mode 100644 index 000000000000..6d1b3ca7e5b7 --- /dev/null +++ b/dev-lang/zig-bin/files/zig-0.11.0-first-try-getconf.patch @@ -0,0 +1,109 @@ +From: Eric Joldasov <bratishkaerik@getgoogleoff.me> + +Based on https://github.com/ziglang/zig/pull/12567 and https://github.com/ziglang/zig/pull/17671 +with small fixes, all ported to 0.11.0. + +First try `getconf GNU_LIBC_VERSION` to detect glibc version, +If there are any errors, skip to the upstream logic. + +Also fix glibc version parsing: if version string does not contain third (patch) component, "std.SemanticVersion.parse" returns parsing error. +For example, this currently happens with "GLIBC_2.37" or "glibc 2.37" inputs. +To fix this, we use copy-pasted "std.zig.CrossTarget.parse" function here, that sets omitted patch component to 0. + +After applying this patch, both `zig build-exe --show-builtin` and `zig env` show correct version on my default/linux/amd64/17.1/desktop/plasma : +glibc 2.37. + +Bug: https://bugs.gentoo.org/914731 +Bug: https://bugs.gentoo.org/914101 + +diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig +index 99a1a8f2e..d1032a716 100644 +--- a/lib/std/zig/system/NativeTargetInfo.zig ++++ b/lib/std/zig/system/NativeTargetInfo.zig +@@ -19,6 +19,32 @@ dynamic_linker: DynamicLinker = DynamicLinker{}, + + pub const DynamicLinker = Target.DynamicLinker; + ++// Copy-pasted from `std.zig.CrossTarget.parse` to avoid changing visibility of mentioned function. ++/// Parses a version with an omitted patch component, such as "1.0", ++/// which SemanticVersion.parse is not capable of. ++fn parseWithOptionalPatchField(ver: []const u8) error{ InvalidVersion, Overflow }!std.SemanticVersion { ++ const parseVersionComponent = struct { ++ fn parseVersionComponent(component: []const u8) !usize { ++ return std.fmt.parseUnsigned(usize, component, 10) catch |err| { ++ switch (err) { ++ error.InvalidCharacter => return error.InvalidVersion, ++ error.Overflow => return error.Overflow, ++ } ++ }; ++ } ++ }.parseVersionComponent; ++ var version_components = mem.split(u8, ver, "."); ++ const major = version_components.first(); ++ const minor = version_components.next() orelse return error.InvalidVersion; ++ const patch = version_components.next() orelse "0"; ++ if (version_components.next() != null) return error.InvalidVersion; ++ return .{ ++ .major = try parseVersionComponent(major), ++ .minor = try parseVersionComponent(minor), ++ .patch = try parseVersionComponent(patch), ++ }; ++} ++ + pub const DetectError = error{ + FileSystem, + SystemResources, +@@ -307,6 +333,35 @@ fn detectAbiAndDynamicLinker( + } + const ld_info_list = ld_info_list_buffer[0..ld_info_list_len]; + ++ if (is_linux and !os_is_non_native and cross_target.glibc_version == null) try_getconf: { ++ var buf: [4096]u8 = undefined; ++ var fba = std.heap.FixedBufferAllocator.init(&buf); ++ const allocator = fba.allocator(); ++ ++ const getconf = std.process.Child.exec(.{ ++ .allocator = allocator, ++ .argv = &.{ "getconf", "GNU_LIBC_VERSION" }, ++ .max_output_bytes = 1024, ++ }) catch break :try_getconf; ++ if (!std.mem.startsWith(u8, getconf.stdout, "glibc ")) break :try_getconf; ++ const version_string = getconf.stdout["glibc ".len..]; ++ const glibc_version = parseWithOptionalPatchField(version_string) catch break :try_getconf; ++ ++ var os_with_glibc = os; ++ os_with_glibc.version_range.linux.glibc = glibc_version; ++ ++ const result: NativeTargetInfo = .{ ++ .target = .{ ++ .cpu = cpu, ++ .os = os_with_glibc, ++ .abi = cross_target.abi orelse Target.Abi.default(cpu.arch, os_with_glibc), ++ .ofmt = cross_target.ofmt orelse Target.ObjectFormat.default(os_with_glibc.tag, cpu.arch), ++ }, ++ .dynamic_linker = cross_target.dynamic_linker, ++ }; ++ return result; ++ } ++ + // Best case scenario: the executable is dynamically linked, and we can iterate + // over our own shared objects and find a dynamic linker. + const elf_file = blk: { +@@ -563,7 +618,7 @@ fn glibcVerFromSoFile(file: fs.File) !std.SemanticVersion { + while (it.next()) |s| { + if (mem.startsWith(u8, s, "GLIBC_2.")) { + const chopped = s["GLIBC_".len..]; +- const ver = std.SemanticVersion.parse(chopped) catch |err| switch (err) { ++ const ver = parseWithOptionalPatchField(chopped) catch |err| switch (err) { + error.Overflow => return error.InvalidGnuLibCVersion, + error.InvalidVersion => return error.InvalidGnuLibCVersion, + }; +@@ -586,7 +641,7 @@ fn glibcVerFromLinkName(link_name: []const u8, prefix: []const u8) !std.Semantic + } + // chop off "libc-" and ".so" + const link_name_chopped = link_name[prefix.len .. link_name.len - suffix.len]; +- return std.SemanticVersion.parse(link_name_chopped) catch |err| switch (err) { ++ return parseWithOptionalPatchField(link_name_chopped) catch |err| switch (err) { + error.Overflow => return error.InvalidGnuLibCVersion, + error.InvalidVersion => return error.InvalidGnuLibCVersion, + }; diff --git a/dev-lang/zig-bin/zig-bin-0.11.0.ebuild b/dev-lang/zig-bin/zig-bin-0.11.0-r1.ebuild index 2ff67d9e16aa..92775c190670 100644 --- a/dev-lang/zig-bin/zig-bin-0.11.0.ebuild +++ b/dev-lang/zig-bin/zig-bin-0.11.0-r1.ebuild @@ -36,7 +36,9 @@ IDEPEND="app-eselect/eselect-zig" # because they can use compile-time mechanics (and it is easier for distributions to patch them) # Here we use this feature for fixing programs that use standard library # Note: Zig build system is also part of standard library, so we can fix it too -#PATCHES=() +PATCHES=( + "${FILESDIR}/zig-0.11.0-first-try-getconf.patch" +) QA_PREBUILT="opt/${P}/zig" diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index 99b9116507be..0041c029d4ff 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -1,2 +1 @@ -DIST zig-0.10.1.tar.xz 15143112 BLAKE2B 4954d95ad763000eedf73a78e62bc0e99d65bba91c7127cdf1ea4503eb67817265daf572f645b7efbe9e24087e690b2768f0b2bc6c43b5fd76eab33143e964fe SHA512 d443adf61556bc95470537c6b0371a0ac99d19a06b15635cf1e5055ae7849039680c9006105e06e1bd6ba0fc12da14c54c1d28ac597c7dee17ee3a5cd9cf79f8 DIST zig-0.11.0.tar.xz 15275316 BLAKE2B 603e4995a36d214ba71cf05b719a04732c8927995c8207ab8fdd574dca3410cdc5ccc8f6aa9964807afc04a5cbce1a3910a6cde4cf12e585cdf7684833217eb2 SHA512 c19a8ae6d440a16dd5e77941fc77c036d1f284f1784376625e63b65f30b4acad62f9f4217bc818c401f88c2c33f8722f26fc467c3e23c29a89178c4b1882d1c4 diff --git a/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch b/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch deleted file mode 100644 index 5704e4ba7921..000000000000 --- a/dev-lang/zig/files/zig-0.10.0-build-dir-install-stage3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Eric Joldasov <bratishkaerik@getgoogleoff.me> - -Install 'zig' binary in 'build_dir/stage3' directory so that we can find it and use for testing. -Also split "add_custom_target(stage3 ALL" and command that it invokes, so that it won't retry it during installation, -as target will be considered not out-of-date. (Bug https://bugs.gentoo.org/890457 and https://bugs.gentoo.org/890459). -Upstream PR https://github.com/ziglang/zig/pull/14255. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1094,10 +1094,14 @@ set(ZIG_BUILD_ARGS - ) - - add_custom_target(stage3 ALL -- COMMAND zig2 build compile ${ZIG_BUILD_ARGS} -- DEPENDS zig2 -- COMMENT STATUS "Building stage3" -- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" -+ DEPENDS "${CMAKE_BINARY_DIR}/stage3/bin/zig" -+) -+ -+add_custom_command( -+ OUTPUT "${CMAKE_BINARY_DIR}/stage3/bin/zig" -+ COMMAND zig2 build --prefix "${CMAKE_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS} -+ COMMENT STATUS "Building stage3" -+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" - ) - - install(CODE "set(ZIG_EXECUTABLE \"${ZIG_EXECUTABLE}\")") - ---- a/build.zig -+++ b/build.zig -@@ -148,10 +148,6 @@ pub fn build(b: *Builder) !void { - }; - - const exe = b.addExecutable("zig", main_file); -- -- const compile_step = b.step("compile", "Build the self-hosted compiler"); -- compile_step.dependOn(&exe.step); -- - exe.stack_size = stack_size; - exe.strip = strip; - exe.sanitize_thread = sanitize_thread; diff --git a/dev-lang/zig/files/zig-0.10.1-musl-1.2.4-lfs64.patch b/dev-lang/zig/files/zig-0.10.1-musl-1.2.4-lfs64.patch deleted file mode 100644 index 05a550a7920e..000000000000 --- a/dev-lang/zig/files/zig-0.10.1-musl-1.2.4-lfs64.patch +++ /dev/null @@ -1,220 +0,0 @@ -From https://github.com/ziglang/zig/commit/b20ccff515364cdb8f3e733cc950e53ab77656db Mon Sep 17 00:00:00 2001 -From: Andrew Kelley <andrew@ziglang.org> -Date: Mon, 19 Jun 2023 15:17:01 -0700 -Subject: [PATCH] std.os: update logic for 64-bit symbol choice - -musl v1.2.4 dropped the "64"-suffixed aliases for legacy "LFS64" ("large -file support") interfaces, so this commit changes the corresponding Zig -logic to call the correct names. ---- a/lib/std/os.zig -+++ b/lib/std/os.zig -@@ -890,10 +890,7 @@ pub fn pread(fd: fd_t, buf: []u8, offset: u64) PReadError!usize { - }; - const adjusted_len = @min(max_count, buf.len); - -- const pread_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.pread64 -- else -- system.pread; -+ const pread_sym = if (lfs64_abi) system.pread64 else system.pread; - - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned - while (true) { -@@ -966,10 +963,7 @@ pub fn ftruncate(fd: fd_t, length: u64) TruncateError!void { - } - - while (true) { -- const ftruncate_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.ftruncate64 -- else -- system.ftruncate; -+ const ftruncate_sym = if (lfs64_abi) system.ftruncate64 else system.ftruncate; - - const ilen = @bitCast(i64, length); // the OS treats this as unsigned - switch (errno(ftruncate_sym(fd, ilen))) { -@@ -1034,10 +1028,7 @@ pub fn preadv(fd: fd_t, iov: []const iovec, offset: u64) PReadError!usize { - - const iov_count = math.cast(u31, iov.len) orelse math.maxInt(u31); - -- const preadv_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.preadv64 -- else -- system.preadv; -+ const preadv_sym = if (lfs64_abi) system.preadv64 else system.preadv; - - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned - while (true) { -@@ -1311,10 +1302,7 @@ pub fn pwrite(fd: fd_t, bytes: []const u8, offset: u64) PWriteError!usize { - }; - const adjusted_len = @min(max_count, bytes.len); - -- const pwrite_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.pwrite64 -- else -- system.pwrite; -+ const pwrite_sym = if (lfs64_abi) system.pwrite64 else system.pwrite; - - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned - while (true) { -@@ -1400,10 +1388,7 @@ pub fn pwritev(fd: fd_t, iov: []const iovec_const, offset: u64) PWriteError!usiz - } - } - -- const pwritev_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.pwritev64 -- else -- system.pwritev; -+ const pwritev_sym = if (lfs64_abi) system.pwritev64 else system.pwritev; - - const iov_count = if (iov.len > IOV_MAX) IOV_MAX else @intCast(u31, iov.len); - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned -@@ -1514,10 +1499,7 @@ pub fn openZ(file_path: [*:0]const u8, flags: u32, perm: mode_t) OpenError!fd_t - return open(mem.sliceTo(file_path, 0), flags, perm); - } - -- const open_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.open64 -- else -- system.open; -+ const open_sym = if (lfs64_abi) system.open64 else system.open; - - while (true) { - const rc = open_sym(file_path, flags, perm); -@@ -1730,10 +1712,7 @@ pub fn openatZ(dir_fd: fd_t, file_path: [*:0]const u8, flags: u32, mode: mode_t) - return openat(dir_fd, mem.sliceTo(file_path, 0), flags, mode); - } - -- const openat_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.openat64 -- else -- system.openat; -+ const openat_sym = if (lfs64_abi) system.openat64 else system.openat; - - while (true) { - const rc = openat_sym(dir_fd, file_path, flags, mode); -@@ -4117,10 +4096,7 @@ pub fn fstat(fd: fd_t) FStatError!Stat { - @compileError("fstat is not yet implemented on Windows"); - } - -- const fstat_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.fstat64 -- else -- system.fstat; -+ const fstat_sym = if (lfs64_abi) system.fstat64 else system.fstat; - - var stat = mem.zeroes(Stat); - switch (errno(fstat_sym(fd, &stat))) { -@@ -4176,10 +4152,7 @@ pub fn fstatatZ(dirfd: fd_t, pathname: [*:0]const u8, flags: u32) FStatAtError!S - return fstatatWasi(dirfd, mem.sliceTo(pathname), flags); - } - -- const fstatat_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.fstatat64 -- else -- system.fstatat; -+ const fstatat_sym = if (lfs64_abi) system.fstatat64 else system.fstatat; - - var stat = mem.zeroes(Stat); - switch (errno(fstatat_sym(dirfd, pathname, &stat, flags))) { -@@ -4416,10 +4389,7 @@ pub fn mmap( - fd: fd_t, - offset: u64, - ) MMapError![]align(mem.page_size) u8 { -- const mmap_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.mmap64 -- else -- system.mmap; -+ const mmap_sym = if (lfs64_abi) system.mmap64 else system.mmap; - - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned - const rc = mmap_sym(ptr, length, prot, flags, fd, ioffset); -@@ -4823,10 +4793,7 @@ pub fn lseek_SET(fd: fd_t, offset: u64) SeekError!void { - } - } - -- const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.lseek64 -- else -- system.lseek; -+ const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek; - - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned - switch (errno(lseek_sym(fd, ioffset, SEEK.SET))) { -@@ -4870,10 +4837,7 @@ pub fn lseek_CUR(fd: fd_t, offset: i64) SeekError!void { - else => |err| return unexpectedErrno(err), - } - } -- const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.lseek64 -- else -- system.lseek; -+ const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek; - - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned - switch (errno(lseek_sym(fd, ioffset, SEEK.CUR))) { -@@ -4917,10 +4881,7 @@ pub fn lseek_END(fd: fd_t, offset: i64) SeekError!void { - else => |err| return unexpectedErrno(err), - } - } -- const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.lseek64 -- else -- system.lseek; -+ const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek; - - const ioffset = @bitCast(i64, offset); // the OS treats this as unsigned - switch (errno(lseek_sym(fd, ioffset, SEEK.END))) { -@@ -4964,10 +4925,7 @@ pub fn lseek_CUR_get(fd: fd_t) SeekError!u64 { - else => |err| return unexpectedErrno(err), - } - } -- const lseek_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.lseek64 -- else -- system.lseek; -+ const lseek_sym = if (lfs64_abi) system.lseek64 else system.lseek; - - const rc = lseek_sym(fd, 0, SEEK.CUR); - switch (errno(rc)) { -@@ -6169,10 +6127,7 @@ pub fn sendfile( - // TODO we should not need this cast; improve return type of @min - const adjusted_count = @intCast(usize, adjusted_count_tmp); - -- const sendfile_sym = if (builtin.link_libc) -- system.sendfile64 -- else -- system.sendfile; -+ const sendfile_sym = if (lfs64_abi) system.sendfile64 else system.sendfile; - - while (true) { - var offset: off_t = @bitCast(off_t, in_offset); -@@ -7050,10 +7005,7 @@ pub fn prctl(option: PR, args: anytype) PrctlError!u31 { - pub const GetrlimitError = UnexpectedError; - - pub fn getrlimit(resource: rlimit_resource) GetrlimitError!rlimit { -- const getrlimit_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.getrlimit64 -- else -- system.getrlimit; -+ const getrlimit_sym = if (lfs64_abi) system.getrlimit64 else system.getrlimit; - - var limits: rlimit = undefined; - switch (errno(getrlimit_sym(resource, &limits))) { -@@ -7067,10 +7019,7 @@ pub fn getrlimit(resource: rlimit_resource) GetrlimitError!rlimit { - pub const SetrlimitError = error{ PermissionDenied, LimitTooBig } || UnexpectedError; - - pub fn setrlimit(resource: rlimit_resource, limits: rlimit) SetrlimitError!void { -- const setrlimit_sym = if (builtin.os.tag == .linux and builtin.link_libc) -- system.setrlimit64 -- else -- system.setrlimit; -+ const setrlimit_sym = if (lfs64_abi) system.setrlimit64 else system.setrlimit; - - switch (errno(setrlimit_sym(resource, &limits))) { - .SUCCESS => return, -@@ -7339,3 +7288,5 @@ pub fn ptrace(request: u32, pid: pid_t, addr: usize, signal: usize) PtraceError! - }, - }; - } -+ -+const lfs64_abi = builtin.os.tag == .linux and builtin.link_libc and builtin.abi.isGnu(); diff --git a/dev-lang/zig/files/zig-0.11.0-first-try-getconf.patch b/dev-lang/zig/files/zig-0.11.0-first-try-getconf.patch new file mode 100644 index 000000000000..6d1b3ca7e5b7 --- /dev/null +++ b/dev-lang/zig/files/zig-0.11.0-first-try-getconf.patch @@ -0,0 +1,109 @@ +From: Eric Joldasov <bratishkaerik@getgoogleoff.me> + +Based on https://github.com/ziglang/zig/pull/12567 and https://github.com/ziglang/zig/pull/17671 +with small fixes, all ported to 0.11.0. + +First try `getconf GNU_LIBC_VERSION` to detect glibc version, +If there are any errors, skip to the upstream logic. + +Also fix glibc version parsing: if version string does not contain third (patch) component, "std.SemanticVersion.parse" returns parsing error. +For example, this currently happens with "GLIBC_2.37" or "glibc 2.37" inputs. +To fix this, we use copy-pasted "std.zig.CrossTarget.parse" function here, that sets omitted patch component to 0. + +After applying this patch, both `zig build-exe --show-builtin` and `zig env` show correct version on my default/linux/amd64/17.1/desktop/plasma : +glibc 2.37. + +Bug: https://bugs.gentoo.org/914731 +Bug: https://bugs.gentoo.org/914101 + +diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig +index 99a1a8f2e..d1032a716 100644 +--- a/lib/std/zig/system/NativeTargetInfo.zig ++++ b/lib/std/zig/system/NativeTargetInfo.zig +@@ -19,6 +19,32 @@ dynamic_linker: DynamicLinker = DynamicLinker{}, + + pub const DynamicLinker = Target.DynamicLinker; + ++// Copy-pasted from `std.zig.CrossTarget.parse` to avoid changing visibility of mentioned function. ++/// Parses a version with an omitted patch component, such as "1.0", ++/// which SemanticVersion.parse is not capable of. ++fn parseWithOptionalPatchField(ver: []const u8) error{ InvalidVersion, Overflow }!std.SemanticVersion { ++ const parseVersionComponent = struct { ++ fn parseVersionComponent(component: []const u8) !usize { ++ return std.fmt.parseUnsigned(usize, component, 10) catch |err| { ++ switch (err) { ++ error.InvalidCharacter => return error.InvalidVersion, ++ error.Overflow => return error.Overflow, ++ } ++ }; ++ } ++ }.parseVersionComponent; ++ var version_components = mem.split(u8, ver, "."); ++ const major = version_components.first(); ++ const minor = version_components.next() orelse return error.InvalidVersion; ++ const patch = version_components.next() orelse "0"; ++ if (version_components.next() != null) return error.InvalidVersion; ++ return .{ ++ .major = try parseVersionComponent(major), ++ .minor = try parseVersionComponent(minor), ++ .patch = try parseVersionComponent(patch), ++ }; ++} ++ + pub const DetectError = error{ + FileSystem, + SystemResources, +@@ -307,6 +333,35 @@ fn detectAbiAndDynamicLinker( + } + const ld_info_list = ld_info_list_buffer[0..ld_info_list_len]; + ++ if (is_linux and !os_is_non_native and cross_target.glibc_version == null) try_getconf: { ++ var buf: [4096]u8 = undefined; ++ var fba = std.heap.FixedBufferAllocator.init(&buf); ++ const allocator = fba.allocator(); ++ ++ const getconf = std.process.Child.exec(.{ ++ .allocator = allocator, ++ .argv = &.{ "getconf", "GNU_LIBC_VERSION" }, ++ .max_output_bytes = 1024, ++ }) catch break :try_getconf; ++ if (!std.mem.startsWith(u8, getconf.stdout, "glibc ")) break :try_getconf; ++ const version_string = getconf.stdout["glibc ".len..]; ++ const glibc_version = parseWithOptionalPatchField(version_string) catch break :try_getconf; ++ ++ var os_with_glibc = os; ++ os_with_glibc.version_range.linux.glibc = glibc_version; ++ ++ const result: NativeTargetInfo = .{ ++ .target = .{ ++ .cpu = cpu, ++ .os = os_with_glibc, ++ .abi = cross_target.abi orelse Target.Abi.default(cpu.arch, os_with_glibc), ++ .ofmt = cross_target.ofmt orelse Target.ObjectFormat.default(os_with_glibc.tag, cpu.arch), ++ }, ++ .dynamic_linker = cross_target.dynamic_linker, ++ }; ++ return result; ++ } ++ + // Best case scenario: the executable is dynamically linked, and we can iterate + // over our own shared objects and find a dynamic linker. + const elf_file = blk: { +@@ -563,7 +618,7 @@ fn glibcVerFromSoFile(file: fs.File) !std.SemanticVersion { + while (it.next()) |s| { + if (mem.startsWith(u8, s, "GLIBC_2.")) { + const chopped = s["GLIBC_".len..]; +- const ver = std.SemanticVersion.parse(chopped) catch |err| switch (err) { ++ const ver = parseWithOptionalPatchField(chopped) catch |err| switch (err) { + error.Overflow => return error.InvalidGnuLibCVersion, + error.InvalidVersion => return error.InvalidGnuLibCVersion, + }; +@@ -586,7 +641,7 @@ fn glibcVerFromLinkName(link_name: []const u8, prefix: []const u8) !std.Semantic + } + // chop off "libc-" and ".so" + const link_name_chopped = link_name[prefix.len .. link_name.len - suffix.len]; +- return std.SemanticVersion.parse(link_name_chopped) catch |err| switch (err) { ++ return parseWithOptionalPatchField(link_name_chopped) catch |err| switch (err) { + error.Overflow => return error.InvalidGnuLibCVersion, + error.InvalidVersion => return error.InvalidGnuLibCVersion, + }; diff --git a/dev-lang/zig/zig-0.10.1-r3.ebuild b/dev-lang/zig/zig-0.10.1-r3.ebuild deleted file mode 100644 index b85fc3c95232..000000000000 --- a/dev-lang/zig/zig-0.10.1-r3.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=15 -inherit edo cmake llvm check-reqs toolchain-funcs - -DESCRIPTION="A robust, optimal, and maintainable programming language" -HOMEPAGE="https://ziglang.org/" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ziglang/zig.git" - inherit git-r3 -else - SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -# project itself: MIT -# There are bunch of projects under "lib/" folder that are needed for cross-compilation. -# Files that are unnecessary for cross-compilation are removed by upstream -# and therefore their licenses (if any special) are not included. -# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) -# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) -# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) -# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain -# lib/libc/musl: MIT BSD-2 -# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND -# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+ -LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+" -SLOT="$(ver_cut 1-2)" -IUSE="doc" - -BUILD_DIR="${S}/build" -# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend. -# (non-LLVM backends don't require these) -# They are not required "on their own", so please don't add them here. -# You can check https://github.com/ziglang/zig-bootstrap in future, to see -# options that are passed to LLVM CMake building (excluding "static" ofc). -DEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT}= - sys-devel/lld:${LLVM_MAX_SLOT}= - sys-devel/llvm:${LLVM_MAX_SLOT}=[zstd] -" - -RDEPEND=" - ${DEPEND} -" - -IDEPEND="app-eselect/eselect-zig" - -# see https://github.com/ziglang/zig/issues/3382 -# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc. -QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig" - -# see https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler -# 0.10.0 release - ~9.6 GiB, since we use compiler written in C++ for bootstrapping -# 0.11.0 release - ~2.8 GiB, since we will (at least according to roadmap) use self-hosted compiler -# (transpiled to C via C backend) for bootstrapping -CHECKREQS_MEMORY="10G" - -PATCHES=( - "${FILESDIR}/zig-0.10.0-build-dir-install-stage3.patch" - "${FILESDIR}/zig-0.10.1-musl-1.2.4-lfs64.patch" -) - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -ctarget_to_zigtarget() { - # Zig's Target Format: arch-os-abi - local CTARGET="${CTARGET:-${CHOST}}" - - local ZIG_ARCH - case "${CTARGET%%-*}" in - i?86) ZIG_ARCH=x86;; - sparcv9) ZIG_ARCH=sparc64;; - *) ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST - esac - - local ZIG_OS - case "${CTARGET}" in - *linux*) ZIG_OS=linux;; - *apple*) ZIG_OS=macos;; - esac - - local ZIG_ABI - case "${CTARGET##*-}" in - gnu) ZIG_ABI=gnu;; - solaris*) ZIG_OS=solaris ZIG_ABI=none;; - darwin*) ZIG_ABI=none;; - *) ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST - esac - - echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}" -} - -get_zig_mcpu() { - local ZIG_DEFAULT_MCPU=native - tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline - echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}" -} - -get_zig_target() { - local ZIG_DEFAULT_TARGET=native - tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)" - echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}" -} - -pkg_setup() { - llvm_pkg_setup - elog "This version requires 10G of memory for building compiler." - elog "If you don't have enough memory, you can wait until 0.11.0 release" - elog "or (if you are risky) use 9999 version (currently requires only 4GB)" - check-reqs_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_SHARED_LLVM=ON - -DZIG_TARGET_TRIPLE="$(get_zig_target)" - -DZIG_TARGET_MCPU="$(get_zig_mcpu)" - -DZIG_USE_LLVM_CONFIG=ON - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc; then - cd "${BUILD_DIR}" || die - edo ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in "${S}/langref.html" - edo ./zig2 test ../lib/std/std.zig --zig-lib-dir ../lib -fno-emit-bin -femit-docs="${S}/std" - fi -} - -src_test() { - cd "${BUILD_DIR}" || die - local ZIG_TEST_ARGS="-Dstatic-llvm=false -Denable-llvm -Dskip-non-native \ - -Drelease -Dtarget=$(get_zig_target) -Dcpu=$(get_zig_mcpu)" - local ZIG_TEST_STEPS=( - test-cases test-fmt test-behavior test-compiler-rt test-universal-libc test-compare-output - test-standalone test-c-abi test-link test-stack-traces test-cli test-asm-link test-translate-c - test-run-translated-c test-std - ) - - local step - for step in "${ZIG_TEST_STEPS[@]}" ; do - edob ./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS} - done -} - -src_install() { - use doc && local HTML_DOCS=( "langref.html" "std" ) - cmake_src_install - cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die - mv lib/zig/ lib2/ || die - rm -rf lib/ || die - mv lib2/ lib/ || die - - dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}" -} - -pkg_postinst() { - eselect zig update ifunset - - elog "0.10.1 release uses self-hosted compiler by default and fixes some bugs from 0.10.0" - elog "But your code still can be un-compilable since some features still not implemented or bugs not fixed" - elog "Upstream recommends:" - elog " * Using old compiler if experiencing such breakage (flag '-fstage1')" - elog " * Waiting for release 0.11.0 with old compiler removed (these changes are already merged in 9999)" - elog "Also see: https://ziglang.org/download/0.10.0/release-notes.html#Self-Hosted-Compiler" - elog "and https://ziglang.org/download/0.10.0/release-notes.html#How-to-Upgrade" -} - -pkg_postrm() { - eselect zig update ifunset -} diff --git a/dev-lang/zig/zig-0.11.0.ebuild b/dev-lang/zig/zig-0.11.0-r1.ebuild index 1644ef100c5c..633b6e1c6399 100644 --- a/dev-lang/zig/zig-0.11.0.ebuild +++ b/dev-lang/zig/zig-0.11.0-r1.ebuild @@ -58,6 +58,10 @@ QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig" # Zig uses self-hosted compiler only CHECKREQS_MEMORY="4G" +PATCHES=( + "${FILESDIR}/zig-0.11.0-first-try-getconf.patch" +) + llvm_check_deps() { has_version "sys-devel/clang:${LLVM_SLOT}" } @@ -108,6 +112,10 @@ pkg_setup() { } src_configure() { + # Useful for debugging and a little bit more deterministic. + export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache" + export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache" + local mycmakeargs=( -DZIG_USE_CCACHE=OFF -DZIG_SHARED_LLVM=ON @@ -124,6 +132,8 @@ src_configure() { src_compile() { cmake_src_compile + "${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed" + if use doc; then cd "${BUILD_DIR}" || die edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/" diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild index e6ab3dbeeb61..9605234cfc43 100644 --- a/dev-lang/zig/zig-9999.ebuild +++ b/dev-lang/zig/zig-9999.ebuild @@ -108,6 +108,10 @@ pkg_setup() { } src_configure() { + # Useful for debugging and a little bit more deterministic. + export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache" + export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache" + local mycmakeargs=( -DZIG_USE_CCACHE=OFF -DZIG_SHARED_LLVM=ON @@ -124,6 +128,8 @@ src_configure() { src_compile() { cmake_src_compile + "${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed" + if use doc; then cd "${BUILD_DIR}" || die edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/" diff --git a/dev-libs/Imath/Manifest b/dev-libs/Imath/Manifest deleted file mode 100644 index 22ce78503b62..000000000000 --- a/dev-libs/Imath/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST Imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd -DIST Imath-3.1.9.tar.gz 598497 BLAKE2B fe3afce26c19f5ddace3c420f9b83caca7b4c75902820fc2182ef9fb9f4d27581f27ca72262b63d65f794eeb73af55782412ba846d142072e0090ff7224d8960 SHA512 ad96b2ac306fc13c01e8ea3256f885499c3f545be327feaba0f5e093b70b544bcca6f8b353fa7e35107aae515c19caced44331a95d0414f367ead4691ec73564 diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest new file mode 100644 index 000000000000..4bf4962b7f9d --- /dev/null +++ b/dev-libs/imath/Manifest @@ -0,0 +1,2 @@ +DIST imath-3.1.6.tar.gz 573255 BLAKE2B c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dddddd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8 SHA512 c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd +DIST imath-3.1.7.tar.gz 583049 BLAKE2B 54619339f349a944e1d72fcea4438d7bd2ef6c9655ba0e16ac608934a8df30c97a2f3cf5c75adaeb8a6fe6bf19ec3240c11439550b452571d0a8cbf75d6bd83e SHA512 e298454cb845cadde28f7881fdaa4739c3942f941278a07ec912459ac376c2ee7858cb3b2d2047b9afb4d4dacae7a8a52ffef4c104f8499b4e0a1f0ed46cc0f0 diff --git a/dev-libs/Imath/Imath-3.1.6.ebuild b/dev-libs/imath/imath-3.1.6.ebuild index 3374d6407bba..140156298dbb 100644 --- a/dev-libs/Imath/Imath-3.1.6.ebuild +++ b/dev-libs/imath/imath-3.1.6.ebuild @@ -7,11 +7,14 @@ PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 +MY_PN="${PN^}" + DESCRIPTION="Imath basic math package" HOMEPAGE="https://imath.readthedocs.io" -SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" # re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="BSD" SLOT="3/29" @@ -21,8 +24,11 @@ RESTRICT="!test? ( test )" # blocker due to file collision #803347 RDEPEND=" + !dev-libs/imath:0 + !media-libs/ilmbase sys-libs/zlib python? ( + !dev-python/pyilmbase ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-libs/boost:=[python,${PYTHON_USEDEP}] diff --git a/dev-libs/Imath/Imath-3.1.9.ebuild b/dev-libs/imath/imath-3.1.7.ebuild index dd64ee70e7cb..2e490284d2c3 100644 --- a/dev-libs/Imath/Imath-3.1.9.ebuild +++ b/dev-libs/imath/imath-3.1.7.ebuild @@ -3,26 +3,32 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 +MY_PN="${PN^}" + DESCRIPTION="Imath basic math package" HOMEPAGE="https://imath.readthedocs.io" -SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" # re-keywording needed for (according to ilmbase keywords): ~x64-macos -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="BSD" -SLOT="3/29" +SLOT="3/30" IUSE="large-stack python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" # blocker due to file collision #803347 RDEPEND=" + !dev-libs/imath:0 + !media-libs/ilmbase sys-libs/zlib python? ( + !dev-python/pyilmbase ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-libs/boost:=[python,${PYTHON_USEDEP}] diff --git a/dev-libs/Imath/metadata.xml b/dev-libs/imath/metadata.xml index e8c22a1a5aea..e8c22a1a5aea 100644 --- a/dev-libs/Imath/metadata.xml +++ b/dev-libs/imath/metadata.xml diff --git a/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild b/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild index 5183c4bb3f18..e9672290f15e 100644 --- a/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild +++ b/dev-python/sphinx-press-theme/sphinx-press-theme-0.8.0.ebuild @@ -15,6 +15,6 @@ HOMEPAGE="https://github.com/schettino72/sphinx_press_theme" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]" diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest index 3b4606e1eaa4..25ccad7bbbff 100644 --- a/dev-util/geany-plugins/Manifest +++ b/dev-util/geany-plugins/Manifest @@ -1 +1,2 @@ DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339 +DIST geany-plugins-2.0.tar.bz2 3181264 BLAKE2B 6175f91a3a7effa081393e9397336e0f5f59846fdadd0e31584f237c14863016cc4ab1b17745e1e2804ad88161dc7e43aef97a2332a5c18a7f1baf10d2ea42ba SHA512 48d575459e5c9f905b8809796ea89a05f6e082a1bb1d29c9f44dd5de607a64ad65a27d18348312702d25cfbb80ea0348b9e806f8c0fe649ea558b5b4ccd84818 diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch new file mode 100644 index 000000000000..91015aa1a619 --- /dev/null +++ b/dev-util/geany-plugins/files/geany-plugins-2.0-webkit2gtk-4.1.patch @@ -0,0 +1,33 @@ +diff --git a/build/markdown.m4 b/build/markdown.m4 +index 6c1f53a6..39bea2a6 100644 +--- a/build/markdown.m4 ++++ b/build/markdown.m4 +@@ -49,13 +49,13 @@ AC_DEFUN([GP_CHECK_MARKDOWN], + GTK_VERSION=2.16 + WEBKIT_VERSION=1.1.13 + +- GP_CHECK_GTK3([webkit_package=webkit2gtk-4.0], ++ GP_CHECK_GTK3([webkit_package=webkit2gtk-4.1], + [webkit_package=webkit-1.0]) + GP_CHECK_PLUGIN_DEPS([markdown], [MARKDOWN], + [$GP_GTK_PACKAGE >= ${GTK_VERSION} + $webkit_package >= ${WEBKIT_VERSION} + gthread-2.0]) +- AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.0]) ++ AM_CONDITIONAL([MARKDOWN_WEBKIT2], [test "$webkit_package" = webkit2gtk-4.1]) + + GP_COMMIT_PLUGIN_STATUS([Markdown]) + +diff --git a/build/webhelper.m4 b/build/webhelper.m4 +index eacef95c..2325a65f 100644 +--- a/build/webhelper.m4 ++++ b/build/webhelper.m4 +@@ -25,7 +25,7 @@ AC_DEFUN([GP_CHECK_WEBHELPER], + glib-2.0 >= ${GLIB_VERSION} + gio-2.0 >= ${GIO_VERSION} + gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} +- webkit2gtk-4.0 >= ${WEBKIT_VERSION} ++ webkit2gtk-4.1 >= ${WEBKIT_VERSION} + gthread-2.0]) + + diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild b/dev-util/geany-plugins/geany-plugins-2.0.ebuild index 7f84f12c63f3..d1ffb9d1c929 100644 --- a/dev-util/geany-plugins/geany-plugins-1.38-r5.ebuild +++ b/dev-util/geany-plugins/geany-plugins-2.0.ebuild @@ -4,24 +4,23 @@ EAPI=8 LUA_COMPAT=( lua5-1 ) -LUA_REQ_USE="deprecated" -inherit flag-o-matic lua-single +inherit autotools lua-single DESCRIPTION="A collection of different plugins for Geany" HOMEPAGE="https://plugins.geany.org" -SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz" +SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench" +IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope webhelper workbench" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" DEPEND=" dev-libs/glib:2 - >=dev-util/geany-1.37[-gtk2(-)] + >=dev-util/geany-2.0 x11-libs/gtk+:3 ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:2.91 ) @@ -32,11 +31,11 @@ DEPEND=" lua? ( ${LUA_DEPS} ) markdown? ( app-text/discount:= - net-libs/webkit-gtk:4 + net-libs/webkit-gtk:4.1 ) pretty-printer? ( dev-libs/libxml2:2 ) scope? ( x11-libs/vte:2.91 ) - soup? ( net-libs/libsoup:2.4 ) + webhelper? ( net-libs/webkit-gtk:4.1 ) workbench? ( dev-libs/libgit2:= ) " RDEPEND="${DEPEND} @@ -46,17 +45,18 @@ BDEPEND="virtual/pkgconfig nls? ( sys-devel/gettext ) " -PATCHES=( "${FILESDIR}/${P}-libgit2-1.4.patch" ) +PATCHES=( "${FILESDIR}/${P}-webkit2gtk-4.1.patch" ) pkg_setup() { use lua && lua-single_pkg_setup } -src_configure() { - # -DLUA_COMPAT_OPENLIB=1 is required to enable the - # deprecated (in 5.1) luaL_openlib API (#878529) - use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 +src_prepare() { + default + eautoreconf +} +src_configure() { local myeconfargs=( --disable-cppcheck --disable-extra-c-warnings @@ -95,23 +95,18 @@ src_configure() { $(use_enable ctags geanyctags) $(use_enable lua geanylua) $(use_enable gpg geanypg) - $(use_enable soup geniuspaste) $(use_enable git gitchangebar) $(use_enable markdown) --disable-peg-markdown # using app-text/discount instead $(use_enable pretty-printer) $(use_enable scope) $(use_enable enchant spellcheck) - # Having updatechecker… when you’re using a package manager? - $(use_enable soup updatechecker) + $(use_enable webhelper) $(use_enable workbench) # GeanyGenDoc requires ctpl which isn’t yet in portage --disable-geanygendoc - # Require obsolete and vulnerable webkit-gtk versions - --disable-devhelp - --disable-webhelper - # GTK 2 only - --disable-geanypy - --disable-multiterm + # Require libsoup-2.4 which conflicts with webkit2gtk-4.1 + --disable-geniuspaste + --disable-updatechecker ) econf "${myeconfargs[@]}" diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml index 5ed0076a04d4..9e62141c276a 100644 --- a/dev-util/geany-plugins/metadata.xml +++ b/dev-util/geany-plugins/metadata.xml @@ -18,7 +18,7 @@ <flag name="markdown">Enable the markdown plugin</flag> <flag name="pretty-printer">Enable pretty-printer plugin</flag> <flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag> - <flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag> + <flag name="webhelper">Enable webhelper plugin</flag> <flag name="workbench">Enable workbench plugin</flag> </use> </pkgmetadata> diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest index 8792daccc874..4dac84fa7c44 100644 --- a/dev-util/geany/Manifest +++ b/dev-util/geany/Manifest @@ -1 +1,2 @@ DIST geany-1.38.tar.bz2 4860717 BLAKE2B 3dda3a7454f96be18de95f8dfeb7a6ee2627ffe370879fa3ee7aee851e21fa46076de6b9741b6e83af94b66afa245a0f69237db4582858bc40f819d8a3c78e6e SHA512 5aff0643d0d9e667d0fb526e9c8426cb80c89decf92110683086c2a7a18e0d3d55ab514fdd68aa0c4431c98ae0c4685607b49c620525184c89e21b26fca06699 +DIST geany-2.0.tar.bz2 6836300 BLAKE2B 9a810827c3c8e5156329ec2e693d7181183d341ea74b5cbca940904912004e09b1ac0307710d2a6bec76c3c4b3e08c0a5231ffe5e65ba1234b33900192703d1a SHA512 443b64fc09501a95241340a6ee582810a3fddb033ef06c1a42d530625921a871a5183b575d73a858fa98b040651c4308a273272cb735753e969fd1270170b87d diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-2.0.ebuild index 067b8c015b22..33efc6136757 100644 --- a/dev-util/geany/geany-9999.ebuild +++ b/dev-util/geany/geany-2.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit strip-linguas xdg -LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW" +LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko ku lb lt mn nl nn pl pt pt_BR ro ru si sk sl sr sv tr uk vi zh_CN ZH_TW" NOSHORTLANGS="en_GB zh_CN zh_TW" DESCRIPTION="GTK+ based fast and lightweight IDE" @@ -16,7 +16,7 @@ if [[ "${PV}" = 9999* ]] ; then else [[ "${PV}" == *_pre* ]] && inherit autotools SRC_URI="https://download.geany.org/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2+ HPND" SLOT="0" @@ -26,7 +26,7 @@ IUSE="+vte" BDEPEND="virtual/pkgconfig" RDEPEND=" >=dev-libs/glib-2.32:2 - >=x11-libs/gtk+-3.0:3 + >=x11-libs/gtk+-3.24:3 vte? ( x11-libs/vte:2.91 ) " DEPEND=" diff --git a/dev-util/geany/metadata.xml b/dev-util/geany/metadata.xml index 93ae2d3e4645..419db80e1fce 100644 --- a/dev-util/geany/metadata.xml +++ b/dev-util/geany/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>aklhfex@gmail.com</email> + <name>Chris Mayo</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Gentoo Proxy Maintainers Project</name> + </maintainer> <longdescription lang="en"> Geany is a small and lightweight integrated development environment. It was developed to provide a small and fast IDE, which has only a diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 4fd884f5f0bc..b2d5a62165a6 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1539,9 +1539,9 @@ gcc_do_filter_flags() { if ver_test -lt 13.6 ; then # These aren't supported by the just-built compiler either. filter-flags -fharden-compares -fharden-conditional-branches \ - -fharden-control-flow-redundancy -fhardcfr-skip-leaf \ - -fhardcfr-check-exceptions -fhardcfr-check-returning-calls \ - '-fhardcfr-check-noreturn-calls=*' + -fharden-control-flow-redundancy -fno-harden-control-flow-redundancy \ + -fhardcfr-skip-leaf -fhardcfr-check-exceptions \ + -fhardcfr-check-returning-calls '-fhardcfr-check-noreturn-calls=*' fi # Makes things painfully slow and no real beenfit for the compiler. diff --git a/gui-apps/waypipe/Manifest b/gui-apps/waypipe/Manifest index 2288cc924b9d..780c9a63d976 100644 --- a/gui-apps/waypipe/Manifest +++ b/gui-apps/waypipe/Manifest @@ -1 +1,2 @@ DIST waypipe-0.8.0.tar.gz 217533 BLAKE2B a2aebb9939acafae3eb693aa8fe344ab775e8d3e9a071e7291ab15a0f9869b681156b5730e42c04401648a32ad2a67d7a3bf95ff5f38e909e9309e00b1c69381 SHA512 853d36a9779e2fcb5ac7bcca6575d456685beadd8d918ec430a57b8359867849bdcb5d9c1edcd19eb8505f06a7758e8f53ba5354daa05f99491d5a45c330eeb2 +DIST waypipe-v0.8.6.tar.bz2 189836 BLAKE2B 4023ddb325982d5cb189bafb9c4bf87f1ccd692c423371b05d273ab2d8ceeeacace256400e5755e89670407746f25ff4499643d3fb722053e5958547ac15600f SHA512 d02afa15e363009820e7e7ad75e8f294a58b42ec74f8a2cd310fc3c65a252b71524a89fb95e3e105cec8d6802fb30470c6842ae69d7c16d687edde96d4ff1263 diff --git a/gui-apps/waypipe/waypipe-0.8.6.ebuild b/gui-apps/waypipe/waypipe-0.8.6.ebuild new file mode 100644 index 000000000000..0cc69b7a164e --- /dev/null +++ b/gui-apps/waypipe/waypipe-0.8.6.ebuild @@ -0,0 +1,71 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit meson python-any-r1 + +DESCRIPTION="Transparent network proxy for Wayland compositors" +HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe" +else + SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" + S="${WORKDIR}"/${PN}-v${PV} + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 ) +WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts ) +WAYPIPE_FLAG_MAP=( + "${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}" + "${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}" +) + +IUSE="dmabuf ffmpeg lz4 systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}" +REQUIRED_USE="vaapi? ( ffmpeg )" +RESTRICT="!test? ( test )" + +DEPEND=" + dmabuf? ( + media-libs/mesa[gbm(+),vaapi?,wayland] + x11-libs/libdrm + ) + lz4? ( app-arch/lz4 ) + systemtap? ( dev-util/systemtap ) + vaapi? ( media-libs/libva[drm(+),wayland] ) + ffmpeg? ( + media-video/ffmpeg[x264,vaapi?] + ) + zstd? ( app-arch/zstd ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + app-text/scdoc + virtual/pkgconfig + test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] ) +" + +src_configure() { + local emesonargs=( + -Dman-pages=enabled + $(meson_use systemtap with_systemtap) + $(meson_feature dmabuf with_dmabuf) + $(meson_feature ffmpeg with_video) + $(meson_feature lz4 with_lz4) + $(meson_feature vaapi with_vaapi) + $(meson_feature zstd with_zstd) + ) + local fl + for fl in "${WAYPIPE_FLAG_MAP[@]}"; do + emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") ) + done + meson_src_configure +} diff --git a/gui-apps/waypipe/waypipe-9999.ebuild b/gui-apps/waypipe/waypipe-9999.ebuild index 0d8968a8db52..0cc69b7a164e 100644 --- a/gui-apps/waypipe/waypipe-9999.ebuild +++ b/gui-apps/waypipe/waypipe-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe" else - SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.bz2" S="${WORKDIR}"/${PN}-v${PV} KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi @@ -28,7 +28,7 @@ WAYPIPE_FLAG_MAP=( "${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}" ) -IUSE="dmabuf ffmpeg lz4 man systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}" +IUSE="dmabuf ffmpeg lz4 systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}" REQUIRED_USE="vaapi? ( ffmpeg )" RESTRICT="!test? ( test )" @@ -48,18 +48,18 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=" ${PYTHON_DEPS} + app-text/scdoc virtual/pkgconfig - man? ( app-text/scdoc ) test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] ) " src_configure() { local emesonargs=( + -Dman-pages=enabled $(meson_use systemtap with_systemtap) $(meson_feature dmabuf with_dmabuf) $(meson_feature ffmpeg with_video) $(meson_feature lz4 with_lz4) - $(meson_feature man man-pages) $(meson_feature vaapi with_vaapi) $(meson_feature zstd with_zstd) ) diff --git a/kde-apps/kdegraphics-meta/metadata.xml b/kde-apps/kdegraphics-meta/metadata.xml index fa5394460a56..77ae00d0575b 100644 --- a/kde-apps/kdegraphics-meta/metadata.xml +++ b/kde-apps/kdegraphics-meta/metadata.xml @@ -9,6 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="color-management">Enable color management via <pkg>media-libs/OpenColorIO</pkg></flag> + <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag> </use> </pkgmetadata> diff --git a/media-gfx/alembic/alembic-1.8.4.ebuild b/media-gfx/alembic/alembic-1.8.4.ebuild index c5dc94f437b4..f3bfe4a9376b 100644 --- a/media-gfx/alembic/alembic-1.8.4.ebuild +++ b/media-gfx/alembic/alembic-1.8.4.ebuild @@ -20,8 +20,8 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} - dev-libs/Imath:= - python? ( dev-libs/Imath:=[python,${PYTHON_SINGLE_USEDEP}] ) + dev-libs/imath:= + python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 diff --git a/media-gfx/alembic/alembic-1.8.5.ebuild b/media-gfx/alembic/alembic-1.8.5.ebuild index 34c19da39b44..3194df0d5070 100644 --- a/media-gfx/alembic/alembic-1.8.5.ebuild +++ b/media-gfx/alembic/alembic-1.8.5.ebuild @@ -23,8 +23,8 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} - dev-libs/Imath:= - python? ( dev-libs/Imath:=[python,${PYTHON_SINGLE_USEDEP}] ) + dev-libs/imath:= + python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] >=sys-libs/zlib-1.2.11-r1 diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 7c56592c6b76..b3c42c94fb98 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -3,4 +3,3 @@ DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 7fb24afe2151bba53d8c25160bd697145aced DIST blender-3.4.1.tar.xz 53666296 BLAKE2B ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee SHA512 d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab DIST blender-3.5.1.tar.xz 69780800 BLAKE2B 6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7 SHA512 7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131 DIST blender-3.6.0.tar.xz 70428872 BLAKE2B a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf SHA512 5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb -DIST blender-3.6.5.tar.xz 70447868 BLAKE2B efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be SHA512 d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild b/media-gfx/blender/blender-3.3.6-r1.ebuild index b1c434b9c585..8452075832d4 100644 --- a/media-gfx/blender/blender-3.3.6-r1.ebuild +++ b/media-gfx/blender/blender-3.3.6-r1.ebuild @@ -45,7 +45,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh # -# <OpenColorIO-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. +# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -66,7 +66,7 @@ RDEPEND="${PYTHON_DEPS} virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/OpenColorIO-2.3.0:= ) + color-management? ( <media-libs/opencolorio-2.3.0:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) @@ -87,9 +87,9 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= ) + openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) @@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= ) + osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) @@ -129,11 +129,11 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch" + "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch + "${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch + "${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch + "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch ) blender_check_requirements() { diff --git a/media-gfx/blender/blender-3.3.8.ebuild b/media-gfx/blender/blender-3.3.8.ebuild index 1f5d50885c97..12beb87e5c35 100644 --- a/media-gfx/blender/blender-3.3.8.ebuild +++ b/media-gfx/blender/blender-3.3.8.ebuild @@ -45,7 +45,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh # -# <OpenColorIO-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. +# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -66,7 +66,7 @@ RDEPEND="${PYTHON_DEPS} virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/OpenColorIO-2.3.0:= ) + color-management? ( <media-libs/opencolorio-2.3.0:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) @@ -87,9 +87,9 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= ) + openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) @@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= ) + osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) @@ -129,11 +129,11 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch" - "${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch" - "${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch" - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch" + "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch + "${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch + "${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch + "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch ) blender_check_requirements() { @@ -177,7 +177,7 @@ src_unpack() { if use test; then #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi fi @@ -202,9 +202,9 @@ src_prepare() { sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild b/media-gfx/blender/blender-3.4.1-r3.ebuild index 91dc3e3014ed..801a0d0bf0db 100644 --- a/media-gfx/blender/blender-3.4.1-r3.ebuild +++ b/media-gfx/blender/blender-3.4.1-r3.ebuild @@ -45,7 +45,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh # -# <OpenColorIO-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. +# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -66,7 +66,7 @@ RDEPEND="${PYTHON_DEPS} virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/OpenColorIO-2.3.0:= ) + color-management? ( <media-libs/opencolorio-2.3.0:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) @@ -82,9 +82,9 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) - openimageio? ( >=media-libs/OpenImageIO-2.3.12.0-r3:= ) + openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) @@ -93,7 +93,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= ) + osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) @@ -139,8 +139,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch" - "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch" + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch + "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch ) blender_check_requirements() { @@ -184,7 +184,7 @@ src_unpack() { if use test; then #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi fi @@ -209,9 +209,9 @@ src_prepare() { sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. @@ -247,7 +247,7 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV} -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) -DWITH_GHOST_WAYLAND_DYNLOAD=OFF -DWITH_GHOST_WAYLAND_LIBDECOR=OFF diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild b/media-gfx/blender/blender-3.5.1-r1.ebuild index 15d278172bfc..879f40ec9257 100644 --- a/media-gfx/blender/blender-3.5.1-r1.ebuild +++ b/media-gfx/blender/blender-3.5.1-r1.ebuild @@ -46,7 +46,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh # -# <OpenColorIO-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. +# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -61,14 +61,14 @@ RDEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate - >=media-libs/OpenImageIO-2.4.6.0:= + >=media-libs/openimageio-2.4.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/OpenColorIO-2.3.0:= ) + color-management? ( <media-libs/opencolorio-2.3.0:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) @@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS} openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) openpgl? ( media-libs/openpgl ) @@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= ) + osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) @@ -173,8 +173,8 @@ src_unpack() { if [[ ${PV} = *9999* ]] ; then git-r3_src_unpack - git-r3_fetch "${ADDONS_EGIT_REPO_URI}" - git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons" + git-r3_fetch ${ADDONS_EGIT_REPO_URI} + git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons if use test; then TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests @@ -187,7 +187,7 @@ src_unpack() { if use test; then #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi fi @@ -212,9 +212,9 @@ src_prepare() { sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. @@ -251,7 +251,7 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV} -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) -DWITH_GHOST_WAYLAND_DYNLOAD=OFF -DWITH_GHOST_WAYLAND_LIBDECOR=OFF diff --git a/media-gfx/blender/blender-3.6.0.ebuild b/media-gfx/blender/blender-3.6.0.ebuild index 15d278172bfc..879f40ec9257 100644 --- a/media-gfx/blender/blender-3.6.0.ebuild +++ b/media-gfx/blender/blender-3.6.0.ebuild @@ -46,7 +46,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh # -# <OpenColorIO-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. +# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -61,14 +61,14 @@ RDEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate - >=media-libs/OpenImageIO-2.4.6.0:= + >=media-libs/openimageio-2.4.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( <media-libs/OpenColorIO-2.3.0:= ) + color-management? ( <media-libs/opencolorio-2.3.0:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) @@ -85,7 +85,7 @@ RDEPEND="${PYTHON_DEPS} openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) openpgl? ( media-libs/openpgl ) @@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= ) + osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) @@ -173,8 +173,8 @@ src_unpack() { if [[ ${PV} = *9999* ]] ; then git-r3_src_unpack - git-r3_fetch "${ADDONS_EGIT_REPO_URI}" - git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons" + git-r3_fetch ${ADDONS_EGIT_REPO_URI} + git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons if use test; then TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests @@ -187,7 +187,7 @@ src_unpack() { if use test; then #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi fi @@ -212,9 +212,9 @@ src_prepare() { sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. @@ -251,7 +251,7 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV} -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) -DWITH_GHOST_WAYLAND_DYNLOAD=OFF -DWITH_GHOST_WAYLAND_LIBDECOR=OFF diff --git a/media-gfx/blender/blender-3.6.5.ebuild b/media-gfx/blender/blender-3.6.5.ebuild deleted file mode 100644 index 1f87c0fac6ef..000000000000 --- a/media-gfx/blender/blender-3.6.5.ebuild +++ /dev/null @@ -1,443 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 python3_11 ) - -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -if [[ ${PV} = *9999* ]] ; then - # Subversion is needed for downloading unit test files - inherit git-r3 subversion - EGIT_REPO_URI="https://projects.blender.org/blender/blender.git" - ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git" -else - SRC_URI="https://download.blender.org/source/${P}.tar.xz" - # Update these between major releases. - TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - # SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -SLOT="${PV%.*}" -LICENSE="|| ( GPL-3 BL )" -IUSE="+bullet +dds +fluid +openexr +tbb - alembic collada +color-management cuda +cycles cycles-bin-kernels - debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k - man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv - +openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl - +sndfile test +tiff valgrind wayland X" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - alembic? ( openexr ) - cuda? ( cycles ) - cycles? ( openexr tiff ) - fluid? ( tbb ) - openvdb? ( tbb ) - optix? ( cuda ) - osl? ( cycles ) - test? ( color-management )" - -# Library versions for official builds can be found in the blender source directory in: -# build_files/build_environment/install_deps.sh -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - media-libs/freetype:=[brotli] - media-libs/libepoxy:= - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libsamplerate - >=media-libs/OpenImageIO-2.4.6.0:= - sys-libs/zlib:= - virtual/glu - virtual/libintl - virtual/opengl - alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/OpenColorIO:= ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - embree? ( >=media-libs/embree-3.10.0[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) - fftw? ( sci-libs/fftw:3.0= ) - gmp? ( dev-libs/gmp ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - oidn? ( >=media-libs/oidn-1.4.1 ) - openexr? ( - >=dev-libs/Imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - ) - openpgl? ( media-libs/openpgl ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) - openvdb? ( - >=media-gfx/openvdb-9.0.0:=[nanovdb?] - dev-libs/c-blosc:= - ) - optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= ) - pdf? ( media-libs/libharu ) - potrace? ( media-gfx/potrace ) - pugixml? ( dev-libs/pugixml ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tbb? ( dev-cpp/tbb:= ) - tiff? ( media-libs/tiff:= ) - valgrind? ( dev-util/valgrind ) - wayland? ( - >=dev-libs/wayland-1.12 - >=dev-libs/wayland-protocols-1.15 - >=x11-libs/libxkbcommon-0.2.0 - media-libs/mesa[wayland] - sys-apps/dbus - ) - X? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) -" - -DEPEND="${RDEPEND} - dev-cpp/eigen:= -" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - dev-python/sphinx[latex] - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) - nls? ( sys-devel/gettext ) - wayland? ( - dev-util/wayland-scanner - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.0-ocio-2.3.0.patch" -) - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -blender_get_version() { - # Get blender version from blender itself. - BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) - if ((${BV:0:1} < 3)) ; then - # Add period (290 -> 2.90). - BV=${BV:0:1}.${BV:1} - else - # Add period and skip the middle number (301 -> 3.1) - BV=${BV:0:1}.${BV:2} - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} = *9999* ]] ; then - git-r3_src_unpack - - git-r3_fetch "${ADDONS_EGIT_REPO_URI}" - git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons" - - if use test; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests - subversion_fetch ${TESTS_SVN_URL} ../lib/tests - fi - ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets - subversion_fetch ${ASSETS_SVN_URL} ../lib/assets - else - default - if use test; then - #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests - mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die - fi - fi - -} - -src_prepare() { - cmake_src_prepare - - blender_get_version - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die - - # Prepare icons and .desktop files for slotting. - sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die - sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die - - sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die - sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die - - if use test; then - # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. - sed -e "s|set(TEST_INSTALL_DIR.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die - sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die - fi -} - -src_configure() { - append-lfs-flags - blender_get_version - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_VERSION="${EPYTHON/python/}" - -DWITH_ALEMBIC=$(usex alembic) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_BOOST=ON - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) - -DWITH_CYCLES_EMBREE=$(usex embree) - -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl) - -DWITH_CYCLES_STANDALONE=OFF - -DWITH_CYCLES_STANDALONE_GUI=OFF - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" - -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) - -DWITH_GHOST_WAYLAND_DYNLOAD=OFF - -DWITH_GHOST_WAYLAND_LIBDECOR=OFF - -DWITH_GHOST_X11=$(usex X) - -DWITH_GMP=$(usex gmp) - -DWITH_GTESTS=$(usex test) - -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - -DWITH_MOD_FLUID=$(usex fluid) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_NANOVDB=$(usex nanovdb) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENCOLORIO=$(usex color-management) - -DWITH_OPENIMAGEDENOISE=$(usex oidn) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_POTRACE=$(usex potrace) - -DWITH_PUGIXML=$(usex pugixml) - -DWITH_PULSEAUDIO=$(usex pulseaudio) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_SDL=$(usex sdl) - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_FREETYPE=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_TBB=$(usex tbb) - -DWITH_USD=OFF - -DWITH_XR_OPENXR=OFF - ) - - if use optix; then - mycmakeargs+=( - -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix - ) - fi - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - use arm64 && append-flags -flax-vector-conversions - - append-flags $(usex debug '-DDEBUG' '-DNDEBUG') - - if tc-is-gcc ; then - # These options only exist when GCC is detected. - # We disable these to respect the user's choice of linker. - mycmakeargs+=( - -DWITH_LINKER_GOLD=OFF - -DWITH_LINKER_LLD=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - # A lot of tests needs to have access to the installed data files. - # So install them into the image directory now. - cmake_src_install - - blender_get_version - # Define custom blender data/script file paths not be able to find them otherwise during testing. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS="${ED}"/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES="${ED}"/usr/share/blender/${BV}/datafiles - - # Sanity check that the script and datafile path is valid. - # If they are not vaild, blender will fallback to the default path which is not what we want. - [ -d "$BLENDER_SYSTEM_SCRIPTS" ] || die "The custom script path is invalid, fix the ebuild!" - [ -d "$BLENDER_SYSTEM_DATAFILES" ] || die "The custom datafiles path is invalid, fix the ebuild!" - - cmake_src_test - - # Clean up the image directory for src_install - rm -fr "${ED}"/* || die -} - -src_install() { - blender_get_version - - # Pax mark blender for hardened support. - pax-mark m "${BUILD_DIR}"/bin/blender - - cmake_src_install - - if use man; then - # Slot the man page - mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die - fi - - if use doc; then - # Define custom blender data/script file paths. Otherwise Blender will not be able to find them during doc building. - # (Because the data is in the image directory and it will default to look in /usr/share) - export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts - export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles - - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/dri - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - # Fix doc installdir - docinto html - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED}"/usr/share/doc/blender || die - - python_optimize "${ED}/usr/share/blender/${BV}/scripts" - - mv "${ED}/usr/bin/blender-thumbnailer" "${ED}/usr/bin/blender-${BV}-thumbnailer" || die - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherent risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "changing the 'Temporary Files' directory in Blender preferences." - elog - - if use osl; then - ewarn "" - ewarn "OSL is know to cause runtime segfaults if Mesa has been linked to" - ewarn "an other LLVM version than what OSL is linked to." - ewarn "See https://bugs.gentoo.org/880671 for more details" - ewarn "" - fi - - if ! use python_single_target_python3_10; then - elog "You are building Blender with a newer python version than" - elog "supported by this version upstream." - elog "If you experience breakages with e.g. plugins, please switch to" - elog "python_single_target_python3_10 instead." - elog "Bug: https://bugs.gentoo.org/737388" - elog - fi - - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${SLOT}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index d32731e15fef..1d0f62f242c9 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -45,6 +45,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/install_deps.sh +# +# <opencolorio-2.3.0 for https://projects.blender.org/blender/blender/issues/112917. RDEPEND="${PYTHON_DEPS} dev-libs/boost:=[nls?] dev-libs/lzo:2= @@ -59,14 +61,14 @@ RDEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate - >=media-libs/OpenImageIO-2.4.6.0:= + >=media-libs/openimageio-2.4.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl virtual/opengl alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/OpenColorIO:= ) + color-management? ( <media-libs/opencolorio-2.3.0:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0[raymask] ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) @@ -83,7 +85,7 @@ RDEPEND="${PYTHON_DEPS} openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) openpgl? ( media-libs/openpgl ) @@ -93,7 +95,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/c-blosc:= ) optix? ( <dev-libs/optix-7.5.0 ) - osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= ) + osl? ( >=media-libs/osl-1.11.16.0-r3:= ) pdf? ( media-libs/libharu ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) @@ -171,8 +173,8 @@ src_unpack() { if [[ ${PV} = *9999* ]] ; then git-r3_src_unpack - git-r3_fetch "${ADDONS_EGIT_REPO_URI}" - git-r3_checkout "${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons" + git-r3_fetch ${ADDONS_EGIT_REPO_URI} + git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons if use test; then TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests @@ -185,7 +187,7 @@ src_unpack() { if use test; then #The tests are downloaded from: https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests mkdir -p lib || die - mv "${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi fi @@ -210,9 +212,9 @@ src_prepare() { sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die - mv release/freedesktop/icons/scalable/apps/blender.svg "release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die - mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg "release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die - mv release/freedesktop/blender.desktop "release/freedesktop/blender-${BV}.desktop" || die + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die if use test; then # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. @@ -249,7 +251,7 @@ src_configure() { -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}" + -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV} -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) -DWITH_GHOST_WAYLAND_DYNLOAD=OFF -DWITH_GHOST_WAYLAND_LIBDECOR=OFF diff --git a/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch b/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch deleted file mode 100644 index e6cc4a6fa026..000000000000 --- a/media-gfx/blender/files/blender-4.0.0-ocio-2.3.0.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 458917773afb4cdf8e1189c0bf5aff7feda6a664 Mon Sep 17 00:00:00 2001 -From: Brecht Van Lommel <brecht@blender.org> -Date: Mon, 2 Oct 2023 17:31:08 +0200 -Subject: [PATCH] Build: changes to build with OpenColorIO 2.3 - -Ref #113157 ---- - intern/opencolorio/ocio_impl_glsl.cc | 12 +++++++++- - .../ocio_color_space_conversion_shader.cc | 24 +++++++++++++++++++ - 2 files changed, 35 insertions(+), 1 deletion(-) - -diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc -index 8d46a2f0773..35e4d0b7a90 100644 ---- a/intern/opencolorio/ocio_impl_glsl.cc -+++ b/intern/opencolorio/ocio_impl_glsl.cc -@@ -343,8 +343,15 @@ static bool addGPULut1D2D(OCIO_GPUTextures &textures, - unsigned int height = 0; - GpuShaderCreator::TextureType channel = GpuShaderCreator::TEXTURE_RGB_CHANNEL; - Interpolation interpolation = INTERP_LINEAR; -+#if OCIO_VERSION_HEX >= 0x02030000 -+ /* Always use 2D textures in OpenColorIO 2.3, simpler and same performance. */ -+ GpuShaderDesc::TextureDimensions dimensions = GpuShaderDesc::TEXTURE_2D; -+ shader_desc->getTexture( -+ index, texture_name, sampler_name, width, height, channel, dimensions, interpolation); -+#else - shader_desc->getTexture( - index, texture_name, sampler_name, width, height, channel, interpolation); -+#endif - - const float *values; - shader_desc->getTextureValues(index, values); -@@ -358,6 +365,7 @@ static bool addGPULut1D2D(OCIO_GPUTextures &textures, - GPU_R16F; - - OCIO_GPULutTexture lut; -+#if OCIO_VERSION_HEX < 0x02030000 - /* There does not appear to be an explicit way to check if a texture is 1D or 2D. - * It depends on more than height. So check instead by looking at the source. */ - std::string sampler1D_name = std::string("sampler1D ") + sampler_name; -@@ -365,7 +373,9 @@ static bool addGPULut1D2D(OCIO_GPUTextures &textures, - lut.texture = GPU_texture_create_1d( - texture_name, width, 1, format, GPU_TEXTURE_USAGE_SHADER_READ, values); - } -- else { -+ else -+#endif -+ { - lut.texture = GPU_texture_create_2d( - texture_name, width, height, 1, format, GPU_TEXTURE_USAGE_SHADER_READ, values); - } -diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc -index 4cdbb52a6ba..52492754c0f 100644 ---- a/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc -+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/ocio_color_space_conversion_shader.cc -@@ -95,6 +95,18 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator { - return GPU_max_texture_size(); - } - -+# if OCIO_VERSION_HEX >= 0x02030000 -+ void setAllowTexture1D(bool allowed) override -+ { -+ allow_texture_1D_ = allowed; -+ } -+ -+ bool getAllowTexture1D() const override -+ { -+ return allow_texture_1D_; -+ } -+# endif -+ - bool addUniform(const char *name, const DoubleGetter &get_double) override - { - /* Check if a resource exists with the same name and assert if it is the case, returning false -@@ -201,6 +213,9 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator { - uint width, - uint height, - TextureType channel, -+# if OCIO_VERSION_HEX >= 0x02030000 -+ OCIO::GpuShaderDesc::TextureDimensions dimensions, -+# endif - OCIO::Interpolation interpolation, - const float *values) override - { -@@ -216,7 +231,11 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator { - GPUTexture *texture; - eGPUTextureFormat texture_format = (channel == TEXTURE_RGB_CHANNEL) ? GPU_RGB16F : GPU_R16F; - /* A height of 1 indicates a 1D texture according to the OCIO API. */ -+# if OCIO_VERSION_HEX >= 0x02030000 -+ if (dimensions == OCIO::GpuShaderDesc::TEXTURE_1D) { -+# else - if (height == 1) { -+# endif - texture = GPU_texture_create_1d( - texture_name, width, 1, texture_format, GPU_TEXTURE_USAGE_SHADER_READ, values); - shader_create_info_.sampler(textures_.size() + 1, ImageType::FLOAT_1D, resource_name); -@@ -398,6 +417,11 @@ class GPUShaderCreator : public OCIO::GpuShaderCreator { - /* A vectors that stores the created uniform buffers when bind_shader_and_resources() is called, - * so that they can be properly unbound and freed in the unbind_shader_and_resources() method. */ - Vector<GPUUniformBuf *> uniform_buffers_; -+ -+# if OCIO_VERSION_HEX >= 0x02030000 -+ /* Allow creating 1D textures, or only use 2D textures. */ -+ bool allow_texture_1D_ = true; -+# endif - }; - - #else --- -2.30.2 - diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index 3f8728aad508..5b6cbb8d18d1 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -29,12 +29,12 @@ Add support for Collada interchange format through <pkg>media-libs/opencollada</pkg>. </flag> - <flag name="color-management">Enable color management via <pkg>media-libs/OpenColorIO</pkg>.</flag> + <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg>.</flag> <flag name="cuda"> Build cycles renderer with nVidia CUDA support. </flag> <flag name="cycles"> - Build cycles renderer (requires <pkg>media-libs/OpenImageIO</pkg> and + Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and <pkg>dev-libs/boost</pkg>). </flag> <flag name="cycles-bin-kernels"> diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild index da7e6a1b6f91..ce792e435b08 100644 --- a/media-gfx/gmic/gmic-3.2.6.ebuild +++ b/media-gfx/gmic/gmic-3.2.6.ebuild @@ -38,7 +38,7 @@ DEPEND=" jpeg? ( media-libs/libjpeg-turbo:= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:= ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= media-libs/openexr:= ) png? ( media-libs/libpng:= ) diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild index 42d21d80aa6d..f313dc477e04 100644 --- a/media-gfx/krita/krita-5.1.5.ebuild +++ b/media-gfx/krita/krita-5.1.5.ebuild @@ -66,7 +66,7 @@ RDEPEND="${PYTHON_DEPS} virtual/opengl x11-libs/libX11 x11-libs/libXi - color-management? ( >=media-libs/OpenColorIO-2.0.0 ) + color-management? ( >=media-libs/opencolorio-2.0.0 ) fftw? ( sci-libs/fftw:3.0= ) gif? ( media-libs/giflib ) gsl? ( sci-libs/gsl:= ) diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml index 0522ea2955be..99adf7a4786d 100644 --- a/media-gfx/krita/metadata.xml +++ b/media-gfx/krita/metadata.xml @@ -9,7 +9,7 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="color-management">Enable color management via <pkg>media-libs/OpenColorIO</pkg></flag> + <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag> <flag name="jpegxl">Support for JPEG XL image format</flag> <flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag> <flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag> diff --git a/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild index b3b2a21652cb..3b2b29b89171 100644 --- a/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild +++ b/media-gfx/mandelbulber/mandelbulber-2.28-r1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" virtual/opencl ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= media-libs/openexr:= ) sndfile? ( media-libs/libsndfile ) diff --git a/media-gfx/openvdb/openvdb-10.0.1.ebuild b/media-gfx/openvdb/openvdb-10.0.1.ebuild index 57779a03ddb1..104a9d150db1 100644 --- a/media-gfx/openvdb/openvdb-10.0.1.ebuild +++ b/media-gfx/openvdb/openvdb-10.0.1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" dev-libs/boost:= dev-libs/jemalloc:= dev-libs/log4cplus:= - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi diff --git a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild index 7f5886a59476..7cdeaa9cc284 100644 --- a/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild +++ b/media-gfx/superslicer/superslicer-2.5.59.0-r3.ebuild @@ -34,7 +34,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= - dev-libs/Imath:= + dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= diff --git a/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild b/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild index 5b52d41743bc..8d4ac88db07d 100644 --- a/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild +++ b/media-gfx/superslicer/superslicer-2.5.59.2-r2.ebuild @@ -34,7 +34,7 @@ RDEPEND=" dev-libs/glib:2 dev-libs/gmp:= dev-libs/mpfr:= - dev-libs/Imath:= + dev-libs/imath:= >=media-gfx/openvdb-8.2:= net-misc/curl[adns] media-libs/glew:0= diff --git a/media-libs/Field3D/Field3D-1.7.2-r3.ebuild b/media-libs/Field3D/Field3D-1.7.2-r3.ebuild index de07b882e7f3..c8141a0bbffe 100644 --- a/media-libs/Field3D/Field3D-1.7.2-r3.ebuild +++ b/media-libs/Field3D/Field3D-1.7.2-r3.ebuild @@ -16,7 +16,7 @@ IUSE="mpi" RDEPEND=" dev-libs/boost:= - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= sci-libs/hdf5:= mpi? ( virtual/mpi ) diff --git a/media-libs/OpenImageIO/Manifest b/media-libs/OpenImageIO/Manifest deleted file mode 100644 index 06f97d6d969f..000000000000 --- a/media-libs/OpenImageIO/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -DIST OpenImageIO-2.4.12.0.tar.gz 32157951 BLAKE2B dd7dd7b641266a7c575eafbc258ffc4b298236043960ae6ef878f46cd3ec3342f3be5b9a14459724578abc6390318666e43e8835ef6b2f25bc05a52002c7096f SHA512 5a0b9e6b634326be051dac46d2145149e9ff3e33d60d05728420d156431d6aa85186706b5f5b66ab820f4cd97f68d049a76e2da13f99e457135360f56fb5a257 -DIST OpenImageIO-2.4.13.0.tar.gz 32162857 BLAKE2B 43d6c16fb9dfba2e01ea6a7b68e8c72ec0c11be0d42d96e476a79b7972bcf61f2ac377009493e8fa9367001cc788a1453f8c0f1cf061a204f9da4b9f713d5554 SHA512 9e887c7039995ce7c41556e09a7eed940863260a522ecf7d9bec300189026ed507da560620dfa4a619deeb679be7adf42fe3a7020ff3094df777c7934c771227 -DIST OpenImageIO-2.4.14.0.tar.gz 47890469 BLAKE2B 53865ab493a586a1e4fdc6f81a90f7ae3847556a09a9c19ade48cbe5d8e3f807d864a2409a468613b1a55c128d5f5e119f1f2a70fc44b1a5293c99c3431cc69f SHA512 6b87c805907a2f7c98f40e987fb6ebf769f8519f5d8a8b7393bed62a41cee1118bb32d2bc4d23fd464973e237077d08771ff85f72073caa57799d71bd098038f -DIST OpenImageIO-2.4.15.0.tar.gz 47894262 BLAKE2B 82afc48b3d9affb987d94c57d91fe93b27c78350d02fc7605ce3995e5f37724495bbc0d2f85fa8efb86113ef48d0aec15cfdb9bad8547315542ed125e5f71349 SHA512 dc1f805d6dc85170784d2b2860bfd488fdebb92cb12254d5c0d4df9483e55f298f6fbf74aca0c52162583300327de99bd92f73c2a2b7f5611f61bbfef5ca22a5 -DIST OpenImageIO-2.4.16.0.tar.gz 47894563 BLAKE2B 02788bb7ccc9bbcb84a44df0c86252545f89cf8dcd1b84443f185f43e60c9eb701e9c5e781c946dec797ec888c5ebdd5efb3f1d95b684c71cbb7271bf6f0da9e SHA512 f9835d6b5e938bdba462a64eb9cc3b89f27ea36b6b59f7143a9c0b2794f095ca68fbd26bdd7322b2b260e9ded5cc6a91f86ad11f292ad8163a1dfe55b9a3446c -DIST OpenImageIO-2.4.6.0.tar.gz 10356052 BLAKE2B e5e660d8c2aee62cecaf520f9bc6bc65e243bd90a88b1a233f95fa3b4bb24390dbc80a922c313672c4d70a0de58bc7573d49ecfda35bde1ae95ecaeeccea90cb SHA512 cb16d767cde35852c9c3618f4eb22f81bc5ba52bce5354a0e819fe16dbd6941fb3847060e8efeb9e367121d8d6421042c82230751c1ea1d9f078bad6df044de6 -DIST OpenImageIO-2.5.4.0.tar.gz 48107518 BLAKE2B 38ba0f01976cfbe0f81c04fe8e64ff9c5ab530204d45a7b566882a7ec31c378c61a9b6bc62d6453c51e7ed33cd514a758b5d8224a646e568c9abd6274ebc6b0c SHA512 db9576bbc0b77da19db957710e86d8979e9987e91ff6246b513197fa98545904a7d34873cc2ba3ee60deed0a00a757dafb8dfa604f1e52097a1848aef43427cd -DIST OpenImageIO-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f -DIST OpenImageIO-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f -DIST OpenImageIO-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137900826 BLAKE2B e89fd990b5e3ef23a853fc554066804c2a092b74a7ee54e3f1654bf419904ca094fef2703cd2f29d90c6d2bc5b8c8808cf9e66eb858c6d8495fdb7941f5029d7 SHA512 6568d4171c7dbd12d86099fd3dc35bfe2cbd46af84e58884900c5cea6ccea0139eabdb6d2194217ab3cffac56a81d37db4fbae57eb2a05f7916c27fe75a51ee6 -DIST OpenImageIO-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910473 BLAKE2B 4fb43e1dc0a726fc64085884494b8fef23a824d38e79c5ec33ab4bd9338f5efbb91a6b534b89f37f868838984e22530e8f938436674b0972537fb6b25f3b9d57 SHA512 d7e49efd1ce07364f226318b6572ceb46d654f22d94baa031dea05c6529b51a23a81ae6940136c3f7dd749f65f105c2efcdb5609b21b291110b92419233b2521 diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.14.0.ebuild b/media-libs/OpenImageIO/OpenImageIO-2.4.14.0.ebuild deleted file mode 100644 index b0a20f341536..000000000000 --- a/media-libs/OpenImageIO/OpenImageIO-2.4.14.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-doc/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/Imath-3.1.2-r4:= - >=media-libs/OpenColorIO-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.15.0.ebuild b/media-libs/OpenImageIO/OpenImageIO-2.4.15.0.ebuild deleted file mode 100644 index b0a20f341536..000000000000 --- a/media-libs/OpenImageIO/OpenImageIO-2.4.15.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-doc/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/Imath-3.1.2-r4:= - >=media-libs/OpenColorIO-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.16.0.ebuild b/media-libs/OpenImageIO/OpenImageIO-2.4.16.0.ebuild deleted file mode 100644 index b0a20f341536..000000000000 --- a/media-libs/OpenImageIO/OpenImageIO-2.4.16.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-doc/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/Imath-3.1.2-r4:= - >=media-libs/OpenColorIO-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/OpenImageIO/OpenImageIO-2.5.4.0.ebuild b/media-libs/OpenImageIO/OpenImageIO-2.5.4.0.ebuild deleted file mode 100644 index b0a20f341536..000000000000 --- a/media-libs/OpenImageIO/OpenImageIO-2.5.4.0.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" -TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" -inherit cmake flag-o-matic font python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" - -LICENSE="BSD" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" - -X86_CPU_FEATURES=( - aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) - -IUSE="dicom doc ffmpeg gif gui jpeg jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools )" - -# Not quite working yet -RESTRICT="!test? ( test )" # test" - -BDEPEND=" - doc? ( - app-doc/doxygen - dev-texlive/texlive-bibtexextra - dev-texlive/texlive-fontsextra - dev-texlive/texlive-fontutils - dev-texlive/texlive-latex - dev-texlive/texlive-latexextra - ) -" -RDEPEND=" - dev-libs/boost:= - dev-cpp/robin-map - dev-libs/libfmt:= - dev-libs/pugixml:= - >=media-libs/libheif-1.13.0:= - jpeg? ( media-libs/libjpeg-turbo:= ) - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=dev-libs/Imath-3.1.2-r4:= - >=media-libs/OpenColorIO-2.1.1-r4:= - >=media-libs/openexr-3:0= - media-libs/tiff:= - sys-libs/zlib:= - dicom? ( sci-libs/dcmtk ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) - opencv? ( media-libs/opencv:= ) - openvdb? ( - dev-cpp/tbb:= - media-gfx/openvdb:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - gui? ( - media-libs/libglvnd - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - dev-qt/qtbase:6[gui,widgets,opengl] - ) - ) - raw? ( media-libs/libraw:= ) - truetype? ( media-libs/freetype:2= ) -" -DEPEND=" - ${RDEPEND} -" - -DOCS=( - CHANGES.md - CREDITS.md - README.md -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - cmake_comment_add_subdirectory src/fonts - - if use test ; then - mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die - fi -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -z ${mysimd[*]} ]] && mysimd=("0") - - # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully - # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available. - use arm64 && append-flags -flax-vector-conversions - - local mycmakeargs=( - "-DVERBOSE=ON" - "-DOIIO_BUILD_TOOLS=$(usex tools)" - "-DBUILD_TESTING=$(usex test)" - "-DOIIO_BUILD_TESTS=$(usex test)" - "-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF" - "-DINSTALL_FONTS=OFF" - "-DBUILD_DOCS=$(usex doc)" - "-DINSTALL_DOCS=$(usex doc)" - "-DSTOP_ON_WARNING=OFF" - "-DUSE_CCACHE=OFF" - "-DUSE_DCMTK=$(usex dicom)" - "-DUSE_EXTERNAL_PUGIXML=ON" - "-DUSE_JPEGTURBO=ON" - "-DUSE_NUKE=OFF" # not in Gentoo - "-DUSE_FFMPEG=$(usex ffmpeg)" - "-DUSE_GIF=$(usex gif)" - "-DUSE_OPENJPEG=$(usex jpeg2k)" - "-DUSE_OPENCV=$(usex opencv)" - "-DUSE_OPENVDB=$(usex openvdb)" - "-DUSE_PTEX=$(usex ptex)" - "-DUSE_PYTHON=$(usex python)" - "-DUSE_LIBRAW=$(usex raw)" - "-DUSE_FREETYPE=$(usex truetype)" - "-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")" - ) - - if use gui; then - mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON ) - if use qt6; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON ) - else - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON ) - fi - else - mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF ) - fi - - if use python; then - mycmakeargs+=( - "-DPYTHON_VERSION=${EPYTHON#python}" - "-DPYTHON_SITE_DIR=$(python_get_sitedir)" - ) - fi - - cmake_src_configure -} - -src_test() { - # TODO: investigate failures - local myctestargs=( - -E "(oiiotool|maketx|oiiotool-maketx|texture-crop|texture-crop.batch|texture-half|texture-half.batch|texture-uint16|texture-uint16.batch|texture-interp-bilinear|texture-interp-bilinear.batch|texture-interp-closest|texture-interp-closest.batch|texture-levels-stochaniso|texture-levels-stochaniso.batch|texture-levels-stochmip|texture-levels-stochmip.batch|texture-mip-onelevel|texture-mip-onelevel.batch|texture-mip-stochastictrilinear|texture-mip-stochastictrilinear.batch|texture-mip-stochasticaniso|texture-mip-stochasticaniso.batch|texture-uint8|texture-uint8.batch|texture-skinny|texture-skinny.batch|texture-icwrite|texture-icwrite.batch|jpeg2000-broken|openexr-damaged|openvdb-broken|texture-texture3d-broken|texture-texture3d-broken.batch|psd|ptex-broken|raw-broken|targa|tiff-depths|zfile|unit_simd|cineon|dds|openvdb.batch-broken|texture-texture3d.batch-broken|cmake-consumer|texture-udim|texture-udim2|texture-udim.batch|texture-udim2.batch)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - # can't use font_src_install - # it does directory hierarchy recreation - FONT_S=( - "${S}/src/fonts/Droid_Sans" - "${S}/src/fonts/Droid_Sans_Mono" - "${S}/src/fonts/Droid_Serif" - ) - insinto "${FONTDIR}" - for dir in "${FONT_S[@]}"; do - doins "${dir}"/*.ttf - done -} diff --git a/media-libs/OpenShadingLanguage/Manifest b/media-libs/OpenShadingLanguage/Manifest deleted file mode 100644 index 47ed2b5ca5c7..000000000000 --- a/media-libs/OpenShadingLanguage/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST OpenShadingLanguage-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e -DIST OpenShadingLanguage-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc -DIST OpenShadingLanguage-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f diff --git a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild index 92708ff95646..fe8ff0e39185 100644 --- a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild +++ b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild @@ -20,7 +20,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-libs/Imath:= + dev-libs/imath:= >=media-libs/openexr-3:=[threads] media-libs/tiff:= !media-libs/openexr_ctl" diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild index 03cb02f581bd..1925f9f320b4 100644 --- a/media-libs/embree/embree-3.13.4.ebuild +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -30,7 +30,7 @@ RDEPEND=" tutorial? ( media-libs/libjpeg-turbo >=media-libs/libpng-1.6.34:0= - >=media-libs/OpenImageIO-1.8.7:0= + >=media-libs/openimageio-1.8.7:0= ) " DEPEND="${RDEPEND}" diff --git a/media-libs/embree/embree-3.13.5.ebuild b/media-libs/embree/embree-3.13.5.ebuild index 4445462c8f10..7a4464c22033 100644 --- a/media-libs/embree/embree-3.13.5.ebuild +++ b/media-libs/embree/embree-3.13.5.ebuild @@ -28,7 +28,7 @@ RDEPEND=" tutorial? ( media-libs/libjpeg-turbo >=media-libs/libpng-1.6.34:0= - >=media-libs/OpenImageIO-1.8.7:0= + >=media-libs/openimageio-1.8.7:0= ) " DEPEND="${RDEPEND}" diff --git a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild index cc2a0e8598d7..502ee0298dbe 100644 --- a/media-libs/freeimage/freeimage-3.18.0-r10.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0-r10.ebuild @@ -31,7 +31,7 @@ RDEPEND=" png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= >=media-libs/tiff-4.4.0:= ) diff --git a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild index 7858e9c97043..727d83891786 100644 --- a/media-libs/freeimage/freeimage-3.18.0-r11.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0-r11.ebuild @@ -31,7 +31,7 @@ RDEPEND=" png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= >=media-libs/tiff-4.4.0:= ) diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest index 955eec847d0e..97ee1069f0e6 100644 --- a/media-libs/libpulse/Manifest +++ b/media-libs/libpulse/Manifest @@ -1 +1,2 @@ DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f +DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2 diff --git a/media-libs/libpulse/files/pulseaudio-16.99.1-memfd-compat.patch b/media-libs/libpulse/files/pulseaudio-16.99.1-memfd-compat.patch new file mode 100644 index 000000000000..77af0ac915f6 --- /dev/null +++ b/media-libs/libpulse/files/pulseaudio-16.99.1-memfd-compat.patch @@ -0,0 +1,24 @@ +commit 421cf15486eea1b52f10e2b0be305018fee8c285 +Author: Rudi Heitbaum <rudi@heitbaum.com> +Date: Sun Aug 13 09:37:32 2023 +0000 + + shm: allow for older versions of Linux without MFD_NOEXEC_SEAL + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/794> + +diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c +index 4247b0921..694f971b4 100644 +--- a/src/pulsecore/shm.c ++++ b/src/pulsecore/shm.c +@@ -164,7 +164,11 @@ static int sharedmem_create(pa_shm *m, pa_mem_type_t type, size_t size, mode_t m + #endif + #ifdef HAVE_MEMFD + case PA_MEM_TYPE_SHARED_MEMFD: ++ /* For linux >= 6.3 create fd with MFD_NOEXEC_SEAL flag */ + fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING|MFD_CLOEXEC|MFD_NOEXEC_SEAL); ++ /* Retry creating fd without MFD_NOEXEC_SEAL to support linux < 6.3 */ ++ if (fd < 0) ++ fd = memfd_create("pulseaudio", MFD_ALLOW_SEALING|MFD_CLOEXEC); + break; + #endif + default: diff --git a/media-libs/libpulse/libpulse-16.99.1.ebuild b/media-libs/libpulse/libpulse-16.99.1.ebuild new file mode 100644 index 000000000000..616a3a730813 --- /dev/null +++ b/media-libs/libpulse/libpulse-16.99.1.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MY_PV="${PV/_pre*}" +MY_P="pulseaudio-${MY_PV}" +inherit bash-completion-r1 flag-o-matic gnome2-utils meson-multilib optfeature systemd toolchain-funcs udev + +DESCRIPTION="Libraries for PulseAudio clients" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_BRANCH="master" + EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio" +else + SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-2.1+" + +SLOT="0" +IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X" +RESTRICT="!test? ( test )" + +# NOTE: libpcre needed in some cases, bug #472228 +# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too +RDEPEND=" + dev-libs/libatomic_ops + >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}] + asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] ) + dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] ) + elibc_mingw? ( dev-libs/libpcre:3 ) + glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] ) + gtk? ( x11-libs/gtk+:3 ) + selinux? ( sec-policy/selinux-pulseaudio ) + systemd? ( sys-apps/systemd:= ) + valgrind? ( dev-util/valgrind ) + X? ( + x11-libs/libX11[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}] + ) + !<media-sound/pulseaudio-16.1 + !<media-sound/pulseaudio-daemon-16.99.1 +" + +DEPEND="${RDEPEND} + test? ( >=dev-libs/check-0.9.10 ) + X? ( x11-base/xorg-proto ) +" + +# pulseaudio ships a bundled xmltoman, which uses XML::Parser +BDEPEND=" + dev-lang/perl + dev-perl/XML-Parser + sys-devel/gettext + sys-devel/m4 + virtual/libiconv + virtual/libintl + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" +PDEPEND=" + || ( + media-video/pipewire[sound-server(+)] + media-sound/pulseaudio-daemon + media-sound/pulseaudio[daemon(+)] + ) +" + +DOCS=( NEWS README ) + +# patches merged upstream, to be removed with 16.99.2 or later bump +PATCHES=( + "${FILESDIR}"/pulseaudio-16.99.1-memfd-compat.patch +) + +src_prepare() { + default + + # disable autospawn by client + sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die + + gnome2_environment_reset +} + +multilib_src_configure() { + # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs + # https://github.com/gentoo/gentoo/pull/28355 + # mold needs this too but right now tc-ld-is-mold is also not available + if tc-ld-is-lld; then + append-ldflags -Wl,--undefined-version + fi + + local emesonargs=( + --localstatedir="${EPREFIX}"/var + + -Ddaemon=false + -Dclient=true + $(meson_native_use_bool doc doxygen) + -Dgcov=false + # tests involve random modules, so just do them for the native # TODO: tests should run always + $(meson_native_use_bool test tests) + -Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks + -Dstream-restore-clear-old-devices=true + -Drunning-from-build-tree=false + + # Paths + -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P} + -Dsystemduserunitdir=$(systemd_get_userunitdir) + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value + + # Optional features + -Dalsa=disabled + $(meson_feature asyncns) + -Davahi=disabled + -Dbluez5=disabled + -Dbluez5-gstreamer=disabled + -Dbluez5-native-headset=false + -Dbluez5-ofono-headset=false + $(meson_feature dbus) + -Delogind=disabled + -Dfftw=disabled + $(meson_feature glib) # WARNING: toggling this likely changes ABI + -Dgsettings=disabled + -Dgstreamer=disabled + $(meson_native_use_feature gtk) + -Dhal-compat=false + -Dipv6=true + -Djack=disabled + -Dlirc=disabled + -Dopenssl=disabled + -Dorc=disabled + -Doss-output=disabled + -Dsamplerate=disabled # Matches upstream + -Dsoxr=disabled + -Dspeex=disabled + $(meson_native_use_feature systemd) + -Dtcpwrap=disabled + -Dudev=disabled + $(meson_native_use_feature valgrind) + $(meson_feature X x11) + + # Echo cancellation + -Dadrian-aec=false + -Dwebrtc-aec=disabled + ) + + if multilib_is_native_abi; then + # Make padsp work for non-native ABI, supposedly only possible with glibc; + # this is used by /usr/bin/padsp that comes from native build, thus we need + # this argument for native build + if use elibc_glibc; then + emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' ) + fi + else + emesonargs+=( -Dman=false ) + if ! use elibc_glibc; then + # Non-glibc multilib is probably non-existent but just in case: + ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!" + fi + fi + + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile + + if multilib_is_native_abi; then + if use doc; then + einfo "Generating documentation ..." + meson_src_compile doxygen + fi + fi +} + +multilib_src_install() { + # The files referenced in the DOCS array do not exist in the multilib source directory, + # therefore clear the variable when calling the function that will access it. + DOCS= meson_src_install + + # Upstream installs 'pactl' if client is built, with all symlinks except for + # 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built. + # This trips QA warning, workaround: + # - install missing aliases in media-libs/libpulse (client build) + # - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build) + bashcomp_alias pactl pulseaudio + bashcomp_alias pactl pacmd + bashcomp_alias pactl pasuspender + + if multilib_is_native_abi; then + if use doc; then + einfo "Installing documentation ..." + docinto html + dodoc -r doxygen/html/. + fi + fi +} + +multilib_src_install_all() { + einstalldocs + + find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die +} + +pkg_postinst() { + optfeature_header "PulseAudio can be enhanced by installing the following:" + use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit +} diff --git a/media-libs/OpenColorIO/Manifest b/media-libs/opencolorio/Manifest index ae18b958ea35..fbe8b3a98232 100644 --- a/media-libs/OpenColorIO/Manifest +++ b/media-libs/opencolorio/Manifest @@ -1,3 +1,3 @@ -DIST OpenColorIO-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061 -DIST OpenColorIO-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9 -DIST OpenColorIO-2.3.0.tar.gz 11406998 BLAKE2B 0e62e43de076a712f68b68b91c9908bc9050316e3500e0924fafb08a3356ce361953f49dfd1eb022eeada11e499653833a48a22a4ba593504617c1c61b16d488 SHA512 cdf20ca6c85b1d70244d8532d010344f1cf85be6a116d831e83ea04d7c47a961049691e6a241e9a7f632d864df57a4bccb68084e27187ec8a05f1fdf344824d7 +DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061 +DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9 +DIST opencolorio-2.3.0.tar.gz 11406998 BLAKE2B 0e62e43de076a712f68b68b91c9908bc9050316e3500e0924fafb08a3356ce361953f49dfd1eb022eeada11e499653833a48a22a4ba593504617c1c61b16d488 SHA512 cdf20ca6c85b1d70244d8532d010344f1cf85be6a116d831e83ea04d7c47a961049691e6a241e9a7f632d864df57a4bccb68084e27187ec8a05f1fdf344824d7 diff --git a/media-libs/OpenColorIO/files/OpenColorIO-2.1.1-gcc12.patch b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch index 0bf00862e51b..0bf00862e51b 100644 --- a/media-libs/OpenColorIO/files/OpenColorIO-2.1.1-gcc12.patch +++ b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch diff --git a/media-libs/OpenColorIO/files/OpenColorIO-2.1.2-musl-strtol.patch b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch index 87059614ff03..87059614ff03 100644 --- a/media-libs/OpenColorIO/files/OpenColorIO-2.1.2-musl-strtol.patch +++ b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch diff --git a/media-libs/OpenColorIO/files/OpenColorIO-2.2.1-adjust-python-installation.patch b/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch index 6f023310eb8d..6f023310eb8d 100644 --- a/media-libs/OpenColorIO/files/OpenColorIO-2.2.1-adjust-python-installation.patch +++ b/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch diff --git a/media-libs/OpenColorIO/files/OpenColorIO-2.2.1-support-minizip-ng-4.patch b/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch index 8ee4ceaf9970..8ee4ceaf9970 100644 --- a/media-libs/OpenColorIO/files/OpenColorIO-2.2.1-support-minizip-ng-4.patch +++ b/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch diff --git a/media-libs/OpenColorIO/files/OpenColorIO-2.3.0-support-yaml-cpp-0.8.0.patch b/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch index 924ed2092881..924ed2092881 100644 --- a/media-libs/OpenColorIO/files/OpenColorIO-2.3.0-support-yaml-cpp-0.8.0.patch +++ b/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch diff --git a/media-libs/OpenColorIO/metadata.xml b/media-libs/opencolorio/metadata.xml index 13813a4b0e7b..13813a4b0e7b 100644 --- a/media-libs/OpenColorIO/metadata.xml +++ b/media-libs/opencolorio/metadata.xml diff --git a/media-libs/OpenColorIO/OpenColorIO-2.1.3.ebuild b/media-libs/opencolorio/opencolorio-2.1.3.ebuild index 3f0ec84665c6..6dfee6592f05 100644 --- a/media-libs/OpenColorIO/OpenColorIO-2.1.3.ebuild +++ b/media-libs/opencolorio/opencolorio-2.1.3.ebuild @@ -10,13 +10,14 @@ inherit cmake flag-o-matic python-single-r1 DESCRIPTION="Color management framework for visual effects and animation" HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO" SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenColorIO-${PV}" LICENSE="BSD" # TODO: drop .1 on next SONAME bump (2.1 -> 2.2?) as we needed to nudge it # to force rebuild of consumers due to changing to openexr 3 changing API. SLOT="0/$(ver_cut 1-2).1" KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv" -IUSE="cpu_flags_x86_sse2 doc opengl python test" +IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test" REQUIRED_USE=" doc? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -30,11 +31,11 @@ RDEPEND=" dev-cpp/pystring dev-python/pybind11 <dev-cpp/yaml-cpp-0.8.0:= - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= dev-libs/tinyxml opengl? ( media-libs/lcms:2 - >=media-libs/OpenImageIO-2.3.12.0-r3:= + >=media-libs/openimageio-2.3.12.0-r3:= media-libs/glew:= media-libs/freeglut virtual/opengl @@ -81,6 +82,7 @@ src_configure() { # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) local mycmakeargs=( -DOCIO_USE_OPENEXR_HALF=OFF + -DOCIO_BUILD_STATIC=$(usex static-libs) -DOCIO_BUILD_DOCS=$(usex doc) -DOCIO_BUILD_APPS=$(usex opengl) -DOCIO_BUILD_PYTHON=$(usex python) diff --git a/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild index 80f90760f17c..b5c5ca2e8c1a 100644 --- a/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild +++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild @@ -10,13 +10,14 @@ inherit cmake python-single-r1 virtualx DESCRIPTION="A color management framework for visual effects and animation" HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO" SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenColorIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" # minizip-ng: ~arm ~arm64 ~ppc64 ~riscv # osl: ~riscv KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="apps cpu_flags_x86_sse2 doc opengl python test" +IUSE="apps cpu_flags_x86_sse2 doc opengl python static-libs test" # TODO: drop opengl? It does nothing without building either the apps or the testsuite REQUIRED_USE=" apps? ( opengl ) @@ -29,7 +30,7 @@ RDEPEND=" dev-cpp/pystring <dev-cpp/yaml-cpp-0.8.0:= dev-libs/expat - >=dev-libs/Imath-3.1.5:= + >=dev-libs/imath-3.1.5:= sys-libs/minizip-ng sys-libs/zlib apps? ( @@ -70,8 +71,8 @@ BDEPEND=" ) " # test? ( -# >=media-libs/OpenImageIO-2.2.14 -# >=media-libs/OpenShadingLanguage-1.11 +# >=media-libs/openimageio-2.2.14 +# >=media-libs/osl-1.11 # ) # " @@ -104,6 +105,7 @@ src_configure() { # ocioconvert (USE opengl) # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) local mycmakeargs=( + -DBUILD_SHARED_LIBS=$(usex !static-libs) -DOCIO_BUILD_APPS=$(usex apps) -DOCIO_BUILD_DOCS=$(usex doc) -DOCIO_BUILD_FROZEN_DOCS=$(usex doc) diff --git a/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild b/media-libs/opencolorio/opencolorio-2.3.0.ebuild index 3d6d69685dd4..dc1dfe604786 100644 --- a/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild +++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild @@ -10,13 +10,14 @@ inherit cmake python-single-r1 virtualx DESCRIPTION="A color management framework for visual effects and animation" HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO" SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenColorIO-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" # minizip-ng: ~arm ~arm64 ~ppc64 ~riscv # osl: ~riscv KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="apps cpu_flags_x86_sse2 doc opengl python test" +IUSE="apps cpu_flags_x86_sse2 doc opengl python static-libs test" # TODO: drop opengl? It does nothing without building either the apps or the testsuite REQUIRED_USE=" apps? ( opengl ) @@ -29,7 +30,7 @@ RDEPEND=" dev-cpp/pystring >=dev-cpp/yaml-cpp-0.7.0:= dev-libs/expat - >=dev-libs/Imath-3.1.5:= + >=dev-libs/imath-3.1.5:= sys-libs/minizip-ng sys-libs/zlib apps? ( @@ -70,8 +71,8 @@ BDEPEND=" ) " # test? ( -# >=media-libs/OpenImageIO-2.2.14 -# >=media-libs/OpenShadingLanguage-1.11 +# >=media-libs/openimageio-2.2.14 +# >=media-libs/osl-1.11 # ) # " @@ -104,6 +105,7 @@ src_configure() { # ocioconvert (USE opengl) # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) local mycmakeargs=( + "-DBUILD_SHARED_LIBS=$(usex !static-libs)" "-DOCIO_BUILD_APPS=$(usex apps)" "-DOCIO_BUILD_DOCS=$(usex doc)" "-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)" diff --git a/media-libs/opencv/opencv-4.6.0-r4.ebuild b/media-libs/opencv/opencv-4.6.0-r4.ebuild index d607377a6418..11596eede91e 100644 --- a/media-libs/opencv/opencv-4.6.0-r4.ebuild +++ b/media-libs/opencv/opencv-4.6.0-r4.ebuild @@ -121,7 +121,7 @@ RDEPEND=" ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= media-libs/openexr:= ) opengl? ( diff --git a/media-libs/opencv/opencv-4.7.0-r1.ebuild b/media-libs/opencv/opencv-4.7.0-r1.ebuild index 6bf3563a650f..ddf36bc7442e 100644 --- a/media-libs/opencv/opencv-4.7.0-r1.ebuild +++ b/media-libs/opencv/opencv-4.7.0-r1.ebuild @@ -121,7 +121,7 @@ RDEPEND=" ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= media-libs/openexr:= ) opengl? ( diff --git a/media-libs/opencv/opencv-4.7.0.ebuild b/media-libs/opencv/opencv-4.7.0.ebuild index 4ab69a62c636..15fd917278e6 100644 --- a/media-libs/opencv/opencv-4.7.0.ebuild +++ b/media-libs/opencv/opencv-4.7.0.ebuild @@ -121,7 +121,7 @@ RDEPEND=" ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= media-libs/openexr:= ) opengl? ( diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild index 3b69baf82b51..2910615c0b36 100644 --- a/media-libs/opencv/opencv-4.8.0-r1.ebuild +++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild @@ -123,7 +123,7 @@ RDEPEND=" ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= media-libs/openexr:= ) opengl? ( diff --git a/media-libs/opencv/opencv-4.8.0.ebuild b/media-libs/opencv/opencv-4.8.0.ebuild index 9cff14513c76..772cd8408d98 100644 --- a/media-libs/opencv/opencv-4.8.0.ebuild +++ b/media-libs/opencv/opencv-4.8.0.ebuild @@ -121,7 +121,7 @@ RDEPEND=" ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) openexr? ( - dev-libs/Imath:= + dev-libs/imath:= media-libs/openexr:= ) opengl? ( diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index ea41489d2b92..b628bae952f4 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,3 +1,2 @@ -DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc70929a802561c2be71b050e97e7087221f78110f2686fcc1ea960d87880ccdbcb57b474f635a3392f3fa169ef3c5 SHA512 ebbad4b22315522f43cafefca77cf92ce38cac87f024c8dc6429aed04a6dad1f0a3d717faaab39c4c3605e440442952acc4630c5393754ea138929be4ad8a0d4 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5 diff --git a/media-libs/openexr/openexr-3.1.11.ebuild b/media-libs/openexr/openexr-3.1.11.ebuild deleted file mode 100644 index bbb330f1fc0f..000000000000 --- a/media-libs/openexr/openexr-3.1.11.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -MY_PN=OpenEXR - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cpu_flags_x86_avx examples large-stack utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/Imath-3.1.6:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch ) -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests" - - if use x86; then - eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch - fi - - cmake_src_prepare -} - -src_configure() { - if use x86; then - replace-cpu-flags native i686 - fi - - local mycmakeargs=( - -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo - -DBUILD_TESTING=$(usex test) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - - cmake_src_install -} diff --git a/media-libs/openexr/openexr-3.1.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild index 514978514e74..25424ab3f979 100644 --- a/media-libs/openexr/openexr-3.1.5-r1.ebuild +++ b/media-libs/openexr/openexr-3.1.5-r1.ebuild @@ -8,7 +8,7 @@ inherit cmake flag-o-matic MY_PN=OpenEXR DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" +HOMEPAGE="https://www.openexr.com/" SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -19,8 +19,10 @@ IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-libs/Imath-${PV}:= + >=dev-libs/imath-${PV}:= sys-libs/zlib + !media-libs/openexr:3 + !media-libs/ilmbase " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/media-libs/openexr/openexr-3.1.7.ebuild b/media-libs/openexr/openexr-3.1.7.ebuild index bc11bb9507bc..2ec269776660 100644 --- a/media-libs/openexr/openexr-3.1.7.ebuild +++ b/media-libs/openexr/openexr-3.1.7.ebuild @@ -8,7 +8,7 @@ inherit cmake flag-o-matic MY_PN=OpenEXR DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/" +HOMEPAGE="https://www.openexr.com/" SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -19,8 +19,10 @@ IUSE="cpu_flags_x86_avx examples large-stack utils test threads" RESTRICT="!test? ( test )" RDEPEND=" - >=dev-libs/Imath-3.1.6:= + >=dev-libs/imath-3.1.6:= sys-libs/zlib + !media-libs/openexr:3 + !media-libs/ilmbase " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest new file mode 100644 index 000000000000..d5e8b771c4cc --- /dev/null +++ b/media-libs/openimageio/Manifest @@ -0,0 +1,7 @@ +DIST openimageio-2.4.12.0.tar.gz 32157785 BLAKE2B b2578165b389029dc6ad295b50d008790f9690c03ca17fda7c1d1ede84039ab4065cb1c88402e2b20913736d669a72781bb523d391af2403a10ddae148ae07a6 SHA512 bf8fa84c6732cabd2810a5cfbdd3ea41b273d82e51762426c8a2b60a31e114ff672c18ce433eb5cf27eb250996da18b7f9ece1b34093a0cb4c7305328174e74e +DIST openimageio-2.4.13.0.tar.gz 32162551 BLAKE2B f0d219b2f585528e8901f695ccde0c599943914ce1b64faf53c172d9eacd3c2f6843a2fd7c1eebd6fcda762b61643a7ea5ed7fbabfd909963afedbedd8d200a1 SHA512 9325beefce55b66a58fcfc2ce93e1406558ed5f6cc37cb1e8e04aee470c4f30a14483bebfb311c329f7868afb6c508a052661c6b12d819a69f707c1a30cd9549 +DIST openimageio-2.4.6.0.tar.gz 31951691 BLAKE2B c21caf6784f366200127ba17a296e2134fa0d494e2cbf9cf592d020fdb820f62db0269545ac37c3969d64ddd8352d06a4f002fa9a7b3f05503ca9ec7d4a15415 SHA512 6e4e5294209c533eb9cf7c8df89b531bc77547df28af0d7964e255ce78142c201d5aa92a1f5f3b17348fdfc7d2a7aa9f2121acdf22fa98a6a872f0d31936bdf5 +DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f +DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f +DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz 137901071 BLAKE2B 1e260eeba062026c719499425a3f7e3c2ccc7bd662725b6cceab4332d2d026bacc7df4c904cb776637ea60f9e2ba854d6e5010ffdc2a1621ad943b166d8402d3 SHA512 e7f7741d1cfadb3ea9ec5bab0b2556c58424c2dd89f938d5e93aeb99bff55479b11faa19cda4a481339be60de73317faa95e190d34d493c7825f706f4e57e73c +DIST openimageio-oiio-test-image-aae37a54e31c0e719edcec852994d052ecf6541e.tar.gz 137910860 BLAKE2B 1dfc1a87ae895e62f223d915583378581cc1be12489d46155009ae10c8f63ab0fa93bfc06b67afe85f6e8a313779b9fed4e32cc6d9b92cd7d53d3c4b6e51bcce SHA512 7a46681a22145e96da5dc6ba4e6432ef38c6c352a607db348dcd194d86caa45b4f76ecb10c28cd50e3ee597404fbb3ede4acf071b4ebabc2de4e7b3cd204dade diff --git a/media-libs/OpenImageIO/metadata.xml b/media-libs/openimageio/metadata.xml index 84fca6c20010..cdd067175302 100644 --- a/media-libs/OpenImageIO/metadata.xml +++ b/media-libs/openimageio/metadata.xml @@ -15,6 +15,6 @@ <flag name="tools">Build the command-line tools</flag> </use> <upstream> - <remote-id type="github">AcademySoftwareFoundation/OpenImageIO</remote-id> + <remote-id type="github">OpenImageIO/oiio</remote-id> </upstream> </pkgmetadata> diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.12.0.ebuild b/media-libs/openimageio/openimageio-2.4.12.0.ebuild index bb0e461ac5ac..031e7ea96764 100644 --- a/media-libs/OpenImageIO/OpenImageIO-2.4.12.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.12.0.ebuild @@ -3,6 +3,7 @@ EAPI=8 +FONT_PN=OpenImageIO PYTHON_COMPAT=( python3_{9..11} ) TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" @@ -11,13 +12,12 @@ inherit cmake font python-single-r1 DESCRIPTION="A library for reading and writing images" HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" +SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" test? ( + https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz + https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz +)" +S="${WORKDIR}/oiio-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -54,8 +54,8 @@ RDEPEND=" media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= - >=dev-libs/Imath-3.1.2-r4:= - >=media-libs/OpenColorIO-2.1.1-r4:= + >=dev-libs/imath-3.1.2-r4:= + >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= @@ -109,8 +109,8 @@ src_prepare() { if use test ; then mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die + mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die + mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die fi } diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.13.0.ebuild b/media-libs/openimageio/openimageio-2.4.13.0.ebuild index e0b5b8df737b..8eedb3eb3558 100644 --- a/media-libs/OpenImageIO/OpenImageIO-2.4.13.0.ebuild +++ b/media-libs/openimageio/openimageio-2.4.13.0.ebuild @@ -3,6 +3,7 @@ EAPI=8 +FONT_PN=OpenImageIO PYTHON_COMPAT=( python3_{10..11} ) TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e" @@ -11,13 +12,12 @@ inherit cmake flag-o-matic font python-single-r1 DESCRIPTION="A library for reading and writing images" HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz - https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" +SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" test? ( + https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz + https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz +)" +S="${WORKDIR}/oiio-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -54,8 +54,8 @@ RDEPEND=" media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= - >=dev-libs/Imath-3.1.2-r4:= - >=media-libs/OpenColorIO-2.1.1-r4:= + >=dev-libs/imath-3.1.2-r4:= + >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= @@ -109,8 +109,8 @@ src_prepare() { if use test ; then mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die + mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die + mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die fi } diff --git a/media-libs/OpenImageIO/OpenImageIO-2.4.6.0-r1.ebuild b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild index bd15fed2793e..09223e5d244c 100644 --- a/media-libs/OpenImageIO/OpenImageIO-2.4.6.0-r1.ebuild +++ b/media-libs/openimageio/openimageio-2.4.6.0-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +FONT_PN=OpenImageIO PYTHON_COMPAT=( python3_{9..11} ) TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4" @@ -11,13 +12,12 @@ inherit cmake font python-single-r1 DESCRIPTION="A library for reading and writing images" HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI=" - https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( - https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz +SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" test? ( + https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz - ) -" + )" +S="${WORKDIR}/oiio-${PV}" LICENSE="BSD" SLOT="0/$(ver_cut 1-2)" @@ -54,8 +54,8 @@ RDEPEND=" media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= - >=dev-libs/Imath-3.1.2-r4:= - >=media-libs/OpenColorIO-2.1.1-r4:= + >=dev-libs/imath-3.1.2-r4:= + >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:= sys-libs/zlib:= @@ -105,8 +105,8 @@ src_prepare() { if use test ; then mkdir -p "${BUILD_DIR}"/testsuite || die - mv "${WORKDIR}/${PN}-images-${TEST_OIIO_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/oiio-images || die - mv "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${BUILD_DIR}"/testsuite/openexr-images || die + mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die + mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die fi } diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest new file mode 100644 index 000000000000..7bf7586baeaa --- /dev/null +++ b/media-libs/osl/Manifest @@ -0,0 +1,3 @@ +DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e +DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc +DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f diff --git a/media-libs/OpenShadingLanguage/metadata.xml b/media-libs/osl/metadata.xml index c79f02eeb110..a300ead37dfa 100644 --- a/media-libs/OpenShadingLanguage/metadata.xml +++ b/media-libs/osl/metadata.xml @@ -19,6 +19,6 @@ <flag name="qt5">Build the osltoy binary</flag> </use> <upstream> - <remote-id type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id> + <remote-id type="github">imageworks/OpenShadingLanguage</remote-id> </upstream> </pkgmetadata> diff --git a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.11.0.ebuild b/media-libs/osl/osl-1.12.11.0.ebuild index ef778e5abdf0..58c299d89c9d 100644 --- a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.11.0.ebuild +++ b/media-libs/osl/osl-1.12.11.0.ebuild @@ -11,9 +11,10 @@ LLVM_MAX_SLOT=15 inherit cmake llvm toolchain-funcs python-single-r1 DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage" +HOMEPAGE="http://opensource.imageworks.com/?p=osl" # If a development release, please don't keyword! -SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenShadingLanguage-${PV}" LICENSE="BSD" SLOT="0" @@ -33,7 +34,7 @@ RDEPEND=" dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= - >=media-libs/OpenImageIO-2.3.12.0:= + >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= sys-libs/zlib:= python? ( diff --git a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.13.0.ebuild b/media-libs/osl/osl-1.12.13.0.ebuild index 1a4c73b60273..dd1d1fecff02 100644 --- a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.13.0.ebuild +++ b/media-libs/osl/osl-1.12.13.0.ebuild @@ -11,9 +11,10 @@ LLVM_MAX_SLOT=15 inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1 DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage" +HOMEPAGE="http://opensource.imageworks.com/?p=osl" # If a development release, please don't keyword! -SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenShadingLanguage-${PV}" LICENSE="BSD" SLOT="0" @@ -33,7 +34,7 @@ RDEPEND=" dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= - >=media-libs/OpenImageIO-2.3.12.0:= + >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= sys-libs/zlib:= python? ( diff --git a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild index 1e05f9b4a6a6..901706148ec2 100644 --- a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.7.0.ebuild +++ b/media-libs/osl/osl-1.12.7.0.ebuild @@ -11,9 +11,10 @@ LLVM_MAX_SLOT=15 inherit cmake llvm toolchain-funcs python-single-r1 DESCRIPTION="Advanced shading language for production GI renderers" -HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage" +HOMEPAGE="http://opensource.imageworks.com/?p=osl" # If a development release, please don't keyword! -SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OpenShadingLanguage-${PV}" LICENSE="BSD" SLOT="0" @@ -33,7 +34,7 @@ RDEPEND=" dev-libs/boost:= dev-libs/pugixml >=media-libs/openexr-3:0= - >=media-libs/OpenImageIO-2.3.12.0:= + >=media-libs/openimageio-2.3.12.0:= <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= sys-libs/zlib:= python? ( diff --git a/media-libs/vigra/vigra-1.11.1-r9.ebuild b/media-libs/vigra/vigra-1.11.1-r9.ebuild index 6f92e9b161c3..6e3de6f74804 100644 --- a/media-libs/vigra/vigra-1.11.1-r9.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r9.ebuild @@ -37,7 +37,7 @@ DEPEND=" hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) jpeg? ( media-libs/libjpeg-turbo:= ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) png? ( media-libs/libpng:0= ) diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index 830558e68913..8e668e863ad0 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-9999.ebuild @@ -37,7 +37,7 @@ DEPEND=" hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) jpeg? ( media-libs/libjpeg-turbo:= ) openexr? ( - >=dev-libs/Imath-3.1.4-r2:= + >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) png? ( media-libs/libpng:0= ) diff --git a/media-libs/webrtc-audio-processing/Manifest b/media-libs/webrtc-audio-processing/Manifest index 4a4f053a09cd..5183b7f9df46 100644 --- a/media-libs/webrtc-audio-processing/Manifest +++ b/media-libs/webrtc-audio-processing/Manifest @@ -1,2 +1,2 @@ DIST webrtc-audio-processing-0.3.1.tar.xz 695920 BLAKE2B 833c6d12b358918d95dee5b165308c8cc382f98264349fd38649bfe478557765b85d9112a35194676ee52a8ef297fb7cb7e3a570d9c2295785b6fb97d35be948 SHA512 1c7a2d16f7f6c03cf6d60405d0dcd224caae6e80c9c4d43f8373bad2446affcdf49a02efb0085387328289aa79c8981dcaedff876cde55be9602dbde9c3f440b -DIST webrtc-audio-processing-1.0.tar.gz 856721 BLAKE2B bbf5bee4887ca9929cdc62ded5a9b12563371e75cf1d3e3a3d7c8ccc766cb00bd718bc1ddf96d713a47342694394cc853067fba531c61c7e28e493a4dcdc895f SHA512 fced98beeb58155e86aed9649413e2f28ee6814e711bd57e946ec0db30ddabcc65bbf425b85892f4ad8803e87f0ece9fdde5595948145b90f436c2592da55961 +DIST webrtc-audio-processing-1.3.tar.gz 879768 BLAKE2B 3bf61e5b9eadde824deb26f0591a10651d3a593ad89d3c71408655a12407bf7ecf422fdef58e651fc31245f3b0d575869e3abb0abfcfcb2e1aea21c03cd79e82 SHA512 4f56cc0acfd93b5ae432bdf681151e91344cea3388107a3eee5f9b17261cf0f09779f8b0bb67b4d35582f1f54dadc236d059802e69447e994dd588506cac95df diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3.ebuild index 6f1978a3eab3..727da560e5da 100644 --- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.0.ebuild +++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-1.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson +inherit meson-multilib DESCRIPTION="AudioProcessing library from the webrtc.org codebase" HOMEPAGE="https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/" @@ -14,17 +14,16 @@ SLOT="1" KEYWORDS="~amd64 ~x86 ~amd64-linux" IUSE="cpu_flags_arm_neon" -RDEPEND="dev-cpp/abseil-cpp[-cxx17(+)]" # TODO: resolve cxx14 requirement +RDEPEND="dev-cpp/abseil-cpp:=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PV}-abseil-cmake.patch ) DOCS=( AUTHORS NEWS README.md ) -src_configure() { +multilib_src_configure() { local emesonargs=( -Dneon=$(usex cpu_flags_arm_neon yes no) ) diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest index 955eec847d0e..97ee1069f0e6 100644 --- a/media-sound/pulseaudio-daemon/Manifest +++ b/media-sound/pulseaudio-daemon/Manifest @@ -1 +1,2 @@ DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f +DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2 diff --git a/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch b/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch new file mode 100644 index 000000000000..c7aa9d8aadbe --- /dev/null +++ b/media-sound/pulseaudio-daemon/files/pulseaudio-16.99.1-bump-c++17.patch @@ -0,0 +1,23 @@ +commit e2b63d157fcc5ceb67a2f0eaed202d18baa05a11 +Author: Arun Raghavan <arun@asymptotic.io> +Date: Sun Aug 13 07:24:41 2023 -0400 + + build-sys: Bump cpp_std to c++17 + + Match it with webrtc-audio-processing, which is what we care about. + + Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/795> + +diff --git a/meson.build b/meson.build +index daa80b573..ba3d01dac 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,7 +1,7 @@ + project('pulseaudio', 'c', + version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check : false).stdout().strip(), + meson_version : '>= 0.50.0', +- default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] ++ default_options : [ 'c_std=gnu11', 'cpp_std=c++17' ] + ) + + if not meson.is_subproject() diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild new file mode 100644 index 000000000000..16f45f943abe --- /dev/null +++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.99.1.ebuild @@ -0,0 +1,385 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MY_PV="${PV/_pre*}" +MY_P="pulseaudio-${MY_PV}" +inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev + +DESCRIPTION="Daemon component of PulseAudio (networked sound server)" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/" + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_BRANCH="master" + EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio" +else + SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +S="${WORKDIR}/${MY_P}" + +# libpulse-simple and libpulse link to libpulse-core; this is daemon's +# library and can link to gdbm and other GPL-only libraries. In this +# cases, we have a fully GPL-2 package. Leaving the rest of the +# GPL-forcing USE flags for those who use them. +LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )" + +SLOT="0" + +# +alsa-plugin as discussed in bug #519530 +# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec +# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file +IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer jack ldac lirc +ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf" + +RESTRICT="!test? ( test )" + +# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac +# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon () +# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once +REQUIRED_USE=" + ?? ( elogind systemd ) + alsa-plugin? ( alsa ) + aptx? ( bluetooth ) + bluetooth? ( dbus ) + equalizer? ( dbus ) + ldac? ( bluetooth ) + ofono-headset? ( bluetooth ) + udev? ( || ( alsa oss ) ) + zeroconf? ( dbus ) +" + +# NOTE: +# - libpcre needed in some cases, bug #472228 +# - media-libs/speexdsp is providing echo canceller implementation and used in resampler +# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too +gstreamer_deps=" + media-libs/gst-plugins-base + >=media-libs/gstreamer-1.14 +" +COMMON_DEPEND=" + ~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,valgrind?,X?] + >=media-libs/libpulse-16.99.1 + dev-libs/libatomic_ops + >=media-libs/libsndfile-1.0.20 + >=media-libs/speexdsp-1.2 + alsa? ( >=media-libs/alsa-lib-1.0.24 ) + aptx? ( ${gstreamer_deps} ) + asyncns? ( >=net-libs/libasyncns-0.1 ) + bluetooth? ( + >=net-wireless/bluez-5 + media-libs/sbc + ) + dev-libs/libltdl + sys-kernel/linux-headers + >=sys-libs/libcap-2.22-r2 + dbus? ( >=sys-apps/dbus-1.4.12 ) + elibc_mingw? ( dev-libs/libpcre:3 ) + elogind? ( sys-auth/elogind ) + equalizer? ( + sci-libs/fftw:3.0= + ) + fftw? ( + sci-libs/fftw:3.0= + ) + gdbm? ( sys-libs/gdbm:= ) + glib? ( >=dev-libs/glib-2.28.0:2 ) + gstreamer? ( + ${gstreamer_deps} + >=dev-libs/glib-2.26.0:2 + ) + jack? ( virtual/jack ) + ldac? ( ${gstreamer_deps} ) + lirc? ( app-misc/lirc ) + ofono-headset? ( >=net-misc/ofono-1.13 ) + orc? ( >=dev-lang/orc-0.4.15 ) + selinux? ( sec-policy/selinux-pulseaudio ) + sox? ( >=media-libs/soxr-0.1.1 ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + udev? ( >=virtual/udev-143[hwdb(+)] ) + valgrind? ( dev-util/valgrind ) + webrtc-aec? ( >=media-libs/webrtc-audio-processing-1.3:1 ) + X? ( + >=x11-libs/libxcb-1.6 + x11-libs/libICE + x11-libs/libSM + >=x11-libs/libX11-1.4.0 + >=x11-libs/libXtst-1.0.99.2 + ) + zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) +" + +# pulseaudio ships a bundle xmltoman, which uses XML::Parser +DEPEND=" + ${COMMON_DEPEND} + test? ( >=dev-libs/check-0.9.10 ) + X? ( x11-base/xorg-proto ) +" + +# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it +# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used +RDEPEND=" + ${COMMON_DEPEND} + system-wide? ( + alsa? ( media-sound/alsa-utils ) + acct-user/pulse + acct-group/audio + acct-group/pulse-access + ) + bluetooth? ( + ldac? ( media-plugins/gst-plugins-ldac ) + aptx? ( media-plugins/gst-plugins-openaptx ) + ) + !media-video/pipewire[sound-server(+)] +" +unset gstreamer_deps + +# This is a PDEPEND to avoid a circular dep +PDEPEND=" + alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) ) +" + +BDEPEND=" + dev-lang/perl + dev-perl/XML-Parser + sys-devel/gettext + sys-devel/m4 + virtual/libiconv + virtual/libintl + virtual/pkgconfig + orc? ( >=dev-lang/orc-0.4.15 ) + system-wide? ( dev-util/unifdef ) +" + +DOCS=( NEWS README ) + +# patches merged upstream, to be removed with 16.99.2 or later bump +PATCHES=( + "${FILESDIR}"/pulseaudio-16.99.1-bump-c++17.patch +) + +src_prepare() { + default + + gnome2_environment_reset +} + +src_configure() { + local enable_bluez5_gstreamer="disabled" + if use aptx || use ldac ; then + enable_bluez5_gstreamer="enabled" + fi + + local enable_fftw="disabled" + if use equalizer || use fftw ; then + enable_fftw="enabled" + fi + + local emesonargs=( + --localstatedir="${EPREFIX}"/var + + -Ddaemon=true + -Dclient=false + -Ddoxygen=false + -Dgcov=false + -Dman=true + # tests involve random modules, so just do them for the native # TODO: tests should run always + $(meson_use test tests) + -Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it + -Dstream-restore-clear-old-devices=true + -Drunning-from-build-tree=false + + # Paths + -Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P} + -Dsystemduserunitdir=$(systemd_get_userunitdir) + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value + + # Optional features + $(meson_feature alsa) + $(meson_feature asyncns) + $(meson_feature zeroconf avahi) + $(meson_feature bluetooth bluez5) + -Dbluez5-gstreamer=${enable_bluez5_gstreamer} + $(meson_use bluetooth bluez5-native-headset) + $(meson_use ofono-headset bluez5-ofono-headset) + -Dconsolekit=disabled + $(meson_feature dbus) + $(meson_feature elogind) + -Dfftw=${enable_fftw} + $(meson_feature glib) # WARNING: toggling this likely changes ABI + $(meson_feature glib gsettings) # Supposedly correct? + $(meson_feature gstreamer) + -Dgtk=disabled + -Dhal-compat=false + -Dipv6=true + $(meson_feature jack) + $(meson_feature lirc) + $(meson_feature ssl openssl) + $(meson_feature orc) + $(meson_feature oss oss-output) + -Dsamplerate=disabled # Matches upstream + $(meson_feature sox soxr) + -Dspeex=enabled + $(meson_feature systemd) + $(meson_feature tcpd tcpwrap) + $(meson_feature udev) + $(meson_feature valgrind) + $(meson_feature X x11) + + # Echo cancellation + -Dadrian-aec=false # Not packaged? + $(meson_feature webrtc-aec) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # qpaeq moved to media-sound/qpaeq + if [[ -f "${ED}"/usr/bin/qpaeq ]]; then + rm "${ED}"/usr/bin/qpaeq || die + fi + + # Upstream installs 'pactl' if client is built, with all symlinks except for + # 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built. + # This trips QA warning, workaround: + # - install missing aliases in media-libs/libpulse (client build) + # - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build) + rm "${D}/$(get_bashcompdir)"/pulseaudio || die + rm "${D}/$(get_bashcompdir)"/pacmd || die + rm "${D}/$(get_bashcompdir)"/pasuspender || die + + # Daemon configuration scripts will try to load snippets from corresponding '.d' dirs. + # Install these dirs to silence a warning if they are missing. + keepdir /etc/pulse/default.pa.d + keepdir /etc/pulse/system.pa.d + + if use system-wide; then + newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio + + use_define() { + local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')} + + use "${1}" && echo "-D${define}" || echo "-U${define}" + } + + unifdef -x 1 \ + $(use_define zeroconf AVAHI) \ + $(use_define alsa) \ + $(use_define bluetooth) \ + $(use_define udev) \ + "${FILESDIR}"/pulseaudio.init.d-5 \ + > "${T}"/pulseaudio \ + || die + + doinitd "${T}"/pulseaudio + + systemd_dounit "${FILESDIR}"/pulseaudio.service + + # We need /var/run/pulse, bug 442852 + newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf + else + # Prevent warnings when system-wide is not used, bug 447694 + if use dbus; then + rm "${ED}"/usr/share/dbus-1/system.d/pulseaudio-system.conf || die + fi + fi + + if use zeroconf; then + sed -i \ + -e '/module-zeroconf-publish/s:^#::' \ + "${ED}/etc/pulse/default.pa" \ + || die + fi + + # Only enable autospawning pulseaudio daemon on systems without systemd + if ! use systemd; then + insinto /etc/pulse/client.conf.d + newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf" + fi + + find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die +} + +pkg_postinst() { + gnome2_schemas_update + + use udev && udev_reload + + if use system-wide; then + tmpfiles_process "pulseaudio.conf" + + elog "You have enabled the 'system-wide' USE flag for pulseaudio." + elog "This mode should only be used on headless servers, embedded systems," + elog "or thin clients. It will usually require manual configuration, and is" + elog "incompatible with many expected pulseaudio features." + elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED." + elog "" + elog "For more information, see" + elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/" + elog " https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/" + elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server" + elog "" + fi + + if use bluetooth; then + elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle" + elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using" + elog "native headset backend by default. This can be selectively disabled" + elog "via runtime configuration arguments to module-bluetooth-discover" + elog "in /etc/pulse/default.pa" + elog "To disable HFP HF append enable_native_hfp_hf=false" + elog "To disable HSP HS append enable_native_hsp_hs=false" + elog "To disable HSP AG append headset=auto or headset=ofono" + elog "(note this does NOT require enabling USE ofono)" + elog "" + fi + + if use ofono-headset; then + elog "You have enabled both native and ofono headset profiles. The runtime decision" + elog "which to use is done via the 'headset' argument of module-bluetooth-discover." + elog "" + fi + + if use gstreamer; then + elog "GStreamer-based RTP implementation modile enabled." + elog "To use OPUS payload install media-plugins/gst-plugins-opus" + elog "and add enable_opus=1 argument to module-rtp-send" + elog "" + fi + + if use systemd; then + elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available." + elog "It's recommended to start pulseaudio via its systemd user units:" + elog "" + elog " systemctl --user enable pulseaudio.service pulseaudio.socket" + elog "" + elog "Root user can change system default configuration for all users:" + elog "" + elog " systemctl --global enable pulseaudio.service pulseaudio.socket" + elog "" + elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:" + elog "" + elog " autospawn = yes" + elog "" + elog "The change from autospawn to user units will take effect after restarting." + elog "" + fi + + optfeature_header "PulseAudio can be enhanced by installing the following:" + use equalizer && optfeature "qpaeq script for equalizer GUI" media-sound/qpaeq + use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit +} + +pkg_postrm() { + gnome2_schemas_update + use udev && udev_reload +} diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest index 3cf224b90ad9..1897e6987711 100644 --- a/net-im/synapse/Manifest +++ b/net-im/synapse/Manifest @@ -1,5 +1,4 @@ DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b -DIST anyhow-1.0.72.crate 43837 BLAKE2B 1547c158882e50579a568a14e6e5cd162feb6cf291835266c9dae0c1c4df05a7872bceb02bbc8a13ab5bb84d299a94892057f54eeade7fa095ff8f897f6fe9d8 SHA512 25d8d4cfcc9679c9125fe03c7ce5a46462ca66e7457d45cd7838b7867f3461a899f75b22d76dfb04caa09c013c3b702313ffb6373f92b2798119a30199c38a98 DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 DIST arc-swap-1.5.1.crate 66157 BLAKE2B 9060ef4f9d699fadc03be1a116d9301f6308fbb7f8bcad6f01926d584386d26d03f9dd2ea35b6771a6725ee7819e028d0e1b256e8b5f3b812cbd388e757491fb SHA512 8636149e92c068d5ff5352a19c9973e7bf2aba68b9363c783178903a8665f6edabbd30c25ad7992646635efe5830d67c958f8d41b44a4ed1fe5698628b41c074 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f @@ -16,48 +15,48 @@ DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d2 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 -DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e -DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f +DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55 DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04 DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644ff9fbd83eccf3d53096a3c2e0991da8b3489ea9984c665751308bcf4aa9c3d31dd62c72127694156a7a0a9 SHA512 5c83ea76202edce13c370d023562a9009382e36fdf3fcd7c4dea844ab8e5e048db4cc79a9c0ea98fb7017a83da16924ba0981ad98bd83e75e2fac434738e9740 +DIST pyo3-0.19.2.crate 418228 BLAKE2B ee018b33383fada78cd22643aea9231a8c8a2f19d1eb297f40eec9206c5220f322fff4c926d939a93a24ac6d231a207ebb25afcc0709191151c7ed9af7465efa SHA512 58698183e0f2f0507f8f765bf3e90185c933e78d62f0a9be65c4b1ce8eea19a98fe0341abe7c58cafdacb63a012ec417876dccb7be6facc1360fcb22796fcaf9 DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2 +DIST pyo3-build-config-0.19.2.crate 29206 BLAKE2B 5b1cd80d643e448cf8f1d28a514333526061c178121b9a0dcb5bff6082f402ecfd166536d94d42065f6dc1f108a73f12bbb78eedf9ea053a6aa2e9c80ac00ddf SHA512 ccc73061ec1989258921c5b5800689170635fa5503d74a4ac458baef903dd31efa41995d238783f1e099ece1f66d0a0e95c4fcb4b772b9f653dbb20e838b4e28 DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e +DIST pyo3-ffi-0.19.2.crate 66500 BLAKE2B b4139fba31ef17017b6b60784e41ccda34931a072c2638af1eed8d02d7af701c46fe38b12772d2301cff41d10a433ff0f00a69d79d40233eadafe82abe585f8d SHA512 789191bca537998dd23d72dce4f185b84bbe700f4171c47de35b9bbca15a180ad214392b4f465cc1ecb0be955ebec1cf5a3c497815073be18035bd8bf8c51a32 DIST pyo3-log-0.8.3.crate 14324 BLAKE2B eb5e74d99eea5496a225600695c5a8413f1f25f3315fbb037c19b2bcdd620f2a3a926b95ac3066aa56503edf1128777f4d292c922fcfc98aa0244027bf0ad9a5 SHA512 7ea537a85ee5909ee22dc3c7a93115e6298698e30c61761927419fbcd53be6e161044b1fb825fb9587f7fd185c06413d099d4e7df90949f6a3cd9880c7c93733 +DIST pyo3-log-0.8.4.crate 14329 BLAKE2B 666fcc4b04ae4d391d15238db67a132d40a9d1df454c80345918d62231181d6cb708c9e8c668a5ee7ee1d0a15e1427cc3313845060b09abd705394b792544afe SHA512 2f374c75b3e4a42041f44f2285388eb3a6da5b217f3fc5bd031d233c46dbc554b93934345b39b359d890efbea1f588f9683388ba777e0b9bd9ccacdb1119da05 DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1 +DIST pyo3-macros-0.19.2.crate 7173 BLAKE2B 8862f42a30929579b0b0bc2ba7f0b416518724480e197fa13288e49324e851f964183e1529b7f31bf5d4fe0ae194a412723b6b401100e66fba98bbcd9c283866 SHA512 852cc2792aa3d30d9ab8802a451be5617cae6536adced1bf0dde71704a3c7c1bfe862fba751b6d045249819a8ba5d87dfc50914d142a0b662f046498c06f8c2e DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927 +DIST pyo3-macros-backend-0.19.2.crate 49962 BLAKE2B 9d8a032c2205f55d2431b6bbc40df153339e08479df3a8a65506ade7d1f3d17cfaf664cbd09eaec9acff3f5a248598e37427d0c5a531eaf527137803adf49834 SHA512 fd708e6fdbd54ef7c676bedc62070175bac6b8f7ae11231578196dbf552b163a8a2499a1266f786bb6bfb85517fe83610902137d59a5c42efcb1a27c4235a07e DIST pythonize-0.17.0.crate 10949 BLAKE2B 6d3c311aae1ef97a2a965124eb23e312f94c4d1e2a8ec17d9316c9fd2f72990b95977a87f722012e4fb54ce0a8be1a2eaac57b71e9d429dbbe59b0da387b2b81 SHA512 a9a46d27b8aa9e5bd7bb0b114b7457275131d90e20acd07110fbc18b3af3b9aa0683b9306fb645645f3801b64c0c479998665f3e4fcec0ed8e5b5947008b76bc +DIST pythonize-0.19.0.crate 11647 BLAKE2B 3cff5f6261926a58a61974eecc893864265e956e854cba40f1930c8dc0990b78356623b7dc591fdd170f124b0a7cf58a41b29e3d600e80c90c102e5aeb2d781d SHA512 f88c58e3507a59039d429f79a4f23364e9c4dbc309ab67819ad3c7265d749553309ddf12f12b56ea1bf09cdf8b53daf2a7e05dff718a06420fda4c77f7a11fe3 DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 -DIST regex-1.9.3.crate 252676 BLAKE2B dd419b02b7dbd28a71e14c90bc538e98a63c0b9cc2ea01e7d8f6a0075c723c42c3d7bcbb45391431dec3008e6709e9d1d396d8e505f7f8d5d3a629ededf74b4d SHA512 ef5ece7d2b80a136d437ac42c5395cb01f6d357dcc490c8f6c89657f3f97af6befcc699008535c27583d7354e979418d1d933e36e8774ff2bb62750b9009d5d6 -DIST regex-1.9.4.crate 253112 BLAKE2B 434a56ab97d988d0121407f4b49825807c639cbd9c498249da9fdd186a40340157adfeadfb8b0f442fbd63968f4c9fb36c487d9472cacacd1fdba9c357bb9218 SHA512 4c7c478c74dd6a470ff89320a6944ea301967543a5ab281341cb4c8abf1dbbf909f329e73082ff5157db8108eb61b7a1a8b1e88555f848a876bcc5072d23e894 DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e -DIST regex-automata-0.3.6.crate 607174 BLAKE2B 6d02512501b45b0e87d8746c894009ec669fbfdeb742966e8ba8960ebf692f3b2c3df44ce5ee03e7d5320136709ad83b532dbc322a779e3c21ff0f65768c0d0e SHA512 ab3da2e63ff2c6a4da2c149dd34e565303f961f38547db7b34fbe984cf90aac107d4ec116111c765c9b71c4bf26022742151e1d4c5d01a6beac0a8a0887e30ce -DIST regex-automata-0.3.7.crate 607421 BLAKE2B ed040e37e24979118edfe37ddd25443986cab4ab96e6391f9a6f70c6ac308678d5773a14bc2d10e809d7bd26d2725bc45d01493efaaef7e6038152de6fc7fc08 SHA512 967f5d0b452ba782b7e5edcb3e7f1e730407cd65f072eecf9d28d1e4c2cec9954a891a3fb4d69310d299a287a5c6afd22f71f7403dc65e07b7be207a2eac83d9 +DIST regex-1.9.6.crate 254981 BLAKE2B e0341184d93703a32734f1081d8962723873ef558f4db764b1996dfa9eeb359ac530f7dd93f4d32947e91c056b8bdc51dde99b890c14f959b02763dc22bd996c SHA512 e0da225eeeb9d02b83992959889fa9360b9c549905e4ae4982e61743fccce6d721eb0283a5d2f3e9323193bd5c839a2d0da603849bf6ec5f8ad2b7ffc81c59ab DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac -DIST regex-syntax-0.7.4.crate 343365 BLAKE2B b50c01f02e08729496e8bcf023949d088463bf62348b4a1043fe5205650da37863b2ca51f683662a4df33bd56085e0501e50410106c9c471a0daec4c71dfe945 SHA512 b33713c71f6f753820ca6405e8415e5eeed457efd01e81b0b720e48c135b9bb0973962269587ddca31350233aec6d3f598596cb48310db0633bf67f8970f0e18 +DIST regex-automata-0.3.9.crate 610489 BLAKE2B 6eccdf930979ff4e8657cdb8fc67feebe18d16f6deefda7e1692c6cb6f311bd3c360d9dc091938bdaba061669b003ff7689d7717489326aba70aee563a4f0e20 SHA512 c404677bf470f913c1ca70385a1b9694ec4c048d306380c23001bb746803ff70999c7e215efdf02c6bf03cd9a922e98a6ecb3be588fd4f05c1f57836dbe54c0f DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST serde-1.0.183.crate 77210 BLAKE2B 280e3d253a29b664b4e2d17f41397b17fe22af64417facca42d6ca0c839f1def745380a5402d7a87345bb16f4fdacf9a8c01966579b8c08fb06c05f097a87e68 SHA512 3a27efdff92cb1f6b50449a761efde781af91584b8410fbf5ce37b20005e7d46dc4c750fd1730e15468ea22aac7799421c4e60c74243c65ef7916d3cbadd0ef8 DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2 -DIST serde_derive-1.0.183.crate 377265 BLAKE2B 041dff0dd5822b3be992cc65c8d789c86f8dda3a42ac77dc1a6c44cad4412c8c9fbb02f7572cc1ec4e4ca731d5f57a765d30f9357827ecf8210ae7f54c26d8f7 SHA512 c19cd2c9665b88b70a12b972c5b30d9ac6c604c77578bda5d7c6c5dbe01f097c1d6d165f1d73c204768427042b7521f43e40ee295c173e685c9ab1b4c23c8fcb +DIST serde-1.0.189.crate 76276 BLAKE2B e4cf8d9608f341007f9a92af434395659511238040ddd2cec137539a51c05b949f79c4965ad9ec25f67a72fe8341573f2d1075766f7ab5842a107b12e0468a3a SHA512 3fb1732f6866db8412cbc4ceb57bc8f90cbee005e2687a388b052e5b94dd464aebff57a91cc8ce5da62508bfbd6cc4e14a524090a5fa60724cc9bd1bb5ea1035 DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0 -DIST serde_json-1.0.104.crate 146130 BLAKE2B 62a613eba9c39bc3f007404995528ac101df3e74d90049e9aca699029f55ce4cee54a1bbfdd9e69cda9ab3e7ba9893fc66f3f9bbbc1eb358d570dd292ae77216 SHA512 06b2f3c818fa5819ff936d2f456fccded743ccc336359bfd1371aecebae9ca2d4f77879f61d1cda510b7a1aaa47b0010688b8e8c656388950e79fa5d007c7f6f -DIST serde_json-1.0.105.crate 146316 BLAKE2B a40b99ac4b5e9aa31a61c4f49f9f4dd9fad94946267a47ac4ba7c1bf3af7122dc410c8984235281b19a917b1fea088615c8e95b4f1aead0957c9e31f2b222599 SHA512 d4203d93ee6e8ffa0d88c21d347196b8d1496d506841273e992c9996019175ed9a965e9401ba63d48589133b13ad9cac6246b7e0143545778b5a090a48a31452 +DIST serde_derive-1.0.189.crate 55708 BLAKE2B 6f49c1a8ef5402251d6bdbfcc03fa411c0440d292fb03bbe38e9d4f9eacc128c60a33bbdcdb5fceeb4e0a6f6eace56b8da16f90fffda08c580b87409ac5c3d29 SHA512 54bf81d6a18297d57122d8eca3fa4fd60a13907fe65bb68081c6f9c0f8c13f3f3206f74a0e9e3c3546c8581b8f7d4af92dd74fe4172f039d3022eda031e1e342 DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a DIST syn-1.0.104.crate 236683 BLAKE2B 865904923ecac469f1d92bab04ea9ee384be0592c7a303d9d0f2f4bc755744bd883372c215a8f1add8bc2728d7c2c27489ab292fc8a89bdce918fc4a32deae44 SHA512 8feabd8e6b1b5eb15077d7c92f0b3269e848d33b1f233b3df343b6d445ed332fb23e0222911a13edfd82cee969d25c43434268cd7a20ce1c0a608a1bbe327b29 DIST syn-2.0.28.crate 241635 BLAKE2B 5784468a0dd04eb298821ae5a3facf72c5fe5907cc469919b0a0b636bb55bd15e9e3a31c9ceb05b7b0f88e7a53e5891e6874641b61e5fde247a91361ae37047f SHA512 96e83979e70e2e1e46ca2af45d10fb259847d61e327809a51351a988282be9688a8c4942a284504674c8684970082dc15cd9ab9b3584bbfa68ac9716e071f9c5 -DIST synapse-1.90.0.gh.tar.gz 8346382 BLAKE2B 1bb6f6e33a0cf3527b59c7a05e5a1fc1aa088b470c893223376ed274421086efb872c4ecbe25cefe7022765ed5ba728125be3e4fb201b3c21518fbc187cc3d99 SHA512 3772a885ed69f17e3ccc4f9e42d4101b996502ab2c9d73c6acc858021c36a7c315f4c1837fb3b948dccfcf4c4adcc389288a1af877afcd7a39fa34d507be428a -DIST synapse-1.92.2.gh.tar.gz 8371367 BLAKE2B 33c7dff28d360ecfd4b03de39281acefaaf28bade11d3cf4ddf594272a82c90177d96cf80e8563047d44fb5996e5b89ff6facfd1524c64285ebff5c17f61900e SHA512 b44c06960ffb1f17398d0be74e7ed0b0dd701762a470c46f5408294bb2a6781c18e202b35843f435aef7ea96f8a2942f1a3936927f9498c14c539c52b9ae0e07 DIST synapse-1.93.0.gh.tar.gz 8382894 BLAKE2B 8fa62d9b2582c9a637b29764dd8cebd2e90355d2cdc53b953bab3be1e3d6f35ec9fa8d6fd067b3c7de523ce1f8875f43bdef5c79239ab51d8c298498fd15ef66 SHA512 2f613d973f43c9c3ac2d569ac910f69b65cd2980fb1a463a80f3dac8ed75dacff6de0543b6c13230326db879b377bcd7c3f88c961b64ae90af02737cd6b369df +DIST synapse-1.95.0.gh.tar.gz 8404490 BLAKE2B 2eb208d0757acd5de33252537ca41c970a992026bd8b5a27fd6b203d37e3a5fb39376c23222c2305d627d853273cf634f7746e6fc77715f7e773529c9feb59db SHA512 c5f83dbb8dbf7b3bdfbd3278ab1a021607d1feaf5056b054c1f5a1afbd44ec80c217152448df7b515f18e8383dafd6dd19e961b0390d6886810982ead4ab0412 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288 DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c diff --git a/net-im/synapse/synapse-1.90.0.ebuild b/net-im/synapse/synapse-1.90.0.ebuild deleted file mode 100644 index a73e55d8e8d9..000000000000 --- a/net-im/synapse/synapse-1.90.0.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..11} ) - -CRATES=" - aho-corasick@1.0.2 - anyhow@1.0.72 - arc-swap@1.5.1 - autocfg@1.1.0 - bitflags@1.3.2 - blake2@0.10.6 - block-buffer@0.10.3 - cfg-if@1.0.0 - crypto-common@0.1.6 - digest@0.10.5 - generic-array@0.14.6 - hex@0.4.3 - indoc@1.0.7 - itoa@1.0.4 - lazy_static@1.4.0 - libc@0.2.135 - lock_api@0.4.9 - log@0.4.19 - memchr@2.5.0 - memoffset@0.6.5 - once_cell@1.15.0 - parking_lot@0.12.1 - parking_lot_core@0.9.3 - proc-macro2@1.0.64 - pyo3-build-config@0.17.3 - pyo3-ffi@0.17.3 - pyo3-log@0.8.3 - pyo3-macros-backend@0.17.3 - pyo3-macros@0.17.3 - pyo3@0.17.3 - pythonize@0.17.0 - quote@1.0.29 - redox_syscall@0.2.16 - regex-automata@0.3.6 - regex-syntax@0.7.4 - regex@1.9.3 - ryu@1.0.11 - scopeguard@1.1.0 - serde@1.0.183 - serde_derive@1.0.183 - serde_json@1.0.104 - smallvec@1.10.0 - subtle@2.4.1 - syn@1.0.104 - syn@2.0.28 - target-lexicon@0.12.4 - typenum@1.15.0 - unicode-ident@1.0.5 - unindent@0.1.10 - version_check@0.9.4 - windows-sys@0.36.1 - windows_aarch64_msvc@0.36.1 - windows_i686_gnu@0.36.1 - windows_i686_msvc@0.36.1 - windows_x86_64_gnu@0.36.1 - windows_x86_64_msvc@0.36.1 -" - -inherit cargo distutils-r1 multiprocessing optfeature systemd - -DESCRIPTION="Reference implementation of Matrix homeserver" -HOMEPAGE=" - https://matrix.org/ - https://github.com/matrix-org/synapse/ -" -SRC_URI=" - https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} -" - -LICENSE="Apache-2.0" -# Dependent crate licenses -LICENSE+=" - Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016 -" -SLOT="0" -KEYWORDS="amd64 ~ppc64" -IUSE="postgres systemd test" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-user/synapse - acct-group/synapse -" -# <pydantic-2, see https://github.com/matrix-org/synapse/issues/15858 -RDEPEND=" - ${DEPEND} - dev-python/attrs[${PYTHON_USEDEP}] - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/bleach[${PYTHON_USEDEP}] - >=dev-python/canonicaljson-2[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/ijson[${PYTHON_USEDEP}] - dev-python/immutabledict[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0[${PYTHON_USEDEP}] - dev-python/jsonschema[${PYTHON_USEDEP}] - >=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/phonenumbers[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},webp] - dev-python/prometheus-client[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - <dev-python/pydantic-2[${PYTHON_USEDEP}] - dev-python/pymacaroons[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/service-identity[${PYTHON_USEDEP}] - dev-python/signedjson[${PYTHON_USEDEP}] - dev-python/sortedcontainers[${PYTHON_USEDEP}] - dev-python/treq[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/unpaddedbase64[${PYTHON_USEDEP}] - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] ) -" -BDEPEND=" - dev-python/setuptools-rust[${PYTHON_USEDEP}] - test? ( - dev-python/hiredis[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/pyicu[${PYTHON_USEDEP}] - dev-python/txredisapi[${PYTHON_USEDEP}] - postgres? ( dev-db/postgresql[server] ) - ) -" - -# Rust extension -QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so" - -src_test() { - if use postgres; then - einfo "Preparing postgres test instance" - initdb --pgdata="${T}/pgsql" || die - pg_ctl --wait --pgdata="${T}/pgsql" start \ - --options="-h '' -k '${T}'" || die - createdb --host="${T}" synapse_test || die - - # See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql - local -x SYNAPSE_POSTGRES=1 - local -x SYNAPSE_POSTGRES_HOST="${T}" - fi - - # This remove is necessary otherwise python is not able to locate - # synapse_rust.abi3.so. - rm -rf synapse || die - - nonfatal distutils-r1_src_test - local ret=${?} - - if use postgres; then - einfo "Stopping postgres test instance" - pg_ctl --wait --pgdata="${T}/pgsql" stop || die - fi - - [[ ${ret} -ne 0 ]] && die -} - -python_test() { - "${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests -} - -src_install() { - distutils-r1_src_install - keepdir /var/{lib,log}/synapse /etc/synapse - fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse - fperms 0750 /var/{lib,log}/synapse /etc/synapse - newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}" - systemd_dounit "${FILESDIR}/synapse.service" -} - -pkg_postinst() { - optfeature "Improve user search for international display names" dev-python/pyicu - optfeature "Redis support" dev-python/txredisapi - optfeature "VoIP relaying on your homeserver with turn" net-im/coturn - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo - elog "In order to generate initial configuration run:" - elog "sudo -u synapse synapse_homeserver \\" - elog " --server-name matrix.domain.tld \\" - elog " --config-path /etc/synapse/homeserver.yaml \\" - elog " --generate-config \\" - elog " --data-directory /var/lib/synapse \\" - elog " --report-stats=no" - einfo - else - einfo - elog "Please refer to upgrade notes if any special steps are required" - elog "to upgrade from the version you currently have installed:" - elog - elog " https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md" - einfo - fi -} diff --git a/net-im/synapse/synapse-1.92.2.ebuild b/net-im/synapse/synapse-1.95.0.ebuild index a45032d0f4b0..853662c0778a 100644 --- a/net-im/synapse/synapse-1.92.2.ebuild +++ b/net-im/synapse/synapse-1.95.0.ebuild @@ -26,29 +26,29 @@ CRATES=" libc@0.2.135 lock_api@0.4.9 log@0.4.20 - memchr@2.5.0 - memoffset@0.6.5 + memchr@2.6.3 + memoffset@0.9.0 once_cell@1.15.0 parking_lot@0.12.1 parking_lot_core@0.9.3 proc-macro2@1.0.64 - pyo3-build-config@0.17.3 - pyo3-ffi@0.17.3 - pyo3-log@0.8.3 - pyo3-macros-backend@0.17.3 - pyo3-macros@0.17.3 - pyo3@0.17.3 - pythonize@0.17.0 + pyo3-build-config@0.19.2 + pyo3-ffi@0.19.2 + pyo3-log@0.8.4 + pyo3-macros-backend@0.19.2 + pyo3-macros@0.19.2 + pyo3@0.19.2 + pythonize@0.19.0 quote@1.0.29 redox_syscall@0.2.16 - regex-automata@0.3.7 + regex-automata@0.3.9 regex-syntax@0.7.5 - regex@1.9.4 + regex@1.9.6 ryu@1.0.11 scopeguard@1.1.0 - serde@1.0.188 - serde_derive@1.0.188 - serde_json@1.0.105 + serde@1.0.189 + serde_derive@1.0.189 + serde_json@1.0.107 smallvec@1.10.0 subtle@2.4.1 syn@1.0.104 @@ -93,7 +93,6 @@ DEPEND=" acct-user/synapse acct-group/synapse " -# <pydantic-2, see https://github.com/matrix-org/synapse/issues/15858 RDEPEND=" ${DEPEND} dev-python/attrs[${PYTHON_USEDEP}] @@ -110,11 +109,11 @@ RDEPEND=" dev-python/netaddr[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/phonenumbers[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},webp] + >=dev-python/pillow-10.0.1[${PYTHON_USEDEP},webp] dev-python/prometheus-client[${PYTHON_USEDEP}] dev-python/pyasn1-modules[${PYTHON_USEDEP}] dev-python/pyasn1[${PYTHON_USEDEP}] - <dev-python/pydantic-2[${PYTHON_USEDEP}] + dev-python/pydantic[${PYTHON_USEDEP}] dev-python/pymacaroons[${PYTHON_USEDEP}] dev-python/pyopenssl[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest index 7cbae12d5e78..5f1d1649aacb 100644 --- a/net-libs/xdp-tools/Manifest +++ b/net-libs/xdp-tools/Manifest @@ -1,3 +1,2 @@ -DIST xdp-tools-1.2.8.tar.gz 253786 BLAKE2B f745085b73da5193c3cdaf60c20dfa5de62f3d83487413c87b4c3d07b755dcf91cfbeb4ba970b4e04eef74b4cec4238057f4462074f49b7139d7652cb0f22998 SHA512 6ada9e433fcbefd13cebdffe93c3ce9159e9e09f1498d1615918ca6ecc4f11f03fcd9096980e8ceb7de126d4d8b953fa64917e777d54b5a3dfd1a9556de81626 -DIST xdp-tools-1.3.1.tar.gz 330516 BLAKE2B 89a61f47ba26efe6d0630d971e913e034d111d05c896e5af1bb28e6cb4e94133e6ecd827a10ee12a935ae2e6856f04556ac564ded1bcc65182766d656f8d0c5f SHA512 9dd434095a043158d14fb6829fa632fc4a0714dc0b6e08c219dfb55cb9f34005300db750115e08bd54210e90142bd499904616da077b8aa827e4de28c31be637 DIST xdp-tools-1.4.0.tar.gz 337221 BLAKE2B 008dda0fcfd403e47ab2b8c801fc0a5c4e103fb3b9869f1d1bf5af258fc646dd5a0285d3126c012c9b81805408b9669da886b9fcf2fdf33b256f74bbf898222a SHA512 c17bd6e9e6e4cf59c33f4b9ae4e3e0434863d147abf80f87b425215261b96d4574898fa09cc2b201a427a5e9d49ad64d0c70e50e3f72e3a18c6fbdf7f4cd4a3a +DIST xdp-tools-1.4.1.tar.gz 339878 BLAKE2B 30ed245dd0da8404cf67313ea4d5f9a148507d14bd7330bdac3b03c07d1cc0b38eb1a376636551cb8ea14c8a2e77d02527da363733a1059e1c2ebaee9ac90392 SHA512 9d2ad42713aa53c10ccbde2c344bf2696524e317544f3693114b343ab74240187699c3802cfc6efa05b3e9f9bfec80fd2537799aa3ae050717bb1f6aab435996 diff --git a/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch b/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch deleted file mode 100644 index 3a37b26efa14..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-disable-stack-protector.patch +++ /dev/null @@ -1,32 +0,0 @@ - -From: https://github.com/xdp-project/xdp-tools/commit/cb6d06219d1b49b07980b481a383e1dea74a0702 -Bug: https://bugs.gentoo.org/889842 - -From cb6d06219d1b49b07980b481a383e1dea74a0702 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com> -Date: Sat, 4 Mar 2023 20:08:25 +0100 -Subject: [PATCH] make: disable stack protector for BPF bits built by clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The clang toolchain might have stack-protection enabled by default -(e.g. via platform configuration) and that won't work for BPF, -so unconfitionally disable it via -fno-stack-protector. - -Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> ---- - lib/defines.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/defines.mk b/lib/defines.mk -index f134c43b..54b259f2 100644 ---- a/lib/defines.mk -+++ b/lib/defines.mk -@@ -1,5 +1,5 @@ - CFLAGS ?= -O2 -g --BPF_CFLAGS ?= -Wno-visibility -+BPF_CFLAGS ?= -Wno-visibility -fno-stack-protector - BPF_TARGET ?= bpf - - HAVE_FEATURES := diff --git a/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch b/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch deleted file mode 100644 index d805e1077c76..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-fix-btf__type_cnt-detection.patch +++ /dev/null @@ -1,36 +0,0 @@ - -From https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3 - -From a7df567634af77381832a2212c5f5099b07734f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com> -Date: Sat, 4 Mar 2023 20:07:39 +0100 -Subject: [PATCH] configure: Fix function detection for btf__type_cnt() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The configure check for btf__type_cnt() swapped two arguments in the -check_libbpf_function() call in the configure script, leading to the check -failing if LIBBPF_CFLAGS is non-empty. Make sure the arguments are in the -right order, and also pass a proper NULL parameter in the check instead of -a 0. - -Reported-by: Holger Hoffstätte <holger@applied-asynchrony.com> -Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com> ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 016c5bbd..62c2f883 100755 ---- a/configure -+++ b/configure -@@ -272,7 +272,7 @@ check_libbpf_functions() - - check_libbpf_function "perf_buffer__consume" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "btf__load_from_kernel_by_id" "(0)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" -- check_libbpf_function "btf__type_cnt" "(0)" "$LIBBPF_CFLAGS" "" "$LIBBPF_LDLIBS" -+ check_libbpf_function "btf__type_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "bpf_object__next_map" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "bpf_object__next_program" "(NULL, NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" - check_libbpf_function "bpf_program__insn_cnt" "(NULL)" "" "$LIBBPF_CFLAGS" "$LIBBPF_LDLIBS" diff --git a/net-libs/xdp-tools/files/1.3.1-musl.patch b/net-libs/xdp-tools/files/1.3.1-musl.patch deleted file mode 100644 index e3238871b262..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://bugs.gentoo.org/836708 -https://github.com/xdp-project/xdp-tools/pull/309 - -From c9956abbfbd238bd2eb98c67ea002bfce29063a4 Mon Sep 17 00:00:00 2001 -From: Stijn Tintel <stijn@linux-ipv6.be> -Date: Wed, 29 Mar 2023 04:25:06 +0300 -Subject: [PATCH] libxdp: fix build on musl - -In musl, PATH_MAX is defined in limits.h. Include it in libxdp.c to fix -building systems using musl libc. - -libxdp.c: In function 'find_bpffs': -libxdp.c:406:33: error: 'PATH_MAX' undeclared (first use in this function) - 406 | static char bpf_wrk_dir[PATH_MAX]; - | ^~~~~~~~ - -Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> ---- a/lib/libxdp/libxdp.c -+++ b/lib/libxdp/libxdp.c -@@ -22,6 +22,7 @@ - #include <fcntl.h> - #include <inttypes.h> - #include <dirent.h> -+#include <limits.h> - - #include <linux/err.h> /* ERR_PTR */ - #include <linux/if_link.h> - diff --git a/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch b/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch deleted file mode 100644 index 3983c8c8f402..000000000000 --- a/net-libs/xdp-tools/files/1.3.1-xdpdump-clang.patch +++ /dev/null @@ -1,36 +0,0 @@ - -From: https://github.com/xdp-project/xdp-tools/commit/344b241da22a5358c714d6db1ea6f225f951dbdb - -From 344b241da22a5358c714d6db1ea6f225f951dbdb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com> -Date: Wed, 8 Mar 2023 18:50:56 +0100 -Subject: [PATCH] xdpdump: fix build with clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When building all of xdp-tools with clang, the xdp-dump build fails -due to 'classic' use of variable-length arrays and -Werror. -Disable the warning and leave a breadcrumb to the discussion. - -Fixes: #304 -Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> ---- - xdp-dump/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/xdp-dump/Makefile b/xdp-dump/Makefile -index 7ee1688e..a9ae0ae7 100644 ---- a/xdp-dump/Makefile -+++ b/xdp-dump/Makefile -@@ -4,6 +4,10 @@ XDP_TARGETS := xdpdump_bpf xdpdump_xdp - USER_TARGETS := xdpdump - TEST_FILE := tests/test-xdpdump.sh - -+# Disable warnings about VLAs not being at the end of a structure when building -+# with clang. The code is fine, but clang's complaint coupled with -Werror would -+# break the build. See https://github.com/xdp-project/xdp-tools/issues/304 -+CFLAGS += "-Wno-gnu-variable-sized-type-not-at-end" - LIB_DIR = ../lib - USER_LIBS = -lpcap - MAN_PAGE := xdpdump.8 diff --git a/net-libs/xdp-tools/files/1.3.1-no-Werror.patch b/net-libs/xdp-tools/files/1.4.0-no-Werror.patch index fb086f5122b9..fb086f5122b9 100644 --- a/net-libs/xdp-tools/files/1.3.1-no-Werror.patch +++ b/net-libs/xdp-tools/files/1.4.0-no-Werror.patch diff --git a/net-libs/xdp-tools/files/1.4.1-no-Werror.patch b/net-libs/xdp-tools/files/1.4.1-no-Werror.patch new file mode 100644 index 000000000000..52c50261f5d8 --- /dev/null +++ b/net-libs/xdp-tools/files/1.4.1-no-Werror.patch @@ -0,0 +1,75 @@ + +Bug: https://bugs.gentoo.org/899744 + +diff --git a/lib/Makefile b/lib/Makefile +index 5ee035d..5342ab3 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -1,5 +1,5 @@ + +-LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Werror -Wall) -fPIC ++LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Wall) -fPIC + + LIB_DIR = . + include defines.mk +diff --git a/lib/common.mk b/lib/common.mk +index b680a75..8dbcb39 100644 +--- a/lib/common.mk ++++ b/lib/common.mk +@@ -116,7 +116,6 @@ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK) + -Wno-unused-value \ + -Wno-pointer-sign \ + -Wno-compare-distinct-pointer-types \ +- -Werror \ + -O2 -emit-llvm -c -g -o ${@:.o=.ll} $< + $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll} + +diff --git a/lib/defines.mk b/lib/defines.mk +index 54b259f..ed246c0 100644 +--- a/lib/defines.mk ++++ b/lib/defines.mk +@@ -40,7 +40,7 @@ endif + + DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +-CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES) $(ARCH_INCLUDES) ++CFLAGS += -std=gnu11 -Wextra $(DEFINES) $(ARCH_INCLUDES) + BPF_CFLAGS += $(DEFINES) $(filter -ffile-prefix-map=%,$(CFLAGS)) $(ARCH_INCLUDES) + + CONFIGMK := $(LIB_DIR)/../config.mk +diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile +index 431932a..a0c625d 100644 +--- a/lib/libxdp/Makefile ++++ b/lib/libxdp/Makefile +@@ -142,7 +142,6 @@ $(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK) + -Wno-unused-value \ + -Wno-pointer-sign \ + -Wno-compare-distinct-pointer-types \ +- -Werror \ + -O2 -emit-llvm -c -g -o ${@:.o=.ll} $< + $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll} + +diff --git a/lib/libxdp/tests/Makefile b/lib/libxdp/tests/Makefile +index 3c22901..a4463f3 100644 +--- a/lib/libxdp/tests/Makefile ++++ b/lib/libxdp/tests/Makefile +@@ -72,7 +72,6 @@ $(BPF_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK) $(EXTRA_DEPS) + -Wno-unused-value \ + -Wno-pointer-sign \ + -Wno-compare-distinct-pointer-types \ +- -Werror \ + -O2 -emit-llvm -c -g -o ${@:.o=.ll} $< + $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll} + +diff --git a/lib/util/Makefile b/lib/util/Makefile +index 24070f0..37485b3 100644 +--- a/lib/util/Makefile ++++ b/lib/util/Makefile +@@ -26,7 +26,6 @@ $(UTIL_BPF_OBJS): %.o: %.c $(KERN_USER_H) $(BPF_HEADERS) $(LIBMK) + -Wno-unused-value \ + -Wno-pointer-sign \ + -Wno-compare-distinct-pointer-types \ +- -Werror \ + -O2 -emit-llvm -c -g -o ${@:.o=.ll} $< + $(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll} + diff --git a/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild deleted file mode 100644 index e881553d3eed..000000000000 --- a/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="The libxdp library and various tools for use with XDP" -HOMEPAGE="https://github.com/xdp-project/xdp-tools" -SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -IUSE="+tools" - -DEPEND="dev-libs/libbpf:= - sys-libs/zlib - net-libs/libpcap - virtual/libelf" -RDEPEND="${DEPEND}" -BDEPEND=">=sys-devel/clang-10.0.0" - -# Not prebuilt -- we build them -- but they're not ordinary ELF objects either. -QA_PREBUILT="usr/lib/bpf/*.o" - -MAKEOPTS+=" V=1" - -src_configure() { - export PRODUCTION=1 - export DYNAMIC_LIBXDP=1 - export FORCE_SYSTEM_LIBBPF=1 - default -} - -src_install() { - export PREFIX="${EPREFIX}/usr" - export LIBDIR="${PREFIX}/$(get_libdir)" - export BPF_OBJECT_DIR="${PREFIX}/lib/bpf" - default - - # To remove the scripts/testing files that are installed. - rm -r "${ED}/usr/share/xdp-tools" || die - # We can't control static archive generation yet. - rm "${ED}/usr/$(get_libdir)/libxdp.a" || die - - use tools || { rm "${ED}/usr/sbin"/* || die; } - - # These are ELF objects but BPF ones. - dostrip -x /usr/lib/bpf -} - -src_test() { :; } diff --git a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild index 1e5a994e83ad..400e2aa0f19e 100644 --- a/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild +++ b/net-libs/xdp-tools/xdp-tools-1.4.0.ebuild @@ -33,8 +33,8 @@ QA_PREBUILT="usr/lib/bpf/*.o" MAKEOPTS+=" V=1" PATCHES=( - "${FILESDIR}"/1.3.1-no-Werror.patch - "${FILESDIR}"/${PV}-toolchain.patch + "${FILESDIR}"/1.4.0-no-Werror.patch + "${FILESDIR}"/1.4.0-toolchain.patch ) src_configure() { diff --git a/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild index 543536b75ae6..53974f63d493 100644 --- a/net-libs/xdp-tools/xdp-tools-1.3.1-r3.ebuild +++ b/net-libs/xdp-tools/xdp-tools-1.4.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> LICENSE="GPL-2 LGPL-2.1 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" IUSE="+tools" DEPEND=" @@ -33,14 +33,12 @@ QA_PREBUILT="usr/lib/bpf/*.o" MAKEOPTS+=" V=1" PATCHES=( - "${FILESDIR}"/1.3.1-disable-stack-protector.patch - "${FILESDIR}"/1.3.1-fix-btf__type_cnt-detection.patch - "${FILESDIR}"/1.3.1-no-Werror.patch - "${FILESDIR}"/1.3.1-xdpdump-clang.patch - "${FILESDIR}"/1.3.1-musl.patch + "${FILESDIR}"/1.4.1-no-Werror.patch ) src_configure() { + export CC="$(tc-getCC)" + export LD="$(tc-getLD)" export PREFIX="${EPREFIX}/usr" export LIBDIR="${PREFIX}/$(get_libdir)" export BPF_OBJECT_DIR="${PREFIX}/lib/bpf" diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest index dc34118cc5c3..4a2367210d59 100644 --- a/net-misc/zerotier/Manifest +++ b/net-misc/zerotier/Manifest @@ -179,3 +179,4 @@ DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d65 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c DIST zerotier-1.10.1.tar.gz 84019609 BLAKE2B 317177c3f64818a78aed3f24e0d5fa8f164bb3778fcf123f222983b784aa8ed4a5bfd842857b3da7bca39e09e74a99b88c541921f2d1ed7633282cc9bae19bd2 SHA512 6a4c9c30b4aad389a60bd72b154f2a0c34303925a5c0efb815b4651db0db5e7b79740b5cfc4f2825bda7c158d374fff277b2f5ba57cd2cf5c740168198e7bbbd DIST zerotier-1.10.6.tar.gz 15259391 BLAKE2B 48a47744502f976584c622f0f117ae2b7f73addd69bdb19c0829b1c0b99fa387618b2cd7203eb4f8838cb59c85ec658792066f55c650f2d9d9774029779d267c SHA512 e22982e0898d5db4748ca009480cc6ea07b13e1cf3dcb2c78fbba5036519c0d08afe8bdad20766669f52fef03679ff228414337e2478990fd5ba5d3dbece1972 +DIST zerotier-1.12.2.tar.gz 12431815 BLAKE2B c67889ce1f2479553382f43d581631686060218d187913931d92da751606246b72763a537fa936d462cdc7b6641ee2d2f4a753cd46398a1a4e6e8ac6a2e19f11 SHA512 75a698dc3755f18a9a8909a231f6d9667edfeb3140e3e4925ebe2e01d2172bd1ac8d1498439e0e9959343a4258bc7f3862d8e6a6eb4f03ebc77e02ef7c074e73 diff --git a/net-misc/zerotier/zerotier-1.12.2.ebuild b/net-misc/zerotier/zerotier-1.12.2.ebuild new file mode 100644 index 000000000000..cae03fbe000e --- /dev/null +++ b/net-misc/zerotier/zerotier-1.12.2.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CARGO_OPTIONAL=1 + +CRATES=" + android_system_properties@0.1.5 + ansi_term@0.12.1 + atty@0.2.14 + autocfg@1.1.0 + base64@0.13.1 + base64@0.21.0 + bitflags@1.3.2 + block-buffer@0.10.3 + bumpalo@3.12.0 + bytes@1.4.0 + cbindgen@0.20.0 + cc@1.0.79 + cfg-if@1.0.0 + chrono@0.4.23 + clap@2.34.0 + codespan-reporting@0.11.1 + core-foundation-sys@0.8.3 + core-foundation@0.9.3 + cpufeatures@0.2.5 + crypto-common@0.1.6 + cxx-build@1.0.91 + cxx@1.0.91 + cxxbridge-flags@1.0.91 + cxxbridge-macro@1.0.91 + darling@0.13.4 + darling_core@0.13.4 + darling_macro@0.13.4 + digest@0.10.6 + either@1.8.1 + encoding_rs@0.8.32 + errno-dragonfly@0.1.2 + errno@0.2.8 + fastrand@1.9.0 + fnv@1.0.7 + foreign-types-shared@0.1.1 + foreign-types@0.3.2 + form_urlencoded@1.1.0 + futures-channel@0.3.26 + futures-core@0.3.26 + futures-io@0.3.26 + futures-sink@0.3.26 + futures-task@0.3.26 + futures-util@0.3.26 + generic-array@0.14.6 + getrandom@0.2.8 + h2@0.3.16 + hashbrown@0.12.3 + heck@0.3.3 + hermit-abi@0.1.19 + hermit-abi@0.2.6 + hmac@0.12.1 + http-body@0.4.5 + http@0.2.9 + httparse@1.8.0 + httpdate@1.0.2 + hyper-tls@0.5.0 + hyper@0.14.24 + iana-time-zone-haiku@0.1.1 + iana-time-zone@0.1.53 + ident_case@1.0.1 + idna@0.3.0 + indexmap@1.9.2 + instant@0.1.12 + io-lifetimes@1.0.5 + ipnet@2.7.1 + itertools@0.10.5 + itoa@1.0.5 + js-sys@0.3.61 + lazy_static@1.4.0 + libc@0.2.139 + link-cplusplus@1.0.8 + linux-raw-sys@0.1.4 + log@0.4.17 + memchr@2.5.0 + mime@0.3.16 + mio@0.8.6 + native-tls@0.2.11 + num-bigint@0.4.3 + num-integer@0.1.45 + num-traits@0.2.15 + num_cpus@1.15.0 + oauth2@4.3.0 + once_cell@1.17.1 + openidconnect@2.5.0 + openssl-macros@0.1.0 + openssl-probe@0.1.5 + openssl-sys@0.9.80 + openssl@0.10.45 + ordered-float@2.10.0 + percent-encoding@2.2.0 + pin-project-lite@0.2.9 + pin-utils@0.1.0 + pkg-config@0.3.26 + ppv-lite86@0.2.17 + proc-macro2@1.0.51 + quote@1.0.23 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + redox_syscall@0.2.16 + reqwest@0.11.14 + ring@0.16.20 + rustix@0.36.8 + ryu@1.0.12 + schannel@0.1.21 + scratch@1.0.3 + security-framework-sys@2.8.0 + security-framework@2.8.2 + serde-value@0.7.0 + serde@1.0.152 + serde_derive@1.0.152 + serde_json@1.0.93 + serde_path_to_error@0.1.9 + serde_plain@1.0.1 + serde_urlencoded@0.7.1 + serde_with@1.14.0 + serde_with_macros@1.5.2 + sha2@0.10.6 + slab@0.4.8 + socket2@0.4.7 + spin@0.5.2 + strsim@0.10.0 + strsim@0.8.0 + subtle@2.4.1 + syn@1.0.109 + tempfile@3.4.0 + termcolor@1.2.0 + textwrap@0.11.0 + thiserror-impl@1.0.38 + thiserror@1.0.38 + time-core@0.1.0 + time-macros@0.2.8 + time@0.3.20 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-native-tls@0.3.1 + tokio-util@0.7.7 + tokio@1.26.0 + toml@0.5.11 + tower-service@0.3.2 + tracing-core@0.1.30 + tracing@0.1.37 + try-lock@0.2.4 + typenum@1.16.0 + unicode-bidi@0.3.10 + unicode-ident@1.0.6 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unicode-width@0.1.10 + untrusted@0.7.1 + url@2.3.1 + vcpkg@0.2.15 + vec_map@0.8.2 + version_check@0.9.4 + want@0.3.0 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.84 + wasm-bindgen-futures@0.4.34 + wasm-bindgen-macro-support@0.2.84 + wasm-bindgen-macro@0.2.84 + wasm-bindgen-shared@0.2.84 + wasm-bindgen@0.2.84 + web-sys@0.3.61 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.42.0 + windows-sys@0.45.0 + windows-targets@0.42.1 + windows_aarch64_gnullvm@0.42.1 + windows_aarch64_msvc@0.42.1 + windows_i686_gnu@0.42.1 + windows_i686_msvc@0.42.1 + windows_x86_64_gnu@0.42.1 + windows_x86_64_gnullvm@0.42.1 + windows_x86_64_msvc@0.42.1 + winreg@0.10.1 +" + +declare -A GIT_CRATES=( + [jwt]='https://github.com/glimberg/rust-jwt;61a9291fdeec747c6edf14f4fa0caf235136c168;rust-jwt-%commit%' +) + +inherit cargo flag-o-matic systemd toolchain-funcs + +DESCRIPTION="A software-based managed Ethernet switch for planet Earth" +HOMEPAGE="https://www.zerotier.com/" +SRC_URI=" + https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.tar.gz + sso? ( + ${CARGO_CRATE_URIS} + ) +" +S="${WORKDIR}"/ZeroTierOne-${PV} + +LICENSE="BUSL-1.1" +# Crate licenses +LICENSE+=" sso? ( Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +IUSE="cpu_flags_arm_neon debug sso" + +RDEPEND=" + dev-libs/openssl:= + net-libs/libnatpmp + >=net-libs/miniupnpc-2:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + sso? ( + virtual/rust + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.1-respect-ldflags.patch + "${FILESDIR}"/${PN}-1.10.1-add-armv7a-support.patch +) + +DOCS=( README.md AUTHORS.md ) + +src_unpack() { + unpack ${P}.tar.gz + use sso && cargo_src_unpack +} + +src_prepare() { + default + + #1. Dont call cargo, we'll run it with cargo eclass functions + #2. Remove man page compression and install, we'll handle it with ebuild functions + sed -i \ + -e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \ + -e '/install:/,/^$/ { /man[0-9]/d }' \ + make-linux.mk || die +} + +src_configure() { + tc-export CXX CC + + # Several assembler files without GNU-stack markings + # https://github.com/zerotier/ZeroTierOne/issues/1179 + append-ldflags -Wl,-z,noexecstack + + use cpu_flags_arm_neon || export ZT_DISABLE_NEON=1 + + use sso && cargo_src_configure +} + +src_compile() { + myemakeargs=( + CXX="${CXX}" + STRIP=: + + # Debug doesnt do more than add preprocessor arguments normally, + # but when rust is used it sets the correct rust directory to link against. + # It would be added by cargo eclass eitherway, so instead of adding REQUIRED_USE + # and patching the makefile its just easier to have it. + ZT_DEBUG="$(usex debug 1 0)" + ZT_SSO_SUPPORTED="$(usex sso 1 0)" + ) + + pushd zeroidc > /dev/null || die + use sso && cargo_src_compile + popd > /dev/null || die + + emake "${myemakeargs[@]}" one +} + +src_test() { + emake "${myemakeargs[@]}" selftest + ./zerotier-selftest || die +} + +src_install() { + default + + newinitd "${FILESDIR}/${PN}".init-r1 "${PN}" + systemd_dounit "${FILESDIR}/${PN}".service + + doman doc/zerotier-{cli.1,idtool.1,one.8} +} diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 355a676ca11b..48029716354c 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -143,8 +143,8 @@ x11-base/xwayland video_cards_nvidia x11-wm/mutter video_cards_nvidia # Bernd Waibel <waebbl-gentoo@posteo.net> (2021-06-11) -# Has unpackaged dependencies, bug #795459 -<media-libs/OpenColorIO-2.2.0 doc +# Has unpackaged depdencies, bug #795459 +>=media-libs/opencolorio-2.0.0 doc # Michael Orlitzky <mjo@gentoo.org> (2021-03-27) # The clozurecl and clozurecl64 flags are now arch-specific in maxima, diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 672434aa47c1..ec682d796980 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -210,7 +210,7 @@ x11-themes/qtcurve plasma # Jonathan Scruggs <j.scruggs@gmail.com> (2017-09-23) # dependencies not keyworded yet -media-libs/OpenImageIO ptex +media-libs/openimageio ptex # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2017-08-22) # Dictionary Manager requires unkeyworded dev-qt/qtwebengine. diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask index 681ebdbde549..703c39a8fa69 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.mask @@ -27,9 +27,9 @@ -media-libs/ctl -media-gfx/openvdb -media-libs/embree --media-libs/OpenColorIO --media-libs/OpenImageIO --media-libs/OpenShadingLanguage +-media-libs/opencolorio +-media-libs/openimageio +-media-libs/osl # Sam James <sam@gentoo.org> (2021-10-16) # Fails with "No byte-swap function available on big-endian platform." on be diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask index 23e53c00bc4c..ddeda73b9834 100644 --- a/profiles/arch/powerpc/ppc64/package.mask +++ b/profiles/arch/powerpc/ppc64/package.mask @@ -30,9 +30,9 @@ media-libs/openexr media-libs/ctl media-gfx/openvdb media-libs/embree -media-libs/OpenColorIO -media-libs/OpenImageIO -media-libs/OpenShadingLanguage +media-libs/opencolorio +media-libs/openimageio +media-libs/osl # Sam James <sam@gentoo.org> (2021-10-16) # Fails with "No byte-swap function available on big-endian platform." diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask index 380dca30beb7..e4ee2f94b694 100644 --- a/profiles/arch/powerpc/ppc64/use.mask +++ b/profiles/arch/powerpc/ppc64/use.mask @@ -15,7 +15,7 @@ openexr osg # Samuli Suominen <ssuominen@gentoo.org> (2012-11-24) -# TODO: Keyword and stabilize media-gfx/OpenColorIO and media-libs/opencv +# TODO: Keyword and stabilize media-gfx/opencolorio and media-libs/opencv color-management opencv diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index ed0fc7ba092b..9e2282f168af 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -33,7 +33,7 @@ kde-plasma/plasma-workspace gps media-gfx/graphviz gts media-libs/libpano13 suitesparse media-libs/opencv gdal lapack -media-libs/OpenImageIO dicom +media-libs/openimageio dicom sci-libs/cholmod partition sci-libs/gdal armadillo fits geos hdf5 netcdf ogdi sci-libs/gsl cblas-external diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask index ea2a97299827..b33814159e81 100644 --- a/profiles/arch/x86/use.mask +++ b/profiles/arch/x86/use.mask @@ -9,7 +9,7 @@ -secureboot # Andreas Sturmlechner <asturm@gentoo.org> (2023-06-10) -# Requires media-libs/OpenColorIO, broken on x86, bug #884115 +# Requires media-libs/opencolorio, broken on x86, bug #884115 color-management # Andreas Sturmlechner <asturm@gentoo.org> (2023-02-06) diff --git a/profiles/package.mask b/profiles/package.mask index 0fa9e167e5c2..ca1422449084 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -382,6 +382,13 @@ net-misc/openr2 =dev-db/mariadb-10.11.2 =dev-db/mariadb-10.11.3 +# Bernd Waibel <waebbl-gentoo@posteo.net> (2023-05-31) +# Mask this version for uptime soversion issue. There will be an updated release +# shortly which fixes this. +# See https://github.com/AcademySoftwareFoundation/Imath/issues/189#issuecomment-1567077722 +# Bug: #907211 +=dev-libs/imath-3.1.7 + # Sam James <sam@gentoo.org> (2023-05-19) # Breaks Portage's pid-sandbox at least with 5.10 kernels. Pending investigation. # If you're hitting this, try: FEATURES="-pid-sandbox" emerge -v1 sys-apps/util-linux @@ -529,10 +536,6 @@ dev-tex/pdfannotextractor # and may be buggier or less secure. Only unmask if really wanted. x11-drivers/nvidia-drivers:0/vulkan -# Mart Raudsepp <leio@gentoo.org> (2021-09-23) -# Incompatible with c++17 abseil-cpp, no in-tree consumers yet -media-libs/webrtc-audio-processing:1 - # Andreas K. Hüttel <dilfridge@gentoo.org> (2021-09-18) # sys-devel/automake version 1.11 is EOL and is only useful for testing # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall. diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023 index cbe9f8ace83d..fc232094ccab 100644 --- a/profiles/updates/4Q-2023 +++ b/profiles/updates/4Q-2023 @@ -5,7 +5,3 @@ move dev-python/sphinx_lv2_theme dev-python/sphinx-lv2-theme move dev-python/jschema_to_python dev-python/jschema-to-python move dev-python/sarif_om dev-python/sarif-om move dev-python/memory_allocator dev-python/memory-allocator -move media-libs/openimageio media-libs/OpenImageIO -move media-libs/opencolorio media-libs/OpenColorIO -move media-libs/osl media-libs/OpenShadingLanguage -move dev-libs/imath dev-libs/Imath diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 9095121b6c60..1ea0c626502e 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -7,6 +7,7 @@ DIST gcc-11-20230622.tar.xz 76199316 BLAKE2B a769dc6be63eabca3bc33944b471d727bf2 DIST gcc-11-20230824.tar.xz 76202120 BLAKE2B 243ce16e28c66d681bb27df32866947309f8fa386e258896651b6853e390da79304250669096fd55cafe0a9d5adf4b3a3cf5989302f4ad13660ece80639b545a SHA512 a9cab8bf61f2a572baba73a2a11271eeb61d43f07411df376a8568820c1373f64f635d747933fda1e942ae717b0ae9f1c810f662fc09ccb075940248bc48b582 DIST gcc-11-20231012.tar.xz 76228876 BLAKE2B f48d440cefdad9eb021116b72ba41a7cb8b3af904abafb26bd49113f3bdaacbeab86f3d7a783130ea1a1f8c6556d1dc83b8176ae96973c524dc8606443e0be0a SHA512 7cae1a36a113e0184b1c10c7892a808a6ec38ecd4b1c482d589717c68474873093eebd68465694344ee1208d0e118f5d91b3a19f981da22dfa95ee86663572bb DIST gcc-11-20231019.tar.xz 76228604 BLAKE2B cc1278eb4beb598d81b1629fe72095487709f9e1a7229dba0512ba8273767b05e79c7c02104a1aa28b699d42ef0f10f7b960f1a37693c1508df9846edfe80b82 SHA512 f98ce83e0d75fe4459e1852d900924e8e3c31853ba54e38e46f040f4d109726b6c171bbb51e9230c459d617c3c8ac37708ef65997d6797a1686b60cdca3107a0 +DIST gcc-11-20231026.tar.xz 76243752 BLAKE2B bdd28659a0ddf9aea98c989377260586aea746cde8fbc082d52944032c02209d67f633c295a7bebcb7bf8a8df081430110cbdf749ceacd9250263629d57797df SHA512 9c2a47465c7143b645df9e863faec4e6d80d158598262b59eaf248d900f73aeddbcd045b37b7015f2ba87c11c8beb3ae7d63fdda974160fef785e0648eb72d92 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17 diff --git a/sys-devel/gcc/gcc-11.4.1_p20231026.ebuild b/sys-devel/gcc/gcc-11.4.1_p20231026.ebuild new file mode 100644 index 000000000000..02c58f02f0a6 --- /dev/null +++ b/sys-devel/gcc/gcc-11.4.1_p20231026.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_GCC_VER="11.4.0" +PATCH_VER="10" +MUSL_VER="2" +MUSL_GCC_VER="11.4.0" + +if [[ ${PV} == *.9999 ]] ; then + MY_PV_2=$(ver_cut 2) + MY_PV_3=1 + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + MY_PV_3=0 + else + MY_PV_2=$((${MY_PV_2} - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3} +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain + +if tc_is_live ; then + # Needs to be after inherit (for now?), bug #830908 + EGIT_BRANCH=releases/gcc-$(ver_cut 1) +elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then + # Don't keyword live ebuilds + #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + :; +fi + +if [[ ${CATEGORY} != cross-* ]] ; then + # Technically only if USE=hardened *too* right now, but no point in complicating it further. + # If GCC is enabling CET by default, we need glibc to be built with support for it. + # bug #830454 + RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" + DEPEND="${RDEPEND}" + BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" +fi + +src_prepare() { + local p upstreamed_patches=( + # add them here + ) + for p in "${upstreamed_patches[@]}"; do + rm -v "${WORKDIR}/patch/${p}" || die + done + + toolchain_src_prepare + + eapply_user +} diff --git a/sys-process/uksmd/Manifest b/sys-process/uksmd/Manifest index 94c41369c0fd..f439b2a4d81f 100644 --- a/sys-process/uksmd/Manifest +++ b/sys-process/uksmd/Manifest @@ -1 +1 @@ -DIST uksmd-6.4.1.tar.gz 16790 BLAKE2B 284302f0a77684fc00d16faf868d857adf539840ea26746dd9774a1501b3361afa58a77dd74bd40680c32a7b1baf632d60d52fae3c031d1be69c8f17e6bbf73d SHA512 ea851a75b7afd4d9c789f31ca473f2c265b0633c86e38b26ec3602dfa3e63e6bea13caca551aba08c5093332cfbb485f40cb96254c39eb083ab66d6256661dd4 +DIST uksmd-6.5.1.tar.gz 16878 BLAKE2B 12c0ed088ce189470a63ed74de02b35c994363500a04a28e2b1a8e7ad1ad3b75970cf69af939476b00b8bf1a9838591f83051dc004f2f91d74f19fd17746c37f SHA512 9be0b2f16aee16201a16fb157c5389f104dc9a818a0528cfda6c37e4e9a0d82bd9966cf654052e5f645e21db2f4f149873b07cac5451a5b377a92a5ec4b6e11e diff --git a/sys-process/uksmd/files/uksmd-6.4.1-systemd-automagic.patch b/sys-process/uksmd/files/uksmd-6.4.1-systemd-automagic.patch deleted file mode 100644 index 7f897731737f..000000000000 --- a/sys-process/uksmd/files/uksmd-6.4.1-systemd-automagic.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://codeberg.org/pf-kernel/uksmd/pulls/5 - -From 0ed68078ed829ff03f95d01f0079485966e3c07a Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 3 Sep 2023 07:21:56 +0100 -Subject: [PATCH] meson: add systemd option - -We may not always want to link against systemd even if installed - consider -the case where a user is switching from systemd->another init system, systemd -may still be installed temporarily but the user wants to rebuild without it. - -This perserves the default behaviour of using systemd if available. - -Signed-off-by: Sam James <sam@gentoo.org> ---- - meson.build | 2 +- - meson_options.txt | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - create mode 100644 meson_options.txt - -diff --git a/meson.build b/meson.build -index 7170db8..bf0b119 100644 ---- a/meson.build -+++ b/meson.build -@@ -18,7 +18,7 @@ build_args = [ - '-DPROJECT_VERSION="' + meson.project_version() + '"', - ] - --systemd = dependency('systemd', required: false) -+systemd = dependency('systemd', required: get_option('systemd')) - - if systemd.found() - systemd_system_unit_dir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir') -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..3a8cdd4 ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,6 @@ -+option( -+ 'systemd', -+ type: 'feature', -+ value: 'auto', -+ description: 'sd-notify support via libsystemd and install systemd unit files' -+) --- -2.30.8 diff --git a/sys-process/uksmd/uksmd-6.4.1.ebuild b/sys-process/uksmd/uksmd-6.5.1.ebuild index 3977cb96df11..9b4eafccdd9e 100644 --- a/sys-process/uksmd/uksmd-6.4.1.ebuild +++ b/sys-process/uksmd/uksmd-6.5.1.ebuild @@ -24,10 +24,6 @@ RDEPEND="${DEPEND}" CONFIG_CHECK="~KSM" -PATCHES=( - "${FILESDIR}"/${PN}-6.4.1-systemd-automagic.patch -) - src_configure() { local emesonargs=( $(meson_feature systemd) |