From 34d4f34516ab568ad4ea24fc16ee0ad9ec8ad079 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Aug 2022 14:19:56 +0100 Subject: gentoo auto-resync : 11:08:2022 - 14:19:56 --- media-libs/Manifest.gz | Bin 65958 -> 65964 bytes media-libs/embree/Manifest | 3 + media-libs/embree/embree-3.13.4.ebuild | 134 +++++++++++++++++++++ .../files/embree-3.13.4-fix-openimageio-test.patch | 71 +++++++++++ media-libs/glfw/Manifest | 4 - media-libs/glfw/glfw-3.3.6.ebuild | 50 -------- media-libs/glfw/glfw-3.3.7.ebuild | 50 -------- 7 files changed, 208 insertions(+), 104 deletions(-) create mode 100644 media-libs/embree/embree-3.13.4.ebuild create mode 100644 media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch delete mode 100644 media-libs/glfw/glfw-3.3.6.ebuild delete mode 100644 media-libs/glfw/glfw-3.3.7.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 118157f2e000..7948b3ec5c22 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest index 19dedc764bdd..f37a6d791aa0 100644 --- a/media-libs/embree/Manifest +++ b/media-libs/embree/Manifest @@ -1,7 +1,10 @@ +AUX embree-3.13.4-fix-openimageio-test.patch 4663 BLAKE2B 2b6a5422f51977317c1149673bc8624f56d363d8362f2d3678c86e661d1f9eb6a2319df241d736a0da8e586d86fa6ff524c3fc98fe564f511551efe756b80d7c SHA512 b3b414f8068af8f45ceca91653b9e8cd2f06cfd7cafbd25a9b97ac6e3f30a27f22bbb121be34ee154e9910d3668f798d226199a843316762486ae85685a2ee9d DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f DIST embree-3.13.2.tar.gz 13716621 BLAKE2B 8fd770ea9984a9f5b532f114c7901a67105f95c98a1bad45ed9dc2e312062e22aee26d54bd54ac3c9593fed14d34b03903ac186516682890cfaf9e0714743cce SHA512 9e4912f52c503d8d1fe0c3c81bf8108f1af044bf08d76111e4c1ab434c6a38d33bae9aacfd60c874da76bcc2f909ad1f3f171d458adb7973644cdbfd3693dc0f DIST embree-3.13.3.tar.gz 13712462 BLAKE2B 02edef26b4c4f3676e792c06490e5947d3a2cedd4ce1bbf4731e60feea0b3714bf4bbf9d859d464f179674e4e0c9462d1565869713c5612705df273baa41923f SHA512 eef8d9101f0bf95d6706a495a9aa628c10749862aeb2baa6bba2f82fcc3a96467a28ca1f522d672eb5aa7b29824363674feda25832724da361b3334334a218cd +DIST embree-3.13.4.tar.gz 13733908 BLAKE2B 4c6c24f62ee88a09149bd930716c71e91d54563eea5cc103c0346d3808c693e8470fc7ea98651e0df9e4423bda565d7ab1a23e16c9d0441c79e9ec9c8571b0fa SHA512 685c3935fabe1bfa7260ef148df26b686b085b75011d72011461471cbcef786a5ce7a0e85c57b2df05798489a2d4e80a8d3ee5df986029edad7df7511d99c0ca EBUILD embree-3.13.0-r2.ebuild 3632 BLAKE2B f444cb044ee4ccf93e943c7407d3c03c792ab45dbe7b29c985438de9686ee56d9885541b97eeab9fa1e8bda3c1966a7a8aa0b7f9149ed85963cfb227396920e8 SHA512 72ee5506cc0e7e4b834bc5952cce2627d07c545d380f94e41084db1646191b6ce10821c136f6d3efdd5bc0bfca9fe08831b0716b5b077bd0b5a826f33a7e76d7 EBUILD embree-3.13.2.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5 EBUILD embree-3.13.3.ebuild 3736 BLAKE2B c9990a93eee76ca97d72e6c4cd6ea93973e5af49bf2bfaeaada48d892f3e6d452b15904550c7fdfc9e8162e4eb59991c2a4bdd5b93c21c8fe14ea474431ae372 SHA512 2581de305e8fd4b963ee2ba7c8af5d86d0ab50eba8d29c20aaf2d9b203fbcf813fc3fad7cb14d003d8aa3b23294c061984ac8beded50d7923d58a0a72492bdc5 +EBUILD embree-3.13.4.ebuild 3740 BLAKE2B 090214e0c2ae5c321b556caece7c22bf9383636060365742cb628aedc2e2cb73c7ac45a9af88d17e296f6a32657ef269e44961deccaf6703f37537ca7b716272 SHA512 3b19ca4ba5ac7964d2cd32f92b4ab7b2ffbed33a669b50b67ec771f5b04c7a9b82a886f1febf1527eda697d439ff80a9305447d7fc5cab499aebb1afa5c29637 MISC metadata.xml 1705 BLAKE2B 2785c8b8752e5730e014ce6edfdd1702a20565ab12c9ebee14c3cf603e267a63360eaa0428afb9e178091edad40fe82ea55e2a872339da744113e480b4eda6c2 SHA512 ebfa1a6d3f8a8fe6acc0cc06f54ad62efb86942b55e985542a049fde421663adddcffe2a78c7309774df9bbc714a2bb11dad73c94b89bf2d1cdf56b69d334f59 diff --git a/media-libs/embree/embree-3.13.4.ebuild b/media-libs/embree/embree-3.13.4.ebuild new file mode 100644 index 000000000000..10b3cb8db86e --- /dev/null +++ b/media-libs/embree/embree-3.13.4.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic linux-info + +DESCRIPTION="Collection of high-performance ray tracing kernels" +HOMEPAGE="https://github.com/embree/embree" +SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq ) +CPU_FLAGS=( cpu_flags_arm_neon ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} ) +IUSE="+compact-polys ispc +raymask ssp +tbb tutorial ${CPU_FLAGS[@]%:*}" +# Let's be explicit here even though we could simplify it. +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 ) + x86? ( cpu_flags_x86_sse2 )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + >=media-libs/glfw-3.2.1 + virtual/opengl + ispc? ( dev-lang/ispc ) + tbb? ( dev-cpp/tbb:= ) + tutorial? ( + media-libs/libjpeg-turbo + >=media-libs/libpng-1.6.34:0= + >=media-libs/openimageio-1.8.7:0= + ) +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md README.md readme.pdf ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.13.4-fix-openimageio-test.patch +) + +pkg_setup() { + CONFIG_CHECK="~TRANSPARENT_HUGEPAGE" + WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance." + + linux-info_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # disable RPM package building + sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \ + -i CMakeLists.txt || die +} + +src_configure() { + # NOTE: You can make embree accept custom CXXFLAGS by turning off + # EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use + # any "m*" compile flags. This is because embree builds modules for the + # different supported ISAs and picks the correct one at runtime. + # "m*" will pull in cpu instructions that shouldn't be in specific modules + # and it fails to link properly. + # https://github.com/embree/embree/issues/115 + + filter-flags -m* + + local mycmakeargs=( + # Currently Intel only host their test files on their internal network. + # So it seems like users can't easily get a hold of these and do + # regression testing on their own. + -DBUILD_TESTING:BOOL=OFF + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON + + # default + -DEMBREE_BACKFACE_CULLING=OFF + -DEMBREE_COMPACT_POLYS=$(usex compact-polys) + + # default + -DEMBREE_FILTER_FUNCTION=ON + # default + -DEMBREE_GEOMETRY_CURVE=ON + # default + -DEMBREE_GEOMETRY_GRID=ON + # default + -DEMBREE_GEOMETRY_INSTANCE=ON + # default + -DEMBREE_GEOMETRY_POINT=ON + # default + -DEMBREE_GEOMETRY_QUAD=ON + # default + -DEMBREE_GEOMETRY_SUBDIVISION=ON + # default + -DEMBREE_GEOMETRY_TRIANGLE=ON + # default + -DEMBREE_GEOMETRY_USER=ON + # default + -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF + # default + -DEMBREE_IGNORE_INVALID_RAYS=OFF + + # Set to NONE so we can manually switch on ISAs below + -DEMBREE_MAX_ISA:STRING="NONE" + -DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx) + -DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2) + -DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq) + -DEMBREE_ISA_NEON=$(usex cpu_flags_arm_neon) + -DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2) + -DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2) + -DEMBREE_ISPC_SUPPORT=$(usex ispc) + -DEMBREE_RAY_MASK=$(usex raymask) + # default + -DEMBREE_RAY_PACKETS=ON + -DEMBREE_STACK_PROTECTOR=$(usex ssp) + -DEMBREE_STATIC_LIB=OFF + -DEMBREE_STAT_COUNTERS=OFF + -DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL") + -DEMBREE_TUTORIALS=$(usex tutorial)) + + # Disable asserts + append-cppflags -DNDEBUG + + if use tutorial; then + mycmakeargs+=( + -DEMBREE_TUTORIALS_LIBJPEG=ON + -DEMBREE_TUTORIALS_LIBPNG=ON + -DEMBREE_TUTORIALS_OPENIMAGEIO=ON + ) + fi + + cmake_src_configure +} diff --git a/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch b/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch new file mode 100644 index 000000000000..9c9893815bc7 --- /dev/null +++ b/media-libs/embree/files/embree-3.13.4-fix-openimageio-test.patch @@ -0,0 +1,71 @@ +diff --git a/common/cmake/FindOpenImageIO.cmake b/common/cmake/FindOpenImageIO.cmake +index 086b91183..5816f3bc5 100644 +--- a/common/cmake/FindOpenImageIO.cmake ++++ b/common/cmake/FindOpenImageIO.cmake +@@ -53,6 +53,7 @@ SET(OPENIMAGEIO_HINTS + ) + SET(OPENIMAGEIO_PATHS PATHS /usr/lib /usr/lib64 /lib /lib64) + FIND_LIBRARY(OPENIMAGEIO_LIBRARY OpenImageIO ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS}) ++FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY OpenImageIO_Util ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS}) + + SET(OPENIMAGEIO_ROOT_LAST ${OPENIMAGEIO_ROOT} CACHE INTERNAL "Last value of OPENIMAGEIO_ROOT to detect changes") + +@@ -68,8 +69,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO + + IF (OPENIMAGEIO_FOUND) + SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) +- SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY}) ++ SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY}) + ENDIF() + + MARK_AS_ADVANCED(OPENIMAGEIO_INCLUDE_DIR) + MARK_AS_ADVANCED(OPENIMAGEIO_LIBRARY) ++MARK_AS_ADVANCED(OPENIMAGEIO_UTIL_LIBRARY) +diff --git a/common/cmake/clang.cmake b/common/cmake/clang.cmake +index 01480ac73..4380823ed 100644 +--- a/common/cmake/clang.cmake ++++ b/common/cmake/clang.cmake +@@ -86,7 +86,6 @@ ELSE() + ENDIF() + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules +diff --git a/common/cmake/dpcpp.cmake b/common/cmake/dpcpp.cmake +index aecb35169..fcdfb4ce4 100644 +--- a/common/cmake/dpcpp.cmake ++++ b/common/cmake/dpcpp.cmake +@@ -83,7 +83,6 @@ ELSE() + ENDIF() + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules +diff --git a/common/cmake/gnu.cmake b/common/cmake/gnu.cmake +index 1b2682d9e..cb96ecb64 100644 +--- a/common/cmake/gnu.cmake ++++ b/common/cmake/gnu.cmake +@@ -44,7 +44,6 @@ IF (NOT APPLE) + ENDIF() + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries +-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") # disables strict aliasing rules +diff --git a/common/cmake/intel.cmake b/common/cmake/intel.cmake +index 2c8e86e6c..abdffba90 100644 +--- a/common/cmake/intel.cmake ++++ b/common/cmake/intel.cmake +@@ -120,7 +120,6 @@ ELSE() + ENDIF() + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # generate position independent code suitable for shared libraries + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") # generate position independent code suitable for shared libraries +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") # enables C++11 features + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") # makes all symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") # makes all inline symbols hidden by default + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-ansi-alias") # disables strict aliasing rules diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest index b7cd3ff1dcaa..ea67d45f90d5 100644 --- a/media-libs/glfw/Manifest +++ b/media-libs/glfw/Manifest @@ -1,9 +1,5 @@ DIST glfw-3.3.5.tar.gz 776593 BLAKE2B ce92a42ef7361ae2580c9d6722d340106f9ca26e7fb436b9a4be2f25bf4a15d2b08d82ff71ad4ce4cd6a59e31d934d0fe6ab0e546474a3e7de38e229795ee0e8 SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb -DIST glfw-3.3.6.tar.gz 776716 BLAKE2B 6bd3ef60e637e96dc71013ce8caada2ad0aba47eb72fd35a7b3060344f604f497ea87d17689723f4bd968098f9b3828c258f35cb3a6128d1a8b649c523dd3287 SHA512 4c295c5f4c02f6ede125fce67c52a97450f552f3985b664745bd8a836c1d6d69c04727c956fd26ec61f1e5fd9c074a28dcf6b1d1800f118444eef066f048b201 -DIST glfw-3.3.7.tar.gz 779531 BLAKE2B f8ea04a6556ca35631d354f92f298c8942a0491e4a96ebcf56a5a88ce5ae68931f7c9cd638ce1951407ed8cb09e9e86272a944d85e1e8010dd6e68135c38de37 SHA512 7b71a5a564633c3617bb0e765566069de9d54e0381fb828959a77a42ca94546623fda514292adee72ddacacc305b219a2e6c4bb799bfab8186010642bc2dffe8 DIST glfw-3.3.8.tar.gz 803789 BLAKE2B e06b319f4b5c1aaa27b32895c39fb1759adc0576a1e4c3fef095b31f204709d7ec6a89a915604b39daaa9f481a2bf2dbff165948ab2074b8a0b12c2afe913c0e SHA512 70d6d99fb7e7616990516070c9a430915dc68d89ec4fe785570f0b35f5c9606a34121e0cd57c0a7debb50e87e2a8e8d97d81a6d52d65ef454f7fd191bd9f679f EBUILD glfw-3.3.5.ebuild 1130 BLAKE2B 31fcf6d5552672d702966981b39ad09f2cd3f2b314543aa86ba3bb3e5a34c9b36fb35dbf53dfe1907b4f6260d14b78f3da6003022508cc87bbadf244bcd3c1da SHA512 2a366687fc283b0247c7137487d5c28d218fc75491918ef0ab02f0c1d46ddc709a09c69f1bc63cf1825381676d6869ef5eefc2b71f35b4fc98616d036703ec5c -EBUILD glfw-3.3.6.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0 -EBUILD glfw-3.3.7.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0 EBUILD glfw-3.3.8.ebuild 1139 BLAKE2B e79aee6746365d62eab5d88bec04a998f1874c09e1d56a0ed60355e249bc8997f18f24f6a1e511300b9887421e6bc57c8bac87dfe466f5eecbd44622db68cd8e SHA512 996a68b3a419747399c604a1eec2ea75bb5f376551d205ff6f2b0ad10aa0125fc61e09ed35be347814648d1d69278e1c0da669e1f36fe8c6cb21d09566648ff0 MISC metadata.xml 486 BLAKE2B d62ee825d2d51b6090cd5de87ffcde75a6dea4e109f144ed1a8305e1fad19b578549118dc3f803069289341f6fb4b95772d34e7a5cd2faff8f84d99b29165c83 SHA512 e1225c91492f76382b91acf579c9fce1be411638ce82186b729bea4a9cb18eb73b6c97d4d6e84b42877faae97c8628cb61176e1fc32589a0f419146aca268d9a diff --git a/media-libs/glfw/glfw-3.3.6.ebuild b/media-libs/glfw/glfw-3.3.6.ebuild deleted file mode 100644 index 32cac19f8453..000000000000 --- a/media-libs/glfw/glfw-3.3.6.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -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 ~riscv ~x86" -IUSE="wayland-only" - -RDEPEND=" - media-libs/libglvnd[${MULTILIB_USEDEP}] - wayland-only? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - !wayland-only? ( - media-libs/libglvnd[X] - x11-libs/libX11[${MULTILIB_USEDEP}] - )" -DEPEND=" - ${RDEPEND} - wayland-only? ( - dev-libs/wayland-protocols - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - ) - !wayland-only? ( - x11-base/xorg-proto - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXinerama[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - )" -BDEPEND=" - wayland-only? ( - dev-util/wayland-scanner - kde-frameworks/extra-cmake-modules - )" - -src_configure() { - local mycmakeargs=( - -DGLFW_BUILD_EXAMPLES=no - -DGLFW_USE_WAYLAND=$(usex wayland-only) - ) - - cmake-multilib_src_configure -} diff --git a/media-libs/glfw/glfw-3.3.7.ebuild b/media-libs/glfw/glfw-3.3.7.ebuild deleted file mode 100644 index 32cac19f8453..000000000000 --- a/media-libs/glfw/glfw-3.3.7.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -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 ~riscv ~x86" -IUSE="wayland-only" - -RDEPEND=" - media-libs/libglvnd[${MULTILIB_USEDEP}] - wayland-only? ( dev-libs/wayland[${MULTILIB_USEDEP}] ) - !wayland-only? ( - media-libs/libglvnd[X] - x11-libs/libX11[${MULTILIB_USEDEP}] - )" -DEPEND=" - ${RDEPEND} - wayland-only? ( - dev-libs/wayland-protocols - x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - ) - !wayland-only? ( - x11-base/xorg-proto - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXinerama[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - )" -BDEPEND=" - wayland-only? ( - dev-util/wayland-scanner - kde-frameworks/extra-cmake-modules - )" - -src_configure() { - local mycmakeargs=( - -DGLFW_BUILD_EXAMPLES=no - -DGLFW_USE_WAYLAND=$(usex wayland-only) - ) - - cmake-multilib_src_configure -} -- cgit v1.2.3