From c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 7 May 2021 01:33:16 +0100
Subject: gentoo resync : 07.05.2021

---
 media-sound/wav2json/Manifest                      |  3 +-
 .../wav2json/files/wav2json-0.4-Makefile.patch     | 35 ++++++++++++++++++++++
 media-sound/wav2json/wav2json-0.4.ebuild           | 19 +++++++-----
 3 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 media-sound/wav2json/files/wav2json-0.4-Makefile.patch

(limited to 'media-sound/wav2json')

diff --git a/media-sound/wav2json/Manifest b/media-sound/wav2json/Manifest
index 7f16e437f642..67b6b7b38ee3 100644
--- a/media-sound/wav2json/Manifest
+++ b/media-sound/wav2json/Manifest
@@ -1,3 +1,4 @@
+AUX wav2json-0.4-Makefile.patch 1148 BLAKE2B 7ae50216389c7611a95c97a80251e069a50b2455d11af4cdcf9a4f69efaa3fbef04369c4014d520984df09aae0b23a1bd58badeb9eb91c2d07dc20ad8649b802 SHA512 19c595a916007552af8b066d61036cc28cd00f5b3ea2517f5cb15a96c1104fb8fa7853eb4146f96860d39d9e55f1bf518edd5ae20c30c6c49df7119b39d7317e
 DIST wav2json-0.4.tar.gz 742606 BLAKE2B 9a4bb2520bb0a69bfcca8437a77753dae43a4328af93ca48134e0371e69aeb683f6c6cd144d250346e07a9b3f3a445a01ab2de7da16b32a5a12f1959bb5a9d0e SHA512 0bfac4dbd5c2535616fcf09e00914eb06fbf042dab6e69133c9ad6494328ff0bcb849d694499946cc6e8e6ac6dc0f1c68ef462c0a264c93da2c2a7aaea4281a0
-EBUILD wav2json-0.4.ebuild 600 BLAKE2B e42bdcd05f1a04373af4d8534ac95b9ca70aa4abc4e7609af8aa73ddc9d13a9b6b5ee0ad37aa820fcf51fa980b95647aedfc0cc51dbe94b6d44353ea0a0e8de0 SHA512 b3e87fb2ee9a1d7156d0da56659cc150b890e27d42cba0cfbc589ef4f460cedfae644b601433bcac451a204c3a565ebc5702dcd1cfb361342092e2d28836f6a4
+EBUILD wav2json-0.4.ebuild 699 BLAKE2B 508a3f30b77a50a49b51ca6943380aef655a1cff22cf32cb2b328e175b344f164345540ab86d272504deeee4baaf4e8077e87ce72b753cb773b772322fd0603a SHA512 14ecda436e5a195024709ce6d24a74bf5ec997067c3d2099d703e921bfcea915116d4b93f8614842e36f0ad9f6e0f83a1251271ea64b21308b8d5bfd526dc5b0
 MISC metadata.xml 499 BLAKE2B 5a52c6d2e030e79c6b92966121b9285ece9bd7c894d107191b6b1a808859b098e0465d80ce77e8c1162dd8088f04d18f056ce8f813c7ee939daf4c4c67cda816 SHA512 df0767c63522bc860d9c68f0fae792193976bed4f015c0611af5ae9c8618d42f1843f83f8f04c7c96bd3df9ef42391bfe7dce88f9ebd68b85f1cfda15ab1f08d
diff --git a/media-sound/wav2json/files/wav2json-0.4-Makefile.patch b/media-sound/wav2json/files/wav2json-0.4-Makefile.patch
new file mode 100644
index 000000000000..ea616509e45a
--- /dev/null
+++ b/media-sound/wav2json/files/wav2json-0.4-Makefile.patch
@@ -0,0 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,23 +4,7 @@ UNAME := $(shell uname)
+ BINARY=../bin/$(UNAME)/wav2json
+ SRC=../src
+ 
+-ifeq ($(UNAME), Linux)
+ LD_PLATFORM_FLAGS=-lboost_program_options -lsndfile
+-CC=g++
+-endif
+-ifeq ($(UNAME), Darwin)
+-CC=clang++
+-LD_PLATFORM_FLAGS=\
+-	/usr/local/lib/libboost_program_options-mt.a \
+-	/usr/local/lib/libsndfile.a \
+-	/usr/local/lib/libogg.a \
+-	/usr/local/lib/libvorbis.a \
+-	/usr/local/lib/libvorbisenc.a \
+-	/usr/local/lib/libFLAC.a
+-
+-INCLUDES=\
+-	-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/usr/X11/include/
+-endif
+ 
+ ifdef USE_FLOAT
+   LD_PLATFORM_FLAGS+=-DUSE_FLOAT
+@@ -42,7 +26,7 @@ $(SRC)/version.hpp: Makefile version.txt
+ 
+ $(BINARY): $(SRC)/*.cpp $(SRC)/*.hpp $(SRC)/version.hpp
+ 	mkdir -p `dirname $(BINARY)`
+-	$(CC) -O3 -Wall -Werror -std=c++11 $(SRC)/*.cpp $(INCLUDES) $(LD_PLATFORM_FLAGS) -o $(BINARY)
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) -Wall -std=c++11 $(SRC)/*.cpp $(INCLUDES) $(LD_PLATFORM_FLAGS) -o $(BINARY)
+ 
+ ../examples/%.json : ../example_data/%.wav
+ 	$(BINARY) $+ --precision 2 --channels left right mid side min max -o $@
diff --git a/media-sound/wav2json/wav2json-0.4.ebuild b/media-sound/wav2json/wav2json-0.4.ebuild
index 6907ef34757d..9929abd646df 100644
--- a/media-sound/wav2json/wav2json-0.4.ebuild
+++ b/media-sound/wav2json/wav2json-0.4.ebuild
@@ -1,26 +1,31 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 COMMIT_ID="e412923f1f792408e8ae1096ca40fb5307ddfc74"
 DESCRIPTION="Generate waveformjs.org compatible json data out of wav files"
 HOMEPAGE="https://github.com/beschulz/wav2json"
 SRC_URI="https://github.com/beschulz/wav2json/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-S=${WORKDIR}/${PN}-${COMMIT_ID}/build
+S="${WORKDIR}/${PN}-${COMMIT_ID}/build"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	dev-libs/boost:=
-	media-libs/libsndfile
-"
+	media-libs/libsndfile:="
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_configure() {
+	tc-export CXX
+}
+
 src_install() {
 	dobin ../bin/Linux/wav2json
 }
-- 
cgit v1.2.3