From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7ED2C1581EE for ; Mon, 07 Apr 2025 17:08:48 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 40190343027 for ; Mon, 07 Apr 2025 17:08:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 38F4E1104B6; Mon, 07 Apr 2025 17:08:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 291171104B6 for ; Mon, 07 Apr 2025 17:08:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B634B343066 for ; Mon, 07 Apr 2025 17:08:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E45A9BE7 for ; Mon, 07 Apr 2025 17:08:44 +0000 (UTC) From: "demize" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "demize" Message-ID: <1744045643.37571ba992e9690badca86429e95baf676d965ee.demize@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-sound/spct/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-sound/spct/files/0001-respect-cflags.patch X-VCS-Directories: media-sound/spct/files/ X-VCS-Committer: demize X-VCS-Committer-Name: demize X-VCS-Revision: 37571ba992e9690badca86429e95baf676d965ee X-VCS-Branch: dev Date: Mon, 07 Apr 2025 17:08:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 92b66f70-5c40-4e42-8dd8-bb637c5fb885 X-Archives-Hash: c2701812e17661cabcc92f2fc9a8a5b3 commit: 37571ba992e9690badca86429e95baf676d965ee Author: demize unstable systems> AuthorDate: Mon Apr 7 16:51:44 2025 +0000 Commit: demize unstable systems> CommitDate: Mon Apr 7 17:07:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37571ba9 media-sound/spct: fix patch The original version of the patch failed to build with GCC. Oops. Signed-off-by: demize unstable.systems> media-sound/spct/files/0001-respect-cflags.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/media-sound/spct/files/0001-respect-cflags.patch b/media-sound/spct/files/0001-respect-cflags.patch index 1d90565d9..611750b9c 100644 --- a/media-sound/spct/files/0001-respect-cflags.patch +++ b/media-sound/spct/files/0001-respect-cflags.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 7531109..8c107b5 100644 +index 7531109..561e059 100644 --- a/Makefile +++ b/Makefile -@@ -24,74 +24,93 @@ endif +@@ -24,74 +24,95 @@ endif VERSION ?= git:$(shell git rev-parse --short HEAD || echo unknown) @@ -20,6 +20,7 @@ index 7531109..8c107b5 100644 - FLAGS += $(shell pkg-config --cflags --libs ncurses) + SPCT_CXXFLAGS += $(shell pkg-config --cflags ncurses) + SPCT_LDLIBS += $(shell pkg-config --libs ncurses) ++ SPCT_LDFLAGS += -arch $(ARCH) GME_CMAKE_FLAGS += -DCMAKE_OSX_ARCHITECTURES='$(ARCH)' - FLAGS += -arch '$(ARCH)' - FLAGS += -DMACOS @@ -42,10 +43,10 @@ index 7531109..8c107b5 100644 + SPCT_LDFLAGS += -static endif -+BUILDDIR ?= build/$(PLATFORM) ++BUILDDIR ?= build/$(PLATFORM)-$(ARCH) +GETCH2 = $(BUILDDIR)/getch2.o +OBJ = $(BUILDDIR)/main.o -+BIN ?= build/$(PLATFORM)/spct ++BIN ?= $(BUILDDIR)/spct + +.PHONY: all +all: $(BIN) @@ -92,7 +93,7 @@ index 7531109..8c107b5 100644 + $(LIBGME): + mkdir -p $(GME_BUILD_DIR) + CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CMAKE) -S vendor/libgme -B $(GME_BUILD_DIR) $(GME_CMAKE_FLAGS) -+ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CMAKE) --build $(GME_BUILD_DIR) -v ++ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CMAKE) --build $(GME_BUILD_DIR) endif - @@ -103,6 +104,7 @@ index 7531109..8c107b5 100644 - -$(BIN): $(LIBGME) main.cpp $(GETCH2_CPP) getch2.h +$(GETCH2): $(GETCH2_CPP) getch2.h ++ mkdir -p $(dir $@) + $(CXX) -std=c++17 $(SPCT_CXXFLAGS) -c -o $@ $< + +$(OBJ): main.cpp @@ -131,8 +133,8 @@ index 7531109..8c107b5 100644 -GME_CMAKE_FLAGS += -DGME_ZLIB=OFF + $(CXX) -std=c++17 $(SPCT_CXXFLAGS) -c -o $@ $< + -+$(BIN): $(LIBGME) $(OBJ) $(GETCH2) -+ $(CXX) -std=c++17 $(SPCT_LDFLAGS) $^ $(SPCT_LDLIBS) -o $@ ++$(BIN): $(OBJ) $(GETCH2) $(LIBGME) ++ $(CXX) $(SPCT_LDFLAGS) $^ $(SPCT_LDLIBS) -o $@ clean: + rm -f $(GETCH2)