diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/blurhash/Manifest | 1 | ||||
| -rw-r--r-- | dev-cpp/blurhash/blurhash-0.2.0.ebuild | 26 | ||||
| -rw-r--r-- | dev-cpp/blurhash/metadata.xml | 10 | ||||
| -rw-r--r-- | dev-cpp/dpp/Manifest | 1 | ||||
| -rw-r--r-- | dev-cpp/dpp/dpp-10.0.21-r1.ebuild (renamed from dev-cpp/dpp/dpp-10.0.21.ebuild) | 3 | ||||
| -rw-r--r-- | dev-cpp/dpp/dpp-10.0.22-r1.ebuild (renamed from dev-cpp/dpp/dpp-10.0.22.ebuild) | 6 | ||||
| -rw-r--r-- | dev-cpp/dpp/files/dpp-rework-compiler-flag-setting-890014.patch | 147 | ||||
| -rw-r--r-- | dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch | 24 | ||||
| -rw-r--r-- | dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch | 54 |
9 files changed, 194 insertions, 78 deletions
diff --git a/dev-cpp/blurhash/Manifest b/dev-cpp/blurhash/Manifest new file mode 100644 index 000000000000..cfe2da5f0647 --- /dev/null +++ b/dev-cpp/blurhash/Manifest @@ -0,0 +1 @@ +DIST blurhash-0.2.0.tar.gz 137426 BLAKE2B 9a41049983866d896e937fde46800f47984ab52f83269023bef040d7694bea5f04449df0f849566cb79a3b1e796d4b02e810d5cab32f348c1dfa2ee7fcde3a01 SHA512 849b0e297816a62c65873bec26a9da46e711e6b4e31b82e1223349a8e840acf96e0b7eec72faeb6d78a9ad63faf6a2968695df4d97fa117607a4f371795818a5 diff --git a/dev-cpp/blurhash/blurhash-0.2.0.ebuild b/dev-cpp/blurhash/blurhash-0.2.0.ebuild new file mode 100644 index 000000000000..5cdc69e311dd --- /dev/null +++ b/dev-cpp/blurhash/blurhash-0.2.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +DESCRIPTION="C++ blurhash encoder/decoder" +HOMEPAGE="https://github.com/Nheko-Reborn/blurhash" +SRC_URI="https://github.com/Nheko-Reborn/blurhash/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Boost-1.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="test" + +BDEPEND="test? ( dev-cpp/doctest )" + +RESTRICT="!test? ( test )" + +src_configure() { + local -a emesonargs=( + $(meson_use test tests) + ) + meson_src_configure +} diff --git a/dev-cpp/blurhash/metadata.xml b/dev-cpp/blurhash/metadata.xml new file mode 100644 index 000000000000..063d284f1307 --- /dev/null +++ b/dev-cpp/blurhash/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>gentoo@tastytea.de</email> + <name>Ronny (tastytea) Gutbrod</name> + </maintainer> + + <origin>gentoo-guru-overlay</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/dev-cpp/dpp/Manifest b/dev-cpp/dpp/Manifest index e250f4a890b7..73ec513e5ddb 100644 --- a/dev-cpp/dpp/Manifest +++ b/dev-cpp/dpp/Manifest @@ -1,3 +1,4 @@ DIST dpp-10.0.21-fix-install.patch 4090 BLAKE2B b4177190fb620952619ed5a0e4147a9adde4871f00643129b1f1140152718816cbcc1099c25e0b350c65ede56c2c5f373aeaf6345c382ba953c3ad32e9e3f2fd SHA512 8dd9a5f7db0097bc7de8e0a50253bc144786786331e3cfbfb00884925c41746e7a81bd2f87254d3bcc8d72bb820415bd92013cd0968950533bffa382bc53f279 DIST dpp-10.0.21.tar.gz 13706441 BLAKE2B e7e68d4d121d17ad840790f14375ddc4e3c95c56ced03a90667b8b838205f3e46162bc9d60ea33d50a619335c7395318a9dd47583eddca3e73481879fe35f393 SHA512 a335886cdde5772b5602426e68c50d91e921cd127bcb918066c450b39fc5b0cf87ae692096140e76176d87265bd0d9de1fbb9d808a1f217dc2c8ef27210ad57f DIST dpp-10.0.22.tar.gz 13712205 BLAKE2B b935b763f87bfd1058e72f8d297fda136f532a03a5b9f3a6e3471f0ce64988c9615105fb1eb9b19192844cdaab9d332f355dfc22f8bcdbf977eec3eb5f0b8df3 SHA512 6c71673b47d559ef4f04b30cd72a3bd0a31b72ffe6d73dd17470a7e754eba75d21218ebd247702441db45549e5dcea9b200f3d435dd3a9af76fda90740ca4f1a +DIST dpp-890014-rework-compiler-flags.patch 6670 BLAKE2B f23ad8f7347841aa924b82b706fbdc5ff5ceac9e90e6c01c28f13117619235a057648e30cdb92d5e3401c228c7497e8804e894d2dfd5d3591e2860746acfcaa2 SHA512 c5777efab36187b59ac8c0d5177752c4f605e584b0f3f2435bf210f792879df0461d64332725e4c47e19f026b3b11eeb2d243425bab9f888cf239dafbedc3890 diff --git a/dev-cpp/dpp/dpp-10.0.21.ebuild b/dev-cpp/dpp/dpp-10.0.21-r1.ebuild index f8bb48f57637..20c778ac62b5 100644 --- a/dev-cpp/dpp/dpp-10.0.21.ebuild +++ b/dev-cpp/dpp/dpp-10.0.21-r1.ebuild @@ -10,6 +10,7 @@ HOMEPAGE="https://dpp.dev/ https://github.com/brainboxdotcc/DPP" SRC_URI=" https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz https://patch-diff.githubusercontent.com/raw/brainboxdotcc/DPP/pull/591.patch -> ${P}-fix-install.patch + https://patch-diff.githubusercontent.com/raw/brainboxdotcc/DPP/pull/596.patch -> ${PN}-890014-rework-compiler-flags.patch " LICENSE="Apache-2.0" @@ -33,6 +34,8 @@ DEPEND="${RDEPEND}" PATCHES=( # Backport of the installation fixes, remove after 10.0.21 "${DISTDIR}/${P}-fix-install.patch" + # Backport of the compiler flag setting fixes, remove after 10.0.22, https://bugs.gentoo.org/890014 + "${DISTDIR}/${PN}-890014-rework-compiler-flags.patch" ) S="${WORKDIR}/DPP-${PV}" diff --git a/dev-cpp/dpp/dpp-10.0.22.ebuild b/dev-cpp/dpp/dpp-10.0.22-r1.ebuild index 6efc34565e8e..bf42bca137a1 100644 --- a/dev-cpp/dpp/dpp-10.0.22.ebuild +++ b/dev-cpp/dpp/dpp-10.0.22-r1.ebuild @@ -9,6 +9,7 @@ DESCRIPTION="Lightweight C++ Discord bot library" HOMEPAGE="https://dpp.dev/ https://github.com/brainboxdotcc/DPP" SRC_URI=" https://github.com/brainboxdotcc/DPP/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://patch-diff.githubusercontent.com/raw/brainboxdotcc/DPP/pull/596.patch -> ${PN}-890014-rework-compiler-flags.patch " LICENSE="Apache-2.0" @@ -33,6 +34,11 @@ S="${WORKDIR}/DPP-${PV}" DOCS=( "README.md" "SECURITY.md" ) +PATCHES=( + # Backport of the compiler flag setting fixes, remove after 10.0.22, https://bugs.gentoo.org/890014 + "${DISTDIR}/${PN}-890014-rework-compiler-flags.patch" +) + src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=true diff --git a/dev-cpp/dpp/files/dpp-rework-compiler-flag-setting-890014.patch b/dev-cpp/dpp/files/dpp-rework-compiler-flag-setting-890014.patch new file mode 100644 index 000000000000..5d41fa407a98 --- /dev/null +++ b/dev-cpp/dpp/files/dpp-rework-compiler-flag-setting-890014.patch @@ -0,0 +1,147 @@ +From 664b39498815689aae284f1d8541ed88a1101dd7 Mon Sep 17 00:00:00 2001 +From: NexAdn <nex@nexadn.de> +Date: Sat, 7 Jan 2023 12:58:34 +0100 +Subject: [PATCH 1/4] build: Use CXX_FLAGS_{DEBUG,RELEASE} to get rid of + if-else blocks + +This commit uses the CMake variables CMAKE_CXX_FLAGS_DEBUG and +CMAKE_CXX_FLAGS_RELEASE to handle setting varying compiler flags +depending on the build target. This gets rid of a bunch of if-else +blocks, allowing easier to read code. + +Furthermore, common flags are put in CMAKE_CXX_FLAGS only once to reduce +code duplication. + +Issue: https://github.com/brainboxdotcc/DPP/issues/595 +--- + library/CMakeLists.txt | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 90cb6b6958..2dea07e7b7 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -170,14 +170,12 @@ if(MSVC) + endif() + string(REGEX REPLACE "/W[1|2|3|4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wno-psabi -Wempty-body -Wignored-qualifiers -Wimplicit-fallthrough -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Wshift-negative-value -pthread -g -Og -fPIC") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wno-psabi -Wempty-body -Wignored-qualifiers -Wimplicit-fallthrough -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Wshift-negative-value -pthread") ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Og -fPIC") ++ if (BUILD_O3) ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fPIC") + else() +- if (BUILD_O3) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wno-psabi -Wempty-body -Wignored-qualifiers -Wimplicit-fallthrough -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Wshift-negative-value -pthread -O3 -fPIC") +- else() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wno-psabi -Wempty-body -Wignored-qualifiers -Wimplicit-fallthrough -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Wshift-negative-value -pthread -Os -fPIC") +- endif() ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -fPIC") + endif() + + if (NOT MINGW) + +From a48f9f6dfa7f9aa443d5bf52295a24decbaf1480 Mon Sep 17 00:00:00 2001 +From: NexAdn <nex@nexadn.de> +Date: Sat, 7 Jan 2023 13:13:53 +0100 +Subject: [PATCH 2/4] build: Drop manually set -fPIC and -std=c++17 flags on + Linux + +-std=c++17 is automatically set on demand by target_compile_features. +-fPIC is set by default for SHARED and MODULE targets and can be enabled +by target properties for STATIC targets. + +Issue: https://github.com/brainboxdotcc/DPP/issues/595 +--- + library/CMakeLists.txt | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 2dea07e7b7..245380d2b9 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -170,12 +170,12 @@ if(MSVC) + endif() + string(REGEX REPLACE "/W[1|2|3|4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wno-psabi -Wempty-body -Wignored-qualifiers -Wimplicit-fallthrough -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Wshift-negative-value -pthread") +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Og -fPIC") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-psabi -Wempty-body -Wignored-qualifiers -Wimplicit-fallthrough -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Wshift-negative-value -pthread") ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Og") + if (BUILD_O3) +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -fPIC") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") + else() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os -fPIC") ++ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") + endif() + + if (NOT MINGW) +@@ -202,6 +202,7 @@ foreach (fullmodname ${subdirlist}) + PROPERTIES + VERSION ${CMAKE_PROJECT_VERSION} + SOVERSION ${CMAKE_PROJECT_VERSION} ++ POSITION_INDEPENDENT_CODE true + ) + target_include_directories(${modname} PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> + +From 5c03764df94b4a1f1c48581ab9e5a94941c2da29 Mon Sep 17 00:00:00 2001 +From: Adrian Schollmeyer <git@nexadn.de> +Date: Mon, 9 Jan 2023 13:07:42 +0100 +Subject: [PATCH 3/4] build: Drop explicitly set -O and -g flags for Linux + where possible + +CMake provides various build types which already set the correct -O +levels and -g depending on the user's choice. This commit gets rid of +the previous explicit setting of these flags where possible. + +Issue: https://github.com/brainboxdotcc/DPP/issues/595 +--- + library/CMakeLists.txt | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 245380d2b9..5531dbaddf 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -171,12 +171,7 @@ if(MSVC) + string(REGEX REPLACE "/W[1|2|3|4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-psabi -Wempty-body -Wignored-qualifiers -Wimplicit-fallthrough -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -Wshift-negative-value -pthread") +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Og") +- if (BUILD_O3) +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") +- else() +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os") +- endif() ++ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og") + + if (NOT MINGW) + add_link_options("-rdynamic") + +From 373d694517d0f773b8b248d306a7014d6c199862 Mon Sep 17 00:00:00 2001 +From: Adrian Schollmeyer <git@nexadn.de> +Date: Mon, 9 Jan 2023 18:52:49 +0100 +Subject: [PATCH 4/4] build: Make C++17 a public compile feature + +C++17 is required when building against DPP. As such, it should be a +PUBLIC compile feature. +--- + library/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 5531dbaddf..f558ce0816 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -240,7 +240,7 @@ foreach (fullmodname ${subdirlist}) + endif() + endforeach() + +-target_compile_features(dpp PRIVATE cxx_std_17) ++target_compile_features(dpp PUBLIC cxx_std_17) + target_compile_features(dpp PRIVATE cxx_constexpr) + target_compile_features(dpp PRIVATE cxx_auto_type) + target_compile_features(dpp PRIVATE cxx_defaulted_functions) diff --git a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch b/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch deleted file mode 100644 index 6779274d2fa1..000000000000 --- a/dev-cpp/folly/files/folly-2023.01.16.00-gcc13.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/facebook/folly/pull/1922 - -From e3cba5dd4f59c695d9cbf6bd02249af7103cc300 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sun, 22 Jan 2023 05:06:16 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing includes) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so <stdexcept> etc is no longer transitively included. - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/folly/system/AtFork.cpp -+++ b/folly/system/AtFork.cpp -@@ -14,6 +14,9 @@ - * limitations under the License. - */ - -+#include <stdexcept> -+#include <system_error> -+ - #include <folly/system/AtFork.h> - - #include <folly/ScopeGuard.h> - diff --git a/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch b/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch deleted file mode 100644 index e2a692cea50c..000000000000 --- a/dev-cpp/folly/files/folly-2023.01.16.00-liburing.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/891633 -https://github.com/facebook/folly/issues/1908 -https://github.com/facebook/folly/commit/259c9d6a4f0eb6d80e0263c2fe5d1af5bff116dc - -From 259c9d6a4f0eb6d80e0263c2fe5d1af5bff116dc Mon Sep 17 00:00:00 2001 -From: Dylan Yudaken <dylany@meta.com> -Date: Mon, 16 Jan 2023 01:20:04 -0800 -Subject: [PATCH] io_uring: implement io_uring_enable_rings locally (#1915) - -Summary: -Pull Request resolved: https://github.com/facebook/folly/pull/1915 - -io_uring_enable_rings was missing from liburing upstream (see https://github.com/axboe/liburing/issues/773) which is breaking the open source build. See https://github.com/facebook/folly/issues/1908 - -Instead just implement it locally, as it's trivial - -Reviewed By: dmm-fb - -Differential Revision: D42497664 - -fbshipit-source-id: 7241785a36046e867f907bfe74623aaeb38c4b70 ---- a/folly/experimental/io/IoUringBackend.cpp -+++ b/folly/experimental/io/IoUringBackend.cpp -@@ -56,6 +56,20 @@ namespace folly { - - namespace { - -+#if FOLLY_IO_URING_UP_TO_DATE -+int ioUringEnableRings(FOLLY_MAYBE_UNUSED struct io_uring* ring) { -+ // Ideally this would call ::io_uring_enable_rings directly which just runs -+ // the below however this was missing from a stable version of liburing, which -+ // means that some distributions were not able to compile it. see -+ // https://github.com/axboe/liburing/issues/773 -+ -+ // since it is so simple, just implement it here until the fix rolls out to an -+ // acceptable number of OSS distributions. -+ return ::io_uring_register( -+ ring->ring_fd, IORING_REGISTER_ENABLE_RINGS, nullptr, 0); -+} -+#endif -+ - struct SignalRegistry { - struct SigInfo { - struct sigaction sa_ {}; -@@ -1360,7 +1374,7 @@ void IoUringBackend::delayedInit() { - if (usingDeferTaskrun_) { - // usingDeferTaskrun_ is guarded already on having an up to date liburing - #if FOLLY_IO_URING_UP_TO_DATE -- int ret = ::io_uring_enable_rings(&ioRing_); -+ int ret = ioUringEnableRings(&ioRing_); - if (ret) { - LOG(ERROR) << "io_uring_enable_rings gave " << folly::errnoStr(-ret); - } - |