commit: b012271f48526ba7d7d74f5b15ee6e2295997b9a Author: YOSHIOKA Takuma <lo48576 <AT> hard-wi <DOT> red> AuthorDate: Tue Mar 25 21:58:15 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Tue Mar 25 21:58:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b012271f
media-sound/loudgain: respect build flags provided by portage Closes: https://bugs.gentoo.org/952032 Signed-off-by: YOSHIOKA Takuma <lo48576 <AT> hard-wi.red> ...ain-0.6.8-github-pr37-respect-build-flags.patch | 31 ---------------------- .../files/loudgain-0.6.8-respect-build-flags.patch | 22 +++++++++++++++ ...1.ebuild => loudgain-0.6.8_p20240128-r2.ebuild} | 2 +- 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/media-sound/loudgain/files/loudgain-0.6.8-github-pr37-respect-build-flags.patch b/media-sound/loudgain/files/loudgain-0.6.8-github-pr37-respect-build-flags.patch deleted file mode 100644 index cf4e4aadd..000000000 --- a/media-sound/loudgain/files/loudgain-0.6.8-github-pr37-respect-build-flags.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/Moonbase59/loudgain/pull/37 -From 31fc71b9970f22a116a9ad7eae66dc9cc66a54c1 Mon Sep 17 00:00:00 2001 -From: Peter Oliver <[email protected]> -Date: Sun, 18 Oct 2020 00:51:52 +0100 -Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20override=20CFLAGS=20and=20CXXFL?= - =?UTF-8?q?AGS=20env=20variables?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is necessary, for example, to build with the [hardened build flags](https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md#hardened-builds) used by default for Fedora. ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9487ab9..eb030e2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -72,9 +72,9 @@ SET_TARGET_PROPERTIES(loudgain PROPERTIES - COMPILE_FLAGS "-Wall -pedantic -g" - ) - --SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE") -+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -D_GNU_SOURCE") - --SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE") -+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_GNU_SOURCE") - - INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) - diff --git a/media-sound/loudgain/files/loudgain-0.6.8-respect-build-flags.patch b/media-sound/loudgain/files/loudgain-0.6.8-respect-build-flags.patch new file mode 100644 index 000000000..9c1d475fe --- /dev/null +++ b/media-sound/loudgain/files/loudgain-0.6.8-respect-build-flags.patch @@ -0,0 +1,22 @@ +Respect CFLAGS and CXXFLAGS provided by the package manager. +https://bugs.gentoo.org/952032 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9487ab98a594..a8e1bed7a527 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,14 +68,6 @@ TARGET_LINK_LIBRARIES(loudgain + ${LTAG_LIBRARIES} + ) + +-SET_TARGET_PROPERTIES(loudgain PROPERTIES +- COMPILE_FLAGS "-Wall -pedantic -g" +-) +- +-SET(CMAKE_C_FLAGS "-std=gnu99 -D_GNU_SOURCE") +- +-SET(CMAKE_CXX_FLAGS "-std=gnu++11 -D_GNU_SOURCE") +- + INSTALL(TARGETS loudgain DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + + INSTALL(FILES diff --git a/media-sound/loudgain/loudgain-0.6.8_p20240128-r1.ebuild b/media-sound/loudgain/loudgain-0.6.8_p20240128-r2.ebuild similarity index 93% rename from media-sound/loudgain/loudgain-0.6.8_p20240128-r1.ebuild rename to media-sound/loudgain/loudgain-0.6.8_p20240128-r2.ebuild index 2035e2f60..e65609482 100644 --- a/media-sound/loudgain/loudgain-0.6.8_p20240128-r1.ebuild +++ b/media-sound/loudgain/loudgain-0.6.8_p20240128-r2.ebuild @@ -28,11 +28,11 @@ DEPEND="${COMMON_DEPEND}" PATCHES=( "${FILESDIR}/loudgain-0.6.8-github-pr34-manpage.patch" - "${FILESDIR}/loudgain-0.6.8-github-pr37-respect-build-flags.patch" "${FILESDIR}/loudgain-0.6.8-github-pr50-ffmpeg6.patch" "${FILESDIR}/loudgain-0.6.8-github-pr53-print-taglib-version.patch" "${FILESDIR}/loudgain-0.6.8-github-pr65-ffmpeg6-gcc14.patch" "${FILESDIR}/loudgain-0.6.8-github-pr66-ffmpeg7.patch" + "${FILESDIR}/loudgain-0.6.8-respect-build-flags.patch" ) src_install() {
