diff options
Diffstat (limited to 'media-libs/glfw')
-rw-r--r-- | media-libs/glfw/Manifest | 8 | ||||
-rw-r--r-- | media-libs/glfw/glfw-3.3.4-r2.ebuild (renamed from media-libs/glfw/glfw-3.3.3.ebuild) | 2 | ||||
-rw-r--r-- | media-libs/glfw/glfw-3.3.4-r3.ebuild (renamed from media-libs/glfw/glfw-3.3.4-r1.ebuild) | 33 | ||||
-rw-r--r-- | media-libs/glfw/glfw-3.3.4.ebuild | 48 | ||||
-rw-r--r-- | media-libs/glfw/metadata.xml | 3 |
5 files changed, 22 insertions, 72 deletions
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest index 5af993d6a090..7492dc64a562 100644 --- a/media-libs/glfw/Manifest +++ b/media-libs/glfw/Manifest @@ -1,6 +1,4 @@ -DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df011f7ab5172e626dc46df90793190284241b470a4b78e020302e5dca4051476e092e73e34731f6245a43ea14 SHA512 6d743d89d159bff6c4f7fa3fc5bc407fd728bdc432d76acc4897fd392580be272f8a9d1d7c375c4323e82bf2fd28310e5daab097fef33e8f43b69ce104f9bd31 DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701 -EBUILD glfw-3.3.3.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca -EBUILD glfw-3.3.4-r1.ebuild 1210 BLAKE2B a9f95844bb5f1a578511cf62756462259799a58d736dfd85a753ad9be0b25edf22deeef6cd20e7e2bcad44e187ed4801dbe26a1ac724565798cb5ea9a9c041cb SHA512 5163c45026772199ca6b6322cbfa3393d3173516980e136027f1859dbd9573de631012eecabc2006e137e8af7ed1a39a291bd06b843e3c2cb2d2d6e9f89d672c -EBUILD glfw-3.3.4.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca -MISC metadata.xml 388 BLAKE2B 6f83bc48ed7a722cf0b64e450ac3839543db9713d3252c40eab395a54d53b9782e163a3238e6d443c2f8f6c8fd747a273ca018e08918fe084b048821665a8bbe SHA512 47ef3b02e4c8b3a12f328bc227f3ed2196c82e05970a9af12d1988a4466d5b614e0b788914dc03b4325a5cd2d63d93a677b6d093cdd50455c78b3d79c64a5171 +EBUILD glfw-3.3.4-r2.ebuild 920 BLAKE2B 1eea6a698f674045f0a5aceccb17a91970dcebb6df2b5a9c35a8296db0fb679764dfcaa84c5e5dca0cc34fa4762f318628770204e25c7a3a9741c719edc80462 SHA512 6eaf04bc7d9cd04725a78984f425fe35de49527ece075cf8ac9336b5a7b05c1f1643f7f1fcaf938e7697aa25b8aab39b9c6c3bc35aac242e820be189f0eaaf30 +EBUILD glfw-3.3.4-r3.ebuild 1274 BLAKE2B 9913c1bb47a27d7184740d7815e2aaac4548d95e354f11456d7348971c04b54c4ae617c1e77fc14b8ef95257ded33aea9b22ea07cd2b7735054c68098dd36e94 SHA512 632d68dc987ae90322f1bb13a7d5eb5e9611d3712e3e74947448a7eff5f17729765611a853e560256ad848683469e1a34ec5d9c0747d92d757cb7d554e2b0b0e +MISC metadata.xml 485 BLAKE2B 0f1924b9f19207b2df6f61de6bd230a6423dac81d60dfd4602354e73db9fa6f5051e1f903c4f180fd5c0f9d58f39f645c720ebed8d7a67f4e260831ff3f3e3c9 SHA512 4cc8567cad28dff3b759614e99a02e86baf2eb8d2aa9be7bb3f4fb4efd341c59b4b25c79d204c63fa764e9b833142116f511cffa84f92d77721438d9df1df017 diff --git a/media-libs/glfw/glfw-3.3.3.ebuild b/media-libs/glfw/glfw-3.3.4-r2.ebuild index 126bde0fc027..a8d714e18bad 100644 --- a/media-libs/glfw/glfw-3.3.3.ebuild +++ b/media-libs/glfw/glfw-3.3.4-r2.ebuild @@ -26,7 +26,7 @@ RDEPEND=" ) wayland? ( dev-libs/wayland - media-libs/mesa[egl,wayland] + media-libs/mesa[egl(+),wayland] ) " DEPEND=" diff --git a/media-libs/glfw/glfw-3.3.4-r1.ebuild b/media-libs/glfw/glfw-3.3.4-r3.ebuild index 43f33ee0dd73..499e6061c4fe 100644 --- a/media-libs/glfw/glfw-3.3.4-r1.ebuild +++ b/media-libs/glfw/glfw-3.3.4-r3.ebuild @@ -6,50 +6,47 @@ EAPI=7 CMAKE_ECLASS=cmake inherit cmake-multilib -DESCRIPTION="The Portable OpenGL FrameWork" +DESCRIPTION="Portable OpenGL FrameWork" HOMEPAGE="https://www.glfw.org/" SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" -IUSE="wayland" +IUSE="wayland-only" +# note: libglfw uses dlopen() for most of these at runtime RDEPEND=" x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - !wayland? ( + wayland-only? ( + dev-libs/wayland[${MULTILIB_USEDEP}] + media-libs/mesa[egl(+),wayland,${MULTILIB_USEDEP}] + ) + !wayland-only? ( virtual/opengl[${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXinerama[${MULTILIB_USEDEP}] x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) - wayland? ( - dev-libs/wayland[${MULTILIB_USEDEP}] - media-libs/mesa[egl,wayland,${MULTILIB_USEDEP}] - ) -" + )" DEPEND=" ${RDEPEND} - !wayland? ( + wayland-only? ( dev-libs/wayland-protocols ) + !wayland-only? ( x11-base/xorg-proto x11-libs/libXi[${MULTILIB_USEDEP}] - ) - wayland? ( dev-libs/wayland-protocols ) -" + )" BDEPEND=" - wayland? ( + wayland-only? ( dev-util/wayland-scanner kde-frameworks/extra-cmake-modules - ) -" + )" src_configure() { local mycmakeargs=( -DGLFW_BUILD_EXAMPLES=no - -DGLFW_USE_WAYLAND="$(usex wayland)" - -DBUILD_SHARED_LIBS=1 + -DGLFW_USE_WAYLAND=$(usex wayland-only) ) cmake-multilib_src_configure } diff --git a/media-libs/glfw/glfw-3.3.4.ebuild b/media-libs/glfw/glfw-3.3.4.ebuild deleted file mode 100644 index 126bde0fc027..000000000000 --- a/media-libs/glfw/glfw-3.3.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="The Portable OpenGL FrameWork" -HOMEPAGE="https://www.glfw.org/" -SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86" -IUSE="wayland" - -RDEPEND=" - x11-libs/libxkbcommon - !wayland? ( - virtual/opengl - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXxf86vm - ) - wayland? ( - dev-libs/wayland - media-libs/mesa[egl,wayland] - ) -" -DEPEND=" - ${RDEPEND} - !wayland? ( x11-libs/libXi ) - wayland? ( dev-libs/wayland-protocols ) -" -BDEPEND=" - wayland? ( kde-frameworks/extra-cmake-modules ) -" - -src_configure() { - local mycmakeargs=( - -DGLFW_BUILD_EXAMPLES=no - -DGLFW_USE_WAYLAND="$(usex wayland)" - -DBUILD_SHARED_LIBS=1 - ) - cmake_src_configure -} diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml index 6e5bbe581196..cd68a68804a2 100644 --- a/media-libs/glfw/metadata.xml +++ b/media-libs/glfw/metadata.xml @@ -9,4 +9,7 @@ <remote-id type="github">glfw/glfw</remote-id> <changelog>https://www.glfw.org/changelog.html</changelog> </upstream> + <use> + <flag name="wayland-only">Enable wayland support and disable X11 support</flag> + </use> </pkgmetadata> |