diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest index cfbc5d206a..8d54ee1e36 100644 --- a/app-misc/fastfetch/Manifest +++ b/app-misc/fastfetch/Manifest @@ -1 +1 @@ -DIST fastfetch-1.2.3.tar.gz 328561 BLAKE2B d52ba5a41eda9cd12cca01ae0387854586f7e3d5594155a20c22fa311b919ade7f71b089c39eb8044ebfb38b486c5d259a1b9f6a671ac7c60e2b36ca5f9d21c5 SHA512 239f695239a181ffb3b1b8d836d67e2876d2e7bfa9d75f3dc74c615e5497e510d1610347b72e3a8a1c31295fd48f6cad4f108592e2cdc9261f209318ca74b154 +DIST fastfetch-1.3.3.tar.gz 335035 BLAKE2B 9bd477c066d80a8e625d1feb300765762ee5fc8ffe3c09399f01cc146eaf26bbb2e6694034fb156c2753e349d15b6282df481710ac20a25e5ffee6fd05c87800 SHA512 15223a69f77c0ff112e153e860db28a429516a65385602439b8a8b0aa901842e438fcd08553a68539ae45979aa4474286a5ca23134da4d0608faa7d032c3a4ed diff --git a/app-misc/fastfetch/fastfetch-1.2.3.ebuild b/app-misc/fastfetch/fastfetch-1.3.3.ebuild similarity index 77% rename from app-misc/fastfetch/fastfetch-1.2.3.ebuild rename to app-misc/fastfetch/fastfetch-1.3.3.ebuild index 414ee9c3d4..556a1a7279 100644 --- a/app-misc/fastfetch/fastfetch-1.2.3.ebuild +++ b/app-misc/fastfetch/fastfetch-1.3.3.ebuild @@ -17,15 +17,17 @@ fi LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="X gnome pci vulkan wayland xcb xfce xrandr" +IUSE="X gnome imagemagick pci vulkan wayland xcb xfce xrandr" # note - qa-vdb will always report errors because fastfetch loads the libs dynamically RDEPEND=" + sys-libs/zlib X? ( x11-libs/libX11 ) gnome? ( dev-libs/glib gnome-base/dconf ) + imagemagick? ( media-gfx/imagemagick:= ) pci? ( sys-apps/pciutils ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) @@ -50,6 +52,9 @@ src_configure() { -DENABLE_GIO=$(usex gnome) -DENABLE_DCONF=$(usex gnome) -DENABLE_XFCONF=$(usex xfce) + -DENABLE_IMAGEMAGICK7=$(use imagemagick && has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no) + -DENABLE_IMAGEMAGICK6=$(use imagemagick && has_version ' + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + + google/gemmlowp + + diff --git a/dev-cpp/tiny-dnn/files/tiny-dnn-1.0.0_alpha3-system-libs.patch b/dev-cpp/tiny-dnn/files/tiny-dnn-1.0.0_alpha3-system-libs.patch new file mode 100644 index 0000000000..5871abad7f --- /dev/null +++ b/dev-cpp/tiny-dnn/files/tiny-dnn-1.0.0_alpha3-system-libs.patch @@ -0,0 +1,123 @@ +--- a/test/test_core.h ++++ b/test/test_core.h +@@ -35,7 +35,7 @@ + #include "tiny_dnn/tiny_dnn.h" + + #if defined(USE_OPENCL) || defined(USE_CUDA) +-#include "third_party/CLCudaAPI/clpp11.h" ++#include "CLCudaAPI/clpp11.h" + #endif // defined(USE_OPENCL) || defined(USE_CUDA) + + namespace tiny_dnn { +--- a/tiny_dnn/core/framework/device.fwd.h ++++ b/tiny_dnn/core/framework/device.fwd.h +@@ -46,9 +46,9 @@ + + #if defined(USE_OPENCL) || defined(USE_CUDA) + #ifdef USE_OPENCL +-#include "third_party/CLCudaAPI/clpp11.h" ++#include "CLCudaAPI/clpp11.h" + #else +-#include "third_party/CLCudaAPI/cupp11.h" ++#include "CLCudaAPI/cupp11.h" + #endif + #endif + +--- a/tiny_dnn/core/framework/program.h ++++ b/tiny_dnn/core/framework/program.h +@@ -49,9 +49,9 @@ + + #if defined(USE_OPENCL) || defined(USE_CUDA) + #ifdef USE_OPENCL +-#include "third_party/CLCudaAPI/clpp11.h" ++#include "CLCudaAPI/clpp11.h" + #else +-#include "third_party/CLCudaAPI/cupp11.h" ++#include "CLCudaAPI/cupp11.h" + #endif + #endif + +--- a/tiny_dnn/core/framework/program_manager.h ++++ b/tiny_dnn/core/framework/program_manager.h +@@ -51,9 +51,9 @@ + + #if defined(USE_OPENCL) || defined(USE_CUDA) + #ifdef USE_OPENCL +-#include "third_party/CLCudaAPI/clpp11.h" ++#include "CLCudaAPI/clpp11.h" + #else +-#include "third_party/CLCudaAPI/cupp11.h" ++#include "CLCudaAPI/cupp11.h" + #endif + #endif + +--- a/tiny_dnn/core/framework/tensor.h ++++ b/tiny_dnn/core/framework/tensor.h +@@ -53,9 +53,9 @@ + + #if defined(USE_OPENCL) || defined(USE_CUDA) + #ifdef USE_OPENCL +-#include "third_party/CLCudaAPI/clpp11.h" ++#include "CLCudaAPI/clpp11.h" + #else +-#include "third_party/CLCudaAPI/cupp11.h" ++#include "CLCudaAPI/cupp11.h" + #endif + #endif + +--- a/tiny_dnn/core/kernels/tiny_quantized_matmul_kernel.h ++++ b/tiny_dnn/core/kernels/tiny_quantized_matmul_kernel.h +@@ -15,7 +15,7 @@ + + // Implements a quantized eight-bit version of the matmul operation. + +-#include "third_party/gemmlowp/public/gemmlowp.h" ++#include "gemmlowp/public/gemmlowp.h" + #include "tiny_dnn/core/kernels/tiny_quantization_kernel.h" + + namespace tiny_dnn { +--- a/tiny_dnn/util/image.h ++++ b/tiny_dnn/util/image.h +@@ -39,15 +39,15 @@ + + #define STB_IMAGE_IMPLEMENTATION + #define STB_IMAGE_INLINE // We need this define to avoid multiple definition +-#include "third_party/stb/stb_image.h" ++#include "stb/stb_image.h" + + #define STB_IMAGE_RESIZE_IMPLEMENTATION + #define STB_IMAGE_RESIZE_INLINE +-#include "third_party/stb/stb_image_resize.h" ++#include "stb/stb_image_resize.h" + + #define STB_IMAGE_WRITE_IMPLEMENTATION + #define STB_IMAGE_WRITE_INLINE +-#include "third_party/stb/stb_image_write.h" ++#include "stb/stb_image_write.h" + + + namespace tiny_dnn { +--- a/tiny_dnn/util/util.h ++++ b/tiny_dnn/util/util.h +@@ -52,9 +52,9 @@ + + #if defined(USE_OPENCL) || defined(USE_CUDA) + #ifdef USE_OPENCL +-#include "third_party/CLCudaAPI/clpp11.h" ++#include "CLCudaAPI/clpp11.h" + #else +-#include "third_party/CLCudaAPI/cupp11.h" ++#include "CLCudaAPI/cupp11.h" + #endif + #endif + +--- a/.travis/cpplint_test.sh ++++ b/.travis/cpplint_test.sh +@@ -1,6 +1,6 @@ + #!/bin/bash + +-python third_party/cpplint.py \ ++cpplint.py \ + --extensions=cpp,h \ + --filter=-build/header_guard,-runtime/references \ + tiny_dnn/*/* examples/*/* test/*/*/*/* diff --git a/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3.ebuild b/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r1.ebuild similarity index 84% rename from dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3.ebuild rename to dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r1.ebuild index 93895644b3..7235c5afa3 100644 --- a/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3.ebuild +++ b/dev-cpp/tiny-dnn/tiny-dnn-1.0.0_alpha3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DOCS_BUILDER="sphinx" DOCS_DEPEND="dev-python/recommonmark" @@ -15,17 +15,16 @@ DESCRIPTION="header only, dependency-free deep learning framework in C++14" HOMEPAGE="https://github.com/tiny-dnn/tiny-dnn" SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${MYPV}" + LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse double-precision opencl openmp +serialization tbb test" -REQUIRED_USE=" - ?? ( openmp tbb ) -" -RESTRICT="test" #tests doesn't build ... +IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse double-precision opencl openmp +serialization tbb test" # TODO: cuda # headers as rdepend because this is also an header only library RDEPEND=" + dev-cpp/gemmlowp + dev-libs/stb opencl? ( dev-util/opencl-headers virtual/opencl @@ -33,19 +32,26 @@ RDEPEND=" serialization? ( dev-libs/cereal ) tbb? ( dev-cpp/tbb ) " -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( dev-cpp/gtest ) +DEPEND=" + ${RDEPEND} + test? ( + dev-cpp/catch:0 + dev-cpp/gtest + ) " +REQUIRED_USE="^^ ( openmp tbb )" +RESTRICT="test" #tests doesn't build ... PATCHES=( "${FILESDIR}/${PN}-add-sphinx-ext-autodoc-to-conf-py.patch" "${FILESDIR}/${PN}-disable-gtest-download.patch" + "${FILESDIR}/${P}-system-libs.patch" ) src_prepare() { #remove bundled cereal rm -r cereal || die + rm -r third_party || die cmake_src_prepare } diff --git a/dev-libs/luksmeta/luksmeta-9.ebuild b/dev-libs/luksmeta/luksmeta-9.ebuild index 4e6c9d29de..0f5d87e819 100644 --- a/dev-libs/luksmeta/luksmeta-9.ebuild +++ b/dev-libs/luksmeta/luksmeta-9.ebuild @@ -12,10 +12,12 @@ SRC_URI="https://github.com/latchset/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" +IUSE="+man" DEPEND="sys-fs/cryptsetup" RDEPEND="${DEPEND}" -BDEPEND="" +BDEPEND="man? ( app-text/asciidoc ) + sys-devel/libtool" PATCHES=( "${FILESDIR}/${PN}-tests.patch" @@ -25,3 +27,8 @@ src_prepare() { default eautoreconf } + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/zlib-google/Manifest b/dev-libs/zlib-google/Manifest index 153d29aadb..ca2b1c00f8 100644 --- a/dev-libs/zlib-google/Manifest +++ b/dev-libs/zlib-google/Manifest @@ -1 +1 @@ -DIST zlib-google-97.0.4692.13.tar.gz 313210 BLAKE2B b3120397fda5b4a7ae516db9b18ef3691c048c2f36ddc908a89c6d86a1b32e2ff7da0b7a453958242ce6d40e0d8ce4ae79f43900cae8f8fe5a39e8617795d335 SHA512 accc923ce6f7635fa116da9a8d57616fe8d193dfb8b4f90499012b3679bc62efb51f5921877ec7789d8dc76535c16fad1ac568ecb91bfee56048c523479ec31f +DIST zlib-google-97.0.4692.13.tar.gz 313198 BLAKE2B a40fab92981d7bae1341aceaa63d751b7400af639b0f9f9b8a806085a3b61149a87795f27c0913daf605deb3c67484541923890876f5f36e6594044f9a1cdeef SHA512 3e5a3e0a304f547d9bc3a7713d071cba2cbfadddfa9e76f35ad5a459451ca71034f4b6b70d0a09aa8335e1430377cb250ee77a2c79b99742de6104ea180d04f7 diff --git a/dev-python/pdfminer-six/Manifest b/dev-python/pdfminer-six/Manifest index 7f75d96158..cc1d5cb765 100644 --- a/dev-python/pdfminer-six/Manifest +++ b/dev-python/pdfminer-six/Manifest @@ -1,2 +1,2 @@ DIST pdfminer-six-20201018.tar.gz 10256409 BLAKE2B 87e4b693621efc36c0f248d977c8c4310d8865629bc459c8f2bb65385ae215ce07701a016e8a5f31a81f84dc596dca9f58895ac98ad34f7549ea557282cfcc9e SHA512 62d3ef815072627baf30cda966f6914422ff4df4945e0442bdaa93e04f42d2e0874f0dba46cec0f789308d787f1c8842e913bb0b590709c22faf12f605ae258e -DIST pdfminer-six-20220319.tar.gz 10852993 BLAKE2B 4b81069c19cbba4d7e7797803d58d13f1419f3251e49745879071441b83fe11cb7282618a2698a4c819f0166aeed1fc3c57817d0a08590394218ec83ec79781a SHA512 1aebbef2e3cf84af61b77e20976487f0cdf4edceed4522f681f7898f5f149c9d6512b50cfdf6f44700a763b340fabefb49f76c634d56c131b46e3fa5c6d5e56f +DIST pdfminer.six-20220319.tar.gz 7356602 BLAKE2B e4ba2e62e923b53bcbd15dc2fdde11ededd6acee0f76cbbd5bb68eccc7d612c4f3d92edaf2b63e30586a2390360ff4bfdcec55515b66846b12494d569cb8cb7f SHA512 b11d4a306a1b4c0f022bd2628d26254069cec6a74b3375f1b335b7b31077fcc9377e8d8ea04ca5accf1133f111f6c2b70d9c25e12341536cc27f9411ca0f05e2 diff --git a/dev-python/pdfminer-six/metadata.xml b/dev-python/pdfminer-six/metadata.xml index 17361c3983..c155fa2dd2 100644 --- a/dev-python/pdfminer-six/metadata.xml +++ b/dev-python/pdfminer-six/metadata.xml @@ -5,4 +5,8 @@ alarig@swordarmor.fr Alarig Le Lay + + Carlos Eduardo + carana2099@gmail.com + diff --git a/dev-python/pdfminer-six/pdfminer-six-20220319.ebuild b/dev-python/pdfminer-six/pdfminer-six-20220319-r1.ebuild similarity index 81% rename from dev-python/pdfminer-six/pdfminer-six-20220319.ebuild rename to dev-python/pdfminer-six/pdfminer-six-20220319-r1.ebuild index e753a74836..0e5bf17976 100644 --- a/dev-python/pdfminer-six/pdfminer-six-20220319.ebuild +++ b/dev-python/pdfminer-six/pdfminer-six-20220319-r1.ebuild @@ -11,11 +11,12 @@ MY_PN="${PN/-/.}" DESCRIPTION="Community maintained fork of pdfminer" HOMEPAGE="https://github.com/pdfminer/pdfminer.six" -SRC_URI="https://github.com/pdfminer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/pdfminer/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="test" RDEPEND=" >=dev-python/chardet-3.0[${PYTHON_USEDEP}] @@ -25,5 +26,5 @@ RDEPEND=" S="${WORKDIR}/${MY_PN}-${PV}" -distutils_enable_tests nose +distutils_enable_tests pytest distutils_enable_sphinx docs/source dev-python/sphinx-argparse diff --git a/games-rpg/airshipper/airshipper-0.7.0.ebuild b/games-rpg/airshipper/airshipper-0.7.0-r1.ebuild similarity index 96% rename from games-rpg/airshipper/airshipper-0.7.0.ebuild rename to games-rpg/airshipper/airshipper-0.7.0-r1.ebuild index 75672bfec8..c4992bd091 100644 --- a/games-rpg/airshipper/airshipper-0.7.0.ebuild +++ b/games-rpg/airshipper/airshipper-0.7.0-r1.ebuild @@ -502,7 +502,25 @@ LICENSE="Apache-2.0 BSD BSL-1.1 GPL-3 ISC MIT MPL-2.0 OFL-1.1 ZLIB" SLOT="0" KEYWORDS="~amd64" -QA_FLAGS_IGNORED="usr/bin/${PN}" +DEPEND=" + media-libs/vulkan-loader + dev-libs/wayland + dev-libs/wayland-protocols + x11-libs/libxkbcommon + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/libXi + x11-libs/libXcursor +" +RDEPEND="${DEPEND}" +BDEPEND=" + x11-libs/libxkbcommon +" + +QA_FLAGS_IGNORED=" + usr/bin/${PN} + usr/bin/${PN}-server +" src_prepare() { default @@ -527,5 +545,8 @@ src_install() { doicon -s 256 client/assets/net.veloren.airshipper.png domenu client/assets/net.veloren.airshipper.desktop - dobin target/release/${PN} + cd target/$(usex debug{,} release) || die + + dobin ${PN} + dobin ${PN}-server } diff --git a/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild b/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild index 7949012b78..a2705683e3 100644 --- a/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild +++ b/gnome-extra/extension-manager/extension-manager-0.3.0.ebuild @@ -47,7 +47,7 @@ src_configure() { meson_src_configure } -# Tests are skipped because as of version 0.2.3, the tests only validate +# Tests are skipped because as of version 0.3.0, the tests only validate # resource files and do not verify any functionality of the program. Those # validations are either already handled by QA checks or not relevant on # Gentoo. For more information about the rationale, please refer to: @@ -58,9 +58,7 @@ src_configure() { # way to skip the validations, the following variable values need to be set: # # IUSE="test" -# # 'Validate appstream file' test case requires Internet connection -# PROPERTIES="test_network" -# RESTRICT="test" +# RESTRICT="!test? ( test )" # BDEPEND="test? ( dev-libs/appstream-glib dev-util/desktop-file-utils )" src_test() { : diff --git a/gnome-extra/extension-manager/extension-manager-9999.ebuild b/gnome-extra/extension-manager/extension-manager-9999.ebuild index 7949012b78..a2705683e3 100644 --- a/gnome-extra/extension-manager/extension-manager-9999.ebuild +++ b/gnome-extra/extension-manager/extension-manager-9999.ebuild @@ -47,7 +47,7 @@ src_configure() { meson_src_configure } -# Tests are skipped because as of version 0.2.3, the tests only validate +# Tests are skipped because as of version 0.3.0, the tests only validate # resource files and do not verify any functionality of the program. Those # validations are either already handled by QA checks or not relevant on # Gentoo. For more information about the rationale, please refer to: @@ -58,9 +58,7 @@ src_configure() { # way to skip the validations, the following variable values need to be set: # # IUSE="test" -# # 'Validate appstream file' test case requires Internet connection -# PROPERTIES="test_network" -# RESTRICT="test" +# RESTRICT="!test? ( test )" # BDEPEND="test? ( dev-libs/appstream-glib dev-util/desktop-file-utils )" src_test() { : diff --git a/gui-libs/text-engine/text-engine-9999.ebuild b/gui-libs/text-engine/text-engine-9999.ebuild index 3d0af284cb..f03fe156c4 100644 --- a/gui-libs/text-engine/text-engine-9999.ebuild +++ b/gui-libs/text-engine/text-engine-9999.ebuild @@ -16,7 +16,7 @@ fi DESCRIPTION="A lightweight rich-text framework for GTK 4" HOMEPAGE="https://github.com/mjakeman/text-engine" -LICENSE="LGPL-3+" +LICENSE="|| ( MPL-2.0 LGPL-2.1+ )" SLOT="0" BDEPEND=" @@ -24,7 +24,7 @@ BDEPEND=" " COMMON_DEPEND=" - dev-libs/glib:2 + >=dev-libs/glib-2.72.0:2 dev-libs/libxml2:2 gui-libs/gtk:4 " diff --git a/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt b/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt new file mode 100644 index 0000000000..713125ec6b --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt @@ -0,0 +1,80 @@ +cmake_minimum_required(VERSION 3.1) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) +project(cimgui) + +#general settings + +set(IMGUI_LIBRARIES ) +set(IMGUI_COMMON_FLAGS ) +set(GENERATOR_IMPL "internal") + +if(IMGUI_FREETYPE) + set(GENERATOR_IMPL "${GENERATOR_IMPL} freetype") + add_definitions("-DCIMGUI_FREETYPE=1") +endif(IMGUI_FREETYPE) + +add_subdirectory(imgui) + +if(IMGUI_BINDINGS) +add_library(cimgui SHARED "") +target_link_libraries(cimgui PUBLIC imgui ${IMGUI_LIBRARIES}) +target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t) +target_include_directories(cimgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/generator/output) +target_include_directories(cimgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/imgui) +set_target_properties(cimgui PROPERTIES LINKER_LANGUAGE CXX) + +set(GENERATOR_ARGS ) +if(IMGUI_ALLEGRO) + list(APPEND GENERATOR_ARGS allegro5) +endif() +if(IMGUI_GLFW) + list(APPEND GENERATOR_ARGS glfw) +endif() +if(IMGUI_GLUT) + list(APPEND GENERATOR_ARGS glut) +endif() +if(IMGUI_OPENGL) + list(APPEND GENERATOR_ARGS opengl2 opengl3) +endif() +if(IMGUI_SDL) + list(APPEND GENERATOR_ARGS sdl sdlrenderer) +endif() +if(IMGUI_VULKAN) + list(APPEND GENERATOR_ARGS vulkan) +endif() +list(APPEND GENERATOR_ARGS ${IMGUI_COMMON_FLAGS} ${CMAKE_CPP_FLAGS}) +file(GLOB GENERATOR_OUTPUT_FILES "${CMAKE_SOURCE_DIR}/generator/output/*") +list(APPEND + GENERATOR_OUTPUT_FILES + ${CMAKE_SOURCE_DIR}/cimgui.cpp + ${CMAKE_SOURCE_DIR}/cimgui.h + ${CMAKE_SOURCE_DIR}/generator/output/cimgui_nopreprocess.cpp + ${CMAKE_SOURCE_DIR}/generator/output/cimgui_nopreprocess.h +) +ADD_CUSTOM_COMMAND(VERBATIM + OUTPUT ${GENERATOR_OUTPUT_FILES} + COMMAND luajit ./generator.lua gcc "${GENERATOR_IMPL}" ${GENERATOR_ARGS} + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/generator" +) +set(CIMGUI_SOURCES "${CMAKE_SOURCE_DIR}/cimgui.cpp") +set(CIMGUI_INCLUDE_FILES "${CMAKE_SOURCE_DIR}/cimgui.h") + +target_sources(cimgui + PUBLIC + ${CIMGUI_SOURCES} + ${CIMGUI_INCLUDE_FILES} +) + +include(GNUInstallDirs) + +#install +install(TARGETS cimgui LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(FILES ${CIMGUI_INCLUDE_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/imgui") + +#test +set(CIMGUI_TEST "no" CACHE STRING "Enable compilation of a test unit based on imgui null") + +if (CIMGUI_TEST) + add_subdirectory(test) +endif () +endif() diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch deleted file mode 100644 index b3bae1cfeb..0000000000 --- a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,21 +1,13 @@ - cmake_minimum_required(VERSION 3.1) - --project(cimgui) -+project(libcimgui) - --if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/imgui/imgui_tables.cpp) -- set(TABLES_SOURCE "imgui/imgui_tables.cpp") --else() - set(TABLES_SOURCE "") --endif() - - - #general settings - file(GLOB IMGUI_SOURCES - cimgui.cpp -- imgui/imgui.cpp -- imgui/imgui_draw.cpp -- imgui/imgui_demo.cpp -- imgui/imgui_widgets.cpp - ${TABLES_SOURCE} - ) - -@@ -24,34 +16,30 @@ - set(IMGUI_LIBRARIES ) - - if(IMGUI_FREETYPE) -- FIND_PACKAGE(freetype REQUIRED PATHS ${FREETYPE_PATH}) -- list(APPEND IMGUI_LIBRARIES freetype) -- list(APPEND IMGUI_SOURCES imgui/misc/freetype/imgui_freetype.cpp) -+ list(APPEND IMGUI_LIBRARIES -lfreetype) - add_definitions("-DCIMGUI_FREETYPE=1") - endif(IMGUI_FREETYPE) - - #add library and link - if (IMGUI_STATIC) -- add_library(cimgui STATIC ${IMGUI_SOURCES}) -+ add_library(libcimgui STATIC ${IMGUI_SOURCES}) - else (IMGUI_STATIC) -- add_library(cimgui SHARED ${IMGUI_SOURCES}) -+ add_library(libcimgui SHARED ${IMGUI_SOURCES}) - endif (IMGUI_STATIC) - --target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1) - if (WIN32) -- target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\)) -+ target_compile_definitions(libcimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\)) - list(APPEND IMGUI_LIBRARIES imm32) - else (WIN32) -- target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t) -+ target_compile_definitions(libcimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t) - endif (WIN32) - --target_include_directories(cimgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) --target_include_directories(cimgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/imgui) --set_target_properties(cimgui PROPERTIES PREFIX "") --target_link_libraries(cimgui ${IMGUI_LIBRARIES}) -+target_include_directories(libcimgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/imgui) -+set_target_properties(libcimgui PROPERTIES PREFIX "") -+target_link_libraries(libcimgui PUBLIC -limgui) - - #install --install(TARGETS cimgui -+install(TARGETS libcimgui - RUNTIME DESTINATION . - LIBRARY DESTINATION . - ARCHIVE DESTINATION . diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt new file mode 100644 index 0000000000..0823d1dc39 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -0,0 +1,160 @@ +cmake_minimum_required(VERSION 3.8.2) +project(imgui VERSION 1.73.0 LANGUAGES CXX C) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +include(GNUInstallDirs) + +option(IMGUI_ALLEGRO OFF) +option(IMGUI_EXAMPLES "Build ImGui examples" OFF) +option(IMGUI_FREETYPE OFF) +option(IMGUI_GLFW OFF) +option(IMGUI_GLUT OFF) +option(IMGUI_OPENGL OFF) +option(IMGUI_SDL OFF) +option(IMGUI_VULKAN OFF) + +add_library (imgui_objects + OBJECT + imgui.cpp + imgui_demo.cpp + imgui_draw.cpp + imgui_tables.cpp + imgui_widgets.cpp +) +add_library (imgui SHARED "") +target_include_directories(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends") +#set(IMGUI_COMMON_FLAGS "-DIMGUI_USE_WCHAR32 -DIMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION -DIMGUI_STB_RECT_PACK_FILENAME=\"\"") +set(IMGUI_COMMON_FLAGS "-DIMGUI_USE_WCHAR32") + +if(IMGUI_ALLEGRO) + find_package(PkgConfig REQUIRED) + pkg_check_modules(ALLEGRO5 REQUIRED allegro-5 allegro_main-5 allegro_primitives-5) + target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp") + target_include_directories(imgui_objects PUBLIC ${ALLEGRO5_INCLUDE_DIRS}) + list(APPEND IMGUI_LIBRARIES ${ALLEGRO5_LIBRARIES}) +endif() +if(IMGUI_FREETYPE) + find_package(Freetype REQUIRED) + target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp") + target_include_directories(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype" ${FREETYPE_INCLUDE_DIRS}) + list(APPEND IMGUI_LIBRARIES ${FREETYPE_LIBRARIES}) +# set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE -DIMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION -DIMGUI_STB_TRUETYPE_FILENAME=\"\"") + set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE") + add_executable(binary_to_compressed_c "${CMAKE_CURRENT_SOURCE_DIR}/misc/fonts/binary_to_compressed_c.cpp") + target_include_directories(binary_to_compressed_c PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") + target_link_libraries(binary_to_compressed_c PUBLIC imgui) + install(TARGETS binary_to_compressed_c DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui") +endif() +if(IMGUI_GLFW) + find_package(glfw3 REQUIRED) + target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.cpp") + list(APPEND IMGUI_LIBRARIES glfw) +endif() +if(IMGUI_GLUT) + find_package(FreeGLUT REQUIRED) + target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glut.cpp") + target_include_directories(imgui_objects PUBLIC ${FreeGLUT_INCLUDE_DIRS}) + list(APPEND IMGUI_LIBRARIES FreeGLUT::freeglut) +endif() +if(IMGUI_OPENGL) + find_package(OpenGL REQUIRED) + target_sources(imgui_objects + PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp" + ) + target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) + list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) +endif() +if(IMGUI_SDL) + find_package(SDL2 REQUIRED) + target_sources(imgui_objects + PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.cpp" + ) + target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") + list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") +endif() +if(IMGUI_VULKAN) + find_package(Vulkan REQUIRED) + target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.cpp") + set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") + target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) + list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) +endif() + +if(IMGUI_EXAMPLES) + install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/examples" DESTINATION "${CMAKE_INSTALL_DOCDIR}") + add_executable(example_null "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_null/main.cpp") + target_include_directories(example_null PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") + target_link_libraries(example_null PUBLIC imgui) + install(TARGETS example_null DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + if(IMGUI_ALLEGRO) + add_executable(example_allegro5 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_allegro5/main.cpp") + target_include_directories(example_allegro5 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends") + target_link_libraries(example_allegro5 PUBLIC imgui) + install(TARGETS example_allegro5 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + endif() + if(IMGUI_GLFW AND IMGUI_OPENGL) + add_executable(example_glfw_opengl2 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glfw_opengl2/main.cpp") + target_include_directories(example_glfw_opengl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends") + target_link_libraries(example_glfw_opengl2 PUBLIC imgui) + install(TARGETS example_allegro5 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + add_executable(example_glfw_opengl3 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glfw_opengl3/main.cpp") + target_include_directories(example_glfw_opengl3 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends") + target_link_libraries(example_glfw_opengl3 PUBLIC imgui) + install(TARGETS example_glfw_opengl3 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + endif() + if(IMGUI_GLFW AND IMGUI_VULKAN) + add_executable(example_glfw_vulkan "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glfw_vulkan/main.cpp") + target_include_directories(example_glfw_vulkan PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends") + target_link_libraries(example_glfw_vulkan PUBLIC imgui) + install(TARGETS example_glfw_vulkan DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + endif() + if(IMGUI_GLUT AND IMGUI_OPENGL) + add_executable(example_glut_opengl2 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glut_opengl2/main.cpp") + target_include_directories(example_glut_opengl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends") + target_link_libraries(example_glut_opengl2 PUBLIC imgui) + install(TARGETS example_glut_opengl2 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + endif() + if(IMGUI_SDL) + add_executable(example_sdl_sdlrenderer "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_sdlrenderer/main.cpp") + target_include_directories(example_sdl_sdlrenderer PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}") + target_link_libraries(example_sdl_sdlrenderer PUBLIC imgui) + install(TARGETS example_sdl_sdlrenderer DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + if(IMGUI_OPENGL) + add_executable(example_sdl_opengl2 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_opengl2/main.cpp") + target_include_directories(example_sdl_opengl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}") + target_link_libraries(example_sdl_opengl2 PUBLIC imgui) + install(TARGETS example_sdl_opengl2 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + add_executable(example_sdl_opengl3 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_opengl3/main.cpp") + target_include_directories(example_sdl_opengl3 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}") + target_link_libraries(example_sdl_opengl3 PUBLIC imgui) + install(TARGETS example_sdl_opengl2 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + endif() + if(IMGUI_VULKAN) + add_executable(example_sdl_vulkan "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_vulkan/main.cpp") + target_include_directories(example_sdl_vulkan PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}") + target_link_libraries(example_sdl_vulkan PUBLIC imgui) + install(TARGETS example_sdl_vulkan DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" ) + endif() + endif() +endif() + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +target_sources (imgui PUBLIC $) + +add_library(imgui::imgui ALIAS imgui) +target_link_libraries(imgui PUBLIC ${IMGUI_LIBRARIES}) + +file(GLOB IMGUI_INCLUDE_FILES "*.h" "backends/*.h" "misc/freetype/*.h") +install(FILES ${IMGUI_INCLUDE_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/imgui") +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/backends/vulkan" DESTINATION "${CMAKE_INSTALL_DATADIR}/imgui/backends") +file(GLOB IMGUI_DOC_FILES "docs/*") +install(FILES ${IMGUI_DOC_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}") +install(TARGETS imgui) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/imgui.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/imgui.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/imgui.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS}" PARENT_SCOPE) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in new file mode 100644 index 0000000000..4d033939f2 --- /dev/null +++ b/media-libs/imgui/files/imgui.pc.in @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/imgui + +Name: imgui +Description: Bloat-free Immediate Mode Graphical User interface for C +Version: @version@ +URL: https://github.com/ocornut/imgui +Libs: -L${libdir} -limgui @IMGUI_LIBRARIES@ +Libs.private: -lm +Cflags: -I${includedir} diff --git a/media-libs/imgui/imgui-1.87-r2.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild deleted file mode 100644 index 0df42793da..0000000000 --- a/media-libs/imgui/imgui-1.87-r2.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic toolchain-funcs - -CMAKE_IN_SOURCE_BUILD=1 - -DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE=" - https://github.com/ocornut/imgui - https://github.com/cimgui/cimgui -" -SRC_URI=" - https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/cimgui/cimgui/archive/refs/tags/${PV}.tar.gz -> c${P}.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="allegro bindings examples freetype glfw glut opengl sdl vulkan" -S="${WORKDIR}/c${P}" - -RDEPEND=" - allegro? ( media-libs/allegro:5 ) - freetype? ( media-libs/freetype ) - glfw? ( media-libs/glfw:0 ) - glut? ( media-libs/freeglut ) - opengl? ( virtual/opengl ) - sdl? ( media-libs/libsdl2 ) - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND=" - bindings? ( dev-lang/luajit ) - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/c${P}-fix-cmake.patch" ) -REQUIRED_USE=" - || ( - allegro - glfw - glut - sdl - ) - || ( - allegro - opengl - vulkan - ) - examples? ( - allegro - glfw - glut - opengl - sdl - vulkan - ) -" - -src_prepare() { - pushd ../ || die - rm -rf "${S}/imgui" || die - mv "${P}" "${S}/imgui" || die - pushd "${S}/imgui" || die - - # imgui - rm -r examples/libs || die - rm -r misc/*/*.ttf || die - rm -r misc/single_file || die - - # cimgui - if use bindings; then - pushd "${S}" || die - cmake_src_prepare - else - eapply_user - fi -} - -src_configure() { - pushd imgui || die - - # imgui - tc-export CXX - append-cppflags "-DIMGUI_USE_WCHAR32" - COMMONFLAGS="-I${S}/imgui -I${S}/imgui/backends -I${S}/imgui/misc/freetype -fPIC -fpermissive" - local PKGCONF="$(tc-getPKG_CONFIG)" || die - - use allegro && append-libs "-lallegro -lallegro_main -lallegro_primitives" - if use freetype; then - append-cppflags "-DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE" - COMMONFLAGS="${COMMONFLAGS} $(${PKGCONF} --cflags freetype2)" || die - append-libs "$(${PKGCONF} --libs freetype2)" || die - fi - if use glfw; then - append-libs "$(${PKGCONF} --libs glfw3)" || die - COMMONFLAGS="${COMMONFLAGS} $(${PKGCONF} --cflags glfw3)" || die - fi - if use glut; then - append-libs "$(${PKGCONF} --libs freeglut)" || die - COMMONFLAGS="${COMMONFLAGS} $(${PKGCONF} --cflags freeglut)" || die - fi - use opengl && append-libs "-lGL" - if use sdl; then - append-libs "-ldl $(sdl2-config --libs)" || die - COMMONFLAGS="${COMMONFLAGS} $(sdl2-config --cflags)" || die - fi - if use vulkan; then - append-libs "$(${PKGCONF} --libs vulkan)" || die - COMMONFLAGS="${COMMONFLAGS} $(${PKGCONF} --cflags vulkan)" || die - append-cppflags "-DImTextureID=ImU64" || die - fi - append-cxxflags "${COMMONFLAGS}" - popd || die - - # cimgui - if use bindings; then - local mycmakeargs=( - -DIMGUI_FREETYPE=$(usex freetype) - -DIMGUI_STATIC=OFF - ) - cmake_src_configure - fi -} - -src_compile() { - pushd imgui || die - - # imgui - set -x || die - - local objects=() - - for i in imgui{,_draw,_demo,_tables,_widgets}; do - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c ${i}.cpp -o ${i}.o || die - objects+=( ${i}.o ) - done - - if use freetype; then - pushd misc/freetype || die - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_freetype.cpp -o imgui_freetype.o || die - objects+=( misc/freetype/imgui_freetype.o ) - popd || die - pushd misc/fonts || die - ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIE binary_to_compressed_c.cpp -o binary_to_compressed_c || die - popd || die - fi - - pushd backends || die - if use allegro; then - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_allegro5.cpp -o imgui_impl_allegro5.o || die - objects+=( backends/imgui_impl_allegro5.o ) - fi - if use glfw; then - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_glfw.cpp -o imgui_impl_glfw.o || die - objects+=( backends/imgui_impl_glfw.o ) - fi - if use glut; then - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_glut.cpp -o imgui_impl_glut.o || die - objects+=( backends/imgui_impl_glut.o ) - fi - if use opengl; then - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_opengl2.cpp -o imgui_impl_opengl2.o || die - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_opengl3.cpp -o imgui_impl_opengl3.o || die - objects+=( backends/imgui_impl_opengl2.o backends/imgui_impl_opengl3.o ) - fi - if use sdl; then - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_sdl.cpp -o imgui_impl_sdl.o || die - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_sdlrenderer.cpp -o imgui_impl_sdlrenderer.o || die - objects+=( backends/imgui_impl_sdl.o backends/imgui_impl_sdlrenderer.o ) - fi - if use vulkan; then - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -fPIC -c imgui_impl_vulkan.cpp -o imgui_impl_vulkan.o || die - objects+=( backends/imgui_impl_vulkan.o ) - fi - popd || die - ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -shared -Wl,-soname,libimgui.so ${objects[@]} -o libimgui.so ${LIBS} || die - - if use examples; then - mkdir ex || die - for f in allegro5 glfw_opengl{2,3} glfw_vulkan null sdl_opengl{2,3} sdl_{sdlrenderer,vulkan} glut_opengl2 ; do - ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} -fPIE examples/example_${f}/main.cpp "-L${S}/imgui" -limgui ${LIBS} -o "${S}/imgui/ex/example_${f}" || die - done - fi - - set +x || die - popd || die - - # cimgui - if use bindings; then - pushd generator || die - local myargs=() - use allegro && myargs+=( allegro5 ) - use glfw && myargs+=( glfw ) - use glut && myargs+=( glut ) - use opengl && myargs+=( opengl3 opengl2 ) - use sdl && myargs+=( sdl sdlrenderer ) - use vulkan && myargs+=( vulkan ) - myargs+=( ${CFLAGS} ${COMMONFLAGS} ${CPPFLAGS} ) - - if use freetype ; then - luajit ./generator.lua gcc "internal freetype" ${myargs[@]} || die - else - luajit ./generator.lua gcc "internal" ${myargs[@]} || die - fi - popd || die - cmake_src_compile - fi -} - -src_install() { - pushd imgui || die - - # imgui - dolib.so libimgui.so - dodoc docs/* - insinto "/usr/include/imgui" - doins *.h - doins -r misc/*/*.h - doins backends/*.h - insinto "/usr/share/${PN}/backends" - doins -r backends/vulkan - exeinto "/usr/libexec/${PN}" - use freetype && doexe misc/fonts/binary_to_compressed_c - rm -rf misc/{fonts,freetype} || die - dodoc -r misc - - if use examples; then - exeinto "/usr/libexec/${PN}/examples" - doexe ex/* - dodoc -r examples - docompress -x "/usr/share/doc/${PF}/examples" - fi - - popd || die - - # cimgui - if use bindings; then - dolib.so libcimgui.so - insinto "/usr/share/doc/${PF}/cimgui" - doins README.md TODO.txt - doheader cimgui.h - fi -} diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r4.ebuild new file mode 100644 index 0000000000..0c83b5cdf4 --- /dev/null +++ b/media-libs/imgui/imgui-1.87-r4.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Bloat-free graphical user interface library for C++" +HOMEPAGE=" + https://github.com/ocornut/imgui + https://github.com/cimgui/cimgui +" +SRC_URI=" + https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/cimgui/cimgui/archive/refs/tags/${PV}.tar.gz -> c${P}.tar.gz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="allegro bindings examples freetype glfw glut opengl sdl vulkan" +S="${WORKDIR}/c${P}" + +RDEPEND=" + dev-libs/stb:= + allegro? ( media-libs/allegro:5 ) + freetype? ( media-libs/freetype ) + glfw? ( media-libs/glfw:0 ) + glut? ( media-libs/freeglut ) + opengl? ( virtual/opengl ) + sdl? ( media-libs/libsdl2 ) + vulkan? ( media-libs/vulkan-loader ) +" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers ) +" +BDEPEND=" + bindings? ( dev-lang/luajit ) + virtual/pkgconfig +" + +REQUIRED_USE=" + || ( + allegro + glfw + glut + sdl + ) + || ( + allegro + opengl + vulkan + ) +" + +src_prepare() { + pushd ../ || die + rm -rf "${S}/imgui" || die + mv "${P}" "${S}/imgui" || die + pushd "${S}/imgui" || die + + # imgui + rm -r examples/libs || die + rm -r misc/*/*.ttf || die + rm -r misc/single_file || die + + cp "${FILESDIR}/${P}-CMakeLists.txt" CMakeLists.txt || die + cp "${FILESDIR}/imgui.pc.in" imgui.pc.in || die + sed -e "s|@version@|${PV}|g" -i imgui.pc.in || die + + pushd "${S}" || die + cp "${FILESDIR}/c${P}-CMakeLists.txt" CMakeLists.txt || die + # remove files to be generated + rm cimgui.cpp cimgui.h || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DIMGUI_ALLEGRO=$(usex allegro) + -DIMGUI_BINDINGS=$(usex bindings) + -DIMGUI_EXAMPLES=$(usex examples) + -DIMGUI_FREETYPE=$(usex freetype) + -DIMGUI_GLFW=$(usex glfw) + -DIMGUI_GLUT=$(usex glut) + -DIMGUI_OPENGL=$(usex opengl) + -DIMGUI_SDL=$(usex sdl) + -DIMGUI_VULKAN=$(usex vulkan) + ) + cmake_src_configure +} + +src_install() { + + cmake_src_install + + pushd imgui || die + # imgui + rm -rf misc/{fonts,freetype} || die + dodoc -r misc + + popd || die + + if use bindings; then + # cimgui + + insinto "/usr/share/doc/${PF}/cimgui" + doins README.md TODO.txt + fi +} diff --git a/net-mail/dovecot-fts-xapian/Manifest b/net-mail/dovecot-fts-xapian/Manifest index 998897ac3d..45d9eafddb 100644 --- a/net-mail/dovecot-fts-xapian/Manifest +++ b/net-mail/dovecot-fts-xapian/Manifest @@ -1,2 +1,3 @@ DIST dovecot-fts-xapian-1.5.2.tar.gz 2985120 BLAKE2B 25ab535a93bbc6c0ce6c50cf01916b3349c7a34d9746ea1f87e1bf45eaa643370a3f6a5e967a168b29d0bd601f3dddbff43dd75eab64f4d62d5277f78374cf9f SHA512 afbdd9866d61104d22875eb326a2a893ef0b252e6a493c939db8a29f2d7460a70c8e7648729840ea89d60c374ce75bb34a9c90e7ca2d9c4a9239fa3b2f5905a4 DIST dovecot-fts-xapian-1.5.4.tar.gz 33101 BLAKE2B f2bf7c2cee8930cb8791035d434468537decd72f0643b308f437ad634affa555c486ac4524a1b63b7cc06304e77c431f1e846497b6080c07911a82c20c602c8d SHA512 773579959c79142ab3a24ceaa7da7fd68a9c7dde4439bd613112fc02f4b23d4d7fd258563f771dbe06db4000f9be6a219bd88b07f57521ae45246029af58570d +DIST dovecot-fts-xapian-1.5.5.tar.gz 33228 BLAKE2B b8e86b3655a6b7291961cfbd39d6ef93ab2e2fbb049e97ebd07b473eb5fc5ecf91950343adfa9c267791442d581ebea47416d8e674d7f3019091fbd69b6e60f1 SHA512 229362207bfa7bb13b1ded4d8b2a2aef7a4a72306e140dc4bd5778991220b27d296ca3659993856f83c80c437f7feadebad1e3ac06f8120a6e45b69f6dbb1ecb diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild new file mode 100644 index 0000000000..2949d81cbb --- /dev/null +++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Dovecot FTS plugin backed by Xapian" +HOMEPAGE="https://github.com/grosjo/fts-xapian" +SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="static-libs" + +RDEPEND=" + dev-libs/icu:= + >=dev-libs/xapian-1.4:= + net-mail/dovecot:= + " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/fts-xapian-${PV}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \ + $( use_enable static-libs static ) +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild new file mode 100644 index 0000000000..ac10858949 --- /dev/null +++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Dovecot FTS plugin backed by Xapian" +HOMEPAGE="https://github.com/grosjo/fts-xapian" + +if [ "$PV" = 9999 ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/grosjo/fts-xapian/" +else + SRC_URI="https://github.com/grosjo/fts-xapian/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/fts-xapian-${PV}" + KEYWORDS="~amd64" +fi + +LICENSE="LGPL-2.1" +SLOT="0" + +IUSE="static-libs" + +RDEPEND=" + dev-libs/icu:= + >=dev-libs/xapian-1.4:= + net-mail/dovecot:= + " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" +if [ "$PV" = 9999 ] ; then + BDPEND="${BDEPEND} + sys-devel/autoconf + sys-devel/autoconf-archive + " +fi + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --with-dovecot="${EPREFIX}/usr/$(get_libdir)/dovecot" \ + $( use_enable static-libs static ) +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/maestral/Manifest b/net-misc/maestral/Manifest index c09e40948a..42374d8506 100644 --- a/net-misc/maestral/Manifest +++ b/net-misc/maestral/Manifest @@ -1,3 +1,3 @@ DIST maestral-1.5.2.tar.gz 8277812 BLAKE2B df901a0a98a51f3c611cd3aa3ff4d4662fa10cdd595df2214f1a4c9fd0da8c787531a21671261df7196869d1822c69884299f2bcecd0e4190bb81fcb55a8885f SHA512 eafed2a3dbc55e3ee9417da393864ec94c76724949855805e99e3c65c29b1d33aeeb2ac063c0a4c115d3f03c002dbe899b6ec1ec6ebcb0a29386a39eabdeb769 DIST maestral-1.5.3.tar.gz 8280040 BLAKE2B dcda43880cea3fb00098b6bf87e43318a523a7c9d83886efff58be715cde17f67504b31735a006b951963e5cf0ef70b4b6431cb84200722cae186053a01edd63 SHA512 aa21277623f4e6f3283cd989be910eeb1caa3a842abca595b27a551c1c9bd1e7ef083e495ee0f096190accd91835939cb2f4a26624feae0046d8770d53aaac2f -DIST maestral-1.6.1.tar.gz 8286154 BLAKE2B 23fcb8e2cb8a84e49ce1badde0ed70d63f7f8b9eeef2c748d49d0439434c7a568dcf8edd009a5d5f12646d2370f117debe0f3ba1fad84148483b952b0140a9b6 SHA512 287d5022c31f001c018a68723c0f97f6bb74db6c68c2083423e34fc11bb31f0bb9c9c1bc8f558d35dbe341667fd89d1d6ec99d020f435f1d05a0ffbc44ada85d +DIST maestral-1.6.2.tar.gz 7982890 BLAKE2B 5a5b5f1c3a3e9000379c720b820c79ff3b6acabb2d7ca2716980299434dd9f6a900b56a4ad0808e9253f292c8d4d62680306071233b85313dad128717bbbb1f8 SHA512 ff02c89e9b1367bd9485b513c66d09912f88a6b45149c5764d8566c2a6ee2713adbb07de9bbe914b602d5aa06abe734af3e73e98bdba4b75a3bdcfba7c82979d diff --git a/net-misc/maestral/maestral-1.6.1.ebuild b/net-misc/maestral/maestral-1.6.2.ebuild similarity index 100% rename from net-misc/maestral/maestral-1.6.1.ebuild rename to net-misc/maestral/maestral-1.6.2.ebuild diff --git a/sci-libs/dart/dart-6.12.1.ebuild b/sci-libs/dart/dart-6.12.1-r1.ebuild similarity index 83% rename from sci-libs/dart/dart-6.12.1.ebuild rename to sci-libs/dart/dart-6.12.1-r1.ebuild index 9186f3021f..58aa8a47e8 100644 --- a/sci-libs/dart/dart-6.12.1.ebuild +++ b/sci-libs/dart/dart-6.12.1-r1.ebuild @@ -5,6 +5,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) +CMAKE_BUILD_TYPE="Release" + inherit cmake python-single-r1 DESCRIPTION="Dynamic Animation and Robotics Toolkit" @@ -45,7 +47,7 @@ RDEPEND=" glut? ( media-libs/freeglut ) gui? ( dev-games/openscenegraph - media-libs/imgui:=[opengl(-)] + media-libs/imgui:=[glut(-)?,opengl(-)] media-libs/lodepng:= virtual/opengl x11-libs/libXi @@ -67,10 +69,7 @@ DEPEND=" dev-cpp/gtest dev-libs/urdfdom_headers ) - test? ( - dev-cpp/gtest - python? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) - ) + test? ( dev-cpp/gtest ) urdfdom? ( dev-libs/urdfdom_headers ) " BDEPEND=" @@ -81,6 +80,7 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( + "${FILESDIR}/${P}-no-deprecated-examples.patch" "${FILESDIR}/${PN}-respect-ldflags.patch" "${FILESDIR}/${P}-respect-cflags.patch" "${FILESDIR}/${P}-use-system-gtest.patch" @@ -88,6 +88,7 @@ PATCHES=( ) REQUIRED_USE=" examples? ( gui ) + gui? ( glut ) python? ( ${PYTHON_REQUIRED_USE} gui @@ -101,9 +102,11 @@ pkg_setup() { } src_prepare() { - # delete bundled gtest + # delete bundled libs rm -r unittests/gtest || die rm -r dart/external/{imgui,lodepng} || die + # delete deprecated examples + rm -r examples/deprecated_examples || die dos2unix unittests/CMakeLists.txt || die cmake_src_prepare } @@ -135,9 +138,10 @@ src_configure() { use cpu_flags_arm_iwmmxt2 && simd=ON use cpu_flags_arm_neon && simd=ON + export ODE_DIR="${EPREFIX}/usr" + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON - -DCMAKE_BUILD_TYPE=Release -DDART_CODECOV=OFF -DDART_VERBOSE=ON -DDART_TREAT_WARNINGS_AS_ERRORS=OFF @@ -152,14 +156,26 @@ src_configure() { src_compile() { cmake_src_compile use examples && cmake_build examples - use python && cmake_build dartpy # no work to do ... + use python && cmake_build dartpy use test && cmake_build tests use tutorials && cmake_build tutorials } src_install() { cmake_src_install - #TODO: python examples tests tutorials - mv "${ED}/usr/share/doc/dart" "${ED}/usr/share/doc/${PF}" || die + #TODO: python (?) + if ! use examples ; then + rm -rf "${ED}/usr/share/doc/dart/examples" || die + fi + if ! use tutorials ; then + rm -rf "${ED}/usr/share/doc/dart/tutorials" || die + fi + if use examples || use tutorials ; then + exeinto "/usr/libexec/${PN}" + doexe "${BUILD_DIR}"/bin/* + fi +# use python && cmake_build install-dartpy + mv "${ED}/usr/share/doc/dart/data" "${ED}/usr/share/${PN}" || die + mv "${ED}"/usr/share/doc/dart/* "${ED}/usr/share/doc/${PF}" || die docompress -x "/usr/share/doc/${PF}" } diff --git a/sci-libs/dart/files/dart-6.12.1-no-deprecated-examples.patch b/sci-libs/dart/files/dart-6.12.1-no-deprecated-examples.patch new file mode 100644 index 0000000000..a16045d946 --- /dev/null +++ b/sci-libs/dart/files/dart-6.12.1-no-deprecated-examples.patch @@ -0,0 +1,9 @@ +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -27,6 +27,3 @@ + + # MJCF model based examples + add_subdirectory(fetch) +- +-# Deprecated examples +-add_subdirectory(deprecated_examples) diff --git a/sys-cluster/cinder/cinder-20.0.0.ebuild b/sys-cluster/cinder/cinder-20.0.0.ebuild index 3d31df44a5..6f95229e34 100644 --- a/sys-cluster/cinder/cinder-20.0.0.ebuild +++ b/sys-cluster/cinder/cinder-20.0.0.ebuild @@ -87,6 +87,7 @@ RDEPEND=" >=dev-python/boto3-1.16.51[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-1.4.23[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] acct-user/cinder acct-group/cinder @@ -109,6 +110,7 @@ BDEPEND=" " RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/${P}-no-vendored-urllib.patch" ) pkg_pretend() { linux-info_pkg_setup diff --git a/sys-cluster/cinder/files/cinder-20.0.0-no-vendored-urllib.patch b/sys-cluster/cinder/files/cinder-20.0.0-no-vendored-urllib.patch new file mode 100644 index 0000000000..8166e26e65 --- /dev/null +++ b/sys-cluster/cinder/files/cinder-20.0.0-no-vendored-urllib.patch @@ -0,0 +1,11 @@ +--- a/cinder/backup/drivers/s3.py ++++ b/cinder/backup/drivers/s3.py +@@ -74,7 +74,7 @@ + import boto3 + from botocore.config import Config + from botocore import exceptions as boto_exc +-from botocore.vendored.requests.packages.urllib3 import exceptions as \ ++from urllib3 import exceptions as \ + urrlib_exc + from oslo_config import cfg + from oslo_log import log as logging diff --git a/sys-cluster/placement/placement-7.0.0.ebuild b/sys-cluster/placement/placement-7.0.0.ebuild index 72dee89ebe..de17ce395b 100644 --- a/sys-cluster/placement/placement-7.0.0.ebuild +++ b/sys-cluster/placement/placement-7.0.0.ebuild @@ -3,6 +3,7 @@ EAPI=8 +EPYTEST_IGNORE=( placement/tests/functional ) MYP="${P//_/}" PYTHON_COMPAT=( python3_{8..9} ) diff --git a/sys-cluster/swift/swift-2.29.1-r1.ebuild b/sys-cluster/swift/swift-2.29.1-r1.ebuild index 45bb1ff745..c1217fecc4 100644 --- a/sys-cluster/swift/swift-2.29.1-r1.ebuild +++ b/sys-cluster/swift/swift-2.29.1-r1.ebuild @@ -103,7 +103,8 @@ python_install_all() { newins "etc/object-expirer.conf-sample" "object-expirer.conf" for i in "${FILESDIR}"/openstack-swift*.service ; do - systemd_dounit "${i/.AT/@}" + name="$(basename ${i})" + systemd_newunit "${i}" "${name/.AT/@}" done insinto /etc/logrotate.d diff --git a/www-apps/stagit/Manifest b/www-apps/stagit/Manifest new file mode 100644 index 0000000000..084c0188e2 --- /dev/null +++ b/www-apps/stagit/Manifest @@ -0,0 +1 @@ +DIST stagit-1.1.tar.gz 19648 BLAKE2B f77f7d79a475d5e7eda734fb0dc5f4006156df90c0019b0cc664efe8a5e0b988e2c9f0bf36efcbabbb06d7c59e6ad81434184c2c73bfef28849261251eb052b8 SHA512 e75d47b84d2783f7396a932b402a4dd36572027931559eae908861f9b8c658f43f5110bdfc81c5a0b65be3a0c53939ba9adabcc1e36fe88a6dab54b929526e0f diff --git a/www-apps/stagit/metadata.xml b/www-apps/stagit/metadata.xml new file mode 100644 index 0000000000..002833e187 --- /dev/null +++ b/www-apps/stagit/metadata.xml @@ -0,0 +1,12 @@ + + + + + kurth4cker@tutanota.com + kurth4cker + + + stagit is a static page generator. It takes sources from a git + repository and generates html pages to a directory. + + diff --git a/www-apps/stagit/stagit-1.1.ebuild b/www-apps/stagit/stagit-1.1.ebuild new file mode 100644 index 0000000000..cc46088b35 --- /dev/null +++ b/www-apps/stagit/stagit-1.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="static git page generator" +HOMEPAGE="https://codemadness.org/stagit.html" +SRC_URI="https://codemadness.org/releases/stagit/stagit-1.1.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="dev-libs/libgit2" +DEPEND="${RDEPEND}" + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" MANPREFIX="${EPREFIX}/usr/share/man" DOCPREFIX="${EPREFIX}/usr/share/doc/${P}" install +}