commit: ac590ef7011fc5aebb9e441ced58398694574741 Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Mon May 13 20:16:07 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Tue May 14 20:37:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ac590ef7
media-libs/*: fix variable order Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> Signed-off-by: Julien Roy <julien <AT> jroy.ca> media-libs/alvr/alvr-16.0.0.ebuild | 4 +- media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild | 15 +++--- media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild | 15 +++--- media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild | 15 +++--- media-libs/amdvlk/amdvlk-2023.1.1.ebuild | 58 ++++++++++++------------ media-libs/amdvlk/amdvlk-2023.1.2.ebuild | 58 ++++++++++++------------ media-libs/amdvlk/amdvlk-2023.1.3.ebuild | 58 ++++++++++++------------ media-libs/dr_flac/dr_flac-0.12.42.ebuild | 9 ++-- media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild | 8 ++-- media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild | 7 +-- media-libs/glee/glee-5.4.0-r1.ebuild | 3 +- media-libs/glee/glee-5.4.0.ebuild | 3 +- media-libs/wivrn/wivrn-0.13.ebuild | 10 ++-- media-libs/wivrn/wivrn-0.14.1.ebuild | 10 ++-- media-libs/wivrn/wivrn-9999.ebuild | 10 ++-- 15 files changed, 146 insertions(+), 137 deletions(-) diff --git a/media-libs/alvr/alvr-16.0.0.ebuild b/media-libs/alvr/alvr-16.0.0.ebuild index 3129df0a0f..41a52cd833 100644 --- a/media-libs/alvr/alvr-16.0.0.ebuild +++ b/media-libs/alvr/alvr-16.0.0.ebuild @@ -521,12 +521,12 @@ HOMEPAGE="https://github.com/alvr-org/ALVR"; SRC_URI="https://github.com/alvr-org/ALVR/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" SRC_URI+=" ${CARGO_CRATE_URIS} " +S="${WORKDIR}/${P^^}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -S="${WORKDIR}/${P^^}" - IUSE="+client +server vaapi vulkan x264 x265" RDEPEND=" diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild b/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild index 740c1759ae..d066b4d614 100644 --- a/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild +++ b/media-libs/amdvlk-bin/amdvlk-bin-2021.2.5.ebuild @@ -11,14 +11,17 @@ HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"; MY_PV="${PV/'.'/'.Q'}" FETCH_URI="https://github.com/GPUOpen-Drivers/AMDVLK/releases/download"; SRC_URI="${FETCH_URI}/v-${MY_PV}/amdvlk-${MY_PV}.x86_64.rpm -> ${P}-amd64.rpm -${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb" -RESTRICT="test" -REQUIRED_USE="abi_x86_64" + ${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb" + +S="${WORKDIR}" LICENSE="MIT" SLOT="legacy-si" KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore +REQUIRED_USE="abi_x86_64" +RESTRICT="test" + RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] app-arch/zstd[${MULTILIB_USEDEP}] @@ -31,9 +34,7 @@ RDEPEND=" !media-libs/amdvlk-bin:0 !media-libs/amdvlk-bin:legacy-polaris " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" BDEPEND="sys-apps/sed" QA_PREBUILT=" usr/lib/* @@ -43,8 +44,6 @@ QA_PREBUILT=" # I don't know why the current value is not working QA_SONAME="usr/*" -S=${WORKDIR} - pkg_pretend(){ ewarn "This is extremely old version which supports AMD's legacy GPUs such as:" ewarn "Radeon™ R5/R7/R9 200/300 Series" diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild b/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild index 3e53e100a5..4fec2e140e 100644 --- a/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild +++ b/media-libs/amdvlk-bin/amdvlk-bin-2023.3.3.ebuild @@ -11,14 +11,17 @@ HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"; MY_PV="${PV/'.'/'.Q'}" FETCH_URI="https://github.com/GPUOpen-Drivers/AMDVLK/releases/download"; SRC_URI="${FETCH_URI}/v-${MY_PV}/amdvlk-${MY_PV}.x86_64.rpm -> ${P}-amd64.rpm -${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb" -RESTRICT="test" -REQUIRED_USE="abi_x86_64" + ${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb" + +S="${WORKDIR}" LICENSE="MIT" SLOT="legacy-polaris" KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore +REQUIRED_USE="abi_x86_64" +RESTRICT="test" + RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] app-arch/zstd[${MULTILIB_USEDEP}] @@ -31,9 +34,7 @@ RDEPEND=" !media-libs/amdvlk-bin:0 !media-libs/amdvlk-bin:legacy-si " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" BDEPEND="sys-apps/sed" QA_PREBUILT=" usr/lib/* @@ -43,8 +44,6 @@ QA_PREBUILT=" # I don't know why the current value is not working QA_SONAME="usr/lib/*" -S=${WORKDIR} - pkg_pretend(){ elog "This is last version which supports AMD's legacy graphics cards such as:" elog "Radeon™ RX Vega Series" diff --git a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild b/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild index b709d1f79d..5b73208cdb 100644 --- a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild +++ b/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild @@ -12,14 +12,17 @@ HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"; MY_PV="${PV/'.'/'.Q'}" FETCH_URI="https://github.com/GPUOpen-Drivers/AMDVLK/releases/download"; SRC_URI="${FETCH_URI}/v-${MY_PV}/amdvlk-${MY_PV}.x86_64.rpm -> ${P}-amd64.rpm -${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb" -RESTRICT="test" -REQUIRED_USE="abi_x86_64" + ${FETCH_URI}/v-${MY_PV}/amdvlk_${MY_PV}_i386.deb -> ${P}-i386.deb" + +S="${WORKDIR}" LICENSE="MIT" SLOT="0" KEYWORDS="-* ~amd64" # The hardware is not supported pure x86 anymore +REQUIRED_USE="abi_x86_64" +RESTRICT="test" + RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] app-arch/zstd[${MULTILIB_USEDEP}] @@ -32,9 +35,7 @@ RDEPEND=" !media-libs/amdvlk-bin:legacy-polaris !media-libs/amdvlk-bin:legacy-si " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" BDEPEND="sys-apps/sed" QA_PREBUILT=" usr/lib/* @@ -44,8 +45,6 @@ QA_PREBUILT=" # I don't know why the current value is not working QA_SONAME="usr/lib/*" -S=${WORKDIR} - pkg_pretend(){ ewarn "Mainline AMDVLK drops support for pre-NAVI graphics cards" ewarn "Such as Radeon™ RX 400/500 Series" diff --git a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild index 2083a930e5..02d04f50ff 100644 --- a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild +++ b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild @@ -10,34 +10,6 @@ inherit check-reqs python-any-r1 cmake-multilib DESCRIPTION="AMD Open Source Driver for Vulkan" HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"; -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="wayland +raytracing" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" -DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - ${BUNDLED_LLVM_DEPEND} - >=dev-util/vulkan-headers-1.3.224 - raytracing? ( dev-util/DirectXShaderCompiler ) - dev-util/glslang[${MULTILIB_USEDEP}]" -BDEPEND="${BUNDLED_LLVM_DEPEND} - ${PYTHON_DEPS} - virtual/linux-sources" -RDEPEND=" ${DEPEND} - x11-libs/libdrm[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxshmfence[${MULTILIB_USEDEP}] - >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}] - dev-util/glslang[${MULTILIB_USEDEP}] - dev-libs/openssl[${MULTILIB_USEDEP}]" #890449 - -CHECKREQS_MEMORY="7G" -CHECKREQS_DISK_BUILD="4G" -S="${WORKDIR}" -CMAKE_USE_DIR="${S}/xgl" ### SOURCE CODE PER_VERSION VARIABLES FETCH_URI="https://github.com/GPUOpen-Drivers"; @@ -66,6 +38,36 @@ ${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${ ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz ${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="wayland +raytracing" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" + +BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" +DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + ${BUNDLED_LLVM_DEPEND} + >=dev-util/vulkan-headers-1.3.224 + raytracing? ( dev-util/DirectXShaderCompiler ) + dev-util/glslang[${MULTILIB_USEDEP}]" +BDEPEND="${BUNDLED_LLVM_DEPEND} + ${PYTHON_DEPS} + virtual/linux-sources" +RDEPEND=" ${DEPEND} + x11-libs/libdrm[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + x11-libs/libxshmfence[${MULTILIB_USEDEP}] + >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}] + dev-util/glslang[${MULTILIB_USEDEP}] + dev-libs/openssl[${MULTILIB_USEDEP}]" #890449 + +CHECKREQS_MEMORY="7G" +CHECKREQS_DISK_BUILD="4G" +CMAKE_USE_DIR="${S}/xgl" + PATCHES=( "${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821 "${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch" diff --git a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild index 5ae8851868..aa0f0cd910 100644 --- a/media-libs/amdvlk/amdvlk-2023.1.2.ebuild +++ b/media-libs/amdvlk/amdvlk-2023.1.2.ebuild @@ -10,34 +10,6 @@ inherit check-reqs python-any-r1 cmake-multilib DESCRIPTION="AMD Open Source Driver for Vulkan" HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"; -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="wayland +raytracing" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" -DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - ${BUNDLED_LLVM_DEPEND} - >=dev-util/vulkan-headers-1.3.224 - raytracing? ( dev-util/DirectXShaderCompiler ) - dev-util/glslang[${MULTILIB_USEDEP}]" -BDEPEND="${BUNDLED_LLVM_DEPEND} - ${PYTHON_DEPS} - virtual/linux-sources" -RDEPEND=" ${DEPEND} - x11-libs/libdrm[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libxcb[${MULTILIB_USEDEP}] - x11-libs/libxshmfence[${MULTILIB_USEDEP}] - >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}] - dev-util/glslang[${MULTILIB_USEDEP}] - dev-libs/openssl[${MULTILIB_USEDEP}]" #890449 - -CHECKREQS_MEMORY="7G" -CHECKREQS_DISK_BUILD="4G" -S="${WORKDIR}" -CMAKE_USE_DIR="${S}/xgl" ### SOURCE CODE PER_VERSION VARIABLES FETCH_URI="https://github.com/GPUOpen-Drivers"; @@ -66,6 +38,36 @@ ${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${ ${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz ${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz" +S="${WORKDIR}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="wayland +raytracing" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" + +BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]" +DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) + ${BUNDLED_LLVM_DEPEND} + >=dev-util/vulkan-headers-1.3.224 + raytracing? ( dev-util/DirectXShaderCompiler ) + dev-util/glslang[${MULTILIB_USEDEP}]" +BDEPEND="${BUNDLED_LLVM_DEPEND} + ${PYTHON_DEPS} + virtual/linux-sources" +RDEPEND=" ${DEPEND} + x11-libs/libdrm[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libxcb[${MULTILIB_USEDEP}] + x11-libs/libxshmfence[${MULTILIB_USEDEP}] + >=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}] + dev-util/glslang[${MULTILIB_USEDEP}] + dev-libs/openssl[${MULTILIB_USEDEP}]" #890449 + +CHECKREQS_MEMORY="7G" +CHECKREQS_DISK_BUILD="4G" +CMAKE_USE_DIR="${S}/xgl" + PATCHES=( "${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821 "${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch" diff --git a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild b/media-libs/amdvlk/amdvlk-2023.1.3.ebuild index 815d180e2e..192387df27 100644 --- a/media-libs/amdvlk/amdvlk-2023.1.3.ebuild +++ b/media-libs/amdvlk/amdvlk-2023.1.3.ebuild @@ -10,6 +10,36 @@ inherit check-reqs python-any-r1 cmake-multilib DESCRIPTION="AMD Open Source Driver for Vulkan" HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"; + +### SOURCE CODE PER_VERSION VARIABLES +FETCH_URI="https://github.com/GPUOpen-Drivers"; +## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml +## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml +## and place commits in the desired variables +## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" +## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..." +XGL_COMMIT="997225355d7fce7392a9e32fe9f0a515f5736d0f" +PAL_COMMIT="4640888b579bc9b0951c586b08a4552f71780d0d" +LLPC_COMMIT="1ecd9997579b962be571162931c9e38bd86bafad" +GPURT_COMMIT="714a028e920c502520011fc4f4556f58ec897424" +LLVM_PROJECT_COMMIT="fdc6165b081b7b5e5ba245f4283fcb23d6d9f167" +METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3" +CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026" +# Submodule of LLPC, also updates often. Grab commit version from +# https://github.com/GPUOpen-Drivers/llpc/tree/${LLPC_COMMIT}/imported +LLVM_DIALECTS_COMMIT="17aafecff46b68206a0ed82d58f5e2fc358367a1" +### end of variables +SRC_URI="${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz +${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz +${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz +${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz +${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz +${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz +${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz +${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz" + +S="${WORKDIR}" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -36,37 +66,9 @@ RDEPEND=" ${DEPEND} CHECKREQS_MEMORY="7G" CHECKREQS_DISK_BUILD="4G" -S="${WORKDIR}" CMAKE_USE_DIR="${S}/xgl" CMAKE_MAKEFILE_GENERATOR=ninja -### SOURCE CODE PER_VERSION VARIABLES -FETCH_URI="https://github.com/GPUOpen-Drivers"; -## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml -## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml -## and place commits in the desired variables -## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07" -## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..." -XGL_COMMIT="997225355d7fce7392a9e32fe9f0a515f5736d0f" -PAL_COMMIT="4640888b579bc9b0951c586b08a4552f71780d0d" -LLPC_COMMIT="1ecd9997579b962be571162931c9e38bd86bafad" -GPURT_COMMIT="714a028e920c502520011fc4f4556f58ec897424" -LLVM_PROJECT_COMMIT="fdc6165b081b7b5e5ba245f4283fcb23d6d9f167" -METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3" -CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026" -# Submodule of LLPC, also updates often. Grab commit version from -# https://github.com/GPUOpen-Drivers/llpc/tree/${LLPC_COMMIT}/imported -LLVM_DIALECTS_COMMIT="17aafecff46b68206a0ed82d58f5e2fc358367a1" -### end of variables -SRC_URI="${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz -${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz -${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz -${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz -${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz -${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz -${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz -${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz" - PATCHES=( "${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821 "${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch" diff --git a/media-libs/dr_flac/dr_flac-0.12.42.ebuild b/media-libs/dr_flac/dr_flac-0.12.42.ebuild index dc4b83ad0e..ce7acda477 100644 --- a/media-libs/dr_flac/dr_flac-0.12.42.ebuild +++ b/media-libs/dr_flac/dr_flac-0.12.42.ebuild @@ -5,16 +5,19 @@ EAPI=8 inherit edo toolchain-funcs -DESCRIPTION="Single-header FLAC audio decoder library" -HOMEPAGE="https://github.com/mackron/dr_libs/"; declare -A COMMITS=( [dr_flac]="39ce69188eab79a913aa23423eef9da5f3dcd142" [testbench]="aa7b0c6cf32994c106ae517a08134c28a96ff5b2" ) + +DESCRIPTION="Single-header FLAC audio decoder library" +HOMEPAGE="https://github.com/mackron/dr_libs/"; SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMITS[dr_flac]}.tar.gz -> ${P}.gh.tar.gz test? ( https://github.com/ietf-wg-cellar/flac-test-files/archive/${COMMITS[testbench]}.tar.gz -> ${P}-testbench.gh.tar.gz )" +S="${WORKDIR}/dr_libs-${COMMITS[dr_flac]}" + LICENSE="|| ( MIT-0 public-domain )" SLOT="0" KEYWORDS="~amd64" @@ -29,8 +32,6 @@ TESTCASES=( dr_flac_{decoding,test_0}.{c,cpp} ) -S="${WORKDIR}/dr_libs-${COMMITS[dr_flac]}" - src_prepare() { if use test; then # Sanitize testbench and move to expected location diff --git a/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild index a5fb0851c4..7f0db96c46 100644 --- a/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild +++ b/media-libs/dr_mp3/dr_mp3-0.6.39-r1.ebuild @@ -5,10 +5,14 @@ EAPI=8 inherit edo toolchain-funcs +COMMIT="da35f9d6c7374a95353fd1df1d394d44ab66cf01" + DESCRIPTION="Single-header MP3 audio decoder library" HOMEPAGE="https://github.com/mackron/dr_libs/"; -COMMIT="da35f9d6c7374a95353fd1df1d394d44ab66cf01" SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" + +S="${WORKDIR}/dr_libs-${COMMIT}" + LICENSE="|| ( MIT-0 public-domain )" SLOT="0" KEYWORDS="~amd64" @@ -16,8 +20,6 @@ KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )" -S="${WORKDIR}/dr_libs-${COMMIT}" - # Unfortunately, the only other test is interactive. TESTCASES=( dr_mp3_test_0.c diff --git a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild index 274907ba47..579593823b 100644 --- a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild +++ b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild @@ -5,11 +5,14 @@ EAPI=8 inherit edo toolchain-funcs +COMMIT="4ec70a37c4450b021a6653f0813f1b9ceaae65fb" + DESCRIPTION="Single-header WAV audio loader and writer library" HOMEPAGE="https://github.com/mackron/dr_libs/"; -COMMIT="4ec70a37c4450b021a6653f0813f1b9ceaae65fb" SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/dr_libs-${COMMIT}" + LICENSE="|| ( MIT-0 public-domain )" SLOT="0" KEYWORDS="~amd64 ~ppc64" @@ -24,8 +27,6 @@ TESTCASES=( dr_wav_{decoding,test_0}.{c,cpp} ) -S="${WORKDIR}/dr_libs-${COMMIT}" - src_prepare() { if use test; then # Unbundle library with incorrect include path. diff --git a/media-libs/glee/glee-5.4.0-r1.ebuild b/media-libs/glee/glee-5.4.0-r1.ebuild index 93b296c4db..147b807d26 100644 --- a/media-libs/glee/glee-5.4.0-r1.ebuild +++ b/media-libs/glee/glee-5.4.0-r1.ebuild @@ -9,6 +9,8 @@ DESCRIPTION="OpenGL Easy Extension library" HOMEPAGE="https://elf-stone.com/glee.php"; SRC_URI="https://elf-stone.com/downloads/GLee/GLee-${PV}-src.tar.gz"; +S="${WORKDIR}" + LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -17,7 +19,6 @@ IUSE="static-libs" RDEPEND="virtual/opengl" DEPEND="${RDEPEND}" -S="${WORKDIR}" src_prepare() { default eapply -p0 "${FILESDIR}/${PN}-autotools.patch" diff --git a/media-libs/glee/glee-5.4.0.ebuild b/media-libs/glee/glee-5.4.0.ebuild index 23907cd28f..2fe6944a47 100644 --- a/media-libs/glee/glee-5.4.0.ebuild +++ b/media-libs/glee/glee-5.4.0.ebuild @@ -9,6 +9,8 @@ DESCRIPTION="OpenGL Easy Extension library" HOMEPAGE="https://elf-stone.com/glee.php"; SRC_URI="https://elf-stone.com/downloads/GLee/GLee-${PV}-src.tar.gz"; +S="${WORKDIR}" + LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -17,7 +19,6 @@ IUSE="static-libs" RDEPEND="virtual/opengl" DEPEND="${RDEPEND}" -S="${WORKDIR}" src_prepare() { default eapply -p0 "${FILESDIR}/${PN}-autotools.patch" diff --git a/media-libs/wivrn/wivrn-0.13.ebuild b/media-libs/wivrn/wivrn-0.13.ebuild index a6e984eabb..af71a45638 100644 --- a/media-libs/wivrn/wivrn-0.13.ebuild +++ b/media-libs/wivrn/wivrn-0.13.ebuild @@ -1,15 +1,15 @@ EAPI=7 +inherit cmake + DESCRIPTION="WiVRn OpenXR streaming" HOMEPAGE="https://github.com/meumeu/WiVRn"; -SLOT="0" -LICENSE="GPL-3 Apache-2.0 MIT" +LICENSE="GPL-3 Apache-2.0 MIT" +SLOT="0" IUSE="nvenc pipewire pulseaudio systemd vaapi wireshark-plugins x264" REQUIRED_USE="|| ( nvenc vaapi x264 )" -inherit cmake - if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/Meumeu/WiVRn.git"; @@ -99,7 +99,7 @@ src_configure() { -DWIVRN_USE_SYSTEMD=$(usex systemd) -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DFETCHCONTENT_FULLY_DISCONNECTED=ON - -DFETCHCONTENT_BASE_DIR=${WORKDIR} + -DFETCHCONTENT_BASE_DIR="${WORKDIR}" -DENABLE_COLOURED_OUTPUT=OFF ) diff --git a/media-libs/wivrn/wivrn-0.14.1.ebuild b/media-libs/wivrn/wivrn-0.14.1.ebuild index 0c9ffea662..de3b4b6fd7 100644 --- a/media-libs/wivrn/wivrn-0.14.1.ebuild +++ b/media-libs/wivrn/wivrn-0.14.1.ebuild @@ -1,15 +1,15 @@ EAPI=7 +inherit cmake + DESCRIPTION="WiVRn OpenXR streaming" HOMEPAGE="https://github.com/meumeu/WiVRn"; -SLOT="0" -LICENSE="GPL-3 Apache-2.0 MIT" +LICENSE="GPL-3 Apache-2.0 MIT" +SLOT="0" IUSE="nvenc +pipewire -pulseaudio systemd vaapi wireshark-plugins x264" REQUIRED_USE="|| ( nvenc vaapi x264 )" -inherit cmake - if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/Meumeu/WiVRn.git"; @@ -93,7 +93,7 @@ src_configure() { -DWIVRN_USE_SYSTEMD=$(usex systemd) -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DFETCHCONTENT_FULLY_DISCONNECTED=ON - -DFETCHCONTENT_BASE_DIR=${WORKDIR} + -DFETCHCONTENT_BASE_DIR="${WORKDIR}" -DENABLE_COLOURED_OUTPUT=OFF ) diff --git a/media-libs/wivrn/wivrn-9999.ebuild b/media-libs/wivrn/wivrn-9999.ebuild index 0c9ffea662..de3b4b6fd7 100644 --- a/media-libs/wivrn/wivrn-9999.ebuild +++ b/media-libs/wivrn/wivrn-9999.ebuild @@ -1,15 +1,15 @@ EAPI=7 +inherit cmake + DESCRIPTION="WiVRn OpenXR streaming" HOMEPAGE="https://github.com/meumeu/WiVRn"; -SLOT="0" -LICENSE="GPL-3 Apache-2.0 MIT" +LICENSE="GPL-3 Apache-2.0 MIT" +SLOT="0" IUSE="nvenc +pipewire -pulseaudio systemd vaapi wireshark-plugins x264" REQUIRED_USE="|| ( nvenc vaapi x264 )" -inherit cmake - if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/Meumeu/WiVRn.git"; @@ -93,7 +93,7 @@ src_configure() { -DWIVRN_USE_SYSTEMD=$(usex systemd) -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DFETCHCONTENT_FULLY_DISCONNECTED=ON - -DFETCHCONTENT_BASE_DIR=${WORKDIR} + -DFETCHCONTENT_BASE_DIR="${WORKDIR}" -DENABLE_COLOURED_OUTPUT=OFF )
