public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsaplayer/, media-sound/alsaplayer/files/
@ 2022-07-10 11:22 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-07-10 11:22 UTC (permalink / raw
  To: gentoo-commits

commit:     4df3cb7fcc16ff76d739b11aef408c3f71f174cc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 11:22:11 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 11:22:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df3cb7f

media-sound/alsaplayer: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...9.81-r2.ebuild => alsaplayer-0.99.81-r3.ebuild} | 31 +++++++-----------
 .../files/alsaplayer-0.99.81-autotools.ebuild      | 37 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
similarity index 79%
rename from media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
rename to media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
index 098fdbbe3336..70ee1adcfa99 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools desktop xdg
 
@@ -13,6 +13,7 @@ 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:=
@@ -31,27 +32,17 @@ RDEPEND="
 	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 )"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.ebuild )
 
 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
-
+	cp "${BROOT}"/usr/share/gettext/config.rpath . || die
 	eautoreconf
 }
 
@@ -83,5 +74,5 @@ src_install() {
 
 	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
 
-	find "${D}" -name '*.la' -delete || die
+	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 <stdio.h>],
+ [ 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
+ 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsaplayer/, media-sound/alsaplayer/files/
@ 2022-07-11  1:15 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-07-11  1:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9c2417fc4192ca14ef8e57dac58db91d5e9f6d3a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 01:15:43 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 01:15:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2417fc

media-sound/alsaplayer: fix patch filename

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild                     | 2 +-
 ...ayer-0.99.81-autotools.ebuild => alsaplayer-0.99.81-autotools.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
index 70ee1adcfa99..32fb30aa29da 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r3.ebuild
@@ -38,7 +38,7 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-autotools.ebuild )
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
 src_prepare() {
 	default

diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild b/media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.patch
similarity index 100%
rename from media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.ebuild
rename to media-sound/alsaplayer/files/alsaplayer-0.99.81-autotools.patch


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/alsaplayer/, media-sound/alsaplayer/files/
@ 2024-09-06  9:42 Miroslav Šulc
  0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2024-09-06  9:42 UTC (permalink / raw
  To: gentoo-commits

commit:     68ea65bbb1877f4048d9fec2a598505fa17ae469
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 09:42:14 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 09:42:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ea65bb

media-sound/alsaplayer: bump to 0.99.82

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/alsaplayer/Manifest                    |  1 +
 media-sound/alsaplayer/alsaplayer-0.99.82.ebuild   | 81 ++++++++++++++++++++++
 .../files/alsaplayer-0.99.82-autotools.patch       | 24 +++++++
 3 files changed, 106 insertions(+)

diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index b57e60ab662e..50ca52c5345c 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1 +1,2 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
+DIST alsaplayer-0.99.82.tar.gz 1087776 BLAKE2B 34a197799da90c2dfe08b4a85baa3ac47d1b21e919908981c6ff3993a16fa1b97814cab54aae84be9e1da8fa3395952ef8fef85fe153a528ea3a6d6cd0f20658 SHA512 749fb8581d766df28a1ec42af9888fda0665ffcc0bb85a489365ae02611bc90a6cfc42d9c2cb19a3eeb385fb2c401b9d16e864a22887d8d6b6de3a55ebc140e2

diff --git a/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
new file mode 100644
index 000000000000..ec4c2f7e0031
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic xdg
+
+DESCRIPTION="A heavily multi-threaded pluggable audio player"
+HOMEPAGE="https://alsaplayer.sourceforge.net/"
+SRC_URI="https://github.com/alsaplayer/alsaplayer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~riscv ~sparc ~x86"
+IUSE="+alsa 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 )
+	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-text/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+
+src_prepare() {
+	default
+	cp "${BROOT}"/usr/share/gettext/config.rpath . || die
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860423
+	# https://github.com/alsaplayer/alsaplayer/issues/28
+	filter-lto
+
+	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 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.82-autotools.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch
new file mode 100644
index 000000000000..202d2e8ccf12
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch
@@ -0,0 +1,24 @@
+--- 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 ===============
+--- 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
+ 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-09-06  9:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-11  1:15 [gentoo-commits] repo/gentoo:master commit in: media-sound/alsaplayer/, media-sound/alsaplayer/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-09-06  9:42 Miroslav Šulc
2022-07-10 11:22 David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox