From 4df3cb7fcc16ff76d739b11aef408c3f71f174cc Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 10 Jul 2022 13:22:11 +0200 Subject: media-sound/alsaplayer: update EAPI 6 -> 8 Signed-off-by: David Seifert --- .../alsaplayer/alsaplayer-0.99.81-r2.ebuild | 87 ---------------------- .../alsaplayer/alsaplayer-0.99.81-r3.ebuild | 78 +++++++++++++++++++ .../files/alsaplayer-0.99.81-autotools.ebuild | 37 +++++++++ 3 files changed, 115 insertions(+), 87 deletions(-) delete mode 100644 media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild create mode 100644 media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild create mode 100644 media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild deleted file mode 100644 index 098fdbbe3336..000000000000 --- a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools desktop xdg - -DESCRIPTION="A heavily multi-threaded pluggable audio player" -HOMEPAGE="http://www.alsaplayer.org/" -SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ~ppc ~riscv ~sparc x86" -IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd" - -RDEPEND=" - media-libs/libsndfile:= - sys-libs/zlib:= - alsa? ( media-libs/alsa-lib ) - audiofile? ( media-libs/audiofile:= ) - flac? ( media-libs/flac ) - gtk? ( >=x11-libs/gtk+-2.10:2 ) - id3tag? ( media-libs/libid3tag:= ) - jack? ( virtual/jack ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod:0 ) - nas? ( media-libs/nas ) - ogg? ( media-libs/libogg ) - opengl? ( virtual/opengl ) - vorbis? ( media-libs/libvorbis ) - xosd? ( x11-libs/xosd )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - nls? ( sys-devel/gettext ) - oss? ( virtual/os-headers )" -REQUIRED_USE="|| ( alsa jack nas oss )" - -src_prepare() { - default - - sed -i \ - -e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \ - output/jack/Makefile.am || die - - sed -i \ - -e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \ - configure.ac || die - - sed -i \ - -e "s:/usr/lib:/usr/$(get_libdir):" \ - configure.ac config.rpath || die - - eautoreconf -} - -src_configure() { - export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false) - export ac_cv_lib_xosd_xosd_create=$(usex xosd) - - econf \ - --disable-esd \ - $(use_enable nls) \ - $(use_enable opengl) \ - $(use_enable mikmod) \ - $(use_enable vorbis oggvorbis) \ - $(use_enable audiofile) \ - $(use_enable flac) \ - $(use_enable mad) \ - $(use_enable id3tag) \ - $(use_enable gtk systray) \ - $(use_enable jack) \ - $(use_enable alsa) \ - $(use_enable oss) \ - $(use_enable gtk gtk2) \ - $(use_enable nas) -} - -src_install() { - default - dodoc docs/*.txt - - newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm - - find "${D}" -name '*.la' -delete || die -} diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild new file mode 100644 index 000000000000..70ee1adcfa99 --- /dev/null +++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop xdg + +DESCRIPTION="A heavily multi-threaded pluggable audio player" +HOMEPAGE="http://www.alsaplayer.org/" +SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~mips ~ppc ~riscv ~sparc x86" +IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd" +REQUIRED_USE="|| ( alsa jack nas oss )" + +RDEPEND=" + media-libs/libsndfile:= + sys-libs/zlib:= + alsa? ( media-libs/alsa-lib ) + audiofile? ( media-libs/audiofile:= ) + flac? ( media-libs/flac ) + gtk? ( >=x11-libs/gtk+-2.10:2 ) + id3tag? ( media-libs/libid3tag:= ) + jack? ( virtual/jack ) + mad? ( media-libs/libmad ) + mikmod? ( media-libs/libmikmod:0 ) + nas? ( media-libs/nas ) + ogg? ( media-libs/libogg ) + opengl? ( virtual/opengl ) + vorbis? ( media-libs/libvorbis ) + xosd? ( x11-libs/xosd )" +DEPEND="${RDEPEND} + oss? ( virtual/os-headers )" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig + doc? ( app-doc/doxygen )" + +PATCHES=( "${FILESDIR}"/${P}-autotools.ebuild ) + +src_prepare() { + default + cp "${BROOT}"/usr/share/gettext/config.rpath . || die + eautoreconf +} + +src_configure() { + export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false) + export ac_cv_lib_xosd_xosd_create=$(usex xosd) + + econf \ + --disable-esd \ + $(use_enable nls) \ + $(use_enable opengl) \ + $(use_enable mikmod) \ + $(use_enable vorbis oggvorbis) \ + $(use_enable audiofile) \ + $(use_enable flac) \ + $(use_enable mad) \ + $(use_enable id3tag) \ + $(use_enable gtk systray) \ + $(use_enable jack) \ + $(use_enable alsa) \ + $(use_enable oss) \ + $(use_enable gtk gtk2) \ + $(use_enable nas) +} + +src_install() { + default + dodoc docs/*.txt + + newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm + + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild new file mode 100644 index 000000000000..b51277317e0f --- /dev/null +++ b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild @@ -0,0 +1,37 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -82,11 +82,6 @@ + dnl PKGCONFIG preparations + dnl ====================== + +-if test -z $PKG_CONFIG_PATH; then +- PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig +-fi +- +-export PKG_CONFIG_PATH + + + dnl =============== +@@ -639,10 +634,10 @@ + + AC_MSG_CHECKING(for gcc optimization flags) + old_cflags=$CFLAGS +-CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall" ++CFLAGS="$CFLAGS -Wall" + AC_TRY_COMPILE([#include ], + [ printf ("hello, world"); ], +-[ EXTRA_OPT_CFLAGS="$CFLAGS -O2 -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""]) ++[ EXTRA_OPT_CFLAGS="$CFLAGS -Wall"],[ EXTRA_OPT_CFLAGS=""]) + CFLAGS=$old_cflags + AC_MSG_RESULT([$EXTRA_OPT_CFLAGS]) + +--- a/output/jack/Makefile.am ++++ b/output/jack/Makefile.am +@@ -24,7 +24,6 @@ + + AM_CXXFLAGS = $(COMMON_FLAGS) $(JACK_CFLAGS) + +-AM_CFLAGS = $(AM_CXXFLAGS) + + libdir = $(ADDON_DIR)/output + -- cgit v1.2.3-65-gdbad