1 |
commit: def84355a9e1cab67ce046b0dec244e7692e0827 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 31 20:01:15 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 20:02:11 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def84355 |
7 |
|
8 |
media-sound/herrie: Add patch for libmodplug/modplug.h include |
9 |
|
10 |
Gentoo-Bug: 573522 |
11 |
* EAPI=6 |
12 |
* Fix errors caused by -Werror=format-security |
13 |
* Fix underlinking issues with sys-libs/ncurses |
14 |
* Amended all patches to be compatible with -p1 |
15 |
|
16 |
Package-Manager: portage-2.2.27 |
17 |
|
18 |
.../herrie/files/herrie-2.2-fix-buildsystem.patch | 38 +++++++++++++ |
19 |
media-sound/herrie/files/herrie-2.2-libxspf.patch | 12 ++--- |
20 |
media-sound/herrie/herrie-2.2-r1.ebuild | 63 ++++++++++++++++++++++ |
21 |
3 files changed, 107 insertions(+), 6 deletions(-) |
22 |
|
23 |
diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch |
24 |
new file mode 100644 |
25 |
index 0000000..03a2c73 |
26 |
--- /dev/null |
27 |
+++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch |
28 |
@@ -0,0 +1,38 @@ |
29 |
+Fix ncurses underlinking by using the pkg-config output instead of assuming |
30 |
+-lncurses/-lncursesw to be enough. In addition, fix wrong modplug include |
31 |
+directive. See also: |
32 |
+https://bugs.gentoo.org/show_bug.cgi?id=573522 |
33 |
+ |
34 |
+--- herrie-2.2/configure |
35 |
++++ herrie-2.2/configure |
36 |
+@@ -215,7 +215,7 @@ |
37 |
+ exit 1 |
38 |
+ fi |
39 |
+ CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\"" |
40 |
+-LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB" |
41 |
++LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`" |
42 |
+ SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \ |
43 |
+ gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \ |
44 |
+ playq_xmms vfs vfs_playlist vfs_regular" |
45 |
+--- herrie-2.2/src/audio_format_modplug.c |
46 |
++++ herrie-2.2/src/audio_format_modplug.c |
47 |
+@@ -31,7 +31,7 @@ |
48 |
+ #include "stdinc.h" |
49 |
+ |
50 |
+ #include <sys/mman.h> |
51 |
+-#include <modplug.h> |
52 |
++#include <libmodplug/modplug.h> |
53 |
+ |
54 |
+ #include "audio_file.h" |
55 |
+ #include "audio_format.h" |
56 |
+--- herrie-2.2/src/main.c |
57 |
++++ herrie-2.2/src/main.c |
58 |
+@@ -165,7 +165,7 @@ |
59 |
+ #endif /* CLOSE_STDERR */ |
60 |
+ if ((errmsg = vfs_lockup()) != NULL) { |
61 |
+ gui_draw_init_abort(); |
62 |
+- g_printerr(errmsg); |
63 |
++ g_printerr("%s", errmsg); |
64 |
+ return (1); |
65 |
+ } |
66 |
+ |
67 |
|
68 |
diff --git a/media-sound/herrie/files/herrie-2.2-libxspf.patch b/media-sound/herrie/files/herrie-2.2-libxspf.patch |
69 |
index 00dc305..fa7cb7a 100644 |
70 |
--- a/media-sound/herrie/files/herrie-2.2-libxspf.patch |
71 |
+++ b/media-sound/herrie/files/herrie-2.2-libxspf.patch |
72 |
@@ -1,5 +1,5 @@ |
73 |
---- configure |
74 |
-+++ configure |
75 |
+--- herrie-2.2/configure |
76 |
++++ herrie-2.2/configure |
77 |
@@ -301,7 +301,7 @@ fi |
78 |
if [ "$CFG_XSPF" != "" ] |
79 |
then |
80 |
@@ -9,8 +9,8 @@ |
81 |
SRCS="$SRCS util vfs_xspf" |
82 |
PLAYQ_DUMPFILE="autosave.xspf" |
83 |
else |
84 |
---- src/conftest.c |
85 |
-+++ src/conftest.c |
86 |
+--- herrie-2.2/src/conftest.c |
87 |
++++ herrie-2.2/src/conftest.c |
88 |
@@ -56,16 +56,10 @@ |
89 |
#include <vorbis/codec.h> |
90 |
#include <vorbis/vorbisfile.h> |
91 |
@@ -28,8 +28,8 @@ |
92 |
|
93 |
return (0); |
94 |
} |
95 |
---- src/vfs_xspf.c |
96 |
-+++ src/vfs_xspf.c |
97 |
+--- herrie-2.2/src/vfs_xspf.c |
98 |
++++ herrie-2.2/src/vfs_xspf.c |
99 |
@@ -30,7 +30,7 @@ |
100 |
|
101 |
#include "stdinc.h" |
102 |
|
103 |
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild |
104 |
new file mode 100644 |
105 |
index 0000000..a2807d2 |
106 |
--- /dev/null |
107 |
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild |
108 |
@@ -0,0 +1,63 @@ |
109 |
+# Copyright 1999-2016 Gentoo Foundation |
110 |
+# Distributed under the terms of the GNU General Public License v2 |
111 |
+# $Id$ |
112 |
+ |
113 |
+EAPI=6 |
114 |
+ |
115 |
+inherit eutils toolchain-funcs |
116 |
+ |
117 |
+DESCRIPTION="Herrie is a command line music player" |
118 |
+HOMEPAGE="http://herrie.info/" |
119 |
+SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2" |
120 |
+ |
121 |
+LICENSE="BSD-2 GPL-2" |
122 |
+SLOT="0" |
123 |
+KEYWORDS="~amd64 ~ppc ~x86" |
124 |
+IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls" |
125 |
+APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN" |
126 |
+for X in ${APP_LINGUAS}; do |
127 |
+ IUSE="${IUSE} linguas_${X}" |
128 |
+done |
129 |
+REQUIRED_USE="|| ( ao alsa pulseaudio oss )" |
130 |
+ |
131 |
+RDEPEND="sys-libs/ncurses:0=[unicode?] |
132 |
+ >=dev-libs/glib-2:2 |
133 |
+ ao? ( media-libs/libao ) |
134 |
+ alsa? ( media-libs/alsa-lib ) |
135 |
+ http? ( net-misc/curl ) |
136 |
+ modplug? ( media-libs/libmodplug ) |
137 |
+ mp3? ( media-libs/libmad |
138 |
+ media-libs/libid3tag ) |
139 |
+ pulseaudio? ( media-sound/pulseaudio ) |
140 |
+ sndfile? ( media-libs/libsndfile ) |
141 |
+ vorbis? ( media-libs/libvorbis ) |
142 |
+ xspf? ( >=media-libs/libxspf-1.2 )" |
143 |
+DEPEND="${RDEPEND} |
144 |
+ nls? ( sys-devel/gettext ) |
145 |
+ virtual/pkgconfig" |
146 |
+ |
147 |
+PATCHES=( |
148 |
+ "${FILESDIR}/${PN}-chost_issue.patch" |
149 |
+ "${FILESDIR}/${P}-libxspf.patch" |
150 |
+ "${FILESDIR}/${P}-fix-buildsystem.patch" |
151 |
+) |
152 |
+ |
153 |
+src_configure() { |
154 |
+ local EXTRA_CONF="verbose no_strip" |
155 |
+ use ao && EXTRA_CONF="${EXTRA_CONF} ao" |
156 |
+ use alsa && EXTRA_CONF="${EXTRA_CONF} alsa" |
157 |
+ use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler" |
158 |
+ use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3" |
159 |
+ use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug" |
160 |
+ use nls || EXTRA_CONF="${EXTRA_CONF} no_nls" |
161 |
+ use oss && EXTRA_CONF="${EXTRA_CONF} oss" |
162 |
+ use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse" |
163 |
+ use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile" |
164 |
+ use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses" |
165 |
+ use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis" |
166 |
+ use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf" |
167 |
+ |
168 |
+ einfo "./configure ${EXTRA_CONF}" |
169 |
+ CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \ |
170 |
+ ./configure ${EXTRA_CONF} || die "configure failed" |
171 |
+} |