Merge updates from master

This commit is contained in:
Repository mirror & CI
2025-04-05 21:50:11 +00:00
8 changed files with 184 additions and 6 deletions

View File

@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
<name>Zac Medico</name>
</maintainer>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>

View File

@@ -0,0 +1,13 @@
Add missing parameters in declaration for C23
https://bugs.gentoo.org/944163
--- a/va/x11/va_nvctrl.c
+++ b/va/x11/va_nvctrl.c
@@ -130,7 +130,7 @@
#define XNVCTRLSimpleCheckExtension(dpy,i) \
XextSimpleCheckExtension (dpy, i, nvctrl_extension_name)
-static int close_display();
+static int close_display(Display *, XExtCodes *);
static /* const */ XExtensionHooks nvctrl_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */

View File

@@ -0,0 +1,26 @@
https://bugs.gentoo.org/925671
https://github.com/intel/libva/commit/45acdece2c8b7d8f6d4e5edd9b9da89e78f18ba2
From 45acdece2c8b7d8f6d4e5edd9b9da89e78f18ba2 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@google.com>
Date: Wed, 21 Dec 2022 11:11:08 -0500
Subject: [PATCH] Remove reference to non-existent symbol
This fixes compilation in recent clang versions (tested against
https://github.com/llvm/llvm-project/commit/6443c0e) which is apparently
stricter with respect to undefined symbols. It appears that this version
script reference was never correct.
---
va/libva.syms | 2 --
1 file changed, 2 deletions(-)
diff --git a/va/libva.syms b/va/libva.syms
index b15d5460d..b3f91f935 100644
--- a/va/libva.syms
+++ b/va/libva.syms
@@ -6,6 +6,4 @@ VA_API_0.32.0 {
VA_API_0.33.0 {
global:
vaCreateSurfaces;
- local:
- vaCreateSurfaces_0_33_0;
} VA_API_0.32.0;

View File

@@ -0,0 +1,71 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools multilib-minimal optfeature
MY_PN="${PN%-compat}"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Video Acceleration (VA) API for Linux"
HOMEPAGE="https://github.com/intel/libva"
SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="1"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+drm egl opengl wayland X"
RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
)
egl? ( >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}] )
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
!media-libs/libva:0/0"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
REQUIRED_USE="|| ( drm wayland X )
opengl? ( X )"
DOCS=( NEWS )
PATCHES=(
"${FILESDIR}/${P}-missing-decl.patch"
"${FILESDIR}/${P}-nonexisting-symbol.patch"
)
src_prepare() {
default
eautoreconf
}
multilib_src_configure() {
local myeconfargs=(
--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
$(use_enable opengl glx)
$(use_enable X x11)
$(use_enable wayland)
$(use_enable egl)
$(use_enable drm)
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install() {
emake -C va DESTDIR="${D}" install-libLTLIBRARIES
rm -vf "${ED}"/usr/$(get_libdir)/*.{la,so} || die
}
pkg_postinst() {
optfeature_header
optfeature "Older Intel GPU support" media-libs/libva-intel-driver
optfeature "Newer Intel GPU support" media-libs/libva-intel-media-driver
}

View File

@@ -1,6 +1,6 @@
DIST makemkv-bin-1.17.7.tar.gz 16420879 BLAKE2B adc54191fd445832b9c4805400746e42d1b3261d076299b5e34beb1f13d80bf7bcbd113699f3d28fce5e21bb8f810a40927924b3d9c7250467d1979b1bf4f72b SHA512 2c93dd6e63c5e59415ad8a9a1370f7a1eddda2b643fa4dcde6383abb6065b84a77b03b977bf2ade50bc2d3560bb245ad2e1e79bab21629f7fc5816598738a5d9
DIST makemkv-bin-1.17.9.tar.gz 17844951 BLAKE2B 26b9c8957bbed9a0772935c2470fea1111836c8fe8f0bceda3a2466f24fbdb004c88c64c4a340ca1a4c9ff355ea2be49445b33de743244df547c916cd53fb676 SHA512 ff4e5ed123a3fcdcebf63de150dc6587525dd736a642c33cba4ff299b16ff2bcc9ffe31b5a0b385a355995cd7d776e147fe184358e95007c905d98fac92e0996
DIST makemkv-bin-1.18.0.tar.gz 17942718 BLAKE2B 59d904cd127c0477d3540b17d1405fcbb8394500883534e526dd6e592339ce375a74112a0962f6a699e0fe233fe1d11bb9843ec74cf03ef965287624e2e2b6b5 SHA512 227fdfe83c0db1afa7b6cffd93b093455ec3690ef81b564bc9102307687ce027516cd5f30523de210f17a99f2adb4f20cee4e77127c2d34cde179fbf4fecd6e7
DIST makemkv-bin-1.18.1.tar.gz 17943201 BLAKE2B 4c86c6593c2b898e05810875b8cefe5e816e345b8fc89b1e02cd109548d950beaee089acd341c4f5daeff11bdba0eb5d04c4294cc9adef1c0459b88103a1a241 SHA512 ea1b35b7b993f5241783123bc360b631438f41a22c195775bcb7fd44602c6bf2f9d332098fee5cb6d21297c0b0d7479b31546c35846e6417c454a3d852655816
DIST makemkv-oss-1.17.7.tar.gz 6618248 BLAKE2B 18652db1d72ea7287e7e38706afc589e6fe8fb1fbf9d4e24770b9a2bfe670a464b2c21b7c543b23d3c6234f40048358d944b123897c4f569beb31faac8ef3eb7 SHA512 e21bc293133d7f999b3ea4258f01f0b88c5a58610da0185d8f74b724d61578211d35d5d44fae1610887e98f3ff36b2f0df33068d8647ad8983020be49adde037
DIST makemkv-oss-1.17.9.tar.gz 6627052 BLAKE2B 552c3c4251920d814833591b30099d87b3c6f6fae0462bafb85d563621af04b2be5299ce473456974363eb2b6128b54b49fa7724aa8faa06dad3b344e363cf9a SHA512 f8769160687c1f603a56bafae3ffb93279859d0a1974e8801ddfbd271ef704b983900682a1035006ac3d43ac647b845fc658948901ff065a064a6659567d7dfc
DIST makemkv-oss-1.18.0.tar.gz 6627070 BLAKE2B 88b09362b201c1c6e85908ad9272683edddf868893f591c23bb77b3e3e0085cf537d6f00e947b2c37f1a442c3233af2a5edabbe37340d31cf1f6b31d2f037fb8 SHA512 601b228950fb7809a3bc2156c04f52649db02e84457903f92f575f86eb76ec6d8662a57e13b630d72f62b4b54c1c678e21c91277985be07c33e8df731167ac80
DIST makemkv-oss-1.18.1.tar.gz 6626995 BLAKE2B 0115b9dda0a513784b8749945f4f3b23212339ba5d4a746db6b9c0c04f9d35866ac4e4827725a92a42d143fa89eada11a2f917360ad93c2488789aed1e707347 SHA512 5268b2250086a28f840f529bad4f964aef5ca8c4d81c0d6c3345cb7728ed3e60cd4e1720d0e5a3c3527962d152f8a305107956fc0d01fb1e4c7440488095deaa

View File

@@ -1 +1,2 @@
DIST hplip-3.24.4-plugin.run 11490921 BLAKE2B 8eeb0a292b1a132841c2d69808441b281de04950be2b906a5906b36b634f30ed42484cc14ac232ef4c50ae5e660c5e48e2afc407e64b12f1b8deb7cf38425bf2 SHA512 21b1636d4d4f7f1673f1a88abc13f4f81c225d6a36a4d45f4f0579ec5ca9bb4a3885ffd413ab6888290c3e2aa62eef45a27cd5eb84c8f20ef3e6c09e24c854b9
DIST hplip-3.25.2-plugin.run 11494026 BLAKE2B b9ee3a3ecea272ae1354883fcc2b539df58c37b4a1b15da3b49b3b0129ef72a36a7c4e6ef06cb96d642631f95d259432309d5a3d663f9a3500658395e58c3ab9 SHA512 7afe547123e9f25b4b6b18d807e66ef707f4fccf3bd7a234ae21880203121d7eab722765cc2da7a3bc77184f81b22937ed534728a2ec78e62ea16a6bcb5e2cf5

View File

@@ -0,0 +1,71 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit unpacker
DESCRIPTION="Proprietary plugins and firmware for HPLIP"
HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
SRC_URI="https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
S="${WORKDIR}"
LICENSE="hplip-plugin"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="orblite"
# License does not allow us to redistribute the "source" package
RESTRICT="mirror"
RDEPEND="
~net-print/hplip-${PV}
virtual/udev
orblite? (
media-gfx/sane-backends
>=sys-libs/glibc-2.26
virtual/libusb:0
)
"
HPLIP_HOME=/usr/share/hplip
# Binary prebuilt package
QA_PREBUILT="${HPLIP_HOME}/*.so"
src_install() {
local hplip_arch plugin
case "${ARCH}" in
amd64) hplip_arch="x86_64" ;;
arm) hplip_arch="arm32" ;;
arm64) hplip_arch="arm64" ;;
x86) hplip_arch="x86_32" ;;
*) die "Unsupported architecture." ;;
esac
insinto "${HPLIP_HOME}"/data/firmware
doins *.fw.gz
for plugin in *-${hplip_arch}.so; do
local plugin_type=prnt
case "${plugin}" in
bb_orblite-*)
use orblite || continue
plugin_type=scan ;;
bb_*)
plugin_type=scan ;;
fax_*)
plugin_type=fax ;;
esac
exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
newexe ${plugin} ${plugin/-${hplip_arch}}
done
insinto /var/lib/hp
newins - hplip.state <<-_EOF_
[plugin]
installed = 1
eula = 1
version = ${PV}
_EOF_
}