From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D6F2C58973 for ; Mon, 8 Feb 2016 08:30:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE92921C0F2; Mon, 8 Feb 2016 08:30:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39A0721C0F2 for ; Mon, 8 Feb 2016 08:30:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA574340894 for ; Mon, 8 Feb 2016 08:30:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0D658F2 for ; Mon, 8 Feb 2016 08:30:26 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1454920219.9e6e94f218cb75fd66f39fc7596d5a9c0f82f523.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/orpheus/files/, media-sound/orpheus/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch media-sound/orpheus/orpheus-1.6-r3.ebuild X-VCS-Directories: media-sound/orpheus/ media-sound/orpheus/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9e6e94f218cb75fd66f39fc7596d5a9c0f82f523 X-VCS-Branch: master Date: Mon, 8 Feb 2016 08:30:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ccf15e6c-06a6-4ee9-a0f3-9f1229569c10 X-Archives-Hash: df42df6c0f7ae2fa55406e3de19c6be7 commit: 9e6e94f218cb75fd66f39fc7596d5a9c0f82f523 Author: David Seifert gentoo org> AuthorDate: Mon Feb 8 08:30:05 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Mon Feb 8 08:30:19 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6e94f2 media-sound/orpheus: Fix broken buildsystem Gentoo-Bug: 533192 * EAPI=6 Package-Manager: portage-2.2.27 .../files/orpheus-1.6-fix-buildsystem.patch | 182 +++++++++++++++++++++ media-sound/orpheus/orpheus-1.6-r3.ebuild | 47 ++++++ 2 files changed, 229 insertions(+) diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch new file mode 100644 index 0000000..5819fe9 --- /dev/null +++ b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch @@ -0,0 +1,182 @@ +--- orpheus-1.6/configure.ac ++++ orpheus-1.6/configure.ac +@@ -1,5 +1,5 @@ +-AC_INIT(aclocal.m4) +-AM_INIT_AUTOMAKE(orpheus, 1.6) ++AC_INIT([orpheus],[1.6]) ++AM_INIT_AUTOMAKE + + AC_CANONICAL_HOST + +@@ -8,7 +8,8 @@ + AC_PROG_CPP + AC_PROG_RANLIB + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) ++AM_PROG_AR + + ### use option --enable-locales-fix to fix problems with double-byte + ### encodings on systems with broken locale, iscntrl() +@@ -20,30 +20,21 @@ + + AC_CHECK_HEADERS(sys/soundcard.h soundcard.h machine/soundcard.h, break) + +-AM_PATH_XML2(2.0.0, [ +- CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" +- LIBS="$LIBS $XML_LIBS" +- AC_DEFINE(HAVE_LIBXML2, 1, [use libxml2]) +-], [ +- AC_MSG_WARN(libxml2 not found, internet radio presets fetching disabled) ++PKG_CHECK_MODULES([DEPENDENCIES], [ncurses vorbis vorbisfile ogg libxml-2.0], ++[ ++AC_DEFINE([HAVE_LIBXML2], [1], [Defined if libxml is present]) ++AC_DEFINE([HAVE_LIBNCURSES], [1], [Defined if ncurses is present]) ++AC_DEFINE([HAVE_LIBVORBIS], [1], [Defined if libvorbis is present]) ++AC_DEFINE([HAVE_LIBVORBISFILE], [1], [Defined if libvorbisfile is present]) + ]) + +-AC_CHECK_LIB(ncurses, main,, AC_CHECK_LIB(curses, main,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))) +- +-AC_CHECK_LIB(ghttp, ghttp_request_new,, +- [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)]) +- +-AC_CHECK_LIB(vorbis, vorbis_synthesis_headerin,, +- AC_MSG_WARN(libvorbisfile not found - the support for OGG tags edit is disabled)) +- +-AC_CHECK_LIB(vorbisfile, ov_open,, +- AC_MSG_WARN(libvorbis not found - the support for OGG files is disabled)) +- + AM_ICONV_LINK + +-LIBS="$LIBS $LIBICONV" ++CPPFLAGS="$CPPFLAGS $DEPENDENCIES_CFLAGS" ++LIBS="$LIBS $LIBICONV $DEPENDENCIES_LIBS" + + ALL_LINGUAS="ru ca" + AM_GNU_GETTEXT + AC_CONFIG_SUBDIRS(kkstrtext-0.1 kkconsui-0.1) +-AC_OUTPUT(Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile) ++AC_CONFIG_FILES([Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile]) ++AC_OUTPUT +--- orpheus-1.6/kkconsui-0.1/configure.ac ++++ orpheus-1.6/kkconsui-0.1/configure.ac +@@ -6,7 +6,7 @@ + AC_PROG_CC + AC_PROG_CXX + AC_PROG_RANLIB +- ++AM_PROG_AR + + ### use option --enable-locales-fix to fix problems with double-byte + ### encodings on systems with broken locale, iscntrl() +--- orpheus-1.6/kkstrtext-0.1/configure.ac ++++ orpheus-1.6/kkstrtext-0.1/configure.ac +@@ -6,6 +6,7 @@ + AC_PROG_CC + AC_PROG_CXX + AC_PROG_RANLIB ++AM_PROG_AR + + AC_CHECK_HEADERS(_G_config.h) + AC_LANG_CPLUSPLUS +--- orpheus-1.6/po/Makefile.in.in ++++ orpheus-1.6/po/Makefile.in.in +@@ -29,7 +29,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs + mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) + + GMSGFMT = @GMSGFMT@ +--- orpheus-1.6/src/cdtrack.cc ++++ orpheus-1.6/src/cdtrack.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "cdtrack.h" + #include "playlist.h" + +--- orpheus-1.6/src/main.cc ++++ orpheus-1.6/src/main.cc +@@ -21,6 +21,9 @@ + * USA + * + */ ++ ++#include "../config.h" ++ + #include "uitext.h" + #include "cdtrack.h" + #include "mp3track.h" +--- orpheus-1.6/src/mp3track.cc ++++ orpheus-1.6/src/mp3track.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "mp3track.h" + #include "orpheusconf.h" + +--- orpheus-1.6/src/oggtrack.cc ++++ orpheus-1.6/src/oggtrack.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "oggtrack.h" + #include "orpheusconf.h" + +--- orpheus-1.6/src/orpheusconf.cc ++++ orpheus-1.6/src/orpheusconf.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "orpheusconf.h" + + #include +--- orpheus-1.6/src/playlist.cc ++++ orpheus-1.6/src/playlist.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "playlist.h" + #include "mp3track.h" + #include "oggtrack.h" +--- orpheus-1.6/src/streamtrack.cc ++++ orpheus-1.6/src/streamtrack.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "streamtrack.h" + #include "playlist.h" + +--- orpheus-1.6/src/uitext.cc ++++ orpheus-1.6/src/uitext.cc +@@ -22,6 +22,8 @@ + * + */ + ++#include "../config.h" ++ + #include "uitext.h" + #include "playlist.h" + #include "cdtrack.h" diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild new file mode 100644 index 0000000..c03679c --- /dev/null +++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools + +DESCRIPTION="Command line MP3 player" +HOMEPAGE="http://konst.org.ua/en/orpheus" +SRC_URI="http://konst.org.ua/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="sys-libs/ncurses:0= + media-libs/libvorbis + media-sound/mpg123 + media-sound/vorbis-tools[ogg123]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/1.5-amd64.patch" + "${FILESDIR}/101_fix-buffer-overflow.diff" + "${FILESDIR}/${P}-fix-buildsystem.patch" + "${FILESDIR}/${P}-cppflags.patch" + "${FILESDIR}/${P}-bufsize.patch" + "${FILESDIR}/${P}-gcc47.patch" + "${FILESDIR}/${P}-constify.patch" +) + +src_prepare() { + # rename all configure.in files to prevent future + # autoconf breakage + local i + for i in "" "kkstrtext-0.1" "kkconsui-0.1" + do + mv ./${i}/configure.{in,ac} || die + done + + default + cp "${S}"/{config.rpath,kkstrtext-0.1} || die + + eautoreconf +}