From d55ab08e73aad1e5e3f03607ac3675cb85411bc6 Mon Sep 17 00:00:00 2001 From: Ryan Fox Date: Thu, 4 Nov 2021 21:12:31 -0700 Subject: [PATCH] media-gfx/glslviewer: Bump to 2.0.0 Now with a submodule with vendored libraries... Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Ryan Fox --- media-gfx/glslviewer/Manifest | 6 ++- media-gfx/glslviewer/glslviewer-2.0.0.ebuild | 47 ++++++++++++++++++++ media-gfx/glslviewer/glslviewer-9999.ebuild | 40 ++++++++++++++--- 3 files changed, 85 insertions(+), 8 deletions(-) create mode 100644 media-gfx/glslviewer/glslviewer-2.0.0.ebuild diff --git a/media-gfx/glslviewer/Manifest b/media-gfx/glslviewer/Manifest index 593ad88..890505e 100644 --- a/media-gfx/glslviewer/Manifest +++ b/media-gfx/glslviewer/Manifest @@ -1,7 +1,11 @@ +DIST ada-c5c173827fee9812caf9c92615c851766edd8cda.tar.gz 1794826 BLAKE2B 7c61b8982b0f389747597677e76b1f689930b16daa94f76d4ab535229e1b147f5879d8c54959227b93dfac9f271a6795ab595c51f1d0e59a0f638a28b92a078f SHA512 7b65aa43c5ef331ddb70f0c19d5b9e8a078bcf6d8f3115fcfa7189db636fbb7c1cb5ef46fa256d434bbd252d448f346838d6b9da96a822cabe55b5bb47b5f14c DIST glslviewer-1.6.8.tar.gz 29443106 BLAKE2B f40d0e3e4dc8369f0846bd84fbd6c8c24eec44efabbcd873cda66183fbd6a38b54830215ac60bc51d4b4237b18b4d46122287d10c5d4ffaaf914c0945ea35990 SHA512 a2121f2271c597aa2b58db00150f52c9e58a4c986080155b408922dae718c3e754fa02d8e174d18f011d87de47262f6082e8814b91078bdfb6556bf4c16f4e56 DIST glslviewer-1.7.0.tar.gz 31291497 BLAKE2B 1610134a50d39f3ed0d9543e5256d0c5d996d193005f05c781d92e64298a99adcc4136a5a3def0ec0700ef7eafb7a9d09299d3aff52ae31c8a22ee7a56a5969d SHA512 ca2203beff010d54de343d3f984121ff0b4feb0bde8f4fde8e380ceec7fe0fbd8631b0cbf998128ab9a1d88d6d24d3d970027ab73d50ab319b3629c432e4b6a0 +DIST glslviewer-2.0.0.tar.gz 49159204 BLAKE2B d8d5f6b2beceb1866c5c5a11c7bf75eb0e9e358d8920cf874b358b0081809597e59ac2c8c6f6a6c4c95e150a4ec00b67587179b14a75f3e6339473ae129dade7 SHA512 96fa75bd75112b8b7678303205fe2251d7b6087d32639344a6a716d76a3e8355a42758767515cdc00ccc1f006fef7fcb169c72a70a6fc80b0807a59817d02a48 DIST miniaudio-0.10.35.tar.gz 1319409 BLAKE2B 1cc823906610fad67b0e4b9f9dd47e8163180057f4801bdb63a7d5dd6a96563e404d8ebe9a35461dd9682c03bf301f9115b2b34aec84d826c8e54a3463ccc4f2 SHA512 015f241891f53b4cde1643ce3a23aa6db39d6e4b8f5ae808072668d9496e34b574f94e5f6c08505ba560c23f76ff2a1a02c9fe1987cdcc87349ec326d3241e2d +DIST miniaudio-0.10.42.tar.gz 1412419 BLAKE2B 51913e9f7e4f58ca4a69f45b3882b95dcc2ba6a87d56ed82e0e29af4519629376c1da94115d13f881eeac2cd2922e0946b9f6290b08b7e3887eedc86f9a21a4d SHA512 9e378e443adb162c4e547cf02b3d4d89e3b300057cd61040352363cd7a8e2a9679d9a1996e4454db2db3b964b095ec9264c4fe9d05bb8f7bac80823cd63168f8 EBUILD glslviewer-1.6.8.ebuild 740 BLAKE2B 41c2035415848d15f085d1521d7b2305e711b10d7316301f8ef21136c24b0c7c7bce2f8b2b92b6387a72eadb84991597bd0d83030fedc9058cdd835973346772 SHA512 f98dcf14e6f9cab813155f95949ebea7be70d5bb44f143fc4697b3db70ca784a57cccd22816800854bf7d0a143a59799020131fe2d1d16e913d25ea1a2c4d498 EBUILD glslviewer-1.7.0.ebuild 863 BLAKE2B 9d9183b9b689f9d2ea787e931e467a754aad51081de094e490168be1e0015996272df7949eb1420d45d6d09c6090046ab0ce6447072f1f64ef6b79370a2e7a50 SHA512 6aa60c9d7276bfea361be6b01d5e813c24f2a3db67d3622f3e38fd6cbbb8db4b85c596e914679dc06b889995a777ba66c2ef9b7518a866e7938610b05fcc2cf0 -EBUILD glslviewer-9999.ebuild 475 BLAKE2B d83776c517a51c8bfffab9c1ffef109a807fce36d8e83b3e9ed27d14048444fe336600f3feeac57bc75d679040d1d4b666660fee45e5d41e6e72e24c90e15163 SHA512 1a5fb78dda1ace62e8fb9be7eea72be97760cc40982018e216f7dc7becbb66804699881cb9a880c025a61692293ef9897c7792ea90205322c51734b32e64a0b8 +EBUILD glslviewer-2.0.0.ebuild 1319 BLAKE2B c5394270bc2cc0ec117005bcd880be4372fab7bd5601c284fecbca937147c0223a836062462dc49dbcea27e3d9bb84f6cf6cad37e9c99a2514a7972f987a4045 SHA512 a2e8ad169fbf8b5ac50c888b7f0105c0bf255025db728df61a7b259614cce6573b278e7c754b7dd7cbe2a7ba19d3764186a8f450b79b000f83240bdf0cc6c496 +EBUILD glslviewer-9999.ebuild 1319 BLAKE2B c5394270bc2cc0ec117005bcd880be4372fab7bd5601c284fecbca937147c0223a836062462dc49dbcea27e3d9bb84f6cf6cad37e9c99a2514a7972f987a4045 SHA512 a2e8ad169fbf8b5ac50c888b7f0105c0bf255025db728df61a7b259614cce6573b278e7c754b7dd7cbe2a7ba19d3764186a8f450b79b000f83240bdf0cc6c496 MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80 diff --git a/media-gfx/glslviewer/glslviewer-2.0.0.ebuild b/media-gfx/glslviewer/glslviewer-2.0.0.ebuild new file mode 100644 index 0000000..3d4c002 --- /dev/null +++ b/media-gfx/glslviewer/glslviewer-2.0.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} != *9999* ]]; then + MY_PN="glslViewer" + MY_P="${MY_PN}-${PV}" + ADA_REF="c5c173827fee9812caf9c92615c851766edd8cda" + MINIAUDIO_V="0.10.42" + MINIAUDIO_REF="dbca7a3b44594e0226f887472b31f54aa5f14214" + S="${WORKDIR}/${MY_P}" + SRC_URI=" + https://github.com/patriciogonzalezvivo/glslViewer/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/patriciogonzalezvivo/ada/archive/${ADA_REF}.tar.gz -> ada-${ADA_REF}.tar.gz + https://github.com/mackron/miniaudio/archive/${MINIAUDIO_REF}.tar.gz -> miniaudio-${MINIAUDIO_V}.tar.gz + " + KEYWORDS="~amd64" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/patriciogonzalezvivo/glslViewer.git" + EGIT_SUBMODULES=( deps/ada deps/miniaudio ) +fi + +DESCRIPTION="Console-based sandbox for GLSL shaders" +HOMEPAGE="http://patriciogonzalezvivo.com/2015/glslViewer/" +LICENSE="BSD" +SLOT="0" + +DEPEND="" +RDEPEND="${DEPEND}" +BDEPEND="" + +src_unpack() { + if [[ ${PV} != *9999* ]]; then + default + rm -rf "${S}/deps/ada" "${S}/deps/miniaudio" || die + ln -s "${WORKDIR}/ada-${ADA_REF}" "${S}/deps/ada" || die + ln -s "${WORKDIR}/miniaudio-${MINIAUDIO_REF}" "${S}/deps/miniaudio" || die + else + git-r3_src_unpack + fi +} + +src_install() { + dobin "${S}/build/glslViewer" +} diff --git a/media-gfx/glslviewer/glslviewer-9999.ebuild b/media-gfx/glslviewer/glslviewer-9999.ebuild index 587b2cc..3d4c002 100644 --- a/media-gfx/glslviewer/glslviewer-9999.ebuild +++ b/media-gfx/glslviewer/glslviewer-9999.ebuild @@ -1,21 +1,47 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit git-r3 -EGIT_REPO_URI="https://github.com/patriciogonzalezvivo/glslViewer.git" -EGIT_SUBMODULES=( include/miniaudio ) +if [[ ${PV} != *9999* ]]; then + MY_PN="glslViewer" + MY_P="${MY_PN}-${PV}" + ADA_REF="c5c173827fee9812caf9c92615c851766edd8cda" + MINIAUDIO_V="0.10.42" + MINIAUDIO_REF="dbca7a3b44594e0226f887472b31f54aa5f14214" + S="${WORKDIR}/${MY_P}" + SRC_URI=" + https://github.com/patriciogonzalezvivo/glslViewer/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/patriciogonzalezvivo/ada/archive/${ADA_REF}.tar.gz -> ada-${ADA_REF}.tar.gz + https://github.com/mackron/miniaudio/archive/${MINIAUDIO_REF}.tar.gz -> miniaudio-${MINIAUDIO_V}.tar.gz + " + KEYWORDS="~amd64" +else + inherit git-r3 + EGIT_REPO_URI="https://github.com/patriciogonzalezvivo/glslViewer.git" + EGIT_SUBMODULES=( deps/ada deps/miniaudio ) +fi DESCRIPTION="Console-based sandbox for GLSL shaders" HOMEPAGE="http://patriciogonzalezvivo.com/2015/glslViewer/" LICENSE="BSD" SLOT="0" -DEPEND="media-libs/glfw" +DEPEND="" RDEPEND="${DEPEND}" BDEPEND="" -src_install() { - dobin "${S}/glslViewer" +src_unpack() { + if [[ ${PV} != *9999* ]]; then + default + rm -rf "${S}/deps/ada" "${S}/deps/miniaudio" || die + ln -s "${WORKDIR}/ada-${ADA_REF}" "${S}/deps/ada" || die + ln -s "${WORKDIR}/miniaudio-${MINIAUDIO_REF}" "${S}/deps/miniaudio" || die + else + git-r3_src_unpack + fi +} + +src_install() { + dobin "${S}/build/glslViewer" }