summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <michael@xmw.de>2018-01-19 22:58:10 +0100
committerMichael Weber <michael@xmw.de>2018-01-19 22:58:10 +0100
commit5b0fe2d5c17d8eb9a9402ff29e34af4ee6111258 (patch)
tree9dea579651eade9394ed8025ebd0effab142809a
parentapp-misc/cflags-test: remove test ebuild. (diff)
downloadxmw-5b0fe2d5c17d8eb9a9402ff29e34af4ee6111258.zip
xmw-5b0fe2d5c17d8eb9a9402ff29e34af4ee6111258.tar.gz
xmw-5b0fe2d5c17d8eb9a9402ff29e34af4ee6111258.tar.bz2
media-sound/muroa: Initial import.
Package-Manager: Portage-2.3.19, Repoman-2.3.6 Manifest-Sign-Key: 0x71D573A82F434065
-rw-r--r--media-sound/muroa/files/muroa-9999-includes.patch19
-rw-r--r--media-sound/muroa/files/muroa-9999-namespace.patch15
-rw-r--r--media-sound/muroa/files/muroa-9999-samplerate-const-float.patch34
-rw-r--r--media-sound/muroa/metadata.xml15
-rw-r--r--media-sound/muroa/muroa-9999.ebuild39
5 files changed, 122 insertions, 0 deletions
diff --git a/media-sound/muroa/files/muroa-9999-includes.patch b/media-sound/muroa/files/muroa-9999-includes.patch
new file mode 100644
index 0000000..75d6913
--- /dev/null
+++ b/media-sound/muroa/files/muroa-9999-includes.patch
@@ -0,0 +1,19 @@
+--- muroa-9999/libmuroadaemon/CSettings.cpp
++++ muroa-9999/libmuroadaemon/CSettings.cpp
+@@ -28,6 +28,8 @@
+ #include "CAlsaSrcDesc.h"
+
+ #include <getopt.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+ #include <log4cplus/loggingmacros.h>
+
+ #include "boost/filesystem/operations.hpp"
+@@ -36,6 +38,7 @@
+ #include <boost/foreach.hpp>
+ #include <utility>
+ #include <map>
++#include <iostream>
+
+
+ using namespace std;
diff --git a/media-sound/muroa/files/muroa-9999-namespace.patch b/media-sound/muroa/files/muroa-9999-namespace.patch
new file mode 100644
index 0000000..e00c596
--- /dev/null
+++ b/media-sound/muroa/files/muroa-9999-namespace.patch
@@ -0,0 +1,15 @@
+--- muroa-9999/libmcommons/CUtils.cpp
++++ muroa-9999/libmcommons/CUtils.cpp
+@@ -40,10 +40,10 @@
+
+ string CUtils::file2string(const string &fileName)
+ {
+- ifstream ifs(fileName.c_str(), ios::in | ios::binary | ios::ate);
++ boost::filesystem::ifstream ifs(fileName.c_str(), ios::in | ios::binary | ios::ate);
+
+ if(ifs.is_open()) {
+- ifstream::pos_type fileSize = ifs.tellg();
++ boost::filesystem::ifstream::pos_type fileSize = ifs.tellg();
+ ifs.seekg(0, ios::beg);
+
+ vector<char> bytes(fileSize);
diff --git a/media-sound/muroa/files/muroa-9999-samplerate-const-float.patch b/media-sound/muroa/files/muroa-9999-samplerate-const-float.patch
new file mode 100644
index 0000000..9a0ecb9
--- /dev/null
+++ b/media-sound/muroa/files/muroa-9999-samplerate-const-float.patch
@@ -0,0 +1,34 @@
+--- muroa-9999/muroad/cfloatresampler.cpp
++++ muroa-9999/muroad/cfloatresampler.cpp
+@@ -159,11 +159,11 @@
+
+ void CFloatResampler::appendFrameToImputBuffer(CAudioFrame* in_frame) {
+
+- float* begin_of_free_inbuffer_space = m_src_data->data_in + m_src_data->input_frames;
++ float* begin_of_free_inbuffer_space = (float*) m_src_data->data_in + m_src_data->input_frames;
+ int num_of_singlechannel_samples = in_frame->dataSize() / m_size_of_input_singlechannel_sample;
+
+ // src_short_to_float_array((const short*)(in_frame->dataPtr()), begin_of_free_inbuffer_space, num_of_singlechannel_samples);
+- src_short_to_float_array((const short*)(in_frame->dataPtr()), m_src_data->data_in, num_of_singlechannel_samples);
++ src_short_to_float_array((const short*)(in_frame->dataPtr()), (float*) m_src_data->data_in, num_of_singlechannel_samples);
+
+
+ //m_src_data->input_frames += num_of_singlechannel_samples / m_num_channels;
+@@ -181,7 +181,7 @@
+
+ // copy remaining input (already tranformed float values) to the beginning of the input buffer and set m_in_offset.
+ int frames_to_copy = m_src_data->input_frames - m_src_data->input_frames_used;
+- void* start_addr = m_src_data->data_in + m_src_data->input_frames_used * m_num_channels;
++ void* start_addr = (float*) m_src_data->data_in + m_src_data->input_frames_used * m_num_channels;
+
+ // assert that mem areas do not overlap!
+ if(frames_to_copy < m_src_data->input_frames_used) {
+@@ -189,7 +189,7 @@
+ cerr << "m_src_data->input_frames_used = " << m_src_data->input_frames_used << endl;
+ }
+ assert(frames_to_copy < m_src_data->input_frames_used);
+- memcpy(m_src_data->data_in, start_addr, frames_to_copy * m_size_of_float_multichannel_sample);
++ memcpy((float*) m_src_data->data_in, start_addr, frames_to_copy * m_size_of_float_multichannel_sample);
+
+ m_src_data->input_frames = frames_to_copy;
+
diff --git a/media-sound/muroa/metadata.xml b/media-sound/muroa/metadata.xml
new file mode 100644
index 0000000..01ce91c
--- /dev/null
+++ b/media-sound/muroa/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+</maintainer>
+<upstream>
+ <maintainer>
+ <name>Martin Runge</name>
+ <email>martin.runge@web.de</email>
+ </maintainer>
+ <remote-id type="github">martinrunge/muroa</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/media-sound/muroa/muroa-9999.ebuild b/media-sound/muroa/muroa-9999.ebuild
new file mode 100644
index 0000000..2205a23
--- /dev/null
+++ b/media-sound/muroa/muroa-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="multi room audio player"
+HOMEPAGE="http://muroa.org"
+EGIT_REPO_URI="https://github.com/martinrunge/muroa.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/boost
+ dev-libs/jsoncpp
+ dev-libs/libxdiff
+ dev-libs/log4cplus
+ media-libs/alsa-lib
+ media-libs/libsamplerate
+ virtual/ffmpeg
+ net-dns/avahi"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-includes.patch
+ "${FILESDIR}"/${P}-namespace.patch
+ "${FILESDIR}"/${P}-samplerate-const-float.patch
+)
+
+src_prepare() {
+ default
+
+ rm -r 3rdparty/libxdiff-0.23 || die
+ sed -e "/DESTINATION/s:lib:$(get_libdir):" \
+ -i lib{mcommons,mstream,muroadaemon,sock++}/CMakeLists.txt || die
+}