* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/files/, media-libs/imgui/
@ 2022-09-08 1:46 Ronny Gutbrod
0 siblings, 0 replies; 2+ messages in thread
From: Ronny Gutbrod @ 2022-09-08 1:46 UTC (permalink / raw
To: gentoo-commits
commit: 3dbd028826ddaa32b5da8af35bc848ac93f98a68
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Wed Sep 7 17:26:09 2022 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Wed Sep 7 17:26:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3dbd0288
media-libs/imgui: 1.81: fix ebuild
wrapdb's meson.build file needs some tweaks so the library gets
properly installed.
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
.../imgui/files/imgui-1.81-wrapdb-meson-fix.patch | 45 ++++++++++++++++++++++
media-libs/imgui/imgui-1.81.ebuild | 4 ++
2 files changed, 49 insertions(+)
diff --git a/media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch b/media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch
new file mode 100644
index 000000000..a80319e9c
--- /dev/null
+++ b/media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch
@@ -0,0 +1,45 @@
+# Meson wrapdb's meson.build file doesn't handle installing the library, we patch that here
+
+diff --git a/meson.build b/imgui-1.81-meson.build
+index 3343dd4ad..804f84227 100644
+--- a/meson.build
++++ b/imgui-1.81-meson.build
+@@ -80,6 +80,38 @@ imgui = library('imgui',
+ sources,
+ dependencies: dependencies,
+ include_directories: include_dirs,
++ version: meson.project_version(),
++ install: true
+ )
+
++pkg_mod = import('pkgconfig')
++pkg_mod.generate(imgui,
++ description : 'Dear ImGui: Bloat-free Graphical User interface for C++ with minimal dependencies'
++)
++
++install_headers(
++ 'imconfig.h',
++ 'imgui.h',
++ 'imgui_internal.h',
++ 'imstb_rectpack.h',
++ 'imstb_textedit.h',
++ 'imstb_truetype.h',
++ 'backends/imgui_impl_dx9.h',
++ 'backends/imgui_impl_osx.h',
++ 'backends/imgui_impl_sdl.h',
++ 'backends/imgui_impl_dx10.h',
++ 'backends/imgui_impl_dx11.h',
++ 'backends/imgui_impl_dx12.h',
++ 'backends/imgui_impl_glfw.h',
++ 'backends/imgui_impl_glut.h',
++ 'backends/imgui_impl_wgpu.h',
++ 'backends/imgui_impl_metal.h',
++ 'backends/imgui_impl_win32.h',
++ 'backends/imgui_impl_vulkan.h',
++ 'backends/imgui_impl_opengl2.h',
++ 'backends/imgui_impl_opengl3.h',
++ 'backends/imgui_impl_allegro5.h',
++ 'backends/imgui_impl_marmalade.h',
++ subdir: 'imgui')
++
+ imgui_dep = declare_dependency(include_directories: include_dirs, link_with: imgui)
diff --git a/media-libs/imgui/imgui-1.81.ebuild b/media-libs/imgui/imgui-1.81.ebuild
index 3ff8437c9..22929f29b 100644
--- a/media-libs/imgui/imgui-1.81.ebuild
+++ b/media-libs/imgui/imgui-1.81.ebuild
@@ -40,6 +40,10 @@ BDEPEND="
app-arch/unzip
"
+PATCHES=(
+ "${FILESDIR}/imgui-1.81-wrapdb-meson-fix.patch"
+)
+
src_unpack() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/files/, media-libs/imgui/
@ 2024-05-10 0:33 Haelwenn Monnier
0 siblings, 0 replies; 2+ messages in thread
From: Haelwenn Monnier @ 2024-05-10 0:33 UTC (permalink / raw
To: gentoo-commits
commit: 59737466120a8e763b4430810a1007bbef9a4584
Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Thu May 9 08:52:50 2024 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu May 9 15:57:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=59737466
media-libs/imgui: drop 1.81-r1, 1.87-r9, add 1.89.9
* use meson wrap instead of CMake to build
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
media-libs/imgui/Manifest | 7 +-
media-libs/imgui/files/cimgui-1.87-CMakeLists.txt | 94 ------------
media-libs/imgui/files/imgui-1.87-CMakeLists.txt | 169 ---------------------
.../imgui/files/imgui-1.87-fpermissive.patch | 11 --
...x.patch => imgui-1.89.9-wrapdb-meson-fix.patch} | 20 +--
media-libs/imgui/files/imgui.pc.in | 11 --
media-libs/imgui/imgui-1.83.ebuild | 37 -----
media-libs/imgui/imgui-1.87-r9.ebuild | 120 ---------------
.../{imgui-1.81-r1.ebuild => imgui-1.89.9.ebuild} | 3 +-
media-libs/imgui/metadata.xml | 12 +-
10 files changed, 17 insertions(+), 467 deletions(-)
diff --git a/media-libs/imgui/Manifest b/media-libs/imgui/Manifest
index 92dc7f09b4..bcfdfa8f68 100644
--- a/media-libs/imgui/Manifest
+++ b/media-libs/imgui/Manifest
@@ -1,5 +1,2 @@
-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
+DIST imgui-1.89.9-1-meson-wrap.zip 2413 BLAKE2B 01598058869b312e225c6c11fdea057854a4ffd45bbd6d64330093c68294f1c06529ed6033f94efa780be3a4243f2ece70fba9207ea54c14cfd32067b25e91a1 SHA512 5951c70d94d747530afb4603e0322cfd038c58bef1a7285f66889f9b7081ae336e2e933c6578176b2fb48279b656106882596bd797f7c949088dd63cd2943cbc
+DIST imgui-1.89.9.tar.gz 1609452 BLAKE2B d5f361acf4318b05066720e9da2ed06db760c482440fc7fb2ca95ce5dd88d9a9a010697c831d3e188baec69819c0a0925e98134c191d5e1856ab43e4dbf9b64f SHA512 42021b06b611b58222b09fab8db2c34e992c3dc4fbaa175e09833c66c90d04b4a4e7def16a732535335c0ac5ff014d235835511a5d9a76d32b4395b302146919
diff --git a/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt b/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt
deleted file mode 100644
index a1c735bcab..0000000000
--- a/media-libs/imgui/files/cimgui-1.87-CMakeLists.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-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})
-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_impl.h
- ${CIMGUI_EXTRA_STUFF}
-)
-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"
- "${CMAKE_SOURCE_DIR}/generator/output/cimgui_impl.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")
-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")
-
-if (CIMGUI_TEST)
- add_subdirectory(test)
-endif ()
-endif()
-
diff --git a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt b/media-libs/imgui/files/imgui-1.87-CMakeLists.txt
deleted file mode 100644
index 1735d82708..0000000000
--- a/media-libs/imgui/files/imgui-1.87-CMakeLists.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-cmake_minimum_required(VERSION 3.8.2)
-project(imgui VERSION 1.73.0 LANGUAGES CXX C)
-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)
-option(IMGUI_GLFW OFF)
-option(IMGUI_GLUT OFF)
-option(IMGUI_OPENGL OFF)
-option(IMGUI_SDL OFF)
-option(IMGUI_VULKAN OFF)
-
-add_library (imgui_objects
- OBJECT
- imgui.cpp
- imgui_demo.cpp
- imgui_draw.cpp
- imgui_tables.cpp
- imgui_widgets.cpp
-)
-add_library (imgui SHARED "")
-target_include_directories(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends")
-#set(IMGUI_COMMON_FLAGS "-DIMGUI_USE_WCHAR32 -DIMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION -DIMGUI_STB_RECT_PACK_FILENAME=\"<stb/stb_rect_pack.h>\"")
-set(IMGUI_COMMON_FLAGS "-DIMGUI_USE_WCHAR32")
-
-if(IMGUI_ALLEGRO)
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(ALLEGRO5 REQUIRED allegro-5 allegro_main-5 allegro_primitives-5)
- target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp")
- target_include_directories(imgui_objects PUBLIC ${ALLEGRO5_INCLUDE_DIRS})
- list(APPEND IMGUI_LIBRARIES ${ALLEGRO5_LIBRARIES})
- string(APPEND pc_req_private " allegro-5 allegro_main-5 allegro_primitives-5")
-endif()
-if(IMGUI_FREETYPE)
- find_package(Freetype REQUIRED)
- target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype/imgui_freetype.cpp")
- target_include_directories(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/misc/freetype" ${FREETYPE_INCLUDE_DIRS})
- list(APPEND IMGUI_LIBRARIES ${FREETYPE_LIBRARIES})
-# set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE -DIMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION -DIMGUI_STB_TRUETYPE_FILENAME=\"<stb/stb_truetype.h>\"")
- set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE")
- add_executable(binary_to_compressed_c "${CMAKE_CURRENT_SOURCE_DIR}/misc/fonts/binary_to_compressed_c.cpp")
- target_include_directories(binary_to_compressed_c PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
- target_link_libraries(binary_to_compressed_c PUBLIC imgui)
- install(TARGETS binary_to_compressed_c DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui")
- 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)
- target_sources(imgui_objects
- PUBLIC
- "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp"
- )
- target_include_directories(imgui_objects PUBLIC ${OPENGL_INCLUDE_DIR})
- list(APPEND IMGUI_LIBRARIES ${OPENGL_gl_LIBRARY})
- string(APPEND pc_req_private " opengl")
-endif()
-if(IMGUI_SDL)
- find_package(SDL2 REQUIRED)
- target_sources(imgui_objects
- PUBLIC
- "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.cpp"
- )
- target_include_directories(imgui_objects PUBLIC "${SDL2_INCLUDE_DIRS}")
- list(APPEND IMGUI_LIBRARIES "${SDL2_LIBRARIES}")
- string(APPEND pc_req_private " sdl2")
-endif()
-if(IMGUI_VULKAN)
- find_package(Vulkan REQUIRED)
- target_sources(imgui_objects PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.cpp")
- set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS} -DImTextureID=ImU64")
- target_include_directories(imgui_objects PUBLIC ${Vulkan_INCLUDE_DIRS})
- list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan)
- string(APPEND pc_req_private " vulkan")
-endif()
-
-if(IMGUI_EXAMPLES)
- install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/examples" DESTINATION "${CMAKE_INSTALL_DOCDIR}")
- add_executable(example_null "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_null/main.cpp")
- target_include_directories(example_null PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
- target_link_libraries(example_null PUBLIC imgui)
- install(TARGETS example_null DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- if(IMGUI_ALLEGRO)
- add_executable(example_allegro5 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_allegro5/main.cpp")
- target_include_directories(example_allegro5 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends")
- target_link_libraries(example_allegro5 PUBLIC imgui)
- install(TARGETS example_allegro5 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- endif()
- if(IMGUI_GLFW AND IMGUI_OPENGL)
- add_executable(example_glfw_opengl2 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glfw_opengl2/main.cpp")
- target_include_directories(example_glfw_opengl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends")
- target_link_libraries(example_glfw_opengl2 PUBLIC imgui)
- install(TARGETS example_allegro5 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- add_executable(example_glfw_opengl3 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glfw_opengl3/main.cpp")
- target_include_directories(example_glfw_opengl3 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends")
- target_link_libraries(example_glfw_opengl3 PUBLIC imgui)
- install(TARGETS example_glfw_opengl3 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- endif()
- if(IMGUI_GLFW AND IMGUI_VULKAN)
- add_executable(example_glfw_vulkan "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glfw_vulkan/main.cpp")
- target_include_directories(example_glfw_vulkan PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends")
- target_link_libraries(example_glfw_vulkan PUBLIC imgui)
- install(TARGETS example_glfw_vulkan DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- endif()
- if(IMGUI_GLUT AND IMGUI_OPENGL)
- add_executable(example_glut_opengl2 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_glut_opengl2/main.cpp")
- target_include_directories(example_glut_opengl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends")
- target_link_libraries(example_glut_opengl2 PUBLIC imgui)
- install(TARGETS example_glut_opengl2 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- endif()
- if(IMGUI_SDL)
- add_executable(example_sdl_sdlrenderer "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_sdlrenderer/main.cpp")
- target_include_directories(example_sdl_sdlrenderer PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}")
- target_link_libraries(example_sdl_sdlrenderer PUBLIC imgui)
- install(TARGETS example_sdl_sdlrenderer DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- if(IMGUI_OPENGL)
- add_executable(example_sdl_opengl2 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_opengl2/main.cpp")
- target_include_directories(example_sdl_opengl2 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}")
- target_link_libraries(example_sdl_opengl2 PUBLIC imgui)
- install(TARGETS example_sdl_opengl2 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- add_executable(example_sdl_opengl3 "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_opengl3/main.cpp")
- target_include_directories(example_sdl_opengl3 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}")
- target_link_libraries(example_sdl_opengl3 PUBLIC imgui)
- install(TARGETS example_sdl_opengl2 DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- endif()
- if(IMGUI_VULKAN)
- add_executable(example_sdl_vulkan "${CMAKE_CURRENT_SOURCE_DIR}/examples/example_sdl_vulkan/main.cpp")
- target_include_directories(example_sdl_vulkan PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/backends" "${SDL2_INCLUDE_DIRS}")
- target_link_libraries(example_sdl_vulkan PUBLIC imgui)
- install(TARGETS example_sdl_vulkan DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/imgui/examples" )
- endif()
- endif()
-endif()
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMGUI_COMMON_FLAGS}")
-target_sources (imgui PUBLIC $<TARGET_OBJECTS:imgui_objects>)
-
-add_library(imgui::imgui ALIAS imgui)
-target_link_libraries(imgui PUBLIC ${IMGUI_LIBRARIES})
-
-file(GLOB IMGUI_INCLUDE_FILES "*.h" "backends/*.h" "misc/freetype/*.h")
-install(FILES ${IMGUI_INCLUDE_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/imgui")
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/backends/vulkan" DESTINATION "${CMAKE_INSTALL_DATADIR}/imgui/backends")
-file(GLOB IMGUI_DOC_FILES "docs/*")
-install(FILES ${IMGUI_DOC_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}")
-install(TARGETS imgui)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/imgui.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/imgui.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/imgui.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-set(IMGUI_COMMON_FLAGS "${IMGUI_COMMON_FLAGS}" PARENT_SCOPE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE)
diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch b/media-libs/imgui/files/imgui-1.87-fpermissive.patch
deleted file mode 100644
index 7b2fef035d..0000000000
--- a/media-libs/imgui/files/imgui-1.87-fpermissive.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/imgui-1.81-wrapdb-meson-fix.patch b/media-libs/imgui/files/imgui-1.89.9-wrapdb-meson-fix.patch
similarity index 75%
rename from media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch
rename to media-libs/imgui/files/imgui-1.89.9-wrapdb-meson-fix.patch
index a80319e9c8..30bf42a168 100644
--- a/media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch
+++ b/media-libs/imgui/files/imgui-1.89.9-wrapdb-meson-fix.patch
@@ -4,14 +4,14 @@ diff --git a/meson.build b/imgui-1.81-meson.build
index 3343dd4ad..804f84227 100644
--- a/meson.build
+++ b/imgui-1.81-meson.build
-@@ -80,6 +80,38 @@ imgui = library('imgui',
- sources,
- dependencies: dependencies,
- include_directories: include_dirs,
-+ version: meson.project_version(),
-+ install: true
+@@ -112,8 +112,38 @@
+ gnu_symbol_visibility: 'hidden',
+ dependencies: dependencies,
+ include_directories: include_dirs,
++ version: meson.project_version(),
++ install: true
)
-
+
+pkg_mod = import('pkgconfig')
+pkg_mod.generate(imgui,
+ description : 'Dear ImGui: Bloat-free Graphical User interface for C++ with minimal dependencies'
@@ -26,7 +26,6 @@ index 3343dd4ad..804f84227 100644
+ 'imstb_truetype.h',
+ 'backends/imgui_impl_dx9.h',
+ 'backends/imgui_impl_osx.h',
-+ 'backends/imgui_impl_sdl.h',
+ 'backends/imgui_impl_dx10.h',
+ 'backends/imgui_impl_dx11.h',
+ 'backends/imgui_impl_dx12.h',
@@ -39,7 +38,8 @@ index 3343dd4ad..804f84227 100644
+ 'backends/imgui_impl_opengl2.h',
+ 'backends/imgui_impl_opengl3.h',
+ 'backends/imgui_impl_allegro5.h',
-+ 'backends/imgui_impl_marmalade.h',
+ subdir: 'imgui')
+
- imgui_dep = declare_dependency(include_directories: include_dirs, link_with: imgui)
+ if host_machine.system() == 'windows'
+ api = '-DIMGUI_API=@0@'.format(get_option('default_library') != 'static' ? '__declspec(dllimport)' : '')
+ endif
diff --git a/media-libs/imgui/files/imgui.pc.in b/media-libs/imgui/files/imgui.pc.in
deleted file mode 100644
index e7776fc8cd..0000000000
--- a/media-libs/imgui/files/imgui.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/imgui
-
-Name: imgui
-Description: Bloat-free Immediate Mode Graphical User interface for C
-Version: @version@
-URL: https://github.com/ocornut/imgui
-Requires.private: @pc_req_private@
-Libs: -L${libdir} -limgui
-Cflags: -I${includedir}/imgui @IMGUI_COMMON_FLAGS@
diff --git a/media-libs/imgui/imgui-1.83.ebuild b/media-libs/imgui/imgui-1.83.ebuild
deleted file mode 100644
index 2b63cb7ce8..0000000000
--- a/media-libs/imgui/imgui-1.83.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Bloat-free graphical user interface library for C++"
-HOMEPAGE="https://github.com/ocornut/imgui"
-SRC_URI="https://github.com/ocornut/imgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="media-libs/glew:0"
-DEPEND="${RDEPEND}"
-
-src_install() {
- dodoc docs/*
- insinto "/usr/include/${PN}"
- doins *.h
- doins -r misc/*/*.h
- insinto "/usr/include/${PN}/backend"
- doins backends/*.h
- insinto "/usr/share/${PN}"
- doins *.cpp
- insinto "/usr/share/${PN}/backend"
- doins backends/*.cpp
- doins -r backends/vulkan
- rm -r misc/*/*.{h,ttf} || die
- doins -r misc
-
- if use examples; then
- dodoc -r examples
- docompress -x "/usr/share/doc/${PF}/examples"
- fi
-}
diff --git a/media-libs/imgui/imgui-1.87-r9.ebuild b/media-libs/imgui/imgui-1.87-r9.ebuild
deleted file mode 100644
index 27dc90b9ae..0000000000
--- a/media-libs/imgui/imgui-1.87-r9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-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[${MULTILIB_USEDEP}] )
- freetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
- glfw? ( media-libs/glfw:0[${MULTILIB_USEDEP}] )
- glut? ( media-libs/freeglut[${MULTILIB_USEDEP}] )
- opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
-"
-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_unpack() {
- # unpack imgui and cimgui to ${WORKDIR}
- unpack "${P}.gh.tar.gz"
- unpack "c${P}.gh.tar.gz"
-
- # move imgui to the proper location before the patch (Bug #924126)
- pushd ${WORKDIR} || die
- rm -rf "${S}/imgui" || die
- mv "${P}" "${S}/imgui" || die
-}
-
-multilib_src_prepare() {
- # imgui
- pushd "${S}/imgui" || die
- rm -r examples/libs || die
- rm -r misc/*/*.ttf || die
- rm -r misc/single_file || die
-
- cp "${FILESDIR}/${P}-CMakeLists.txt" CMakeLists.txt || die
- cp "${FILESDIR}/imgui.pc.in" imgui.pc.in || die
- sed -e "s|@version@|${PV}|g" -i imgui.pc.in || die
-
- pushd "${S}" || die
- cp "${FILESDIR}/c${P}-CMakeLists.txt" CMakeLists.txt || die
- # remove files to be generated
- rm cimgui.cpp cimgui.h generator/output/* || die
- cmake_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DIMGUI_ALLEGRO=$(usex allegro)
- -DIMGUI_BINDINGS=$(usex bindings)
- -DIMGUI_EXAMPLES=$(usex examples)
- -DIMGUI_FREETYPE=$(usex freetype)
- -DIMGUI_GLFW=$(usex glfw)
- -DIMGUI_GLUT=$(usex glut)
- -DIMGUI_OPENGL=$(usex opengl)
- -DIMGUI_SDL=$(usex sdl)
- -DIMGUI_VULKAN=$(usex vulkan)
- )
- cmake_src_configure
-}
-
-multilib_src_install() {
-
- cmake_src_install
-
- pushd imgui || die
- # imgui
- rm -rf misc/{fonts,freetype} || die
- dodoc -r misc
-
- popd || die
-
- if use bindings; then
- # cimgui
-
- insinto "/usr/share/doc/${PF}/cimgui"
- doins README.md TODO.txt
- fi
-}
diff --git a/media-libs/imgui/imgui-1.81-r1.ebuild b/media-libs/imgui/imgui-1.89.9.ebuild
similarity index 94%
rename from media-libs/imgui/imgui-1.81-r1.ebuild
rename to media-libs/imgui/imgui-1.89.9.ebuild
index 3c6e5ee7e8..44891bc53b 100644
--- a/media-libs/imgui/imgui-1.81-r1.ebuild
+++ b/media-libs/imgui/imgui-1.89.9.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/imgui-1.81-wrapdb-meson-fix.patch"
+ "${FILESDIR}/${P}-wrapdb-meson-fix.patch"
)
src_unpack() {
@@ -63,7 +63,6 @@ multilib_src_configure() {
$(meson_feature sdl2)
-Dosx=disabled
-Dwin=disabled
- $(meson_feature marmalade)
$(meson_feature allegro5)
)
meson_src_configure
diff --git a/media-libs/imgui/metadata.xml b/media-libs/imgui/metadata.xml
index 9ffdaf77e7..a32bd51ac0 100644
--- a/media-libs/imgui/metadata.xml
+++ b/media-libs/imgui/metadata.xml
@@ -1,23 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>gonegrier.duarte@gmail.com</email>
+ <name>Gonçalo Negrier Duarte</name>
+ </maintainer>
<upstream>
<bugs-to>https://github.com/ocornut/imgui/issues</bugs-to>
<remote-id type="github">ocornut/imgui</remote-id>
- <remote-id type="github">cimgui/cimgui</remote-id>
</upstream>
<use>
<flag name="allegro5">Enable allegro backend and renderer</flag>
- <flag name="allegro">Enable allegro backend and renderer</flag>
- <flag name="bindings">Build the cimgui C bindigs</flag>
- <flag name="freetype">Use FreeType to build and rasterize the font atlas</flag>
<flag name="glfw">Enable glfw backend</flag>
- <flag name="glut">Enable glut backen</flag>
<flag name="opengl">Enable opengl renderer</flag>
- <flag name="sdl">Enable sdl backend</flag>
<flag name="vulkan">Enable vulkan renderer</flag>
- <flag name="marmalade">Enable Marmalade backend</flag>
<flag name="sdl2">Enable SDL2 backend</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-10 0:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-08 1:46 [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/files/, media-libs/imgui/ Ronny Gutbrod
-- strict thread matches above, loose matches on Subject: below --
2024-05-10 0:33 Haelwenn Monnier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox