commit: fd73aedb541baa3215ee5c8d56bb3f3d8b40e3f7
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 18:56:21 2018 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Sun Feb 4 16:51:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd73aedb
media-sound/sc2mpd: new package 1.1.4
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-sound/sc2mpd/Manifest | 6 ++
media-sound/sc2mpd/files/ohnet.makefile.patch | 35 +++++++
media-sound/sc2mpd/files/ohnet.optionparser.patch | 12 +++
.../sc2mpd/files/ohnetgenerated.commonmk.patch | 24 +++++
.../sc2mpd/files/ohnetgenerated.makefile.patch | 30 ++++++
media-sound/sc2mpd/metadata.xml | 9 ++
media-sound/sc2mpd/sc2mpd-1.1.4.ebuild | 113 +++++++++++++++++++++
7 files changed, 229 insertions(+)
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
new file mode 100644
index 00000000000..ae40124eb0d
--- /dev/null
+++ b/media-sound/sc2mpd/Manifest
@@ -0,0 +1,6 @@
+DIST ohdevtools.d35861.tar.gz 1187475 BLAKE2B
82138d9b64f3172d540402e99b716e9b56bde2133b2565b442bfe6ae6b0e2235226027c4b43b17e3eb005b6f52a4d6a278e0895d267222a63f910ea556e4d76c
SHA512
25188c3ae837db12e5c7f349ab01a315f8c68909e3eaa530dc9ba09fb2bcb3cd0a671676b3dd4902ef019b7e331d2acac0978649bce29df585e54d13158ff162
+DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B
82724b7f2cd5cd0dcaa54786394a2560b965f5f16df7bb84037795f1334b8052a4cfeff8f5f39bdc5d7a0ccb2093190c38de987957463d10cac407d9694a6a92
SHA512
67ccdbee6d909df30acb7c89aeba75d3accdbb533dda5abc02c66f867e2fad9a360696d5e28dd1decdc575a1396d026824329450e85e3a3b3e4f7af2e144140a
+DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B
1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906
SHA512
9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
+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
diff --git a/media-sound/sc2mpd/files/ohnet.makefile.patch
b/media-sound/sc2mpd/files/ohnet.makefile.patch
new file mode 100644
index 00000000000..29a29bcc9bb
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnet.makefile.patch
@@ -0,0 +1,35 @@
+diff --git a/Makefile b/Makefile
+index 29f2d6a..038b05e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -82,12 +82,19 @@ else
+ ifneq (,$(findstring arm,$(gcc_machine)))
+ ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
+ detected_openhome_architecture = armhf
++ else ifneq (,$(findstring armv7hl,$(gcc_machine)))
++ # cubox: armv7hl-redhat-linux-gnueabi
++ detected_openhome_architecture = armhf
+ else ifeq (${detected_openhome_system},Qnap)
+ detected_openhome_architecture = x19
+ else
+ detected_openhome_architecture = armel
+ endif
+ endif
++ ifneq (,$(findstring aarch64,$(gcc_machine)))
++ # odroid64: aarch64-linux-gnu
++ detected_openhome_architecture = arm64
++ endif
+ ifneq (,$(findstring i686,$(gcc_machine)))
+ detected_openhome_architecture = x86
+ endif
+@@ -375,6 +382,10 @@ mkdir = mkdir -p
+ rmdir = rm -rf
+ uset4 = no
+
++# This avoids errors in Generated/Devices.mak (they apparently have no
++# consequences anyway because we use make native_only=yes)
++t4 = echo
++
+ ifeq ($(managed_only), yes)
+ build_targets_base = make_obj_dir ohNet.net.dll CpProxyDotNetAssemblies
DvDeviceDotNetAssemblies
+ else
diff --git a/media-sound/sc2mpd/files/ohnet.optionparser.patch
b/media-sound/sc2mpd/files/ohnet.optionparser.patch
new file mode 100644
index 00000000000..a3165768427
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnet.optionparser.patch
@@ -0,0 +1,12 @@
+diff --git a/OpenHome/TestFramework/OptionParser.cpp
b/OpenHome/TestFramework/OptionParser.cpp
+index fe90233..644fc0b 100644
+--- a/OpenHome/TestFramework/OptionParser.cpp
++++ b/OpenHome/TestFramework/OptionParser.cpp
+@@ -282,6 +282,6 @@ void OptionParser::SetUsage(const TChar* aUsage)
+ {
+ delete iUsage;
+ iUsage = NULL;
+- iUsage = new TChar[strlen(iUsage)];
++ iUsage = new TChar[strlen(aUsage)];
+ (void)strcpy(iUsage, aUsage);
+ }
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
b/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
new file mode 100644
index 00000000000..a4f28f9a700
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnetgenerated.commonmk.patch
@@ -0,0 +1,24 @@
+diff -u ./Common.mak ../../openhome/ohNetGenerated/Common.mak
+--- ./Common.mak 2017-09-19 10:51:13.000000000 +0200
++++ ./Common.mak 2017-09-19 13:21:25.984071432 +0200
+@@ -17,20 +17,6 @@
+ $(objdir)ohnet-generated.jar : CpProxyJavaClasses DvDeviceJavaClasses
+ $(jar) $(jarflags) $(objdir)ohnet-generated.jar -C $(objdir) org
+
+-Generated$(dirsep)GenerateSourceFiles.mak : $(tt)
OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml
OpenHome/Net/T4/Templates/UpnpMakeT4.tt
+- $(mkdir) Generated
+- $(t4) -o Generated$(dirsep)GenerateSourceFiles.mak
OpenHome/Net/T4/Templates/UpnpMakeT4.tt -a xml:OpenHome/Net/Service/Services.xml
+- @echo Attention: a makefile has been re-generated.
+-
+-Generated$(dirsep)Proxies.mak : $(tt)
OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml
OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt
+- $(mkdir) Generated
+- $(t4) -o Generated$(dirsep)Proxies.mak
OpenHome/Net/T4/Templates/CpUpnpMakeProxies.tt -a
xml:OpenHome/Net/Service/Services.xml
+- @echo Attention: a makefile has been re-generated.
+-
+-Generated$(dirsep)Devices.mak : $(tt)
OpenHome$(dirsep)Net$(dirsep)Service$(dirsep)Services.xml
OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt
+- $(mkdir) Generated
+- $(t4) -o Generated$(dirsep)Devices.mak
OpenHome/Net/T4/Templates/DvUpnpMakeDevices.tt -a
xml:OpenHome/Net/Service/Services.xml
+- @echo Attention: a makefile has been re-generated.
+
+ native_targets = make_obj_dir copy_build_includes proxies devices
+
diff --git a/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
b/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
new file mode 100644
index 00000000000..d320cefbd47
--- /dev/null
+++ b/media-sound/sc2mpd/files/ohnetgenerated.makefile.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile b/Makefile
+index bf7a1ba..49bffaf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,14 +70,17 @@ else
+ else ifneq (,$(findstring linux,$(gcc_machine)))
+ detected_openhome_system = Linux
+ endif
+- ifeq ($(gcc_machine),arm-none-linux-gnueabi)
+- detected_openhome_architecture = armel
+- endif
+- ifeq ($(gcc_machine),arm-linux-gnueabi)
+- detected_openhome_architecture = armel
+- endif
+- ifeq ($(gcc_machine),arm-linux-gnueabihf)
+- detected_openhome_architecture = armhf
++ ifneq (,$(findstring arm,$(gcc_machine)))
++ ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
++ detected_openhome_architecture = armhf
++ else ifneq (,$(findstring armv7hl,$(gcc_machine)))
++ # cubox: armv7hl-redhat-linux-gnueabi
++ detected_openhome_architecture = armhf
++ else ifeq (${detected_openhome_system},Qnap)
++ detected_openhome_architecture = x19
++ else
++ detected_openhome_architecture = armel
++ endif
+ endif
+ ifneq (,$(findstring i686,$(gcc_machine)))
+ detected_openhome_architecture = x86
diff --git a/media-sound/sc2mpd/metadata.xml b/media-sound/sc2mpd/metadata.xml
new file mode 100644
index 00000000000..c401bc22328
--- /dev/null
+++ b/media-sound/sc2mpd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+<maintainer type="person">
+ <email>stasib...@gentoo.org</email>
+ <description>Primary maintainer</description>
+</maintainer>
+<longdescription>Implements the SongCast protocol for use by upmpdcli and
mpd</longdescription>
+</pkgmetadata>
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
b/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
new file mode 100644
index 00000000000..90ecdf9ac79
--- /dev/null
+++ b/media-sound/sc2mpd/sc2mpd-1.1.4.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"
+}
