summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Zamarin <arthurzam@gentoo.org>2024-07-19 17:17:15 +0300
committerArthur Zamarin <arthurzam@gentoo.org>2024-07-19 17:30:57 +0300
commit0b155d96c07ff330faeeb7b993527c29c3743746 (patch)
treeebe4ae7703474e079662451321a399bfaa615834 /media-libs/faun
parentgames-rpg/xu4: drop 0.9-r1 (diff)
downloadgentoo-0b155d96c07ff330faeeb7b993527c29c3743746.tar.gz
gentoo-0b155d96c07ff330faeeb7b993527c29c3743746.tar.bz2
gentoo-0b155d96c07ff330faeeb7b993527c29c3743746.zip
media-libs/faun: fix LICENSE, fix calling cc
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'media-libs/faun')
-rw-r--r--media-libs/faun/faun-0.1.2.ebuild12
-rw-r--r--media-libs/faun/files/faun-0.1.2_makefile.patch (renamed from media-libs/faun/files/0.1.2_makefile.patch)22
2 files changed, 19 insertions, 15 deletions
diff --git a/media-libs/faun/faun-0.1.2.ebuild b/media-libs/faun/faun-0.1.2.ebuild
index bf49a3d73f7a..a5b0eb2e7089 100644
--- a/media-libs/faun/faun-0.1.2.ebuild
+++ b/media-libs/faun/faun-0.1.2.ebuild
@@ -1,13 +1,16 @@
-# Copyright 2023 Gentoo Authors
+# 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"
-LICENSE="GPL-2 MIT"
+# based on COPYING file
+LICENSE="MIT flac? ( GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="flac"
@@ -19,12 +22,13 @@ DEPEND="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/0.1.2_makefile.patch"
+ "${FILESDIR}/${PN}-0.1.2_makefile.patch"
)
src_configure() {
+ tc-export CC
# custom configure
- ./configure $(usex !flac --no_flac "") || die
+ edo ./configure $(usex !flac --no_flac "")
}
src_install() {
diff --git a/media-libs/faun/files/0.1.2_makefile.patch b/media-libs/faun/files/faun-0.1.2_makefile.patch
index d971d5937852..5bc22077aad2 100644
--- a/media-libs/faun/files/0.1.2_makefile.patch
+++ b/media-libs/faun/files/faun-0.1.2_makefile.patch
@@ -10,14 +10,14 @@ Subject: [PATCH] Fix buildsystem
@@ -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)
@@ -26,23 +26,23 @@ Subject: [PATCH] Fix buildsystem
@@ -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
@@ -54,15 +54,15 @@ Subject: [PATCH] Fix buildsystem
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:
@@ -74,6 +74,6 @@ Subject: [PATCH] Fix buildsystem
ln -s $(FAUN_LIB) $(LIB_DIR)/$(FAUN_SO)
ln -s $(FAUN_LIB) $(LIB_DIR)/libfaun.so
endif
---
+--
2.39.2