From 6d730aa8064fbab6cc54447b6ed0e60b99c13256 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2025 06:41:55 +0000 Subject: gentoo auto-resync : 17:01:2025 - 06:41:55 --- media-libs/faun/Manifest | 8 +-- media-libs/faun/faun-0.1.4.ebuild | 37 ------------ media-libs/faun/faun-0.2.1.ebuild | 38 ++++++++++++ media-libs/faun/files/faun-0.1.2_makefile.patch | 79 ------------------------- media-libs/faun/files/faun-0.2.1_makefile.patch | 40 +++++++++++++ media-libs/faun/metadata.xml | 2 +- 6 files changed, 83 insertions(+), 121 deletions(-) delete mode 100644 media-libs/faun/faun-0.1.4.ebuild create mode 100644 media-libs/faun/faun-0.2.1.ebuild delete mode 100644 media-libs/faun/files/faun-0.1.2_makefile.patch create mode 100644 media-libs/faun/files/faun-0.2.1_makefile.patch (limited to 'media-libs/faun') diff --git a/media-libs/faun/Manifest b/media-libs/faun/Manifest index a3bc047d6a78..57343892c15a 100644 --- a/media-libs/faun/Manifest +++ b/media-libs/faun/Manifest @@ -1,4 +1,4 @@ -AUX faun-0.1.2_makefile.patch 2362 BLAKE2B caeaeafeafb42508cc276de36142a59b7a5106b0592012f8811ef54d1b06a94555f6a4ce7e0713f5d6ec80c89b8ac22f5bd8cd7e3256ccc5d18815a6a161bd9e SHA512 1c3407800aff5ebf3706c23b72f17c8e448f2a75cb2feb76cf9d91b9c6edca1ab9b70193154fe0b67fffbfc0d4c8141cbfb8824d152f3b95270c1250c209f286 -DIST faun-0.1.4.tar.gz 110154 BLAKE2B a41e33282442a1b2999c7cc46fc6978607b6d6f2e6d8d7e92dd43386f2ff2ac61aa3c86e0219ffded8a35224c366a85cd7ab1c36a128eb746457be9fdea76c8e SHA512 4449c478109dd78933e346e87228639d0c5fcc33466a60a9649756cb69b087b82a7e0aa21591b4b2e8046858ac6ac9fc7cc43d84eb2e64624b49af8445dcda21 -EBUILD faun-0.1.4.ebuild 723 BLAKE2B 9f810398222999017b1c20751446cea6bd9dc0e1e2a81ac7477618561e92b181bf752daab6f79385ab2e9a733ce353ea16861d2b848e01d5fc7a765d8ee8bc53 SHA512 0f4c91835c44194183cdd86ba5ccfa204d34326c7620f1cf837e1a73ce269275074c4cd13af600bd72a33e2a540e7cd517a65d0319611b26ac2ea361cb1edca4 -MISC metadata.xml 474 BLAKE2B 681b365b3146371dac7b778ee37ba9401215ab28cf98f3a01527f4496b2b215f9bf3ff12e60be6f08478a05719b7d1ee3169a7dff86948b3a7c766d6d83efc31 SHA512 511f1ee5ff692e2999da9de2d8dc1ba4a5a840635d70ffaabe2e7efb93694a995a1dad813f4d2f928d83722a86c8b175000835b907522daf698d396d64a945bb +AUX faun-0.2.1_makefile.patch 973 BLAKE2B e3e5185e5a7686dc9e1ba5d5f1487beb4500db8ecaeef5b23960245d4f9969ef8882506b1b50f00633df08bb305ce0a55325c816c7bc042ddea12864fd9fc671 SHA512 c2ead60a2ba361862f3e12322a27c254e03b0299b1d8e685331708785071f890860ee4cedc9ee822532412eb4c2d57ab2a43e3f55ab6afbdfd5b03fe3e4fca31 +DIST faun-0.2.1.tar.gz 118623 BLAKE2B 812f99462d512efde104c664ae1a12b0ada5b87e7b975c2f89274c41d9d24409eccb2ea28d37e02225dab0d6290bf2fa5302a55b5ec824ae7943aaa6149c80cb SHA512 d145d99519c6836147f27bada0b87b70ad864b9bb3af3860183fc7a1c0b51c10a6f904ca365f7016510088d4f83e42dbd2d0e9dd260ad73209e29985af3a9fd4 +EBUILD faun-0.2.1.ebuild 731 BLAKE2B 762583c7c7ef70ac3fd598d98a7486b01c5bcea62144e52e8929bc8e9f0a34ad60824606e492cbb92d97f54f0169fd6513a1df6975542c850d5d1b64b53bfb5e SHA512 243c9af5ef0a758c9b35db834c4a44b7b5a5acf6ac4e4c5d9198a04b7c54f63b062c83cc80f5fe6a144aafb40e313452270821efd6737d33600187e5098a1909 +MISC metadata.xml 476 BLAKE2B 752d96fb4f66572889e2568466fb8122344981a925c835e31c238a676c8942292da1748eeaf5d627489999bc3db0c0196419426b21c28165a773a356d8794225 SHA512 6d4299f946986a0a3463e91fa27482abc836a9fed779301271f1d0d3e1fe1a33e9a14237f03be47a9a1e349cb3c4429c5774ecd1fdfce8a7b94fdf90535b38a4 diff --git a/media-libs/faun/faun-0.1.4.ebuild b/media-libs/faun/faun-0.1.4.ebuild deleted file mode 100644 index a5b0eb2e7089..000000000000 --- a/media-libs/faun/faun-0.1.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -DESCRIPTION="A high-level C audio library" -HOMEPAGE="https://wickedsmoke.github.io/faun/" -SRC_URI="https://github.com/WickedSmoke/faun/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -# based on COPYING file -LICENSE="MIT flac? ( GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="flac" - -DEPEND=" - media-libs/libpulse - media-libs/libvorbis -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-0.1.2_makefile.patch" -) - -src_configure() { - tc-export CC - # custom configure - edo ./configure $(usex !flac --no_flac "") -} - -src_install() { - emake DESTDIR="${D}/usr" install - dodoc README.md -} diff --git a/media-libs/faun/faun-0.2.1.ebuild b/media-libs/faun/faun-0.2.1.ebuild new file mode 100644 index 000000000000..3750f5c686a8 --- /dev/null +++ b/media-libs/faun/faun-0.2.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="A high-level C audio library" +HOMEPAGE="https://wickedsmoke.codeberg.page/faun_doc/" +SRC_URI="https://codeberg.org/wickedsmoke/faun/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="flac" + +DEPEND=" + flac? ( media-libs/flac ) + media-libs/libpulse + media-libs/libvorbis +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.2.1_makefile.patch" +) + +src_configure() { + tc-export CC + # custom configure + edo ./configure $(usex !flac --no_flac "") +} + +src_install() { + emake DESTDIR="${D}/usr" install + dodoc README.md +} diff --git a/media-libs/faun/files/faun-0.1.2_makefile.patch b/media-libs/faun/files/faun-0.1.2_makefile.patch deleted file mode 100644 index 5bc22077aad2..000000000000 --- a/media-libs/faun/files/faun-0.1.2_makefile.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7d87d5e2fc52c1d429fe99b505bf2db643c82da2 Mon Sep 17 00:00:00 2001 -From: "Azamat H. Hackimov" -Date: Fri, 28 Apr 2023 14:58:02 +0300 -Subject: [PATCH] Fix buildsystem - -* Respect CC, CFLAGS, LDFLAGS -* Don't strip binaries on install ---- a/Makefile -+++ b/Makefile -@@ -6,10 +6,13 @@ ifeq ($(STATIC),1) - STATIC_LIB=true - endif - --CFLAGS=-O3 -DNDEBUG -+CC ?= cc -+PKG_CONFIG ?= pkg-config -+ -+CFLAGS ?= -O3 -DNDEBUG - #CFLAGS=-g -DDEBUG - --OPT=-DUSE_SFX_GEN -+OPT=-DUSE_SFX_GEN `$(PKG_CONFIG) --cflags libpulse-simple libpulse vorbisfile` - ifeq ($(FLAC),1) - OPT+=-DUSE_FLAC - endif -@@ -25,7 +28,7 @@ else - LIB_DIR=$(DESTDIR)/lib - endif - --DEP_LIB = -lpulse-simple -lpulse -lvorbisfile -lpthread -lm -+DEP_LIB = `$(PKG_CONFIG) --libs libpulse-simple libpulse vorbisfile` -lpthread -lm - - ifdef STATIC_LIB - FAUN_LIB=libfaun.a -@@ -49,10 +52,10 @@ obj: - mkdir obj - - obj/tmsg.o: support/tmsg.c obj -- cc -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@ -+ $(CC) -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@ - - obj/faun.o: faun.c support/wav_write.c support/wav_read.c support/flac.c support/sfx_gen.c support/well512.c support/os_thread.h support/tmsg.h support/flac.h support/sfx_gen.h support/well512.h obj -- cc -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@ -+ $(CC) -c -pipe -Wall -W $< $(CFLAGS) -Isupport $(OPT) -fPIC -o $@ - - $(FAUN_LIB): obj/tmsg.o obj/faun.o - ifdef STATIC_LIB -@@ -60,16 +63,16 @@ ifdef STATIC_LIB - ranlib $@ - #strip -d $@ - else -- cc -o $@ $^ -shared -Wl,-soname,$(FAUN_SO) $(DEP_LIB) -+ $(CC) -o $@ $^ -shared -Wl,-soname,$(FAUN_SO) $(LDFLAGS) $(DEP_LIB) - ln -sf $@ $(FAUN_SO) - ln -sf $@ libfaun.so - endif - - faun_test: faun_test.c $(FAUN_LIB) -- cc -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) -o $@ -+ $(CC) -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) $(LDFLAGS) -o $@ - - basic: example/basic.c $(FAUN_LIB) -- cc -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) -o $@ -+ $(CC) -Wall -W $< $(CFLAGS) -I. -L. -lfaun $(DEP_STATIC) $(LDFLAGS) -o $@ - - install: - mkdir -p $(DESTDIR)/include $(LIB_DIR) -@@ -77,7 +80,7 @@ install: - ifdef STATIC_LIB - install -m 644 $(FAUN_LIB) $(LIB_DIR) - else -- install -m 755 -s $(FAUN_LIB) $(LIB_DIR) -+ install -m 755 $(FAUN_LIB) $(LIB_DIR) - ln -s $(FAUN_LIB) $(LIB_DIR)/$(FAUN_SO) - ln -s $(FAUN_LIB) $(LIB_DIR)/libfaun.so - endif --- -2.39.2 - diff --git a/media-libs/faun/files/faun-0.2.1_makefile.patch b/media-libs/faun/files/faun-0.2.1_makefile.patch new file mode 100644 index 000000000000..7de9b4d67449 --- /dev/null +++ b/media-libs/faun/files/faun-0.2.1_makefile.patch @@ -0,0 +1,40 @@ +From c8c08f50ba9900790ce4127eee4adcbda208ad7b Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" +Date: Thu, 16 Jan 2025 18:19:25 +0300 +Subject: [PATCH] Fix buildsystem + +* Respect CFLAGS, library dependencies +--- a/Makefile ++++ b/Makefile +@@ -6,10 +6,11 @@ ifeq ($(STATIC),1) + STATIC_LIB=true + endif + +-CFLAGS+=-O3 -DNDEBUG ++CFLAGS?=-O3 -DNDEBUG + #CFLAGS+=-g -DDEBUG ++PKG_CONFIG?=pkg-config + +-OPT=-DUSE_LOAD_MEM -DUSE_SFX_GEN ++OPT=-DUSE_LOAD_MEM -DUSE_SFX_GEN `$(PKG_CONFIG) --cflags libpulse-simple libpulse vorbisfile` + + DESTDIR ?= /usr/local + +@@ -22,11 +23,11 @@ else + LIB_DIR=$(DESTDIR)/lib + endif + +-DEP_LIB = -lpulse -lvorbisfile -lpthread -lm ++DEP_LIB = `$(PKG_CONFIG) --libs libpulse-simple libpulse vorbisfile` -lpthread -lm + + ifeq ($(FLAC),1) +-OPT+=-DUSE_FLAC=1 +-DEP_LIB+=-lFLAC ++OPT+=-DUSE_FLAC=1 `$(PKG_CONFIG) --cflags flac` ++DEP_LIB+=`$(PKG_CONFIG) --libs flac` + else ifeq ($(FLAC),2) + OPT+=-DUSE_FLAC=2 + endif +-- +2.45.2 + diff --git a/media-libs/faun/metadata.xml b/media-libs/faun/metadata.xml index a4800f6c9069..e17def60d1ea 100644 --- a/media-libs/faun/metadata.xml +++ b/media-libs/faun/metadata.xml @@ -10,6 +10,6 @@ Proxy Maintainers - WickedSmoke/faun + wickedsmoke/faun -- cgit v1.2.3