[gentoo-commits] repo/gentoo:master commit in: media-sound/alsaplayer/, media-sound/alsaplayer/files/

["Sam James" <sam@gentoo.org>]

commit:     f23bdfa87a69f95a61f570c21303794ee1f4dd00
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 08:15:35 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 08:16:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23bdfa8

media-sound/alsaplayer: fix modern C issue, drop LTO filter

* Fix modern C issue in configure (backport from upstream)
* Drop LTO filter. It was fixed already upstream, per the comment in the
  ebuild, in 0.99.82, but the filter wasn't dropped in 68ea65bbb1877f4048d9fec2a598505fa17ae469,
  so do that now.

Bug: https://bugs.gentoo.org/860423
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...0.99.82.ebuild => alsaplayer-0.99.82-r1.ebuild} | 14 +++++-------
 .../alsaplayer/files/alsaplayer-0.99.82-c99.patch  | 26 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.82-r1.ebuild
similarity index 87%
rename from media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
rename to media-sound/alsaplayer/alsaplayer-0.99.82-r1.ebuild
index 05d91e5ed653..fd82a83a669d 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.82-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools desktop flag-o-matic xdg
+inherit autotools desktop xdg
 
 DESCRIPTION="A heavily multi-threaded pluggable audio player"
 HOMEPAGE="https://alsaplayer.sourceforge.net/"
@@ -38,7 +38,10 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-text/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-c99.patch
+)
 
 src_prepare() {
 	default
@@ -47,11 +50,6 @@ src_prepare() {
 }
 
 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)
 

diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.82-c99.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.82-c99.patch
new file mode 100644
index 000000000000..b01a0eba939e
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.82-c99.patch
@@ -0,0 +1,26 @@
+https://github.com/alsaplayer/alsaplayer/commit/65f5db98f58cd5042454c7f834e3698e8cb153e5
+
+From 65f5db98f58cd5042454c7f834e3698e8cb153e5 Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats@offog.org>
+Date: Tue, 21 Jan 2025 14:15:42 +0000
+Subject: [PATCH] Add missing #include in libmikmod configure test.
+
+GCC 14 treats missing prototypes as an error by default, so this test
+would always fail.
+---
+ m4/libmikmod.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/m4/libmikmod.m4 b/m4/libmikmod.m4
+index e34ab4e0..c33b6f91 100644
+--- a/m4/libmikmod.m4
++++ b/m4/libmikmod.m4
+@@ -64,6 +64,7 @@ dnl
+ #include <mikmod.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ char* my_strdup (char *str)
+ {
+