gentoo resync : 16.04.2018

2 files changed, 115 insertions, 0 deletions

diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index d71c57294c93..13989be0b2ee 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -8,5 +8,7 @@ DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd6
 DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
 DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
 DIST sc2mpd-1.1.4.tar.gz 218128 BLAKE2B 71ff5e95d868c40d5c9fc72d65161d97ccc1ed366e7465c038efb646bb4ab581d24dbab7280fb739029bbaec7ff8f5804006a4cdc8a61ad0395acb9da74db95c SHA512 eebd21198ec2a9b0e1122a9b3316eaefd38daa2e6b6aa4c480e8c1fef0a8600a68c386d1957b4cf9203a61bcc63b7842e145073092f30ec2e81cdf1010e9f1ad
+DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
 EBUILD sc2mpd-1.1.4.ebuild 4566 BLAKE2B 7bf45b49fbeb40a971898568a8a704605bce5c500997ce7d24d0fb22a5a299af9fedf271565e2ee20bd01fc8104f6404ee906ccf977cbec1704ce15f19757bad SHA512 a38646d513b604ea0237be131adf7992603090e1cdfa12e4f715b2239a73d7d06440a0ecbfe7622e8a6475eb0df3921dc7f227a977a265398d514bc401be5a6d
+EBUILD sc2mpd-1.1.5.ebuild 4566 BLAKE2B 7bf45b49fbeb40a971898568a8a704605bce5c500997ce7d24d0fb22a5a299af9fedf271565e2ee20bd01fc8104f6404ee906ccf977cbec1704ce15f19757bad SHA512 a38646d513b604ea0237be131adf7992603090e1cdfa12e4f715b2239a73d7d06440a0ecbfe7622e8a6475eb0df3921dc7f227a977a265398d514bc401be5a6d
 MISC metadata.xml 313 BLAKE2B 81be81a3249c77371bf3c159e69a7151fd4763449f1b32cb02de42e774e4e050b45197e0a22dd294b3f9f116c680d18e18c03437bc571952b6739a01f5b04180 SHA512 993a3648e52c72afc8cceb7cf87a3bbf28658f106ca0b12c2e90f098e8d02b6d73f6e1ff728aef86715daae17533a17e6495d8110c59f91e116e84587ef5eddc
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
new file mode 100644
index 000000000000..90ecdf9ac79c
--- /dev/null
+++ b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
+
+sha_net="1dd6411ffbe59fe09517162fb88e2405adb4990f"
+sha_netgenerated="e3edb912410d4c5a4d5323bb1e9c27660a42d78f"
+sha_topology="cc09c09da4be8d3d04adae5b8f0daaf8450906a3"
+sha_songcast="3299eaedfea34993b79e6d30444792d4fb12a110"
+sha_devtools="d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d"
+
+SRC_URI="
+	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
+	https://codeload.github.com/openhome/ohNet/tar.gz/${sha_net}
+		-> ohnet.${sha_net:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohNetGenerated/tar.gz/${sha_netgenerated}
+		-> ohnetgenerated.${sha_netgenerated:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohTopology/tar.gz/${sha_topology}
+		-> ohtopology.${sha_topology:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohSongcast/tar.gz/${sha_songcast}
+		-> ohsongcast.${sha_songcast:0:6}.tar.gz
+	https://codeload.github.com/openhome/ohdevtools/tar.gz/${sha_devtools}
+		-> ohdevtools.${sha_devtools:0:6}.tar.gz
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/libsamplerate
+	net-libs/libmicrohttpd
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
+	mkdir openhome || die "Couldn't mkdir openhome"
+	mv ohNet-${sha_net} openhome/ohNet || die "Couldn't mv ohNet"
+	mv ohNetGenerated-${sha_netgenerated} openhome/ohNetGenerated || die "Couldn't mv ohNetGenerated"
+	mv ohdevtools-${sha_devtools} openhome/ohdevtools || die "Couldn't mv ohdevtools"
+	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
+	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
+
+	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
+	epatch "${FILESDIR}/ohnet.makefile.patch"
+	epatch "${FILESDIR}/ohnet.optionparser.patch"
+	sed -i -e 's/ bundle-after-build//' UserTargets.mak || die "Couldn't patch UserTargets.mak"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
+	epatch "${FILESDIR}/ohnetgenerated.makefile.patch"
+	epatch "${FILESDIR}/ohnetgenerated.commonmk.patch"
+	sed -i -e 's/ bundle-after-build//' UserTargets.mak \
+		|| die "Couldn't patch generated UserTargets.mak"
+
+	eapply_user
+}
+
+src_configure() {
+	econf "--with-openhome=${WORKDIR}/openhome"
+}
+
+src_compile() {
+	# Begin ohbuild.sh reverse engineer
+
+	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
+	make native_only=yes || die "ohnet make failed"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
+	# TODO: get from environment/make target
+	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
+	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
+	cd $deps || die "Couldn't cd to deps dir"
+
+	ohnet="${WORKDIR}/openhome/ohNet"
+	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
+		 -exec cp '{}' lib ';' \
+		|| die "Couldn't cp binary libs"
+
+	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
+	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
+	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
+	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
+	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
+	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
+	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
+	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
+	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
+	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
+
+	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
+	make native_only=yes || die "ohnetgenerated make failed"
+
+	cd "Build/Include" || die "Couldn't cd later to include"
+	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
+
+	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
+	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
+	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
+
+	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
+	make release=1 Receiver WavSender || die "Failed to build ohSongcast"
+
+	# End ohbuild.sh reverse engineer
+
+	cd "${S}" || die "Failed to cd to source directory"
+	make || die "Failed to make sc2mpd"
+}