commit: 87fcd74774b279cfd237c41ac3739c45ca713a45
Author: demize <demize <AT> unstable <DOT> systems>
AuthorDate: Mon Apr 7 18:09:05 2025 +0000
Commit: demize <demize <AT> unstable <DOT> systems>
CommitDate: Mon Apr 7 18:09:05 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87fcd747
media-sound/spct: add 1.1.3, drop 1.1.1-r1
Upstream merged the patch and cut a release making
1.1.1-r1 unnecessary. Bumped to 1.1.3 because of a
release issue upstream that was fixed in 1.1.3.
Signed-off-by: demize <demize <AT> unstable.systems>
media-sound/spct/Manifest | 2 +-
media-sound/spct/files/0001-respect-cflags.patch | 144 ---------------------
.../{spct-1.1.1-r1.ebuild => spct-1.1.3.ebuild} | 2 -
3 files changed, 1 insertion(+), 147 deletions(-)
diff --git a/media-sound/spct/Manifest b/media-sound/spct/Manifest
index dfe0223dc..761b25a82 100644
--- a/media-sound/spct/Manifest
+++ b/media-sound/spct/Manifest
@@ -1 +1 @@
-DIST spct-1.1.1.tar.gz 652598 BLAKE2B
40a01c1e3e05e7cacb122d61f4e6d3ea71b144aeb8329e7707d51199f2819379a1e24915877dae304c7760c846ba0d8be19b2a6f21023cf76961140591ce120d
SHA512
513bd626b0607674dd9170793a88f9c62433635eff0bf85e2024ba3910c7582f9d5bbd138aa62a9c316e4b75506dd742583164bb18e068d057bd71784fb10ea8
+DIST spct-1.1.3.tar.gz 652776 BLAKE2B
7bd4da790c3afbc7bbc31b7f9c457b07a83034518375626265fe6da0fd13441bdf96fbb14b8b5b28ca92d78d993a1eaff8dc23bbe2f2ad7234c1c34369333d68
SHA512
58df651f0613d4cc61bb70236a97d711b9f99024ccbc8db7d89dc8459cdf0fc256491ff41abb87935e7cf808c5933933683fc69d59a181fc8bd684824cbfac1d
diff --git a/media-sound/spct/files/0001-respect-cflags.patch
b/media-sound/spct/files/0001-respect-cflags.patch
deleted file mode 100644
index 611750b9c..000000000
--- a/media-sound/spct/files/0001-respect-cflags.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7531109..561e059 100644
---- a/Makefile
-+++ b/Makefile
-@@ -24,74 +24,95 @@ endif
-
- VERSION ?= git:$(shell git rev-parse --short HEAD || echo unknown)
-
--FLAGS = -DSPCT_VERSION=\"$(VERSION)\"
-+CXXFLAGS ?= -Wall -g -O0
-+SPCT_CXXFLAGS = $(CXXFLAGS) $(CPPFLAGS)
-+SPCT_LDFLAGS = $(LDFLAGS)
-+SPCT_LDLIBS = $(LOADLIBES) $(LDLIBS)
-+
-+SPCT_CXXFLAGS += -DSPCT_VERSION=\"$(VERSION)\"
-
- GETCH2_CPP = getch2.cpp
-
- ifeq ($(PLATFORM),macos)
-- 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
-+ SPCT_CXXFLAGS += -arch '$(ARCH)'
-+ SPCT_CXXFLAGS += -DMACOS
- endif
-
- ifeq ($(PLATFORM),linux)
-- FLAGS += -DLINUX
-- FLAGS += $(shell pkg-config --cflags --libs tinfo)
-+ SPCT_CXXFLAGS += -DLINUX
-+ SPCT_CXXFLAGS += $(shell pkg-config --cflags tinfo)
-+ SPCT_LDLIBS += $(shell pkg-config --libs tinfo)
- endif
-
- ifeq ($(PLATFORM),windows)
- GETCH2_CPP = getch2-win.cpp
-- FLAGS += -static -DWINDOWS
-+ SPCT_CXXFLAGS += -DWINDOWS
-+ SPCT_LDFLAGS += -static
- endif
-
-+BUILDDIR ?= build/$(PLATFORM)-$(ARCH)
-+GETCH2 = $(BUILDDIR)/getch2.o
-+OBJ = $(BUILDDIR)/main.o
-+BIN ?= $(BUILDDIR)/spct
-+
-+.PHONY: all
-+all: $(BIN)
-+
- GME_BUILD_DIR ?= ./tmp/gme-build-$(PLATFORM)-$(ARCH)
-
- ifeq ($(LIBGME_NO_VENDOR),1)
--LIBGME=
--FLAGS += $(shell pkg-config --cflags --libs libgme)
-+ LIBGME=
-+ SPCT_CXXFLAGS += $(shell pkg-config --cflags libgme)
-+ SPCT_LDLIBS += $(shell pkg-config --libs libgme)
- else
--LIBGME ?= $(GME_BUILD_DIR)/gme/libgme.a
--FLAGS += -I./vendor/libgme
--
--$(LIBGME):
-- mkdir -p $(GME_BUILD_DIR)
-- $(CMAKE) -S vendor/libgme -B $(GME_BUILD_DIR) $(GME_CMAKE_FLAGS)
-- $(CMAKE) --build $(GME_BUILD_DIR)
-+ LIBGME ?= $(GME_BUILD_DIR)/gme/libgme.a
-+ SPCT_CXXFLAGS += -I./vendor/libgme
-+
-+ GME_CMAKE_FLAGS += -DBUILD_SHARED_LIBS=OFF
-+ GME_CMAKE_FLAGS += -DGME_BUILD_TESTING=OFF
-+ GME_CMAKE_FLAGS += -DGME_BUILD_EXAMPLES=OFF
-+
-+ # only use SPC functionality
-+ GME_CMAKE_FLAGS += -DUSE_GME_SPC=ON
-+ GME_CMAKE_FLAGS += -DUSE_GME_VGM=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_AY=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_GBS=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_GYM=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_HES=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_KSS=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_NSF=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_NSFE=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_SAP=OFF
-+ GME_CMAKE_FLAGS += -DUSE_GME_VGM=OFF
-+
-+ # disable zlib, we don't need compression for SPC only
-+ GME_CMAKE_FLAGS += -DGME_ZLIB=OFF
-+
-+ $(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)
- endif
-
--
--BIN ?= build/$(PLATFORM)/spct
--
--.PHONY: all
--all: $(BIN)
--
--$(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
- @echo Building for $(PLATFORM)
- mkdir -p $(dir $@)
-- $(CXX) -std=c++17 -Wall -g -O0 $(GETCH2_CPP) main.cpp $(LIBGME)
$(FLAGS) -o $@
--
--GME_CMAKE_FLAGS += -DBUILD_SHARED_LIBS=OFF
--GME_CMAKE_FLAGS += -DGME_BUILD_TESTING=OFF
--GME_CMAKE_FLAGS += -DGME_BUILD_EXAMPLES=OFF
--
--# only use SPC functionality
--GME_CMAKE_FLAGS += -DUSE_GME_SPC=ON
--GME_CMAKE_FLAGS += -DUSE_GME_VGM=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_AY=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_GBS=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_GYM=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_HES=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_KSS=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_NSF=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_NSFE=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_SAP=OFF
--GME_CMAKE_FLAGS += -DUSE_GME_VGM=OFF
--
--# disable zlib, we don't need compression for SPC only
--GME_CMAKE_FLAGS += -DGME_ZLIB=OFF
-+ $(CXX) -std=c++17 $(SPCT_CXXFLAGS) -c -o $@ $<
-+
-+$(BIN): $(OBJ) $(GETCH2) $(LIBGME)
-+ $(CXX) $(SPCT_LDFLAGS) $^ $(SPCT_LDLIBS) -o $@
-
- clean:
-+ rm -f $(GETCH2)
-+ rm -f $(OBJ)
- rm -f $(BIN)
- rm -rf $(GME_BUILD_DIR)
-
diff --git a/media-sound/spct/spct-1.1.1-r1.ebuild
b/media-sound/spct/spct-1.1.3.ebuild
similarity index 92%
rename from media-sound/spct/spct-1.1.1-r1.ebuild
rename to media-sound/spct/spct-1.1.3.ebuild
index 7c57396c7..744a0ff79 100644
--- a/media-sound/spct/spct-1.1.1-r1.ebuild
+++ b/media-sound/spct/spct-1.1.3.ebuild
@@ -21,8 +21,6 @@ RDEPEND="
${DEPEND}
"
-PATCHES="${FILESDIR}/0001-respect-cflags.patch"
-
src_compile() {
emake VERSION="${PV}" LIBGME_NO_VENDOR=1
}
