[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 6b24ca9ef444311a78105507d415509a8dd7d836 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 00:59:16 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Wed May 4 00:59:16 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b24ca9e media-libs/imgui: fix pkgconfig file Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 11 ++- media-libs/imgui/files/imgui.pc.in| 6 +++--- .../imgui/{imgui-1.87-r4.ebuild => imgui-1.87-r5.ebuild} | 5 - 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt index 0823d1dc3..1735d8270 100644 --- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt @@ -4,6 +4,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(GNUInstallDirs) +set(pc_req_private) + option(IMGUI_ALLEGRO OFF) option(IMGUI_EXAMPLES "Build ImGui examples" OFF) option(IMGUI_FREETYPE OFF) @@ -32,6 +34,7 @@ if(IMGUI_ALLEGRO) 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}) + string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5") endif() if(IMGUI_FREETYPE) find_package(Freetype REQUIRED) @@ -44,17 +47,20 @@ if(IMGUI_FREETYPE) 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") + string(APPEND pc_req_private " freetype2") 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) + string(APPEND pc_req_private " glfw3") 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) + string(APPEND pc_req_private " glut") endif() if(IMGUI_OPENGL) find_package(OpenGL REQUIRED) @@ -65,6 +71,7 @@ if(IMGUI_OPENGL) ) target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR}) list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY}) + string(APPEND pc_req_private " opengl") endif() if(IMGUI_SDL) find_package(SDL2 REQUIRED) @@ -75,6 +82,7 @@ if(IMGUI_SDL) ) target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}") list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}") + string(APPEND pc_req_private " sdl2") endif() if(IMGUI_VULKAN) find_package(Vulkan REQUIRED) @@ -82,6 +90,7 @@ if(IMGUI_VULKAN) set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64") target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS}) list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan) + string(APPEND pc_req_private " vulkan") endif() if(IMGUI_EXAMPLES) @@ -142,7 +151,7 @@ if(IMGUI_EXAMPLES) endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS} -fpermissive") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}") target_sources (imgui PUBLIC $) add_library(imgui::imgui ALIAS imgui) diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in index 4d033939f..e7776fc8c 100644 --- a/media-libs/imgui/files/imgui.pc.in +++ b/media-libs/imgui/files/imgui.pc.in @@ -6,6 +6,6 @@ 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} +Requires.private: @pc_req_private@ +Libs: -L${libdir} -limgui +Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@ diff --git a/media-libs/imgui/imgui-1.87-r4.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild similarity index 95% rename from media-libs/imgui/imgui-1.87-r4.ebuild rename to media-libs/imgui/imgui-1.87-r5.ebuild index 0c83b5cdf..51478bf63 100644 --- a/media-libs/imgui/imgui-1.87-r4.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -55,6 +55,9 @@ REQUIRED_USE=" " src_prepare() { + # https://github.com/ocornut/imgui/issues/5281 + append-cxxflags -fpermissive
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: cad184ce0526c395646191e9f4fdece311355842 Author: Alessandro Barbieri gmail com> AuthorDate: Wed May 4 11:30:26 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu May 5 07:32:17 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce media-libs/imgui: fix for fpermissive Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++ media-libs/imgui/imgui-1.87-r5.ebuild | 7 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch new file mode 100644 index 0..7b2fef035 --- /dev/null +++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch @@ -0,0 +1,11 @@ +--- a/imgui/backends/imgui_impl_allegro5.cpp b/imgui/backends/imgui_impl_allegro5.cpp +@@ -233,7 +233,7 @@ + return false; + + // Store our identifier +-io.Fonts->SetTexID((void*)cloned_img); ++io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img); + bd->Texture = cloned_img; + + // Create an invisible mouse cursor diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild b/media-libs/imgui/imgui-1.87-r5.ebuild index 51478bf63..927b7feae 100644 --- a/media-libs/imgui/imgui-1.87-r5.ebuild +++ b/media-libs/imgui/imgui-1.87-r5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake flag-o-matic +inherit cmake DESCRIPTION="Bloat-free graphical user interface library for C++" HOMEPAGE=" @@ -54,10 +54,9 @@ REQUIRED_USE=" ) " -src_prepare() { - # https://github.com/ocornut/imgui/issues/5281 - append-cxxflags -fpermissive +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) +src_prepare() { pushd ../ || die rm -rf "${S}/imgui" || die mv "${P}" "${S}/imgui" || die
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 0f466458f5ba120eeb3fb28b250bdea19d1bb85c Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 10 01:04:34 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Apr 15 20:34:20 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f466458 media-libs/imgui: add cimgui C bindings Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 + .../{imgui-1.87-r1.ebuild => imgui-1.87-r2.ebuild} | 110 ++--- media-libs/imgui/metadata.xml | 2 + 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index 9bbf158f0..582ac2320 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,2 +1,3 @@ +DIST cimgui-1.87.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch new file mode 100644 index 0..b3bae1cfe --- /dev/null +++ b/media-libs/imgui/files/cimgui-1.87-fix-cmake.patch @@ -0,0 +1,69 @@ +--- 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/imgui-1.87-r1.ebuild b/media-libs/imgui/imgui-1.87-r2.ebuild similarity index 64% rename from media-libs/imgui/imgui-1.87-r1.ebuild rename to media-libs/imgui/imgui-1.87-r2.ebuild index 4339ad386..f51097b79 100644 --- a/media-libs/imgui/imgui-1.87-r1.ebuild +++ b/media-libs/imgui/imgui-1.87-r2.ebuild @@ -3,16 +3,25 @@ EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs + +CMAKE_IN_SOURCE_BUILD=1 DESCRIPTION="Bloat-free graphical user interface library for C++" -HOMEPAGE="https://git
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: baad5b2e46440f460cbb58a0807f5a5a2f50f319 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:14:10 2022 + Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=baad5b2e media-libs/imgui: build with cmake Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 80 +++ media-libs/imgui/files/cimgui-1.87-fix-cmake.patch | 69 -- media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 160 + media-libs/imgui/files/imgui.pc.in | 11 + media-libs/imgui/imgui-1.87-r2.ebuild | 251 - media-libs/imgui/imgui-1.87-r4.ebuild | 119 ++ 6 files changed, 370 insertions(+), 320 deletions(-) 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 0..713125ec6 --- /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 b3bae1cfe..0 --- 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) -
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 9631fc4edbeac197d38ada2049d3daa6f9da093f Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Mon Sep 5 19:33:40 2022 + Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Sep 7 16:07:18 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9631fc4e media-libs/imgui: improve 1.81 ebuild Signed-off-by: Adel KARA SLIMANE zegrapher.com> media-libs/imgui/Manifest | 1 + media-libs/imgui/files/imgui-1.81-meson.build | 137 - .../imgui/files/imgui-1.81-meson_options.txt | 18 --- media-libs/imgui/imgui-1.81.ebuild | 26 ++-- media-libs/imgui/metadata.xml | 4 +- 5 files changed, 17 insertions(+), 169 deletions(-) diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest index c33c14ca9..92dc7f09b 100644 --- a/media-libs/imgui/Manifest +++ b/media-libs/imgui/Manifest @@ -1,4 +1,5 @@ DIST cimgui-1.87.gh.tar.gz 385460 BLAKE2B 0916d53a00234343536ee412035a2c405b01e31a26c3d059cff4d446188ee8a1835a1233a68f671ccebb67be480801b85203a90b0e79fa729f7ac1efdc8bf4a2 SHA512 bf2ed9461e8c12514d29914e6da7f8fae7cd31fcc587c7d89122c950541aed3b4b908d8cd298b3975e9a955a47789335a88db7223ca558cbdf459693a0081bda +DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba52499c3540cc389ab51b929f1dd65c4a599ab71f7f06fa082f31572d8cdaf2f9d7bfdd8cf6ca96a529318bd53f0a06 SHA512 c97fa4cb5ab31c040951e6da04bb1b9659f0105adf54becc35c60ad376c6d4f9e4dcd2a5a554dc5430cfc69527ef5d8570f39fbbf91a23d15f51740f06fb7c3c DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e DIST imgui-1.83.tar.gz 1448389 BLAKE2B 648306bd69181ad8315f12fc5b2c319b23005d6b3fc790ad64caaf1f80304e81b33af5d6f435fa97151fcf1e77eb15455838a09570b7a9c7dd9c56a61510b5a1 SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c DIST imgui-1.87.gh.tar.gz 1460834 BLAKE2B f73b71400311e7c5f82248e242a932add5090670c78077ca2239f349730bab88a00bfe4deca4e854772ef7f6a2cff1fc0f38f7174a026995f93c9e7b55eb2a1d SHA512 3255b06698ab9c8951953e1e0b6d160d64adfa4c011b21a4288547292a7f8fff586875faf9dae0677818bde65bd7e98da92f16f6beb1e6a66aa835edf32e8ce2 diff --git a/media-libs/imgui/files/imgui-1.81-meson.build b/media-libs/imgui/files/imgui-1.81-meson.build deleted file mode 100644 index 1d5e67e38..0 --- a/media-libs/imgui/files/imgui-1.81-meson.build +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (c) 2020 The Meson development team - -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: - -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. - -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -project('imgui', 'cpp', -version: '1.81', -license: 'MIT', -) - -include_dirs = include_directories('.', 'backends') -sources = ['imgui_demo.cpp', 'imgui_draw.cpp', 'imgui_tables.cpp', 'imgui_widgets.cpp', 'imgui.cpp'] - -cpp = meson.get_compiler('cpp') -dependencies = [] - -# renderer backends -dx9_dep = cpp.find_library('d3d9', required: get_option('dx9')) -if dx9_dep.found() -sources += 'backends/imgui_impl_dx9.cpp' -dependencies += dx9_dep -endif -dx10_dep = cpp.find_library('d3d10', required: get_option('dx10')) -if dx10_dep.found() -sources += 'backends/imgui_impl_dx10.cpp' -dependencies += dx10_dep -endif -dx11_dep = cpp.find_library('d3d11', required: get_option('dx11')) -if dx11_dep.found() -sources += 'backends/imgui_impl_dx11.cpp' -dependencies += dx11_dep -endif -dx12_dep = cpp.find_library('d3d12', required: get_option('dx12')) -if dx12_dep.found() -sources += 'backends/imgui_impl_dx12.cpp' -dependencies += dx12_dep -endif -metal_dep = cpp.find_library('metal', required: get_option('metal')) -if get_option('metal').enabled() -sources += 'backends/
[gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/, media-libs/imgui/files/
commit: 3e12b65f0dc89e9f147f1055a0157c729ebf0fe8 Author: Alessandro Barbieri gmail com> AuthorDate: Wed Sep 20 17:38:19 2023 + Commit: David Roman gmail com> CommitDate: Wed Sep 20 17:39:26 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3e12b65f media-libs/imgui: install all the generated cimgui files Signed-off-by: Alessandro Barbieri gmail.com> media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 26 +++-- media-libs/imgui/imgui-1.87-r7.ebuild | 113 ++ 2 files changed, 133 insertions(+), 6 deletions(-) diff --git a/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt b/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt index 713125ec6b..a1c735bcab 100644 --- a/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt +++ b/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt @@ -43,13 +43,22 @@ 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 +set(CIMGUI_EXTRA_STUFF + ${CMAKE_SOURCE_DIR}/generator/output/definitions.json + ${CMAKE_SOURCE_DIR}/generator/output/definitions.lua + ${CMAKE_SOURCE_DIR}/generator/output/impl_definitions.json + ${CMAKE_SOURCE_DIR}/generator/output/impl_definitions.lua + ${CMAKE_SOURCE_DIR}/generator/output/overloads.txt + ${CMAKE_SOURCE_DIR}/generator/output/structs_and_enums.json + ${CMAKE_SOURCE_DIR}/generator/output/structs_and_enums.lua + ${CMAKE_SOURCE_DIR}/generator/output/typedefs_dict.json + ${CMAKE_SOURCE_DIR}/generator/output/typedefs_dict.lua +) +set(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 + ${CMAKE_SOURCE_DIR}/generator/output/cimgui_impl.h + ${CIMGUI_EXTRA_STUFF} ) ADD_CUSTOM_COMMAND(VERBATIM OUTPUT ${GENERATOR_OUTPUT_FILES} @@ -57,7 +66,10 @@ ADD_CUSTOM_COMMAND(VERBATIM WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/generator" ) set(CIMGUI_SOURCES "${CMAKE_SOURCE_DIR}/cimgui.cpp") -set(CIMGUI_INCLUDE_FILES "${CMAKE_SOURCE_DIR}/cimgui.h") +set(CIMGUI_INCLUDE_FILES + "${CMAKE_SOURCE_DIR}/cimgui.h" + "${CMAKE_SOURCE_DIR}/generator/output/cimgui_impl.h" +) target_sources(cimgui PUBLIC @@ -70,6 +82,7 @@ include(GNUInstallDirs) #install install(TARGETS cimgui LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${CIMGUI_INCLUDE_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/imgui") +install(FILES ${CIMGUI_EXTRA_STUFF} DESTINATION "${CMAKE_INSTALL_DATADIR}/cimgui") #test set(CIMGUI_TEST "no" CACHE STRING "Enable compilation of a test unit based on imgui null") @@ -78,3 +91,4 @@ if (CIMGUI_TEST) add_subdirectory(test) endif () endif() + diff --git a/media-libs/imgui/imgui-1.87-r7.ebuild b/media-libs/imgui/imgui-1.87-r7.ebuild new file mode 100644 index 00..49227f0f47 --- /dev/null +++ b/media-libs/imgui/imgui-1.87-r7.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2023 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}.gh.tar.gz + https://github.com/cimgui/cimgui/archive/refs/tags/${PV}.tar.gz -> c${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0/${PV}" +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 + ) +" + +PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" ) + +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.p