From 2900e684ae4bdce1f20652587728095cd01a30a1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Nov 2023 10:31:10 +0000 Subject: gentoo auto-resync : 25:11:2023 - 10:31:10 --- media-libs/Manifest.gz | Bin 69458 -> 69434 bytes media-libs/libglvnd/Manifest | 2 +- media-libs/libglvnd/libglvnd-1.7.0.ebuild | 2 +- media-libs/libpulse/Manifest | 1 - media-libs/libpulse/libpulse-16.1-r1.ebuild | 206 ------------- media-libs/libraw/Manifest | 2 +- media-libs/libraw/libraw-0.21.1-r1.ebuild | 2 +- media-libs/mesa/Manifest | 2 + media-libs/mesa/mesa-23.3.0_rc5.ebuild | 445 ++++++++++++++++++++++++++++ media-libs/openh264/Manifest | 2 + media-libs/openh264/openh264-2.4.0.ebuild | 134 +++++++++ media-libs/x264/Manifest | 4 +- media-libs/x264/x264-0.0.20231114.ebuild | 74 +++++ media-libs/x264/x264-9999.ebuild | 22 +- 14 files changed, 676 insertions(+), 222 deletions(-) delete mode 100644 media-libs/libpulse/libpulse-16.1-r1.ebuild create mode 100644 media-libs/mesa/mesa-23.3.0_rc5.ebuild create mode 100644 media-libs/openh264/openh264-2.4.0.ebuild create mode 100644 media-libs/x264/x264-0.0.20231114.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index f48365c1eb3e..4e15283ce1b9 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest index ec9d426dc050..6e8d1aea31b8 100644 --- a/media-libs/libglvnd/Manifest +++ b/media-libs/libglvnd/Manifest @@ -1,6 +1,6 @@ DIST libglvnd-1.6.0.tar.bz2 565006 BLAKE2B c18909aecc9f0f59819146c2194b20dc34abe3f4fc4bae68131aef18e9eb5713aadec3785e359850d91946fcb816a0b3a0390653fd46c5058e0d5fde6209ce13 SHA512 44752ebd30b46f64c668239716eda34f54286d3dde419ca0526e057f3be34a198986ce11b4df555b62395dbadf1485412d5ba5b9c52f1c6aa8224d7ebd34efbe DIST libglvnd-1.7.0.tar.bz2 572931 BLAKE2B 6b55dab6ac4202bdb007e34d73bf81a58eedb87b9375cca36b2f4c7565d89c393978e4511fa0a8865eaebd78d15f8bb0751eb80d4d7f73c8080a22665dbd3dad SHA512 7caef0a129527bb968bf1ced64082a56cdde881f013f5ba54c51c09989e7d559dba3071c8fdc04e535e62609d68e7622197445152f655e0afbe06890c0b7a69b EBUILD libglvnd-1.6.0.ebuild 1437 BLAKE2B f77615a509d60e9265d7a5d477516ea5c2079062c262f3201581ae666c65d82222486cea85459f23d72971ff4834bfc80b4bac483139e2088793186431f85b28 SHA512 5b259589274433d61e070f0052c3265174f17013bd0e4ad9552335f7271a6d055e6c4d17ac67c8d7741a7104f7cfa5433f32870a260e107cd5ff23fce76098b7 -EBUILD libglvnd-1.7.0.ebuild 1442 BLAKE2B 38081890fff427868bf46cf4e665efe292ac6bc900ecc9d22454a2e74eead99835066a82e676ba342d3b20d90ccf9787ddb17bf5c05c5b8b4a3fb407569ad7df SHA512 97cedb603e9b5ab8bd61b13aed9ffed2cce49937608f2c6faddb7696f55fb3241b8ebde0647651818e8f7e39fc6167d2a950fd188e52fbe4db750adcc9fbad09 +EBUILD libglvnd-1.7.0.ebuild 1441 BLAKE2B 578ab668ba98fbbc5ca789974fab10fa7b03ad95392814a2714ef58279176ec5d24c439b47863fdcb0724f7292b3dea1d00a508de2c07d635e4549493f1e61e6 SHA512 5c729c2cdb950ac2d119c1847216e5e5bb0f8c4dd899c7b51ea5e25daa602052f7ffec18eb6c65631ea52242b41c050fd021e818508640652cf66e1c4aebf7b5 EBUILD libglvnd-9999.ebuild 1446 BLAKE2B f5d4bf60376a6029fdb77f02081f02c56c8abcc7873791a7203ea79617702cfeb14f7819cecd48cca203f1d5de45082fc500c73a036006c255c30fdc0423e6df SHA512 27201bc9341de4d7ac6962cf8fbe6f03edf3a6ff0c5c9d17df943c3ead8e0e8ce377be4f426565189ad07de1ea2008ad7b7791bbd095bc66834d879613c87480 MISC metadata.xml 336 BLAKE2B 4bf6bd6267610a40d3966ded2563015cc2cdf4100bb5b56f14311d8f2ab4796c6bdb08f7fd9922a83bd9738e47f2c603ccf35117c0ef4fabfb6858048f34f4fe SHA512 52454eacfef943242844a5c244372c902fff7d801dd73372a4105c998b209fd333057ec47acbb7036613e6cc656b9bda52023e2d1a202d993d8a42c8055378c5 diff --git a/media-libs/libglvnd/libglvnd-1.7.0.ebuild b/media-libs/libglvnd/libglvnd-1.7.0.ebuild index c25cee7fb9f2..d48363e534c3 100644 --- a/media-libs/libglvnd/libglvnd-1.7.0.ebuild +++ b/media-libs/libglvnd/libglvnd-1.7.0.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2" S=${WORKDIR}/${PN}-v${PV} fi diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest index 4ddc01d0c28c..cee0424a7914 100644 --- a/media-libs/libpulse/Manifest +++ b/media-libs/libpulse/Manifest @@ -7,7 +7,6 @@ AUX pulseaudio-16.1-smoother-time-calculation.patch 1354 BLAKE2B 2fc644c66a0329a AUX pulseaudio-16.99.1-memfd-compat.patch 971 BLAKE2B 6228f8b01cd8799221d5e121a8c1bc2f3635acebf2c75f1538abf88f2f717da93c3d90ebee038a5fb3bfe8d015c6d3a4f5d6e20026eb44b889fde3d45f6c6769 SHA512 498f86291cb5837494a6b698ea7590ae778edf58ca9b82d58b2d93e30f5e424b93f3ecf8a0a203817eba7bcea7702bf3f1a6cdd346b02088f1748cd1231787bf DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f DIST pulseaudio-16.99.1.tar.xz 1565020 BLAKE2B 02aad918e2b76dcf250bd55e03460206c7781cd1b43aa2efe46b25258626892e07f478b9966fa5027c9ae0a370145f5204dba05d2f5dfbfd3ba956225ccb3cad SHA512 1a3347e4c892ba0e321d39184f8bd52cfd16f59e66e52a753d6f706dfbf3f170f87b7ff27c0a6cdf3e462e6dd531ecde6829d48a374d0be2622688fb85abaac2 -EBUILD libpulse-16.1-r1.ebuild 5765 BLAKE2B 1d7612f22f43daee09d1a3ccc6bf1d854410d293a2bfdd9e6c60453ff39556f3e40c21e776a9ed02bf6e62a29b4d7ec5be87003f9cdf64df4e0add642be423df SHA512 558d94ef4d2cde4a9a41e364a592ecf3acca0939d2f8c2f069b502c800549cd8a9400a6a3e3ad3645fda83b48c84811ac9bf1e8d6f9a614545e1fe2d0b4e2e03 EBUILD libpulse-16.1-r2.ebuild 5880 BLAKE2B 78dbe7da864b8c36cdc5730a98260b35a58ea0beaca798f86a63f9124b71f2ee2a449cb13f5c4cc3111c5298ecc900291e9c0d457c8d765be43bdd09d7e7c315 SHA512 3bb7b39fb201c202f3b20e605e37774b525a0a78979f8a24eabd464ae0a5b8314fc9362a9f9d8a47a43f3d534ddc5a9bd39b3874f3b9cc5ea402f7f897d12a38 EBUILD libpulse-16.1-r4.ebuild 6467 BLAKE2B a56b3974cb6be676856f1fd99596603907a2f3024329f6b9db3edf941a3693ba0af4c06a9cc6081ba546b698a2f9e99b518739a4f6eb9944c1a0605ba093dfd0 SHA512 40a7b8969aec1d4588e51c989325d57517e3ab74833c12e0b80cd2165491334388c2873c53e14a4f26c5a2e2872cf595de1d1593f30a8484b91ccb62b55a21bd EBUILD libpulse-16.99.1.ebuild 6154 BLAKE2B 765f34cc85e5265aa52a05a4b28256ddae953906b4a7713d5fdfd72c5c61cbca351ec876228c08d572fe73518b8dcecbca5d387bc0192ddeb3699fdb00b2a2b4 SHA512 d9af02a4d83d9990dbc9c000a0097874551c96884c2496e84788069adb15dde26816075b0b9aa5036b9022dc235dc23d1b24c8294887232597711bd359ad694f diff --git a/media-libs/libpulse/libpulse-16.1-r1.ebuild b/media-libs/libpulse/libpulse-16.1-r1.ebuild deleted file mode 100644 index 6d4f74cbc46c..000000000000 --- a/media-libs/libpulse/libpulse-16.1-r1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# 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-multilib optfeature systemd 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}] - ) - !=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + vulkan? ( + dev-util/glslang + llvm? ( + video_cards_intel? ( + amd64? ( + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] + ) + ) + ) + ) + wayland? ( dev-util/wayland-scanner ) +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib/libglapi.so.0.0.0 + usr/lib/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +llvm_check_deps() { + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1 + has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d" + fi + fi + + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + if use llvm && use vulkan && use video_cards_intel && use amd64; then + python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 + fi +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + if use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 +} + +multilib_src_configure() { + local emesonargs=() + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_intel || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable -- swrast + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + if use llvm && use opencl; then + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst + emesonargs+=( + $(meson_native_true gallium-rusticl) + -Drust_std=2021 + ) + fi + + if use vulkan; then + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel intel_hasvk + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + if use llvm && use vulkan && use video_cards_intel && use amd64; then + emesonargs+=(-Dintel-clc=system) + else + emesonargs+=(-Dintel-clc=disabled) + fi + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=enabled + -Ddri3=enabled + -Degl=enabled + -Dexpat=enabled + -Dgbm=enabled + -Dglvnd=true + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest index 083b61a7edaf..d26406478710 100644 --- a/media-libs/openh264/Manifest +++ b/media-libs/openh264/Manifest @@ -3,6 +3,8 @@ AUX openh264-2.3.1-pr3630.patch 5566 BLAKE2B 06e6ff75ccbcb287413752283d3b192ccd9 DIST gmp-api-Firefox114_2-e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7.tar.gz 10915 BLAKE2B aa4b82baebbd990d94f381be4516e8780f6bc3a2104c4b899f091a9e6ec91dff9788ee6ef548d3bc07c7bf50f56347c44d01e51805f96cf9b59494889a5f7b61 SHA512 f1c75007d4f1e1ef3a11b8eb9c703935408a5e4051c8eab408e4edc09f265a71f172025269442fdab9d4c2a8b108fa69397bfbd84af4ecda22881b50de804de9 DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLAKE2B db6990a55b4128c267ee5ffa4e38edd2551c862e549776b4092d5683818001366665830c6304642cdd9c2c0afe06035edebafde769693082ae7a5236cdc463e8 SHA512 a6383834391d98754177b54df31d006144b5cad952df60115fd12fb6f0c87e571a10f9ce7276b817e4137efd97ffa7bca5092e289b0eb7cde2a3ad923319e874 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1 +DIST openh264-2.4.0.tar.gz 60297968 BLAKE2B d725896979e8178277e304ac0d94e59f0971a7f0f443f6dee0abffbadc53cce8ba7fe6612a966c697296bf46c3035bd03ac9a65e63d6d87853317b178b06a236 SHA512 dc66986e84ad328e1615384e7bff93d6eaac42a68e87d9c9b59f55d9f90efd13dc87637a7e3b8c9694634dfa82351c5944828f3f478286608e362e014dd70ca1 EBUILD openh264-2.3.1-r1.ebuild 3926 BLAKE2B e3acf06baa5bc7682aa84ea182ba2145c60592cbcbf7349305488a67cd4d8dc887eb7dc96d6dfe8d53a6bc58de788e5ed05cb9996a342c3440f316a07dc947f7 SHA512 78fe4cf84fc040496cc276d3c003d4042f353e8c1b0fec5697016616b826b53eebb952e660f1c012829e5631e1cbf85bd9a5ff28d68b812f1388f32725abaa09 EBUILD openh264-2.3.1-r3.ebuild 3950 BLAKE2B ea8e950589697e3b08a97ee52357b862b358b2b72bde137b1ea58a621649f0b3c0823236c00a0ebcafc6d8c59d35f7a84763948e3dab0aabd399c1e814b532cf SHA512 b2564cd6d300df5c95ef029624c45022cda399c2fcc190f83ba961b30d798e9926718a24100cf4023e53595fee8c3f694823bbf173eefd77aedc9ddf44387902 +EBUILD openh264-2.4.0.ebuild 3955 BLAKE2B 6c1bf0aeb775ea849951b3357debc87ecc80887db474b954ed2eb9cdc17e24f2145eded1aa45aa70844726f529b5680b57310a28c6f774c79ea197b89f703921 SHA512 7c91350363615cc9327d6deba0433d4326a8686303763ff2aef19d83e36913f2b68d19c6e9709257e2f770e26cd05ff442c7d7d4c019f4c0b0e346d48c96e09f MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd diff --git a/media-libs/openh264/openh264-2.4.0.ebuild b/media-libs/openh264/openh264-2.4.0.ebuild new file mode 100644 index 000000000000..f97e1deaaf35 --- /dev/null +++ b/media-libs/openh264/openh264-2.4.0.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs multilib-minimal + +MOZVER=114_2 +MY_GMP_COMMIT="e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7" + +DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" +HOMEPAGE="https://www.openh264.org/ https://github.com/cisco/openh264" +SRC_URI="https://github.com/cisco/openh264/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/mozilla/gmp-api/archive/${MY_GMP_COMMIT}.tar.gz -> gmp-api-Firefox${MOZVER}-${MY_GMP_COMMIT}.tar.gz" +LICENSE="BSD" + +# openh264 soname version. +# (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure. +# https://github.com/cisco/openh264/issues/3459 ) +SLOT="0/7" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin test utils" + +RESTRICT="bindist !test? ( test )" + +BDEPEND=" + abi_x86_32? ( dev-lang/nasm ) + abi_x86_64? ( dev-lang/nasm ) + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )" + +DOCS=( LICENSE CONTRIBUTORS README.md ) + +PATCHES=( + "${FILESDIR}"/openh264-2.3.0-pkgconfig-pathfix.patch + "${FILESDIR}"/${PN}-2.3.1-pr3630.patch +) + +src_prepare() { + default + + ln -svf "/dev/null" "build/gtest-targets.mk" || die + sed -i -e 's/$(LIBPREFIX)gtest.$(LIBSUFFIX)//g' Makefile || die + + sed -i -e 's/ | generate-version//g' Makefile || die + sed -e 's|$FULL_VERSION|""|g' codec/common/inc/version_gen.h.template > \ + codec/common/inc/version_gen.h + + multilib_copy_sources +} + +multilib_src_configure() { + ln -s "${WORKDIR}"/gmp-api-${MY_GMP_COMMIT} gmp-api || die +} + +emakecmd() { + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" AR="$(tc-getAR)" \ + emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR_NAME="$(get_libdir)" \ + SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \ + HAVE_AVX2=$(usex cpu_flags_x86_avx2 Yes No) \ + HAVE_GTEST=$(usex test Yes No) \ + ARCH="$(tc-arch)" \ + ENABLEPIC="Yes" \ + $@ +} + +multilib_src_compile() { + local myopts="ENABLE64BIT=No" + case "${ABI}" in + s390x|alpha|*64) myopts="ENABLE64BIT=Yes";; + esac + + if use arm; then + myopts+=" USE_ASM=$(usex cpu_flags_arm_neon Yes No)" + fi + + emakecmd ${myopts} + use plugin && emakecmd ${myopts} plugin +} + +multilib_src_test() { + emakecmd test +} + +multilib_src_install() { + emakecmd DESTDIR="${D}" install-shared + + if use utils; then + newbin h264enc openh264enc + newbin h264dec openh264dec + fi + + if use plugin; then + local plugpath="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/gmp-gmp${PN}/system-installed" + insinto "${plugpath}" + doins libgmpopenh264.so* gmpopenh264.info + echo "MOZ_GMP_PATH=\"${plugpath}\"" >"${T}"/98-moz-gmp-${PN} + doenvd "${T}"/98-moz-gmp-${PN} + + cat <"${T}"/${P}.js +pref("media.gmp-gmp${PN}.autoupdate", false); +pref("media.gmp-gmp${PN}.version", "system-installed"); +PREFEOF + + insinto /usr/$(get_libdir)/firefox/defaults/pref + newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js + + insinto /usr/$(get_libdir)/seamonkey/defaults/pref + newins "${T}"/${P}.js ${PN}-${PV/_p*/}.js + fi +} + +pkg_postinst() { + if use plugin; then + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Please restart your login session, in order for the session's environment" + elog "to include the new MOZ_GMP_PATH variable." + elog "" + fi + elog "This package attempts to override the Mozilla GMPInstaller auto-update process," + elog "however even if it is not successful in doing so the profile-installed plugin" + elog "will not be used unless this package is removed. This package will take precedence" + elog "over any gmp-gmpopenh264 that may be installed in a user's profile." + elog "" + fi + + if use utils; then + elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec" + elog "to avoid file collisions with media-video/h264enc" + elog "" + fi +} diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest index 4352089c9f56..b58973d3b9bd 100644 --- a/media-libs/x264/Manifest +++ b/media-libs/x264/Manifest @@ -1,4 +1,6 @@ DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9 +DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5 EBUILD x264-0.0.20220222.ebuild 2101 BLAKE2B e31719349399dfa83e5d0c97b3684b2f9484d051951f740e12d478b1a57448add56c5d5ff9e461f05d89cb9012205074d7a3e9246af65079cbbe5a88c191ed22 SHA512 ea9bb23667b27e6b14a1b0d3b751509c2fdd5dab93de26d1f4c2a73067bddbec2d76edf839a6bf096338b97f3e17b8866163950e2b99af7c3f1e4e64cda46cd1 -EBUILD x264-9999.ebuild 2101 BLAKE2B b76303887637392892b9393168c9d1d40e7d822c4f3cac83f7bfc580903e60c5cd79b7da72b286a82bfa59639bac66b29ab65e09d466319eb31afd68421ca125 SHA512 a05ba23fb57a423e7c9a6bf424a2c8a604a2e1b479567be1fb8ebf761e6542f977dbca077bb2fb39ed1d7e6466ccf22244f49ece34b7c5f85cfc890f3658f910 +EBUILD x264-0.0.20231114.ebuild 2137 BLAKE2B 52fd9c1d3fd59454498fcb75a39f930e91fc27588e7f649530acc04b3d3b975e4721948c170c7cd34e2f32245a2fc5e6b2f8bcf5114d3171f8336ee8e2ec3fd4 SHA512 0e1f1ab79148090f34f80bd4eb2456c98a9f3c895098123d90e0afa059f5197270f6c0b6b6d4c85011d32acca4cedd7a5e5d85990d7725e7add5e0fa6bcb753b +EBUILD x264-9999.ebuild 2137 BLAKE2B 52fd9c1d3fd59454498fcb75a39f930e91fc27588e7f649530acc04b3d3b975e4721948c170c7cd34e2f32245a2fc5e6b2f8bcf5114d3171f8336ee8e2ec3fd4 SHA512 0e1f1ab79148090f34f80bd4eb2456c98a9f3c895098123d90e0afa059f5197270f6c0b6b6d4c85011d32acca4cedd7a5e5d85990d7725e7add5e0fa6bcb753b MISC metadata.xml 489 BLAKE2B b9c1e67f7b3bce14a0d3330717204b25bfccc55d77343dba21b8a4d01b915dd690627a7affea0de0e7940c42ac2378e2e06dff243099b70b5c6a1805095d5fd1 SHA512 1416496833de2a3e28ad0f407701c0a08b6d3435a3ba65c159beac19c7a64d0f5f04d5200cbaf9217846cef0a101827bf50824eedc2b6ae7414a7fc6fc10b250 diff --git a/media-libs/x264/x264-0.0.20231114.ebuild b/media-libs/x264/x264-0.0.20231114.ebuild new file mode 100644 index 000000000000..7317a87e9e6a --- /dev/null +++ b/media-libs/x264/x264-0.0.20231114.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal toolchain-funcs flag-o-matic + +DESCRIPTION="Free library for encoding X264/AVC streams" +HOMEPAGE="https://www.videolan.org/developers/x264.html" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git" +else + X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7" + SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + S="${WORKDIR}/${PN}-${X264_COMMIT}" +fi + +LICENSE="GPL-2" +SLOT="0/164" # SONAME +IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads" + +ASM_DEP=">=dev-lang/nasm-2.13" +DEPEND=" + abi_x86_32? ( ${ASM_DEP} ) + abi_x86_64? ( ${ASM_DEP} ) + opencl? ( dev-lang/perl ) +" +RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" + +DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) + +multilib_src_configure() { + tc-export CC + + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + + local asm_conf="" + + if \ + [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } \ + || [[ ${ABI} == "x32" ]] \ + || [[ ${CHOST} == armv5* ]] \ + || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; } \ + || use mips && { ! test-compile 'c' 'int main(void){__asm__("addvi.b $w0, $w1, 1");return 0;}' ; } + then + asm_conf=" --disable-asm" + fi + + "${S}/configure" \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --disable-cli \ + --disable-avs \ + --disable-lavf \ + --disable-swscale \ + --disable-ffms \ + --disable-gpac \ + --enable-pic \ + --enable-shared \ + --host="${CHOST}" \ + --cross-prefix="${CHOST}-" \ + $(usex interlaced "" "--disable-interlaced") \ + $(usex opencl "" "--disable-opencl") \ + $(usex static-libs "--enable-static" "") \ + $(usex threads "" "--disable-thread") \ + ${asm_conf} || die +} diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index cef3a4d4053a..7317a87e9e6a 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -1,31 +1,33 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit multilib-minimal toolchain-funcs flag-o-matic -DESCRIPTION="A free library for encoding X264/AVC streams" +DESCRIPTION="Free library for encoding X264/AVC streams" HOMEPAGE="https://www.videolan.org/developers/x264.html" + if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git" else - # Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2 - SRC_URI="https://dev.gentoo.org/~aballier/distfiles/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - S="${WORKDIR}/${PN}-master" + X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7" + SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + S="${WORKDIR}/${PN}-${X264_COMMIT}" fi -SLOT="0/164" # SONAME - LICENSE="GPL-2" +SLOT="0/164" # SONAME IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads" ASM_DEP=">=dev-lang/nasm-2.13" -DEPEND="abi_x86_32? ( ${ASM_DEP} ) +DEPEND=" + abi_x86_32? ( ${ASM_DEP} ) abi_x86_64? ( ${ASM_DEP} ) - opencl? ( dev-lang/perl )" + opencl? ( dev-lang/perl ) +" RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )" DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt ) -- cgit v1.2.3