summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2016-01-31 21:01:15 +0100
committerDavid Seifert <soap@gentoo.org>2016-01-31 21:02:11 +0100
commitdef84355a9e1cab67ce046b0dec244e7692e0827 (patch)
tree1146c818ccfe00ef02d92138115a0512db506193 /media-sound/herrie
parentdev-python/keyring: bup (diff)
downloadgentoo-def84355a9e1cab67ce046b0dec244e7692e0827.tar.gz
gentoo-def84355a9e1cab67ce046b0dec244e7692e0827.tar.bz2
gentoo-def84355a9e1cab67ce046b0dec244e7692e0827.zip
media-sound/herrie: Add patch for libmodplug/modplug.h include
Gentoo-Bug: 573522 * EAPI=6 * Fix errors caused by -Werror=format-security * Fix underlinking issues with sys-libs/ncurses * Amended all patches to be compatible with -p1 Package-Manager: portage-2.2.27
Diffstat (limited to 'media-sound/herrie')
-rw-r--r--media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch38
-rw-r--r--media-sound/herrie/files/herrie-2.2-libxspf.patch12
-rw-r--r--media-sound/herrie/herrie-2.2-r1.ebuild63
3 files changed, 107 insertions, 6 deletions
diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
new file mode 100644
index 00000000000..03a2c7397da
--- /dev/null
+++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
@@ -0,0 +1,38 @@
+Fix ncurses underlinking by using the pkg-config output instead of assuming
+-lncurses/-lncursesw to be enough. In addition, fix wrong modplug include
+directive. See also:
+https://bugs.gentoo.org/show_bug.cgi?id=573522
+
+--- herrie-2.2/configure
++++ herrie-2.2/configure
+@@ -215,7 +215,7 @@
+ exit 1
+ fi
+ CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\""
+-LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB"
++LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`"
+ SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \
+ gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \
+ playq_xmms vfs vfs_playlist vfs_regular"
+--- herrie-2.2/src/audio_format_modplug.c
++++ herrie-2.2/src/audio_format_modplug.c
+@@ -31,7 +31,7 @@
+ #include "stdinc.h"
+
+ #include <sys/mman.h>
+-#include <modplug.h>
++#include <libmodplug/modplug.h>
+
+ #include "audio_file.h"
+ #include "audio_format.h"
+--- herrie-2.2/src/main.c
++++ herrie-2.2/src/main.c
+@@ -165,7 +165,7 @@
+ #endif /* CLOSE_STDERR */
+ if ((errmsg = vfs_lockup()) != NULL) {
+ gui_draw_init_abort();
+- g_printerr(errmsg);
++ g_printerr("%s", errmsg);
+ return (1);
+ }
+
diff --git a/media-sound/herrie/files/herrie-2.2-libxspf.patch b/media-sound/herrie/files/herrie-2.2-libxspf.patch
index 00dc3057b20..fa7cb7a4fcb 100644
--- a/media-sound/herrie/files/herrie-2.2-libxspf.patch
+++ b/media-sound/herrie/files/herrie-2.2-libxspf.patch
@@ -1,5 +1,5 @@
---- configure
-+++ configure
+--- herrie-2.2/configure
++++ herrie-2.2/configure
@@ -301,7 +301,7 @@ fi
if [ "$CFG_XSPF" != "" ]
then
@@ -9,8 +9,8 @@
SRCS="$SRCS util vfs_xspf"
PLAYQ_DUMPFILE="autosave.xspf"
else
---- src/conftest.c
-+++ src/conftest.c
+--- herrie-2.2/src/conftest.c
++++ herrie-2.2/src/conftest.c
@@ -56,16 +56,10 @@
#include <vorbis/codec.h>
#include <vorbis/vorbisfile.h>
@@ -28,8 +28,8 @@
return (0);
}
---- src/vfs_xspf.c
-+++ src/vfs_xspf.c
+--- herrie-2.2/src/vfs_xspf.c
++++ herrie-2.2/src/vfs_xspf.c
@@ -30,7 +30,7 @@
#include "stdinc.h"
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
new file mode 100644
index 00000000000..a2807d2058c
--- /dev/null
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Herrie is a command line music player"
+HOMEPAGE="http://herrie.info/"
+SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
+APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
+for X in ${APP_LINGUAS}; do
+ IUSE="${IUSE} linguas_${X}"
+done
+REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+ >=dev-libs/glib-2:2
+ ao? ( media-libs/libao )
+ alsa? ( media-libs/alsa-lib )
+ http? ( net-misc/curl )
+ modplug? ( media-libs/libmodplug )
+ mp3? ( media-libs/libmad
+ media-libs/libid3tag )
+ pulseaudio? ( media-sound/pulseaudio )
+ sndfile? ( media-libs/libsndfile )
+ vorbis? ( media-libs/libvorbis )
+ xspf? ( >=media-libs/libxspf-1.2 )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-chost_issue.patch"
+ "${FILESDIR}/${P}-libxspf.patch"
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+ local EXTRA_CONF="verbose no_strip"
+ use ao && EXTRA_CONF="${EXTRA_CONF} ao"
+ use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
+ use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
+ use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
+ use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
+ use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
+ use oss && EXTRA_CONF="${EXTRA_CONF} oss"
+ use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
+ use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
+ use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
+ use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
+ use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
+
+ einfo "./configure ${EXTRA_CONF}"
+ CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
+ ./configure ${EXTRA_CONF} || die "configure failed"
+}