1 |
commit: 2ad838e68bc250cfb1740d7cf27d9fd7fc94776f |
2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
3 |
AuthorDate: Tue Jun 30 21:25:11 2015 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 21:36:15 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=2ad838e6 |
7 |
|
8 |
media-sound/dermixd: 1.6.2 |
9 |
|
10 |
media-sound/dermixd/dermixd-1.6.2.ebuild | 47 ++++++++ |
11 |
.../dermixd/files/dermixd-1.6.2-compile.patch | 121 +++++++++++++++++++++ |
12 |
2 files changed, 168 insertions(+) |
13 |
|
14 |
diff --git a/media-sound/dermixd/dermixd-1.6.2.ebuild b/media-sound/dermixd/dermixd-1.6.2.ebuild |
15 |
new file mode 100644 |
16 |
index 0000000..09142d7 |
17 |
--- /dev/null |
18 |
+++ b/media-sound/dermixd/dermixd-1.6.2.ebuild |
19 |
@@ -0,0 +1,47 @@ |
20 |
+# Copyright 1999-2015 Gentoo Foundation |
21 |
+# Distributed under the terms of the GNU General Public License v2 |
22 |
+# $Header: $ |
23 |
+ |
24 |
+EAPI="5" |
25 |
+ |
26 |
+inherit eutils |
27 |
+ |
28 |
+DESCRIPTION="Multi-stream music player daemon" |
29 |
+HOMEPAGE="http://thomas.orgis.org/dermixd/i.shtml" |
30 |
+SRC_URI="http://thomas.orgis.org/${PN}/${P}.tar.bz2" |
31 |
+ |
32 |
+LICENSE="GPL-2" |
33 |
+SLOT="0" |
34 |
+KEYWORDS="~amd64 ~x86" |
35 |
+IUSE="" |
36 |
+ |
37 |
+DEPEND=" |
38 |
+ dev-lang/perl |
39 |
+ media-libs/alsa-lib |
40 |
+ media-libs/libsndfile |
41 |
+ media-libs/libvorbis |
42 |
+ media-sound/mpg123 |
43 |
+ sys-devel/gcc[cxx] |
44 |
+ " |
45 |
+RDEPEND="${DEPEND}" |
46 |
+ |
47 |
+src_prepare() { |
48 |
+ epatch "${FILESDIR}"/${P}-compile.patch |
49 |
+} |
50 |
+ |
51 |
+src_compile() { |
52 |
+ emake SNDFILE=yes VORBISFILE=yes gnu-alsa || die |
53 |
+} |
54 |
+ |
55 |
+src_install() { |
56 |
+ # Library |
57 |
+ insinto /usr/lib/${PN} |
58 |
+ doins frontend/Param.pm |
59 |
+ doins -r frontend/DerMixD |
60 |
+ |
61 |
+ # Commands |
62 |
+ newbin frontend/simple_player ${PN}-simple-player |
63 |
+ newbin frontend/shuffle ${PN}-shuffle |
64 |
+ dobin frontend/${PN}-control |
65 |
+ dobin ${PN} |
66 |
+} |
67 |
|
68 |
diff --git a/media-sound/dermixd/files/dermixd-1.6.2-compile.patch b/media-sound/dermixd/files/dermixd-1.6.2-compile.patch |
69 |
new file mode 100644 |
70 |
index 0000000..76344aa |
71 |
--- /dev/null |
72 |
+++ b/media-sound/dermixd/files/dermixd-1.6.2-compile.patch |
73 |
@@ -0,0 +1,121 @@ |
74 |
+From f26141183f24c9cea162352cf7aaa982e27b4978 Mon Sep 17 00:00:00 2001 |
75 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
76 |
+Date: Tue, 30 Jun 2015 22:58:10 +0200 |
77 |
+Subject: [PATCH] Add missing libc includes |
78 |
+ |
79 |
+--- |
80 |
+ audio_fifo.cxx | 1 + |
81 |
+ in_vorbisfile.cxx | 3 +++ |
82 |
+ input.cxx | 3 +++ |
83 |
+ mixer.cxx | 1 + |
84 |
+ mixer_data.cxx | 2 ++ |
85 |
+ mixer_tools.cxx | 2 ++ |
86 |
+ param.cxx | 1 + |
87 |
+ tstring.cxx | 1 + |
88 |
+ 8 files changed, 14 insertions(+) |
89 |
+ |
90 |
+diff --git a/audio_fifo.cxx b/audio_fifo.cxx |
91 |
+index 8a59757..984b287 100644 |
92 |
+--- a/audio_fifo.cxx |
93 |
++++ b/audio_fifo.cxx |
94 |
+@@ -40,6 +40,7 @@ |
95 |
+ #include "audio_fifo.hxx" |
96 |
+ #include "param.hxx" |
97 |
+ #include "secsleep.hxx" |
98 |
++#include <cstring> // memcpy |
99 |
+ #include <sys/time.h> |
100 |
+ |
101 |
+ void* fifo_reader(void* p) |
102 |
+diff --git a/in_vorbisfile.cxx b/in_vorbisfile.cxx |
103 |
+index 376d116..362cda0 100644 |
104 |
+--- a/in_vorbisfile.cxx |
105 |
++++ b/in_vorbisfile.cxx |
106 |
+@@ -13,6 +13,9 @@ |
107 |
+ #define ME "vorbisfile_input" |
108 |
+ #define MEF "vorbis_file" |
109 |
+ |
110 |
++#include <cstdio> // vsnprintf |
111 |
++#include <cstring> // memset |
112 |
++ |
113 |
+ // Hm, actually we talk about vorbus, ogg is generic... but it is the common file name ending. |
114 |
+ // Dammit, I should code real file type detection... using libmagic... test access. |
115 |
+ const string vorbisfile_input::t = "ogg"; |
116 |
+diff --git a/input.cxx b/input.cxx |
117 |
+index 37355a1..97f7356 100644 |
118 |
+--- a/input.cxx |
119 |
++++ b/input.cxx |
120 |
+@@ -25,6 +25,9 @@ |
121 |
+ #ifdef IN_SNDFILE |
122 |
+ #include "in_sndfile.hxx" |
123 |
+ #endif |
124 |
++ |
125 |
++#include <strings.h> // strcasecmp |
126 |
++ |
127 |
+ input_device* new_input_device(string type, input_data& data) |
128 |
+ { |
129 |
+ if(strcasecmp(type.c_str(), mpg123_input::t.c_str()) == 0) return new mpg123_input(&data); |
130 |
+diff --git a/mixer.cxx b/mixer.cxx |
131 |
+index 7164fa5..2f739bb 100644 |
132 |
+--- a/mixer.cxx |
133 |
++++ b/mixer.cxx |
134 |
+@@ -10,6 +10,7 @@ |
135 |
+ |
136 |
+ #include <fcntl.h> |
137 |
+ #include <signal.h> |
138 |
++#include <cstring> // memmove |
139 |
+ |
140 |
+ #include "audio_buffer.hxx" |
141 |
+ #include "audio_functions.hxx" |
142 |
+diff --git a/mixer_data.cxx b/mixer_data.cxx |
143 |
+index 3da6e00..29588e6 100644 |
144 |
+--- a/mixer_data.cxx |
145 |
++++ b/mixer_data.cxx |
146 |
+@@ -22,6 +22,8 @@ |
147 |
+ #include "mixer_tools.hxx" |
148 |
+ #include "communicator_actions.hxx" |
149 |
+ |
150 |
++#include <strings.h> // strcasecmp |
151 |
++ |
152 |
+ //#define DEBUG_SCRIPT |
153 |
+ //#define DEBUG_MIXER2 |
154 |
+ //#define DEBUG_RESET |
155 |
+diff --git a/mixer_tools.cxx b/mixer_tools.cxx |
156 |
+index c9f5365..73bc3bc 100644 |
157 |
+--- a/mixer_tools.cxx |
158 |
++++ b/mixer_tools.cxx |
159 |
+@@ -19,6 +19,8 @@ |
160 |
+ #include "mixer_data.hxx" |
161 |
+ #include "mixer_tools.hxx" |
162 |
+ |
163 |
++#include <strings.h> // strcasecmp |
164 |
++ |
165 |
+ //#define DEBUG_TOOLS |
166 |
+ |
167 |
+ string stringstatus(signed char status) |
168 |
+diff --git a/param.cxx b/param.cxx |
169 |
+index c3eff1f..d19882c 100644 |
170 |
+--- a/param.cxx |
171 |
++++ b/param.cxx |
172 |
+@@ -8,6 +8,7 @@ |
173 |
+ //not depending on dermixd's common header, this stuff can easily tranfserred to other projects or into an independent library |
174 |
+ #include <cstdlib> |
175 |
+ #include <cstdio> |
176 |
++#include <strings.h> // strcasecmp |
177 |
+ #include <string> |
178 |
+ #include <vector> |
179 |
+ using namespace std; |
180 |
+diff --git a/tstring.cxx b/tstring.cxx |
181 |
+index 04e91f2..3a6d3cb 100644 |
182 |
+--- a/tstring.cxx |
183 |
++++ b/tstring.cxx |
184 |
+@@ -5,6 +5,7 @@ |
185 |
+ (c)2008 Thomas Orgis, licensed under GPLv2 |
186 |
+ */ |
187 |
+ #include "tstring.hxx" |
188 |
++#include <cstdio> // vsnprintf |
189 |
+ using namespace std; |
190 |
+ |
191 |
+ // Chunks for increasing the sprintf buffer. |
192 |
+-- |
193 |
+2.4.0 |
194 |
+ |