| 1 |
commit: aa97c3df1c9977df01e201ea5de2e243c4d50133 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Fri Apr 30 16:14:37 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 22:17:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa97c3df |
| 7 |
|
| 8 |
media-sound/wav2json: Respect CFLAGS/LDFLAGS/CXX |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/727778 |
| 11 |
Closes: https://bugs.gentoo.org/724844 |
| 12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../wav2json/files/wav2json-0.4-Makefile.patch | 35 ++++++++++++++++++++++ |
| 16 |
media-sound/wav2json/wav2json-0.4.ebuild | 19 +++++++----- |
| 17 |
2 files changed, 47 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-sound/wav2json/files/wav2json-0.4-Makefile.patch b/media-sound/wav2json/files/wav2json-0.4-Makefile.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..ea616509e45 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-sound/wav2json/files/wav2json-0.4-Makefile.patch |
| 24 |
@@ -0,0 +1,35 @@ |
| 25 |
+--- a/Makefile |
| 26 |
++++ b/Makefile |
| 27 |
+@@ -4,23 +4,7 @@ UNAME := $(shell uname) |
| 28 |
+ BINARY=../bin/$(UNAME)/wav2json |
| 29 |
+ SRC=../src |
| 30 |
+ |
| 31 |
+-ifeq ($(UNAME), Linux) |
| 32 |
+ LD_PLATFORM_FLAGS=-lboost_program_options -lsndfile |
| 33 |
+-CC=g++ |
| 34 |
+-endif |
| 35 |
+-ifeq ($(UNAME), Darwin) |
| 36 |
+-CC=clang++ |
| 37 |
+-LD_PLATFORM_FLAGS=\ |
| 38 |
+- /usr/local/lib/libboost_program_options-mt.a \ |
| 39 |
+- /usr/local/lib/libsndfile.a \ |
| 40 |
+- /usr/local/lib/libogg.a \ |
| 41 |
+- /usr/local/lib/libvorbis.a \ |
| 42 |
+- /usr/local/lib/libvorbisenc.a \ |
| 43 |
+- /usr/local/lib/libFLAC.a |
| 44 |
+- |
| 45 |
+-INCLUDES=\ |
| 46 |
+- -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/usr/X11/include/ |
| 47 |
+-endif |
| 48 |
+ |
| 49 |
+ ifdef USE_FLOAT |
| 50 |
+ LD_PLATFORM_FLAGS+=-DUSE_FLOAT |
| 51 |
+@@ -42,7 +26,7 @@ $(SRC)/version.hpp: Makefile version.txt |
| 52 |
+ |
| 53 |
+ $(BINARY): $(SRC)/*.cpp $(SRC)/*.hpp $(SRC)/version.hpp |
| 54 |
+ mkdir -p `dirname $(BINARY)` |
| 55 |
+- $(CC) -O3 -Wall -Werror -std=c++11 $(SRC)/*.cpp $(INCLUDES) $(LD_PLATFORM_FLAGS) -o $(BINARY) |
| 56 |
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -Wall -std=c++11 $(SRC)/*.cpp $(INCLUDES) $(LD_PLATFORM_FLAGS) -o $(BINARY) |
| 57 |
+ |
| 58 |
+ ../examples/%.json : ../example_data/%.wav |
| 59 |
+ $(BINARY) $+ --precision 2 --channels left right mid side min max -o $@ |
| 60 |
|
| 61 |
diff --git a/media-sound/wav2json/wav2json-0.4.ebuild b/media-sound/wav2json/wav2json-0.4.ebuild |
| 62 |
index 6907ef34757..9929abd646d 100644 |
| 63 |
--- a/media-sound/wav2json/wav2json-0.4.ebuild |
| 64 |
+++ b/media-sound/wav2json/wav2json-0.4.ebuild |
| 65 |
@@ -1,26 +1,31 @@ |
| 66 |
-# Copyright 1999-2016 Gentoo Foundation |
| 67 |
+# Copyright 1999-2021 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
-EAPI=6 |
| 71 |
+EAPI=7 |
| 72 |
+ |
| 73 |
+inherit toolchain-funcs |
| 74 |
|
| 75 |
COMMIT_ID="e412923f1f792408e8ae1096ca40fb5307ddfc74" |
| 76 |
DESCRIPTION="Generate waveformjs.org compatible json data out of wav files" |
| 77 |
HOMEPAGE="https://github.com/beschulz/wav2json" |
| 78 |
SRC_URI="https://github.com/beschulz/wav2json/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" |
| 79 |
- |
| 80 |
-S=${WORKDIR}/${PN}-${COMMIT_ID}/build |
| 81 |
+S="${WORKDIR}/${PN}-${COMMIT_ID}/build" |
| 82 |
|
| 83 |
LICENSE="GPL-2" |
| 84 |
SLOT="0" |
| 85 |
KEYWORDS="~amd64 ~x86" |
| 86 |
-IUSE="" |
| 87 |
|
| 88 |
DEPEND=" |
| 89 |
dev-libs/boost:= |
| 90 |
- media-libs/libsndfile |
| 91 |
-" |
| 92 |
+ media-libs/libsndfile:=" |
| 93 |
RDEPEND="${DEPEND}" |
| 94 |
|
| 95 |
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) |
| 96 |
+ |
| 97 |
+src_configure() { |
| 98 |
+ tc-export CXX |
| 99 |
+} |
| 100 |
+ |
| 101 |
src_install() { |
| 102 |
dobin ../bin/Linux/wav2json |
| 103 |
} |
Archives