diff options
Diffstat (limited to 'media-libs')
28 files changed, 697 insertions, 614 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 088b04dd6e84..b3137e32e632 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest index f3085198cb24..02fffaf4e3ba 100644 --- a/media-libs/freeglut/Manifest +++ b/media-libs/freeglut/Manifest @@ -1,5 +1,4 @@ AUX freeglut-3.6.0-c23.patch 896 BLAKE2B 61470d013ba04bd738fbaa8a80e9ace000fd5dc3e9f8f46e9d003d3fcbc06fbd529dbb78ddaa977a3ae0c895452de0790feaa0c7caac14ea9b7916c0cab434d8 SHA512 9fc73f321f4aba7e9287baafa375ee1f0d84c912ee523d4abfe9a71bcd7f4cdecad014f1e72fe2e587b891a1f9d54e4ce56e85947bdf88e8b02d8b105e7b3ba8 DIST freeglut-3.6.0.tar.gz 429619 BLAKE2B c42985013aafbe0e21369295f67355f2b498f284289fceed9baff5de6a46b7fee2a2ee07e00c136f65caa9159b635df82030a112eae101f9f82751abd76636e4 SHA512 ceb5dd9ea86e915acb177e405e79b92f77cf3213ba21fe200491d0b1150dd9c81835b71cb8a928bd514eb719626ff802250429df2f6dfa33f8e181c3f74b2dd0 EBUILD freeglut-3.6.0-r1.ebuild 1369 BLAKE2B be0118d3f6db4bc778d39cff46e6d2266ccee1df21d1422a2e2be61bcb1d25954dde9bbb13eff1415d42a0626dc13c565e6cf78468a50ddde8f513879f8e2f0c SHA512 f842f557e1ebd9adf1a9e133a860a06cc6ced4409c7640d0b133170e3beabdc5fe580c24e29f01e6919ff87161676ec4c9f1e0da5cd99c522c4d22c2c190f925 -EBUILD freeglut-3.6.0.ebuild 1319 BLAKE2B 5c5152d727db8aec67454bc7859abbbe7419f0acc233e92873b3ec322762071f562ca1db52fafa20aedfedcc5450f8af29e3134ffd0004989fe4fdc7329850b1 SHA512 aa5957284b2c837e78b3d348d45cfcca29836dbd1f02c04c8bc6ec51ce6aa808dd9cbb8d087e12fb08b0e3dc8c5789bc7f63a009d7efb2def3866b9d2408ac6f MISC metadata.xml 594 BLAKE2B 984028f68aa76f8cfe537ea8a9f090af580cbe5ec33007c91b5b95b1f8c5396c779f67155d99fce7708e4fba8ee661f35fb01f5fd714a5ccc08794516df15820 SHA512 159f5756565afb1a55ac874afc42e49591c94519970d10eb7857159262bf4f6e372e5c0584f03ed1ad70e28bb5d328d3f36fdb0208d9de8f22e307973ee38167 diff --git a/media-libs/freeglut/freeglut-3.6.0.ebuild b/media-libs/freeglut/freeglut-3.6.0.ebuild deleted file mode 100644 index d73fd4e40595..000000000000 --- a/media-libs/freeglut/freeglut-3.6.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library" -HOMEPAGE="https://freeglut.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -# enabling GLES support seems to cause build failures -RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]" -# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] ) -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( -# "-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006 - "-DFREEGLUT_GLES=OFF" - "-DFREEGLUT_BUILD_DEMOS=OFF" - "-DFREEGLUT_BUILD_STATIC_LIBS=OFF" - ) -# $(cmake-utils_use gles FREEGLUT_GLES) - cmake-multilib_src_configure -} - -multilib_src_install() { - cmake_src_install - cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die -} diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest index e869b1b1c482..22615e1ca9d1 100644 --- a/media-libs/gst-plugins-base/Manifest +++ b/media-libs/gst-plugins-base/Manifest @@ -1,9 +1,5 @@ -DIST gst-plugins-base-1.22.11.tar.xz 2373020 BLAKE2B 0809629afae7b82a12079dc40dd5a6a7c86876b591389c3179a74cea975b0ef3c66d9fc2f42a2f722892de2c75ef87eb0cfc5cc5df65f0ebefa02a891b0c392a SHA512 cfd8f7fe66f4707e043c8f070110eb80f9804cec529c8d29b13dbc8604db90e3f010c9614d538ad076b826df54f75ce5ebac355bd05a874e44dccead6a953c60 DIST gst-plugins-base-1.22.12.tar.xz 2374324 BLAKE2B 7600d5a10a3d7d4f6874cc166cdca2d45d3daedec3fbb56982db172bd4f6c0463fcde812e31c42f912d8fbda793730695ab39e44b7f126b49581f7c87858b988 SHA512 f72edccd49ce2a35577dff80feb1d0f667df54d6b8f61ef2320b5d4564442b907954d015bccec7a915acf25d2197a507c32b72c1ab18dd38d254f57a3277b334 -DIST gst-plugins-base-1.24.10.tar.xz 2453672 BLAKE2B 0935a21d344b7d1328d1958325c49d23dadddd5bb72b2639ed2598efd2a2d35a8bb322583c2e6b9865c9d4d922400abcd20512ef28c1de8e7f6c11369008e23c SHA512 d5eae27c70999fd3a02294354a30e24d82ee9a7920e2e5f6bf63fcd8a321c7541dbbd402dbcee7c44ba4a67f9e5b0b264d28e295b91ccf67ce577c613f427244 DIST gst-plugins-base-1.24.11.tar.xz 2455952 BLAKE2B efbf7b1aaece5a287738afb93e4b99c27471c640079bc7312f84925309de0eb91ecb9837eab314e5f787d745fda6c9113105156bd819db64c869ddec6a04e7ff SHA512 b0a2a072c52628b85ae3d2ff8f2769f149fd2d0c3644fb9d9d934ea586835e29af97f41731023969a8120a470f998080ef5a0cac5aa26823d01698dfe2a5e2fb -EBUILD gst-plugins-base-1.22.11-r1.ebuild 5643 BLAKE2B bebdcd333669924df273c3b287993ef4be01a40b0737f207a505445d15ebab2ab413689a225c677536b1095f813613b196e99c8e3457606ec16c844eac66971d SHA512 ee7ce316402da7b965b5d758f3d55fe980bdde8bd8eb85abdc1902c076acc86b273289f430a5409e879b3d0034b605497454302f84d64afc8091df88689cd48d EBUILD gst-plugins-base-1.22.12.ebuild 5643 BLAKE2B 67e374b6a65fd97fed6a1977244c04ac6c25e58c199d03f2333e55c8c2119ed5792633b5cb79739b636e78ecb6758be4c9c10a5d63c26ae7757dcffe9607c089 SHA512 8b8d746032ac5c85003d49a8f68024aaf240af4505b6afe23da0e8b3a47d5c3899bee8a091fee6d083db95f0e186f6e80604d82596f4a5bb8a0a93c6e625619e -EBUILD gst-plugins-base-1.24.10.ebuild 5748 BLAKE2B 1fa8140de69f7a691c7881878d70615e2ad7a4aa671f543f4f7ba9f6f3f1f258cc4890096a895d9ff559b2956323e40950cc7e600da999d19b2c59bd9ce014b8 SHA512 e974bdfda21f396b3ba6ab1daabab1860a0d05bebd7cccdb5206424dc1be81402a9b2d5c8a12e82442678ec0a3a692fb13009aabac607102653cc2fe30bd3fd9 EBUILD gst-plugins-base-1.24.11.ebuild 5748 BLAKE2B 1fa8140de69f7a691c7881878d70615e2ad7a4aa671f543f4f7ba9f6f3f1f258cc4890096a895d9ff559b2956323e40950cc7e600da999d19b2c59bd9ce014b8 SHA512 e974bdfda21f396b3ba6ab1daabab1860a0d05bebd7cccdb5206424dc1be81402a9b2d5c8a12e82442678ec0a3a692fb13009aabac607102653cc2fe30bd3fd9 MISC metadata.xml 1013 BLAKE2B 97a1460e8774c2a5b51a2a19e0c770794439af5e661eb26e365f0eb4edc6887b7b7e02335f4d8ef9dee0dea84cfc5f6f550f0569d1ecbbf9c715d91f3b5fbd9b SHA512 9e69852f7dda892dd3e395a403d06319d7438db93c03e8c82e4584acc2493d7f91d79d6ad6c02149419a08b81ca08428ccbc8472cb4848d60428b5d29992d907 diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.22.11-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.22.11-r1.ebuild deleted file mode 100644 index 38ac060220c2..000000000000 --- a/media-libs/gst-plugins-base/gst-plugins-base-1.22.11-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GST_ORG_MODULE="gst-plugins-base" - -inherit flag-o-matic gstreamer-meson - -DESCRIPTION="Basepack of plugins for gstreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" - -LICENSE="GPL-2+ LGPL-2+" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -# For OpenGL we have three separate concepts, with a list of possibilities in each: -# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant -# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams. -# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches -# With the following limitations: -# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl -# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case -# * glx platform requires opengl API (but we don't REQUIRED_USE that as USE=X is common, glx is just disabled with USE=-opengl or USE=-X) -# * wayland, gbm and most other non-glx WSIs require egl platform -# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options; -# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; -# and libpng/jpeg are required for gloverlay element; - -# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad -IUSE="alsa +egl gbm +gles2 +introspection ivorbis +ogg opengl +orc +pango theora +vorbis wayland +X" -GL_REQUIRED_USE=" - || ( gbm wayland X ) - wayland? ( egl ) - gbm? ( egl ) -" -REQUIRED_USE=" - ivorbis? ( ogg ) - theora? ( ogg ) - vorbis? ( ogg ) - opengl? ( || ( egl X ) ${GL_REQUIRED_USE} ) - gles2? ( egl ${GL_REQUIRED_USE} ) -" - -# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl) -# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options -GL_DEPS=" - || ( - >=media-libs/mesa-24.1.0_rc1[opengl,wayland?,${MULTILIB_USEDEP}] - <media-libs/mesa-24.1.0_rc1[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}] - ) - egl? ( - x11-libs/libdrm - ) - gbm? ( - >=dev-libs/libgudev-147[${MULTILIB_USEDEP}] - >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] - ) - wayland? ( - >=dev-libs/wayland-1.20.0[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.15 - ) - - >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}] - media-libs/libpng:0[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] -" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element -# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}] - -RDEPEND=" - app-text/iso-codes - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) - ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] ) - ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] ) - pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] ) - theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] ) - vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - ) - - gles2? ( ${GL_DEPS} ) - opengl? ( ${GL_DEPS} ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - X? ( x11-base/xorg-proto ) -" - -DOCS=( AUTHORS NEWS README.md RELEASE ) - -PATCHES=( -) - -multilib_src_configure() { - filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340 - - # opus: split to media-plugins/gst-plugins-opus - GST_PLUGINS_NOAUTO="alsa gl ogg pango theora vorbis x11 xshm xvideo" - - local emesonargs=( - -Dtools=enabled - - $(meson_feature alsa) - $(meson_feature ogg) - $(meson_feature pango) - $(meson_feature theora) - $(meson_feature vorbis) - $(meson_feature X x11) - $(meson_feature X xshm) - $(meson_feature X xvideo) - ) - - if use opengl || use gles2; then - # because meson doesn't likes extraneous commas - local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) ) - local gl_platform=( $(use X && use opengl && echo glx) $(use egl && echo egl) ) - local gl_winsys=( - $(use X && echo x11) - $(use wayland && echo wayland) - $(use egl && echo egl) - $(use gbm && echo gbm) - ) - - emesonargs+=( - -Dgl=enabled - -Dgl-graphene=enabled - -Dgl_api=$(IFS=, ; echo "${gl_api[*]}") - -Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}") - -Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}") - ) - else - emesonargs+=( - -Dgl=disabled - -Dgl_api= - -Dgl_platform= - -Dgl_winsys= - ) - fi - - # Workaround EGL/eglplatform.h being built with X11 present - use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11" - - gstreamer_multilib_src_configure -} diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.24.10.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.24.10.ebuild deleted file mode 100644 index 14a809042334..000000000000 --- a/media-libs/gst-plugins-base/gst-plugins-base-1.24.10.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GST_ORG_MODULE="gst-plugins-base" - -inherit flag-o-matic gstreamer-meson - -DESCRIPTION="Basepack of plugins for gstreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" - -LICENSE="GPL-2+ LGPL-2+" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -# For OpenGL we have three separate concepts, with a list of possibilities in each: -# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant -# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams. -# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches -# With the following limitations: -# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl -# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case -# * glx platform requires opengl API (but we don't REQUIRED_USE that as USE=X is common, glx is just disabled with USE=-opengl or USE=-X) -# * wayland, gbm and most other non-glx WSIs require egl platform -# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options; -# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; -# and libpng/jpeg are required for gloverlay element; - -# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad -IUSE="alsa +egl gbm +gles2 +introspection ivorbis +ogg opengl +orc +pango theora +vorbis wayland +X" -GL_REQUIRED_USE=" - || ( gbm wayland X ) - wayland? ( egl ) - gbm? ( egl ) -" -REQUIRED_USE=" - ivorbis? ( ogg ) - theora? ( ogg ) - vorbis? ( ogg ) - opengl? ( || ( egl X ) ${GL_REQUIRED_USE} ) - gles2? ( egl ${GL_REQUIRED_USE} ) -" - -# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl) -# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options -GL_DEPS=" - || ( - >=media-libs/mesa-24.1.0_rc1[opengl,wayland?,${MULTILIB_USEDEP}] - <media-libs/mesa-24.1.0_rc1[egl(+)?,gbm(+)?,gles2?,wayland?,${MULTILIB_USEDEP}] - ) - egl? ( - x11-libs/libdrm - ) - gbm? ( - >=dev-libs/libgudev-147[${MULTILIB_USEDEP}] - >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] - ) - wayland? ( - >=dev-libs/wayland-1.20.0[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.15 - ) - - >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}] - media-libs/libpng:0[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] -" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element -# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}] - -RDEPEND=" - app-text/iso-codes - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) - ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] ) - ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] ) - kernel_linux? ( >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] ) - pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] ) - theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] ) - vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - ) - - gles2? ( ${GL_DEPS} ) - opengl? ( ${GL_DEPS} ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - X? ( x11-base/xorg-proto ) -" - -DOCS=( AUTHORS NEWS README.md RELEASE ) - -PATCHES=( -) - -multilib_src_configure() { - filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340 - - # opus: split to media-plugins/gst-plugins-opus - GST_PLUGINS_NOAUTO="alsa gl ogg pango theora vorbis x11 xshm xvideo" - - local emesonargs=( - -Dtools=enabled - - $(meson_feature alsa) - $(meson_feature kernel_linux drm) - $(meson_feature ogg) - $(meson_feature pango) - $(meson_feature theora) - $(meson_feature vorbis) - $(meson_feature X x11) - $(meson_feature X xshm) - $(meson_feature X xvideo) - ) - - if use opengl || use gles2; then - # because meson doesn't like extraneous commas - local gl_api=( $(use opengl && echo opengl) $(use gles2 && echo gles2) ) - local gl_platform=( $(use X && use opengl && echo glx) $(use egl && echo egl) ) - local gl_winsys=( - $(use X && echo x11) - $(use wayland && echo wayland) - $(use egl && echo egl) - $(use gbm && echo gbm) - ) - - emesonargs+=( - -Dgl=enabled - -Dgl-graphene=enabled - -Dgl_api=$(IFS=, ; echo "${gl_api[*]}") - -Dgl_platform=$(IFS=, ; echo "${gl_platform[*]}") - -Dgl_winsys=$(IFS=, ; echo "${gl_winsys[*]}") - ) - else - emesonargs+=( - -Dgl=disabled - -Dgl_api= - -Dgl_platform= - -Dgl_winsys= - ) - fi - - # Workaround EGL/eglplatform.h being built with X11 present - use X || export CFLAGS="${CFLAGS} -DEGL_NO_X11" - - gstreamer_multilib_src_configure -} diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest index e86ebe008d16..314e82955bc5 100644 --- a/media-libs/gst-plugins-good/Manifest +++ b/media-libs/gst-plugins-good/Manifest @@ -1,9 +1,5 @@ -DIST gst-plugins-good-1.22.11.tar.xz 2847708 BLAKE2B d61f834727719992e207ce3aa2e9b4ca779930f8bc0baf12bef7869f456ac86fad4a3874b50071d28724e414c5b134f7604af4b66c836da3388e584fbbe16dcf SHA512 e6105c90a66bfee8a69f621bf44f53fcbf832ec9290cee984354da91e57b61d2bbd548e3ad0c5d9f859d0c3f5ba3c313539f24b350e0a7acf29cb8983d4f40cb DIST gst-plugins-good-1.22.12.tar.xz 2844924 BLAKE2B 5bc2f802a6abac4405642f9fe9a0ce4aacfdd1273a9e6224f7fa917ec3a654a2db97c6f74f8cbba93211bc7d41a10ea5394342ea9c902fddb723adfe8535cdec SHA512 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0 -DIST gst-plugins-good-1.24.10.tar.xz 2936480 BLAKE2B 7f860cebe757dccd46d3f37a6e88b20d616d2d754f00833d0805a81a07046a67e37b4c6a0b9ba12857142ad6f642db29eba795da4c7feabdf9ec836d13d95d9e SHA512 8c22f0502952677657716d52116101dd03d4b7af19f16bab6d5afbbc24fd9c920c3030bbe307cff19558b7a41d0347de0f5f28b4e15d9a26b482eb0c84d482f5 DIST gst-plugins-good-1.24.11.tar.xz 2937828 BLAKE2B 66d2f4ff4564d34a0cb26c6bd00d7dd933d7674a08ea8119e94c32f2088c8f3aebc006e4288309bb3c2b5862f44806f74395609f4c58f2d563247dd8acf4f49d SHA512 7b15baf2aa0aa72f469d0c44cc13a892b85e7d4e08d04c44bfeb0ff475aa274474adcf652ed4fb9bca22155d04afa47898a423d3b5844a9b597337a3ab46faed -EBUILD gst-plugins-good-1.22.11.ebuild 950 BLAKE2B f4a364c4e446d1b2e9d67ba73c9a10a501d5bca659d6e5a72f9fee7d6ee88d697ef45899f539297f2e41b243b16350de98bd6535d7d62a109a3f2fba54b35402 SHA512 9ca6a3fd58bc339087ce2faa0f038da2cf6d7bbd2267f03a931eda78f5cc940fc912a12e1d64707d2d7a4d86d6c7da4cf60990b51f70e030262b3e9ae969caca EBUILD gst-plugins-good-1.22.12.ebuild 950 BLAKE2B 0c6bd46423d447f5f984c4df1af1358d6833537eb684b3bb789b489c126d5878eeef7f2724e02eb4b1c5eee8fe4f7acbcce2ed27867cca0f59db93779258106c SHA512 b3de3c41c8b3cbfc0189847b6b5e9c3a184b72021c75037a87e8756c738d28f6954a2374a9841e88ddcb4f51954209ee05871db4ba29f234b7949385f543d542 -EBUILD gst-plugins-good-1.24.10.ebuild 956 BLAKE2B 55f3f2ac104462e40c3a071c6630a71de9988b01e72e8291b0808b590c636299d1a424d8b583adeb00fcaa4c2d5be45f1524392cc1d187f111b89ba04aeecbb8 SHA512 4cda3c932919d5802376aa730e33ac50bbe3e871d15bc58d778a1bb7dacacca09d1bd073daca5bcefe8b74a39558c55b2d155ae2749168775a8a93a2b444ebbe EBUILD gst-plugins-good-1.24.11.ebuild 956 BLAKE2B a9cceb082cd86c87c5732ea9b6b4354f69c451ad68ac862d397c42ebc70c139e4e9a62ad7eb169187deb84c0a39b1d998532bdd59d71ceb3df12f2764816e41b SHA512 c3a3db233b81a3a119e98cfae8b6505d1c1871a6e75a545fb51c262a65b352e8aeb1e8bb81be7cd52b3decaa481c409ef6edede8fe718b571603afdb285af3e6 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5 diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.22.11.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.22.11.ebuild deleted file mode 100644 index 47f709973afa..000000000000 --- a/media-libs/gst-plugins-good/gst-plugins-good-1.22.11.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GST_ORG_MODULE="gst-plugins-good" - -inherit gstreamer-meson - -DESCRIPTION="Basepack of plugins for GStreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" - -LICENSE="LGPL-2.1+" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="+orc" - -# Old media-libs/gst-plugins-ugly blocker for xingmux moving from ugly->good -RDEPEND=" - !<media-libs/gst-plugins-ugly-1.22.3 - >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}] - >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE ) - -multilib_src_configure() { - # gst/matroska can use bzip2 - GST_PLUGINS_NOAUTO="bz2" - - local emesonargs=( - -Dbz2=enabled - ) - - gstreamer_multilib_src_configure -} diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.24.10.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.24.10.ebuild deleted file mode 100644 index 5b146687177e..000000000000 --- a/media-libs/gst-plugins-good/gst-plugins-good-1.24.10.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GST_ORG_MODULE="gst-plugins-good" - -inherit gstreamer-meson - -DESCRIPTION="Basepack of plugins for GStreamer" -HOMEPAGE="https://gstreamer.freedesktop.org/" - -LICENSE="LGPL-2.1+" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+orc" - -# Old media-libs/gst-plugins-ugly blocker for xingmux moving from ugly->good -RDEPEND=" - !<media-libs/gst-plugins-ugly-1.22.3 - >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}] - >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - orc? ( >=dev-lang/orc-0.4.33[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE ) - -multilib_src_configure() { - # gst/matroska can use bzip2 - GST_PLUGINS_NOAUTO="bz2" - - local emesonargs=( - -Dbz2=enabled - ) - - gstreamer_multilib_src_configure -} diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest index 5a3a779e8f1c..3f2f075ba17a 100644 --- a/media-libs/gstreamer/Manifest +++ b/media-libs/gstreamer/Manifest @@ -1,10 +1,6 @@ AUX gstreamer-1.24.10-disable-test-with-no-tools.patch 688 BLAKE2B 4e05dff9d7a61a7258cf1669d75a8b9c1689ae66ad119937c96b3efbfcf8576b3dad340274bfeb8dde56482466eb473961f475cfddbd1a4fe24afb1440a1af92 SHA512 606b4285281e82941b1b47f5c11460e535c664d9b9c8c890f5075a7425c744fb68eb228a4967de230483264cc6340ba3ef9dadfb35cd32ffda2b0756ea7b4380 -DIST gstreamer-1.22.11.tar.xz 1801248 BLAKE2B 856342994bc8750598cb256313151355e7c58d751214c168c53ba831cfcdf3ab789a192473ba0e0645df8cb7cb9e625348b18cfe83d839f1f231f8f746877f49 SHA512 8976cebd2cbac3ef31ee6163d2c5264be7d10d54ab9fe6f0b2317d7d0380420ef2378e1b476af09f1e6b203e3eafcda88fc08bb2f550a6f411d8670dec04843e DIST gstreamer-1.22.12.tar.xz 1803104 BLAKE2B c44d0b2a18f523c6e826f774255e0a6946ef6a8386f92dd611ee1f9d2e3bee6dc837654efd61017c7bc4784e6356a66698f9038e1747ed14ff3e468b4fcb8652 SHA512 2443a337a97ac805267d683d049b5023281db54d0d9c561510cff478b0a13256078eb08b1dd89440d2348c84e6e64c8137ce8e6e7c131440a7bd3a8975ebe722 -DIST gstreamer-1.24.10.tar.xz 1870200 BLAKE2B 77fac310664aefbbd35889b6c502d5e1af5b220cb22952d43b3ea1e025990ae10b6fd0199eb19ef965207a0bee748cf58432c6da6df08716b586e5882fa4a6a2 SHA512 b8f4200ca073c1cdb3a94dba0d37d5a41fc16f5dae88e0350d647122a5bcaf7f3b65e2894ff87088eeea4f8bb834ba7b4d447a5e81cb73d647a9d04a569ca184 DIST gstreamer-1.24.11.tar.xz 1870996 BLAKE2B 8d4a24a2c4ee7af8b30eed569f27125cafd8e77b0d93b210a87b2b442809e6bd4b3009b01e961f1c488b11f0c1e21b8d12702a4c32f4c76718d12a4df6dfed9e SHA512 980dcabb5481cc1c59060c0b9b396deb4bc5646f757bc6be6ac514847f046473b5a997ca2d5a394cbedd079403ac0ae84e6b1d94997761018d080fadf9e99af5 -EBUILD gstreamer-1.22.11.ebuild 1506 BLAKE2B 4d880b1a4a44530caa0b7ea985ba2c69a311a1c081c00503ecc893407c3df071809862a62b3e6f676ff645c91f81380c02dc350329f6c12cfeb3c92df4cf5734 SHA512 9151aa7820777f43a87ecc824a84b937935886730e7cff9bdbee58a8231605997b72ce22e8cb984a7a437ba1ed04f730563df87d639dda109c6b45faaf61bbfc EBUILD gstreamer-1.22.12.ebuild 1506 BLAKE2B 4fb13d13d6307cfe1f58216abfd920eb0a0b5320bc9b15682c0cbfb6266f2a71e9300d2f8519c3ae18a8a2649328e735fdc455e628e873d762b30d49d1561542 SHA512 c43e4de00f6d8410f202ac4783b9a193cbe672cfe62598700c07ed3f4949779bbc377a01e225f71cc823c6e0a002c9cc3223ec09ab74c78efb7817248f082fb2 -EBUILD gstreamer-1.24.10.ebuild 1899 BLAKE2B ad50d38dc26cbac588b43cded4aa8842420fed67d527da83ae4bcecf1daa46fd65a3901f6caa123a821d8e104a21feff9723a166924dfc8315c8192e7ee2b86a SHA512 bfd28af62640b033d46fc4ee239674d7c288c5eeb3fbd234581422ff6cead64a608566feb45a93d87e15ec6e8ab1619ffaabd50ed3e66e96ff8d8848f882f243 EBUILD gstreamer-1.24.11.ebuild 1899 BLAKE2B ad50d38dc26cbac588b43cded4aa8842420fed67d527da83ae4bcecf1daa46fd65a3901f6caa123a821d8e104a21feff9723a166924dfc8315c8192e7ee2b86a SHA512 bfd28af62640b033d46fc4ee239674d7c288c5eeb3fbd234581422ff6cead64a608566feb45a93d87e15ec6e8ab1619ffaabd50ed3e66e96ff8d8848f882f243 MISC metadata.xml 502 BLAKE2B d7ba251b049df6e28eb19c356c1ae87e0ee2f9f9b77d4d61a7cf6fa0d24c29e1c77dc7ab87d86fa6041b9bce83dc1127d5b0ac18f514a02bc4046c38d2ba66af SHA512 791be53a89c0140c6d8b160955dc706c2da71e1e2fbc742d7a8df9815bf0508fefd7ffc6c489183ed82ee035ffa8a0ca2a4cb9d5c518a673f15805b745912860 diff --git a/media-libs/gstreamer/gstreamer-1.22.11.ebuild b/media-libs/gstreamer/gstreamer-1.22.11.ebuild deleted file mode 100644 index 4aa50b8c28c9..000000000000 --- a/media-libs/gstreamer/gstreamer-1.22.11.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gstreamer-meson - -DESCRIPTION="Open source multimedia framework" -HOMEPAGE="https://gstreamer.freedesktop.org/" -SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+caps +introspection unwind" - -# gstreamer-1.22.x requires 2.62, but 2.64 is strongly recommended -RDEPEND=" - >=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}] - caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) - unwind? ( - >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}] - dev-libs/elfutils[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - app-alternatives/yacc - app-alternatives/lex -" - -DOCS=( AUTHORS ChangeLog NEWS MAINTAINERS README.md RELEASE ) - -multilib_src_configure() { - local emesonargs=( - -Dtools=$(multilib_is_native_abi && echo enabled || echo disabled) - -Dbenchmarks=disabled - -Dexamples=disabled - -Dcheck=enabled - $(meson_feature unwind libunwind) - $(meson_feature unwind libdw) - ) - - if use caps ; then - emesonargs+=( -Dptp-helper-permissions=capabilities ) - else - emesonargs+=( - -Dptp-helper-permissions=setuid-root - -Dptp-helper-setuid-user=nobody - -Dptp-helper-setuid-group=nobody - ) - fi - - gstreamer_multilib_src_configure -} diff --git a/media-libs/gstreamer/gstreamer-1.24.10.ebuild b/media-libs/gstreamer/gstreamer-1.24.10.ebuild deleted file mode 100644 index fd802735e446..000000000000 --- a/media-libs/gstreamer/gstreamer-1.24.10.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -RUST_OPTIONAL=1 -RUST_MIN_VER=1.48 -inherit gstreamer-meson rust - -DESCRIPTION="Open source multimedia framework" -HOMEPAGE="https://gstreamer.freedesktop.org/" -SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2+" -SLOT="1.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+caps +introspection ptp unwind" - -# gstreamer-1.22.x requires 2.62, but 2.64 is strongly recommended -RDEPEND=" - >=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}] - caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) - unwind? ( - >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}] - dev-libs/elfutils[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - app-alternatives/yacc - app-alternatives/lex - ptp? ( ${RUST_DEPEND} ) -" - -DOCS=( AUTHORS ChangeLog NEWS MAINTAINERS README.md RELEASE ) - -PATCHES=( - "${FILESDIR}"/gstreamer-1.24.10-disable-test-with-no-tools.patch -) - -# Rust -QA_FLAGS_IGNORED="usr/libexec/gstreamer-1.0/gst-ptp-helper" - -pkg_setup() { - gstreamer-meson_pkg_setup - use ptp && rust_pkg_setup -} - -multilib_src_configure() { - local emesonargs=( - -Dtools=$(multilib_is_native_abi && echo enabled || echo disabled) - -Dbenchmarks=disabled - -Dexamples=disabled - -Dcheck=enabled - -Dptp-helper=$(multilib_is_native_abi && echo $(usex 'ptp' 'enabled' 'disabled') || echo disabled) - $(meson_feature unwind libunwind) - $(meson_feature unwind libdw) - ) - - if use caps ; then - emesonargs+=( -Dptp-helper-permissions=capabilities ) - else - emesonargs+=( - -Dptp-helper-permissions=setuid-root - -Dptp-helper-setuid-user=nobody - -Dptp-helper-setuid-group=nobody - ) - fi - - gstreamer_multilib_src_configure -} diff --git a/media-libs/ksanecore-common/Manifest b/media-libs/ksanecore-common/Manifest index ff722aa8092d..0b7eefd760b0 100644 --- a/media-libs/ksanecore-common/Manifest +++ b/media-libs/ksanecore-common/Manifest @@ -1,5 +1,5 @@ DIST ksanecore-24.08.3.tar.xz 51184 BLAKE2B 285285ece94d8c55a81be2cb932c1e34b2154d04101a4501fb2cc69c310656529eee7e3d612ff12a240009a86d22d5738352dbad408d8a7871fc66c378083077 SHA512 808c220cf01ec9de1fc5e6cf55f873fe6f70f8ab231e59b7c048db5a5b7ecde542e3291798118d0e65b99c4b627e34beceef38948ba208e9dfb2c992e65a06f8 -DIST ksanecore-24.12.0.tar.xz 54372 BLAKE2B 0e4c6c81ce6a0ab3ec02d23473c0e3d8d0c9f4b14b2afd7d9ccd056e0df2c13f3cb124030c937c933cb0b1e7e6d5d735d7216e303219ef628fa69da4d0745011 SHA512 0ac6acfbd7d2e79d4e1a6b0cdf5629f5ab1cc337dbd2dc60a2e3e2c752b599c1a1aac0356674d0d3ef6c4964b8b2774734fb5333a8864e9f90e4ea63b03ebe28 +DIST ksanecore-24.12.1.tar.xz 54388 BLAKE2B 30d9f8775818dfaf51a49ef442d5f3aa6f810430b6258f9c9cb221224b420301a16969c2f7ac9c4e82160adb8a7bc4d96d6604d0c47f51889a7179720f5362e3 SHA512 11171a23e0cc22a7cdba87bd1814e392028084f4c304e2d517547f0d23f92658323dd1ebcd91bd221859fee8be0f61bdc0be260b131198f6137fd5d6991abf26 EBUILD ksanecore-common-24.08.3.ebuild 364 BLAKE2B 6209d72b32e2703bf688bdaf6aed825917a8053799a7be4b7bef48503677eca63a8113510fbe7d4aad4f55a05bb85e294150ac8bc21a0ffd80f883ffd037a426 SHA512 6b8575f6d6ff49ef2b618b4982ca080b33806e88612bfbdb0322f98cf7007986db6b5420078f118cbc1f91f0c28a253022ff3b65c983da44021eeac7032ffc05 -EBUILD ksanecore-common-24.12.0.ebuild 353 BLAKE2B 65e204c59241ca63ee7c08689b979154d4a20a14a3c53fd78eddc1ef4b896927c0a649d1cc238899099bcc62936724c337661068f46793aa08b04c12057e378c SHA512 549055e950698984d0ae252f50472e76bc594682debca7da243761a5c448d83a38d9359c83ce26073749370345bf39f477803dbf0d11016dc8906986f505574f +EBUILD ksanecore-common-24.12.1.ebuild 353 BLAKE2B dd7788ecdaed33bafdde2fdb7ece9c6cdc920bfb3ce4cce653426920a63ccec69e67237f4004b7a5a6d208789d0d65f43db354c7f39a7d66b1a4fdbaa875692b SHA512 8798f07977b7b715531cf6383700bd77557d8a5d956f7149370d2a407d1df8400eb5ec6e8665c9f94b195ebef1121cb43bbf43904e57926c61164f65fdd252fe MISC metadata.xml 381 BLAKE2B 42cf8662e7a405016cbf593e43771e2a354116ed82825cf42ba21c41d9dcd22dfc868fcc1837ae47b3c13b229908a7a1db8b1fe636b53418664f7835cabe4c35 SHA512 1d3caf0c29b67b79a29c02db8625ee17306f6c114b48599b432c5ced09d51aa02339e75d1552b56fa86ad4ec781c44cc909f8f7cccc0eadc2043ce3103604c38 diff --git a/media-libs/ksanecore-common/ksanecore-common-24.12.0.ebuild b/media-libs/ksanecore-common/ksanecore-common-24.12.1.ebuild index c490609504ee..35adc0add6cb 100644 --- a/media-libs/ksanecore-common/ksanecore-common-24.12.0.ebuild +++ b/media-libs/ksanecore-common/ksanecore-common-24.12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/media-libs/ksanecore/Manifest b/media-libs/ksanecore/Manifest index db8fa06f1e5f..c2fa9d10df98 100644 --- a/media-libs/ksanecore/Manifest +++ b/media-libs/ksanecore/Manifest @@ -1,5 +1,5 @@ DIST ksanecore-24.08.3.tar.xz 51184 BLAKE2B 285285ece94d8c55a81be2cb932c1e34b2154d04101a4501fb2cc69c310656529eee7e3d612ff12a240009a86d22d5738352dbad408d8a7871fc66c378083077 SHA512 808c220cf01ec9de1fc5e6cf55f873fe6f70f8ab231e59b7c048db5a5b7ecde542e3291798118d0e65b99c4b627e34beceef38948ba208e9dfb2c992e65a06f8 -DIST ksanecore-24.12.0.tar.xz 54372 BLAKE2B 0e4c6c81ce6a0ab3ec02d23473c0e3d8d0c9f4b14b2afd7d9ccd056e0df2c13f3cb124030c937c933cb0b1e7e6d5d735d7216e303219ef628fa69da4d0745011 SHA512 0ac6acfbd7d2e79d4e1a6b0cdf5629f5ab1cc337dbd2dc60a2e3e2c752b599c1a1aac0356674d0d3ef6c4964b8b2774734fb5333a8864e9f90e4ea63b03ebe28 +DIST ksanecore-24.12.1.tar.xz 54388 BLAKE2B 30d9f8775818dfaf51a49ef442d5f3aa6f810430b6258f9c9cb221224b420301a16969c2f7ac9c4e82160adb8a7bc4d96d6604d0c47f51889a7179720f5362e3 SHA512 11171a23e0cc22a7cdba87bd1814e392028084f4c304e2d517547f0d23f92658323dd1ebcd91bd221859fee8be0f61bdc0be260b131198f6137fd5d6991abf26 EBUILD ksanecore-24.08.3.ebuild 642 BLAKE2B b861222212cf1e437541bd3558de13f8aa57017721207d010f687f02864716a75b60834ab2d37e57c2ddbced478ffbd4450bd28d2ee5d8e507aee1ea3f9ffd7e SHA512 f298920b638e72fa325f4b636661c2510778153a0413483df7568cb4a221323aa7aa4773bef87516416e4c92a0ee47ead55b8503bdab2a89fc4391dc2a93b24b -EBUILD ksanecore-24.12.0.ebuild 644 BLAKE2B 7983b4d938bf81160ca83fe41a07190b94d37de9cbeb455f96abfd07c0b9d5c8cff58b9bcdd2873ebc70f6c75c6a429a47a3164ec84d10dbc8b6588b46e5205f SHA512 c71602af4192e509a0c6267d4d7084915cabfafe198ff7b7d7d727486f3d60518257087b614f2e0df772750a49b3b3b5974b3dd1d84521f197d86b6238928aa8 +EBUILD ksanecore-24.12.1.ebuild 644 BLAKE2B 4184fc58caec146b9bb9829aa1f219594bcb0fba5b1ea1197cd7ac6d42e181c0b5fa02d516fbb7dbb10711fa69230a52ff01f2290ac417a4843ef706971cc7ed SHA512 5d0b74701b9c2aee1d23261d897d710f1bff5503a0fe885530b7edb44815e12d99145071838ebfe443a8084b8742e8e7c75ca58c404d323b729b7fc989285762 MISC metadata.xml 338 BLAKE2B a2597ee8510ec4e47f014dcf1d255490b5dae78003e5526665945d4092116cc4e3f2bf3d76e03b5fdcb8a70f872b35c70ca1d89f6c8b4f2d67f2d7bad6a502d5 SHA512 34040d0fa7bdbb70bce78cd8d543e69db0e835deb85c33055769277df44a5ed1b8efcb7ba5aeaeb1b389704b42b941279b9faabc8f476b87beb06bbb266217f8 diff --git a/media-libs/ksanecore/ksanecore-24.12.0.ebuild b/media-libs/ksanecore/ksanecore-24.12.1.ebuild index 625b222fc648..2c29a6094be9 100644 --- a/media-libs/ksanecore/ksanecore-24.12.0.ebuild +++ b/media-libs/ksanecore/ksanecore-24.12.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org diff --git a/media-libs/libopenmpt/Manifest b/media-libs/libopenmpt/Manifest index 66d87d8755f3..adbac1e567b6 100644 --- a/media-libs/libopenmpt/Manifest +++ b/media-libs/libopenmpt/Manifest @@ -1,7 +1,7 @@ DIST libopenmpt-0.6.6+release.autotools.tar.gz 1554516 BLAKE2B 21e2fc4252431235608a52d3a321e26eae5d45f2328ff3e3604d84c537d72e07d72346c504901b000af04dfc52b1dd91c79f576be4331ea8685e534a174b61cd SHA512 b634c556f13dc51d1008f4216936a9b7cab25a6fb0d5218da0b692ec848de21905ed1981223ac9ecdebea9ce6c5376e91ff92e1655dd0be491fce0114e3230bf DIST libopenmpt-0.7.10+release.autotools.tar.gz 1671289 BLAKE2B 62bd4a1bcd9685fdb92c270687b71609a23986941e301ad17cc37ca5f6b5b76fa1a8f425b2e68603bb29bfa34c3c1caea98faea1d95004f87943b2bed6b7c9a0 SHA512 e5f02b045bc1449791ec43a32216c4c4231edff88b3bda07283c9768118bce3a1f50c2535dbe38a21eb12016294e3b5823ef2f32f2f1e21d40fafe188bad783d -DIST libopenmpt-0.7.9+release.autotools.tar.gz 1669833 BLAKE2B 9ba6af6df794583748336cc977b20d7bdb3f8d75e32d32a420c5e137511352ea5ec41b31beb7b0df78376dcb0e3a8160a1c527b6f4575b61b945a9f93252fe84 SHA512 e0928d3dc439c3ed7296b97dc8b8e255db22bfd91fd3bc73d0bdca8262a5cb26dff0ba89e508a4443ebe34c34fc880b202a758a11fde31b75e1ebd5725819414 +DIST libopenmpt-0.7.13+release.autotools.tar.gz 1681351 BLAKE2B d75df89e85531e85974bd532773e8ed16440211448790779191a61a629dde33ef7280bcc1c82e6ac6aeb313f7f568bc7a2abe707772801f52c271977b88eff8e SHA512 04e63c635dd6c63c2ce79db4eff971f10e4d14a12c7f143fc317a4b5f5188cd8cbf84fc5121057c2beff3a3e6b9b48767c02b9eb5c569accab3e6ff7322a9690 EBUILD libopenmpt-0.6.6.ebuild 1560 BLAKE2B 649dbcde7c2bc9aabf1b50f6d7e232e1173f6669e9b73afb34b9cf6273783f52193dda79aa52d54fc0e502fe3a978bbba79bf04c631d2141b91c8d456e8ec4ac SHA512 35cea07a2a46d8f316455e5115e6388b601bb5fe8218a4460e4b523e4401b8b771d2d1149fbb5f97462bd8361ea842034040d80a40ed91166056f24273288bb0 EBUILD libopenmpt-0.7.10.ebuild 1565 BLAKE2B bf355c4e8df835d7e1c575b2159b71841167042547a51405eff6b8eafe0e9d1a40a1d53684800769bd35744230bfc62d19bcebff4943c77cee60bc75513ee86b SHA512 59e0ac9f28dbf891e6bb02971682fa669af730f7e99c5ccb6d3b357f6fb4d08e33bbed1ac466c18990685ad15edce9b083027eda2b49efb4b49562598886da24 -EBUILD libopenmpt-0.7.9.ebuild 1565 BLAKE2B bf355c4e8df835d7e1c575b2159b71841167042547a51405eff6b8eafe0e9d1a40a1d53684800769bd35744230bfc62d19bcebff4943c77cee60bc75513ee86b SHA512 59e0ac9f28dbf891e6bb02971682fa669af730f7e99c5ccb6d3b357f6fb4d08e33bbed1ac466c18990685ad15edce9b083027eda2b49efb4b49562598886da24 +EBUILD libopenmpt-0.7.13.ebuild 1565 BLAKE2B 670fdc2276f182bcfde28f69fd6dc3f642e118f2bcf98e5da7ef7ca9538817556a96cee8d56fd77142b41f93e042693501380d96854066c8801b989b0530c125 SHA512 11b99d76bf8efb583c68693adef682c3dc6ed09de3f0bda3b21ef3ae3a5c2125be99b12f0e2fa9c5ed56fb936fd874285f9957a0db7d7d7c6d33ee9940dc8d73 MISC metadata.xml 328 BLAKE2B 25f8b37a7e7885a50e5b7305c9090033c78b1154214e05060c3407f0d27ac436aa3f0da1dff3a5ba1685bef390f1fe99416893aaf59e002921cc3464ce0d2167 SHA512 6686c75dbfcd5a5f9d6ef4d667916f54388180045471f8eb585c7b0d6e03f5d56c3fc892c97851f7453318309a456bbfd877eb240cbf008b71984009d08a8181 diff --git a/media-libs/libopenmpt/libopenmpt-0.7.9.ebuild b/media-libs/libopenmpt/libopenmpt-0.7.13.ebuild index 03b0016c8652..875b7213ec44 100644 --- a/media-libs/libopenmpt/libopenmpt-0.7.9.ebuild +++ b/media-libs/libopenmpt/libopenmpt-0.7.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest index 94ca76a342f9..200992168440 100644 --- a/media-libs/osl/Manifest +++ b/media-libs/osl/Manifest @@ -1,9 +1,14 @@ +AUX osl-1.12.14.0-libfmt11.patch 17575 BLAKE2B 5a9745185816934c124e2c3955e1ef31417a8fa5debc4a47a2918805b805cb907c4e7f4698ad375778876308f60a634f11d5cb6bd0068ae9ec83f0c9f319e28b SHA512 bee654dd41674af24f9d2345988276619ef59681b82649e29c9895eaa61391e44e012cd50fcb07819e572111c2c2a79f559fa54629aef4dfb9268f0942e62b10 +AUX osl-1.12.14.0-m_dz.patch 759 BLAKE2B 90f51613bebf8c33a49809226f1dd156aed0d59f9717566ddde9131bdb3f6257a3a1a790d596c25ed788a126c4bc5a889c38f9a94b72da2a412318aae2e042e2 SHA512 14121a2764fd1662651884f71901cbe16756376fbefc64243deb8d6dc05c5fc3f0e986cc7f257ad9e130f0df75e1734827294c92c33a6f07fd3c99b58dc0c03b +AUX osl-boost-config.patch 848 BLAKE2B 591a874bec29b28de3efb6ee27aa2c2c719b4342a86f1ca5e176bd493341e0ec284a1e96053b7aae72d2b133738741e61f35fc71193a12c7094482fab04ab83a SHA512 aa044ae09b33035d0357e032d47d500df0b1b7c6ae34e42c802c37ad6687d3c9a02aa4604a513563559269e56a2e32e76c9e5276333a9fd21eee1c3bdd08b35e +AUX osl-include-cstdint.patch 322 BLAKE2B ef0739524bea3eced1b74cc116719f725a546fdb48704f03eb9134482df6b805512821156a082c788b1383d3d38c928b035846de079b5cae2a5c97e0b4ae1927 SHA512 3c169930fb4f90a176f7f5c120f13a28383cfab5334282f5755b479c7f3ad22dec0c9bdd8d0fbbbe91146248efb3ec83539fa56d1f1ae9be33c6cc3a08376b16 +AUX osl-oslfile.patch 948 BLAKE2B a3862fd04ef4ae18ad8644829a7e064a13e2bd1d2269ca4dfc0358b3d5245eab1ad1035a043f5334a2e786cb07839cfe7475dab9baba6f501d040648d0f5d66d SHA512 12af586c78730725cc8caf67446e8dd006d6cffb240b0d007c9a6b2ac61d2b455daa3d2d8bd2017e9994fcd5191e6165ef6e45e465eb9491e5fc6f5155a3f5bc DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5 DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d DIST osl-1.13.12.0.tar.gz 21824352 BLAKE2B 0d5c1d166afc347a515187c34d60c0a2be99e8a1b7078a388190f2232ee545654e3c1fea829dfabb7b0a105d69d3d98cc5dae4fa8f4db1a2228f9f258b34e76b SHA512 152a1b085c4ea88c86bc0ccbd694b848b9f50bd91f1a165899c2c3999042e413e54cdfb83dd90ea23daeeb2a3b65f794b8b2c19e9629bbda266971dcd6e3b5e7 -EBUILD osl-1.12.14.0-r2.ebuild 9647 BLAKE2B 2fa1118e970336fcbbdf499c4c584bd7edff4d7e2978f2368a70323bd11f64834a1a5d43fe6b4399bafe6b6b59f00e8ad1a5746204e9bff0b7bd724858d44385 SHA512 6becb0eb838e9dad30fb1644fd0578a190364a6d3f6812437f94c4cbfaf3c7e6059021d0255ac6c885ac9494e4cde0e08cc929c392687283f4b54b27c846d167 +EBUILD osl-1.12.14.0-r3.ebuild 10439 BLAKE2B 1ce29bfd7988636b8c3ca287ebf106b26f5ead7575f9134b5dde1c813df77b4034eb0efcfca830de7ec6373de720800cd32ae80c91e90d34cb923390ec2b49b8 SHA512 dbc37768b5d5c8afb9c1d44b6db737fad57deb0f663f9207c245fe8aa91fa7fa538bf9abdf10734c8cf761ef820dca92aef78b89c9806181d7705fd44e4578a6 EBUILD osl-1.12.14.0.ebuild 3906 BLAKE2B 59228846da135c84663ff3d4a12f3370de16f281bf7f03dbd14668581c2b8fd010de16129f1e1957c51da5d83a0c1d9541ad1713ff5b938c22021ff9b84eb74b SHA512 e557e55accb7b1a5b5b07c1198fe92547d067d6687100f4ef54be38e20488bdda2cb7809e218aa7f207358ab6a1dc157d1bf5581a7db42180ed2fd4927f42c22 -EBUILD osl-1.13.10.0.ebuild 7413 BLAKE2B 41e145d8e5667e4d806d5866d6c0290f19acbe708b016defd8135d95789d4f90fbe1aa3752df7f0f77f44e74a0b48854529a0a54cf11f3c1304d7963de06ed9f SHA512 4705b288b171509af1e6ac213c3b1efeeffb57f82773dcbd60ff67fb91f13d955d0d271027e2028229bb4decdd0af40d55a7eacdc604c37bd3189c7485a5ad32 -EBUILD osl-1.13.12.0.ebuild 7414 BLAKE2B 9c6bb8ac71cfa7be1515560a996ac6a67ce92a7b6b984774a32eaa8019f536a02b2488cb9c66da3d21cfd61a5403a1e899be7280c2877f06ddc99c7e082c5811 SHA512 1301357bcfd76558740d00fc8fda5de4e49449155e27d014c243a8f3ee6561f3a01efac4dca4067187852b94f54bf89e5384fbf158c042be3a338519b86e46b9 -EBUILD osl-9999.ebuild 7414 BLAKE2B 9c6bb8ac71cfa7be1515560a996ac6a67ce92a7b6b984774a32eaa8019f536a02b2488cb9c66da3d21cfd61a5403a1e899be7280c2877f06ddc99c7e082c5811 SHA512 1301357bcfd76558740d00fc8fda5de4e49449155e27d014c243a8f3ee6561f3a01efac4dca4067187852b94f54bf89e5384fbf158c042be3a338519b86e46b9 +EBUILD osl-1.13.10.0-r1.ebuild 7949 BLAKE2B b79ea75f6622de002bb68002c7cc0c1dfa3f0273698e0b1c97a37e45a31633b49153bbc0d4ade9d874de021455a87524084141d98631c462848caa44b38cc5f2 SHA512 1806739ec0a8e42ba3111980fbf144d65119f1b4d7cc479087f5937bcfc28c3827b75dec589346ec0333d16ee53bac9da342857fcfdfd2055dce11aefb50a28f +EBUILD osl-1.13.12.0-r1.ebuild 7908 BLAKE2B 6bd879152bd18ab8dfbadbfeb9a696c214851ebb62704f97f4d23c615392ed8c332ee0fc1f9f43c28a176b152ad1b2839ba4cc47eb86bb303132b797710c7048 SHA512 10d805b863d8d2ea2e4c2cef312704e09a0fc8b0c0db98735274b5987eb21c97a0fa78755910100e77288a98deea5098603b17b544efbd624f2a00bacdb5957d +EBUILD osl-9999.ebuild 7908 BLAKE2B 6bd879152bd18ab8dfbadbfeb9a696c214851ebb62704f97f4d23c615392ed8c332ee0fc1f9f43c28a176b152ad1b2839ba4cc47eb86bb303132b797710c7048 SHA512 10d805b863d8d2ea2e4c2cef312704e09a0fc8b0c0db98735274b5987eb21c97a0fa78755910100e77288a98deea5098603b17b544efbd624f2a00bacdb5957d MISC metadata.xml 1095 BLAKE2B d9d1b720bceb0f61f6841ef3a2d7b222a952f4c96c6ab1ee61f8e28ddae0d470b49fce998d60afedc527c8776d3514268ba0f135fcba881252c512f26e2f3c74 SHA512 b4a36e79e830cf648e0de7fdd3f360cd41834de8ac491972609990386380960b34263fde6d3cd129d07d8032a7741b399880c3f24684ba5ea8beb6498da0189f diff --git a/media-libs/osl/files/osl-1.12.14.0-libfmt11.patch b/media-libs/osl/files/osl-1.12.14.0-libfmt11.patch new file mode 100644 index 000000000000..6b0d7caead64 --- /dev/null +++ b/media-libs/osl/files/osl-1.12.14.0-libfmt11.patch @@ -0,0 +1,431 @@ +From 62ab57dcaa96587c9c7d014571c4b83da1181090 Mon Sep 17 00:00:00 2001 +From: Larry Gritz <lg@larrygritz.com> +Date: Mon, 13 Mar 2023 09:58:11 -0700 +Subject: [PATCH] oslc: simple constant folding of binary expressions on the + oslc side + +The runtime optimization does a great job of constant folding, and +we'd pushed it there because, with instance parameter values and +shader network connections known, it can find so much more opportunity +to optimize than we could in oslc. + +However, there is one pesky problem, which is that shader parameters +that are initialized to even simple expressions such as 3+1 end up +with "init ops", which although later constant folded by the time the +shader is JITed, make it impossible to know the value via OSLQuery. + +So this patch just takes the simplest cases -- certain `int OP int` +and `float OP float` expressions involving literal constants, and +performs the operation as it's parsing the code. So + + int val = 3 + 1; + +actually just immediately is turned into `val = 4` instead of making +an "add". + +To reiterate, the add would never have happened while executing the +shader -- at runtime in the renderer, when it's time to optimize and +JIT the shader, it would know it's a constant 4 value. This is +strictly about making oslc directly output an .oso file that knows +that parameter `val` has default value 4 instead of throwing up its +hands and saying "it's math code that will be evaluated later." + +Signed-off-by: Larry Gritz <lg@larrygritz.com> +--- + src/cmake/testing.cmake | 1 + + src/liboslcomp/ast.cpp | 63 +++++++++++++++++++++++ + src/liboslcomp/ast.h | 4 ++ + src/liboslcomp/oslgram.y | 36 +++++++------- + testsuite/oslc-literalfold/ref/out.txt | 28 +++++++++++ + testsuite/oslc-literalfold/run.py | 7 +++ + testsuite/oslc-literalfold/test.osl | 69 ++++++++++++++++++++++++++ + 7 files changed, 190 insertions(+), 18 deletions(-) + create mode 100644 testsuite/oslc-literalfold/ref/out.txt + create mode 100755 testsuite/oslc-literalfold/run.py + create mode 100644 testsuite/oslc-literalfold/test.osl + +diff --git a/src/cmake/testing.cmake b/src/cmake/testing.cmake +index 0ae2c200e..3ce6f2a3d 100644 +--- a/src/cmake/testing.cmake ++++ b/src/cmake/testing.cmake +@@ -299,6 +299,7 @@ macro (osl_add_all_tests) + oslc-err-struct-dup oslc-err-struct-print + oslc-err-type-as-variable + oslc-err-unknown-ctr ++ oslc-literalfold + oslc-pragma-warnerr + oslc-warn-commainit + oslc-variadic-macro +diff --git a/src/liboslcomp/ast.cpp b/src/liboslcomp/ast.cpp +index 0ae74db48..74873e1c1 100644 +--- a/src/liboslcomp/ast.cpp ++++ b/src/liboslcomp/ast.cpp +@@ -1187,6 +1187,69 @@ ASTbinary_expression::ASTbinary_expression(OSLCompilerImpl* comp, Operator op, + + + ++ASTNode* ++ASTbinary_expression::make(OSLCompilerImpl* comp, Operator op, ASTNode* left, ++ ASTNode* right) ++{ ++ // If the left and right are both literal constants, fold the expression ++ if (left->nodetype() == literal_node && right->nodetype() == literal_node) { ++ ASTNode* cf = nullptr; // constant-folded result ++ if (left->typespec().is_int() && right->typespec().is_int()) { ++ int lv = dynamic_cast<ASTliteral*>(left)->intval(); ++ int rv = dynamic_cast<ASTliteral*>(right)->intval(); ++ switch (op) { ++ case Mul: cf = new ASTliteral(comp, lv * rv); break; ++ case Div: cf = new ASTliteral(comp, rv ? lv / rv : 0); break; ++ case Add: cf = new ASTliteral(comp, lv + rv); break; ++ case Sub: cf = new ASTliteral(comp, lv - rv); break; ++ case Mod: cf = new ASTliteral(comp, rv ? lv % rv : 0); break; ++ case Equal: cf = new ASTliteral(comp, lv == rv ? 1 : 0); break; ++ case NotEqual: cf = new ASTliteral(comp, lv != rv ? 1 : 0); break; ++ case Greater: cf = new ASTliteral(comp, lv > rv ? 1 : 0); break; ++ case Less: cf = new ASTliteral(comp, lv < rv ? 1 : 0); break; ++ case GreaterEqual: ++ cf = new ASTliteral(comp, lv >= rv ? 1 : 0); ++ break; ++ case LessEqual: cf = new ASTliteral(comp, lv <= rv ? 1 : 0); break; ++ case BitAnd: cf = new ASTliteral(comp, lv & rv); break; ++ case BitOr: cf = new ASTliteral(comp, lv | rv); break; ++ case Xor: cf = new ASTliteral(comp, lv ^ rv); break; ++ case ShiftLeft: cf = new ASTliteral(comp, lv << rv); break; ++ case ShiftRight: cf = new ASTliteral(comp, lv >> rv); break; ++ default: break; ++ } ++ } else if (left->typespec().is_float() ++ && right->typespec().is_float()) { ++ float lv = dynamic_cast<ASTliteral*>(left)->floatval(); ++ float rv = dynamic_cast<ASTliteral*>(right)->floatval(); ++ switch (op) { ++ case Mul: cf = new ASTliteral(comp, lv * rv); break; ++ case Div: cf = new ASTliteral(comp, rv ? lv / rv : 0.0f); break; ++ case Add: cf = new ASTliteral(comp, lv + rv); break; ++ case Sub: cf = new ASTliteral(comp, lv - rv); break; ++ case Equal: cf = new ASTliteral(comp, lv == rv ? 1 : 0); break; ++ case NotEqual: cf = new ASTliteral(comp, lv != rv ? 1 : 0); break; ++ case Greater: cf = new ASTliteral(comp, lv > rv ? 1 : 0); break; ++ case Less: cf = new ASTliteral(comp, lv < rv ? 1 : 0); break; ++ case GreaterEqual: ++ cf = new ASTliteral(comp, lv >= rv ? 1 : 0); ++ break; ++ case LessEqual: cf = new ASTliteral(comp, lv <= rv ? 1 : 0); break; ++ default: break; ++ } ++ } ++ if (cf) { ++ delete left; ++ delete right; ++ return cf; ++ } ++ } ++ ++ return new ASTbinary_expression(comp, op, left, right); ++} ++ ++ ++ + const char* + ASTbinary_expression::childname(size_t i) const + { +diff --git a/src/liboslcomp/ast.h b/src/liboslcomp/ast.h +index db9bd14e5..f4bd2eeec 100644 +--- a/src/liboslcomp/ast.h ++++ b/src/liboslcomp/ast.h +@@ -832,6 +832,10 @@ class ASTbinary_expression final : public ASTNode { + ASTbinary_expression(OSLCompilerImpl* comp, Operator op, ASTNode* left, + ASTNode* right); + ++ // Special consructor wrapper that can collapse ops between literals ++ static ASTNode* make(OSLCompilerImpl* comp, Operator op, ASTNode* left, ++ ASTNode* right); ++ + const char* nodetypename() const { return "binary_expression"; } + const char* childname(size_t i) const; + const char* opname() const; +diff --git a/src/liboslcomp/oslgram.y b/src/liboslcomp/oslgram.y +index b65818193..b4f3ad2e1 100644 +--- a/src/liboslcomp/oslgram.y ++++ b/src/liboslcomp/oslgram.y +@@ -858,109 +858,109 @@ variable_ref + binary_expression + : expression OR_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Or, $1, $3); + $$->sourceline (@2.first_line); + } + | expression AND_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::And, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '|' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::BitOr, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '^' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Xor, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '&' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::BitAnd, $1, $3); + $$->sourceline (@2.first_line); + } + | expression EQ_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Equal, $1, $3); + $$->sourceline (@2.first_line); + } + | expression NE_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::NotEqual, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '>' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Greater, $1, $3); + $$->sourceline (@2.first_line); + } + | expression GE_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::GreaterEqual, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '<' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Less, $1, $3); + $$->sourceline (@2.first_line); + } + | expression LE_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::LessEqual, $1, $3); + $$->sourceline (@2.first_line); + } + | expression SHL_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::ShiftLeft, $1, $3); + $$->sourceline (@2.first_line); + } + | expression SHR_OP expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::ShiftRight, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '+' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Add, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '-' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Sub, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '*' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Mul, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '/' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Div, $1, $3); + $$->sourceline (@2.first_line); + } + | expression '%' expression + { +- $$ = new ASTbinary_expression (oslcompiler, ++ $$ = ASTbinary_expression::make(oslcompiler, + ASTNode::Mod, $1, $3); + $$->sourceline (@2.first_line); + } +diff --git a/testsuite/oslc-literalfold/ref/out.txt b/testsuite/oslc-literalfold/ref/out.txt +new file mode 100644 +index 000000000..9397357ff +--- /dev/null ++++ b/testsuite/oslc-literalfold/ref/out.txt +@@ -0,0 +1,28 @@ ++Compiled test.osl -> test.oso ++int add_i = 8 ++int sub_i = 2 ++int mul_i = 15 ++int div_i = 1 ++int mod_i = 2 ++int eq_i = 0 ++int ne_i = 1 ++int gt_i = 1 ++int ge_i = 1 ++int lt_i = 0 ++int le_i = 0 ++int and_i = 1 ++int or_i = 7 ++int xor_i = 6 ++int shl_i = 40 ++int shr_i = 0 ++float add_f = 8.000000 ++float sub_f = 2.000000 ++float mul_f = 15.000000 ++float div_f = 1.666667 ++float eq_f = 0 ++float ne_f = 1 ++float gt_f = 1 ++float ge_f = 1 ++float lt_f = 0 ++float le_f = 0 ++ +diff --git a/testsuite/oslc-literalfold/run.py b/testsuite/oslc-literalfold/run.py +new file mode 100755 +index 000000000..6836d5554 +--- /dev/null ++++ b/testsuite/oslc-literalfold/run.py +@@ -0,0 +1,7 @@ ++#!/usr/bin/env python ++ ++# Copyright Contributors to the Open Shading Language project. ++# SPDX-License-Identifier: BSD-3-Clause ++# https://github.com/AcademySoftwareFoundation/OpenShadingLanguage ++ ++command = testshade("test") +diff --git a/testsuite/oslc-literalfold/test.osl b/testsuite/oslc-literalfold/test.osl +new file mode 100644 +index 000000000..0f1b09e36 +--- /dev/null ++++ b/testsuite/oslc-literalfold/test.osl +@@ -0,0 +1,69 @@ ++// Copyright Contributors to the Open Shading Language project. ++// SPDX-License-Identifier: BSD-3-Clause ++// https://github.com/AcademySoftwareFoundation/OpenShadingLanguage ++ ++// Test oslc-side constant folding of simple binary operators on literal ++// values ++ ++#define three 3 ++#define five 5 ++ ++ ++shader test( ++ int add_i = five + three, ++ int sub_i = five - three, ++ int mul_i = five * three, ++ int div_i = five / three, ++ int mod_i = five % three, ++ int eq_i = five == three, ++ int ne_i = five != three, ++ int gt_i = five > three, ++ int ge_i = five >= three, ++ int lt_i = five < three, ++ int le_i = five <= three, ++ int and_i = five & three, ++ int or_i = five | three, ++ int xor_i = five ^ three, ++ int shl_i = five << three, ++ int shr_i = five >> three, ++ ++ float add_f = float(five) + float(three), ++ float sub_f = float(five) - float(three), ++ float mul_f = float(five) * float(three), ++ float div_f = float(five) / float(three), ++ int eq_f = float(five) == float(three), ++ int ne_f = float(five) != float(three), ++ int gt_f = float(five) > float(three), ++ int ge_f = float(five) >= float(three), ++ int lt_f = float(five) < float(three), ++ int le_f = float(five) <= float(three), ++) ++{ ++ printf("int add_i = %d\n", add_i); ++ printf("int sub_i = %d\n", sub_i); ++ printf("int mul_i = %d\n", mul_i); ++ printf("int div_i = %d\n", div_i); ++ printf("int mod_i = %d\n", mod_i); ++ printf("int eq_i = %d\n", eq_i); ++ printf("int ne_i = %d\n", ne_i); ++ printf("int gt_i = %d\n", gt_i); ++ printf("int ge_i = %d\n", ge_i); ++ printf("int lt_i = %d\n", lt_i); ++ printf("int le_i = %d\n", le_i); ++ printf("int and_i = %d\n", and_i); ++ printf("int or_i = %d\n", or_i); ++ printf("int xor_i = %d\n", xor_i); ++ printf("int shl_i = %d\n", shl_i); ++ printf("int shr_i = %d\n", shr_i); ++ ++ printf("float add_f = %f\n", add_f); ++ printf("float sub_f = %f\n", sub_f); ++ printf("float mul_f = %f\n", mul_f); ++ printf("float div_f = %f\n", div_f); ++ printf("float eq_f = %d\n", eq_f); ++ printf("float ne_f = %d\n", ne_f); ++ printf("float gt_f = %d\n", gt_f); ++ printf("float ge_f = %d\n", ge_f); ++ printf("float lt_f = %d\n", lt_f); ++ printf("float le_f = %d\n", le_f); ++} +From 977f2898b10b9688c4bd65260884e1e477d29806 Mon Sep 17 00:00:00 2001 +From: Larry Gritz <lg@larrygritz.com> +Date: Sun, 20 Aug 2023 21:36:59 -0700 +Subject: [PATCH] fix: Recent journaling changes break with some fmtlib + versions + +Certain fmt library versions don't automatically know how to format +atomics. Explicitly load them to turn into regular ints to avoid new +build errors introduced by the recent journaling changes. + +Signed-off-by: Larry Gritz <lg@larrygritz.com> +--- + .github/workflows/ci.yml | 2 +- + src/liboslcomp/ast.cpp | 2 +- + src/liboslexec/journal.cpp | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/liboslcomp/ast.cpp b/src/liboslcomp/ast.cpp +index 74873e1c1..a8e5d75e4 100644 +--- a/src/liboslcomp/ast.cpp ++++ b/src/liboslcomp/ast.cpp +@@ -46,7 +46,7 @@ ScopeExit print_node_counts([]() { + for (int i = 0; i < ASTNode::_last_node; ++i) + if (node_counts[i] > 0) + Strutil::print("ASTNode type {:2}: {:5} (peak {:5})\n", i, +- node_counts[i], node_counts_peak[i]); ++ node_counts[i].load(), node_counts_peak[i].load()); + }); + } // namespace + #endif diff --git a/media-libs/osl/files/osl-1.12.14.0-m_dz.patch b/media-libs/osl/files/osl-1.12.14.0-m_dz.patch new file mode 100644 index 000000000000..fb50c53452bf --- /dev/null +++ b/media-libs/osl/files/osl-1.12.14.0-m_dz.patch @@ -0,0 +1,23 @@ +From f8b8242f26a7d4676cf8e5e195f3b6ba0335bcfc Mon Sep 17 00:00:00 2001 +From: Larry Gritz <lg@larrygritz.com> +Date: Mon, 23 Sep 2024 12:35:36 -0700 +Subject: [PATCH] fix: Typo in dual.h made invalid template DualStorage + +Signed-off-by: Larry Gritz <lg@larrygritz.com> +--- + src/include/OSL/dual.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/OSL/dual.h b/src/include/OSL/dual.h +index a7b5e4063..60ec05ee8 100644 +--- a/src/include/OSL/dual.h ++++ b/src/include/OSL/dual.h +@@ -204,7 +204,7 @@ class DualStorage<T, 3> + : m_val(other.m_val) + , m_dx(other.m_dx) + , m_dy(other.m_dy) +- , m_dz(other.dz) ++ , m_dz(other.m_dz) + {} + + OSL_HOSTDEVICE constexpr const T& elem (ConstIndex<0>) const { return m_val; } diff --git a/media-libs/osl/files/osl-boost-config.patch b/media-libs/osl/files/osl-boost-config.patch new file mode 100644 index 000000000000..0c0f3bbe71e0 --- /dev/null +++ b/media-libs/osl/files/osl-boost-config.patch @@ -0,0 +1,22 @@ +From 8a29f2263675bf9cb7a567f00fc257728b3ac3d8 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Thu, 9 Jan 2025 19:49:15 +0100 +Subject: [PATCH] boost config + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 7250633..1f032f8 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -57,6 +57,7 @@ else () + checked_find_package (Boost REQUIRED + VERSION_MIN 1.55 + COMPONENTS ${Boost_COMPONENTS} ++ CONFIG + RECOMMEND_MIN 1.66 + RECOMMEND_MIN_REASON "Boost 1.66 is the oldest version our CI tests against" + PRINT Boost_INCLUDE_DIRS Boost_LIBRARIES +-- +2.47.1 + diff --git a/media-libs/osl/files/osl-include-cstdint.patch b/media-libs/osl/files/osl-include-cstdint.patch new file mode 100644 index 000000000000..efaa2f81b9b6 --- /dev/null +++ b/media-libs/osl/files/osl-include-cstdint.patch @@ -0,0 +1,20 @@ +--- a/src/include/OSL/platform.h ++++ b/src/include/OSL/platform.h +@@ -18,6 +18,7 @@ + + #pragma once + ++#include <cstdint> + #include <cstring> + #include <memory> + +--- a/src/include/osl_pvt.h ++++ b/src/include/osl_pvt.h +@@ -4,6 +4,7 @@ + + #pragma once + ++#include <cstdint> + #include <memory> + + #include <OSL/oslconfig.h> diff --git a/media-libs/osl/files/osl-oslfile.patch b/media-libs/osl/files/osl-oslfile.patch new file mode 100644 index 000000000000..76e985c26372 --- /dev/null +++ b/media-libs/osl/files/osl-oslfile.patch @@ -0,0 +1,26 @@ +From 9abc5d56c8ae830355a10d6008b5925faef30af2 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Thu, 9 Jan 2025 19:59:01 +0100 +Subject: [PATCH] oslsrc + +This was snuck in via +https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1914 + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt +index 1ea7bee..e96207d 100644 +--- a/src/shaders/CMakeLists.txt ++++ b/src/shaders/CMakeLists.txt +@@ -40,7 +40,7 @@ macro (oslc_compile) + list (APPEND oslc_args "-I${CMAKE_SOURCE_DIR}/src/shaders") + add_custom_command (OUTPUT ${osofile} + COMMAND oslc ${oslc_args} "${oslfile}" -o "${osofile}" +- MAIN_DEPENDENCY ${oslsrc} ++ MAIN_DEPENDENCY ${oslfile} + DEPENDS ${_shader_DEPENDS} "${stdosl_header}" oslc + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "oslc ${oslsrc_we}") +-- +2.47.1 + diff --git a/media-libs/osl/osl-1.12.14.0-r2.ebuild b/media-libs/osl/osl-1.12.14.0-r3.ebuild index 104c0702a449..92d756ff9fb0 100644 --- a/media-libs/osl/osl-1.12.14.0-r2.ebuild +++ b/media-libs/osl/osl-1.12.14.0-r3.ebuild @@ -24,7 +24,7 @@ else fi LICENSE="BSD" -SLOT="0/$(ver_cut 1-3)" +SLOT="0/$(ver_cut 1-2)" # based on SONAME X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 @@ -33,19 +33,19 @@ X86_CPU_FEATURES=( CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" ) IUSE="debug doc gui libcxx nofma partio test ${CPU_FEATURES[*]%:*} python" + RESTRICT="!test? ( test )" + REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" dev-libs/boost:= dev-libs/pugixml - >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') - sys-libs/zlib:= python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -59,13 +59,28 @@ RDEPEND=" ) " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-util/patchelf + >=media-libs/openexr-3 + sys-libs/zlib + test? ( + media-fonts/droid + ) +" BDEPEND=" sys-devel/bison sys-devel/flex virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" + "${FILESDIR}/${PN}-include-cstdint.patch" + "${FILESDIR}/${PN}-1.12.14.0-libfmt11.patch" + "${FILESDIR}/${PN}-1.12.14.0-m_dz.patch" +) + pkg_setup() { llvm-r1_pkg_setup @@ -115,25 +130,24 @@ src_configure() { "b8_AVX512_noFMA" "b16_AVX512_noFMA" ) - else - mybatched+=( - "b8_AVX512" - "b16_AVX512" - ) fi + mybatched+=( + "b8_AVX512" + "b16_AVX512" + ) fi if use cpu_flags_x86_avx2 ; then if use nofma; then mybatched+=( "b8_AVX2_noFMA" ) - else - mybatched+=( - "b8_AVX2" - ) fi + mybatched+=( + "b8_AVX2" + ) fi - elif use cpu_flags_x86_avx ; then + fi + if use cpu_flags_x86_avx ; then mybatched+=( "b8_AVX" ) @@ -182,7 +196,7 @@ src_configure() { if use partio; then mycmakeargs+=( - -Dpartio_ROOT="${EPREFIX}/usr" + -Dpartio_DIR="${EPREFIX}/usr" ) fi @@ -204,7 +218,7 @@ src_test() { ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die CMAKE_SKIP_TESTS=( - "broken" + "-broken$" "^render" # outright fail @@ -213,6 +227,7 @@ src_test() { "^color.batched$" "^color.batched.opt$" "^matrix.batched.opt$" + "^osl-imageio" "^spline-reg.regress.batched.opt$" "^transform-reg.regress.batched.opt$" ) @@ -346,7 +361,7 @@ src_test() { ) local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH - DEBUG=1 # doubles the floating point tolerance + DEBUG=1 # doubles the floating point tolerance so we avoid FMA related issues CXXFLAGS="-I${T}/usr/include" LD_LIBRARY_PATH="${T}/usr/$(get_libdir)" OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL" @@ -358,6 +373,10 @@ src_test() { cmake_src_test + einfo "" + einfo "testing render tests in isolation" + einfo "" + CMAKE_SKIP_TESTS=( "^render-background$" "^render-bumptest$" @@ -381,3 +400,21 @@ src_test() { cmake_src_test } + +src_install() { + cmake_src_install + + if use test; then + rm \ + "${ED}/usr/bin/test"{render,shade{,_dso}} \ + "${ED}/usr/$(get_libdir)/libtestshade.so"* \ + || die + fi + + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi +} diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0-r1.ebuild index bd2b569e7e9c..ccf08a400628 100644 --- a/media-libs/osl/osl-1.13.10.0.ebuild +++ b/media-libs/osl/osl-1.13.10.0-r1.ebuild @@ -42,13 +42,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" dev-libs/boost:= dev-libs/pugixml - >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') - sys-libs/zlib:= optix? ( dev-libs/optix[-headers-only] ) python? ( ${PYTHON_DEPS} @@ -65,6 +63,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/patchelf + >=media-libs/openexr-3 + sys-libs/zlib test? ( media-fonts/droid ) @@ -75,6 +75,13 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" + "${FILESDIR}/${PN}-include-cstdint.patch" + "${FILESDIR}/${PN}-1.12.14.0-m_dz.patch" +) + pkg_setup() { llvm-r1_pkg_setup @@ -264,6 +271,15 @@ src_test() { "^osl-imageio.opt.rs_bitcode$" ) + if use optix; then + CMAKE_SKIP_TESTS+=( + "^color2.optix$" + "^color4.optix(|.opt|.fused)$" + "^vector2.optix$" + "^vector4.optix$" + ) + fi + myctestargs=( # src/build-scripts/ci-test.bash '--force-new-ctest-process' @@ -312,10 +328,20 @@ src_install() { cmake_src_install if [[ -d "${ED}/usr/build-scripts" ]]; then - rm -rf "${ED}/usr/build-scripts" || die + rm -vr "${ED}/usr/build-scripts" || die + fi + + if use test; then + rm \ + "${ED}/usr/bin/test"{render,shade{,_dso}} \ + "${ED}/usr/$(get_libdir)/libtestshade.so"* \ + || die fi - for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do - patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die - done + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi } diff --git a/media-libs/osl/osl-1.13.12.0.ebuild b/media-libs/osl/osl-1.13.12.0-r1.ebuild index 267c8484ce23..5f185caace4b 100644 --- a/media-libs/osl/osl-1.13.12.0.ebuild +++ b/media-libs/osl/osl-1.13.12.0-r1.ebuild @@ -42,13 +42,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" dev-libs/boost:= dev-libs/pugixml - >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') - sys-libs/zlib:= optix? ( dev-libs/optix[-headers-only] ) python? ( ${PYTHON_DEPS} @@ -65,6 +63,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/patchelf + >=media-libs/openexr-3 + sys-libs/zlib test? ( media-fonts/droid ) @@ -75,6 +75,12 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" + "${FILESDIR}/${PN}-include-cstdint.patch" +) + pkg_setup() { llvm-r1_pkg_setup @@ -264,6 +270,15 @@ src_test() { "^osl-imageio.opt.rs_bitcode$" ) + if use optix; then + CMAKE_SKIP_TESTS+=( + "^color2.optix$" + "^color4.optix(|.opt|.fused)$" + "^vector2.optix$" + "^vector4.optix$" + ) + fi + myctestargs=( # src/build-scripts/ci-test.bash '--force-new-ctest-process' @@ -312,10 +327,20 @@ src_install() { cmake_src_install if [[ -d "${ED}/usr/build-scripts" ]]; then - rm -rf "${ED}/usr/build-scripts" || die + rm -vr "${ED}/usr/build-scripts" || die + fi + + if use test; then + rm \ + "${ED}/usr/bin/test"{render,shade{,_dso}} \ + "${ED}/usr/$(get_libdir)/libtestshade.so"* \ + || die fi - for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do - patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die - done + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi } diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index 267c8484ce23..5f185caace4b 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -42,13 +42,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" dev-libs/boost:= dev-libs/pugixml - >=media-libs/openexr-3:0= >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') - sys-libs/zlib:= optix? ( dev-libs/optix[-headers-only] ) python? ( ${PYTHON_DEPS} @@ -65,6 +63,8 @@ RDEPEND=" DEPEND="${RDEPEND} dev-util/patchelf + >=media-libs/openexr-3 + sys-libs/zlib test? ( media-fonts/droid ) @@ -75,6 +75,12 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" + "${FILESDIR}/${PN}-include-cstdint.patch" +) + pkg_setup() { llvm-r1_pkg_setup @@ -264,6 +270,15 @@ src_test() { "^osl-imageio.opt.rs_bitcode$" ) + if use optix; then + CMAKE_SKIP_TESTS+=( + "^color2.optix$" + "^color4.optix(|.opt|.fused)$" + "^vector2.optix$" + "^vector4.optix$" + ) + fi + myctestargs=( # src/build-scripts/ci-test.bash '--force-new-ctest-process' @@ -312,10 +327,20 @@ src_install() { cmake_src_install if [[ -d "${ED}/usr/build-scripts" ]]; then - rm -rf "${ED}/usr/build-scripts" || die + rm -vr "${ED}/usr/build-scripts" || die + fi + + if use test; then + rm \ + "${ED}/usr/bin/test"{render,shade{,_dso}} \ + "${ED}/usr/$(get_libdir)/libtestshade.so"* \ + || die fi - for batched_lib in "${ED}/usr/$(get_libdir)/lib_"*"_oslexec.so"; do - patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die - done + if use amd64; then + find "${ED}/usr/$(get_libdir)" -type f -name 'lib_*_oslexec.so' -print0 \ + | while IFS= read -r -d $'\0' batched_lib; do + patchelf --set-soname "$(basename "${batched_lib}")" "${batched_lib}" || die + done + fi } |