public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mp3asm/, media-sound/mp3asm/files/
@ 2020-06-21 13:21 David Seifert
  0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-06-21 13:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4b909c3fc49f1c65afa83c48657f57361c4b84b6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 13:19:55 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 13:19:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b909c3f

media-sound/mp3asm: [QA] Run autoreconf

Closes: https://bugs.gentoo.org/724680
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../mp3asm/files/mp3asm-0.1.3-fix-autotools.patch      | 11 +++++++++++
 media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild              | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch b/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch
new file mode 100644
index 00000000000..334050d441a
--- /dev/null
+++ b/media-sound/mp3asm/files/mp3asm-0.1.3-fix-autotools.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -7,8 +7,6 @@
+ dnl Checks for programs.
+ AC_PROG_LN_S
+ 
+-CFLAGS="-g -O -Wall"
+-
+ dnl Checks for libraries.
+ 
+ dnl Checks for header files.

diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
index 467241065e7..a03af0ddc1d 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit autotools
 
-MY_PV="${PV}-1"  # Patchlevel
+MY_PV="${PV}-1" # Patchlevel
 
 DESCRIPTION="A command line tool to clean and edit mp3 files"
 HOMEPAGE="https://sourceforge.net/projects/mp3asm/"
@@ -18,11 +18,15 @@ KEYWORDS="amd64 ppc sparc x86"
 # the author uses weird numbering...
 S="${WORKDIR}/${PN}-0.1"
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+PATCHES=( "${FILESDIR}"/${P}-fix-autotools.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
-	dobin src/mp3asm
-	dodoc Changelog README
+	default
+	dodoc Changelog
 }


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/mp3asm/, media-sound/mp3asm/files/
@ 2022-10-13  5:14 Ionen Wolkens
  0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2022-10-13  5:14 UTC (permalink / raw
  To: gentoo-commits

commit:     c834681a7dc439277955ea7d03677ed3b28caa47
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 05:09:53 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 05:13:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c834681a

media-sound/mp3asm: fix build with clang

Closes: https://bugs.gentoo.org/731028
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-sound/mp3asm/files/mp3asm-0.1.3-log.patch | 8 ++++++++
 media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild       | 1 +
 2 files changed, 9 insertions(+)

diff --git a/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch b/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch
new file mode 100644
index 000000000000..2fe3c032ce79
--- /dev/null
+++ b/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch
@@ -0,0 +1,8 @@
+Lazy fix to prevent log() overlap that leads to failure with clang.
+https://bugs.gentoo.org/731028
+--- a/src/mp3asm.h
++++ b/src/mp3asm.h
+@@ -48,2 +48,3 @@
+ extern char *me; /* name of the executable */
++#define log logfile
+ extern logfile_t log; /* file to log to */

diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
index ec2af61680e5..ea03c2c4e219 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="amd64 ppc sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-autotools.patch
+	"${FILESDIR}"/${P}-log.patch
 )
 
 src_prepare() {


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

end of thread, other threads:[~2022-10-13  5:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-21 13:21 [gentoo-commits] repo/gentoo:master commit in: media-sound/mp3asm/, media-sound/mp3asm/files/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2022-10-13  5:14 Ionen Wolkens

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