* [gentoo-commits] repo/gentoo:master commit in: media-sound/ttaenc/, media-sound/ttaenc/files/
@ 2019-12-10 23:49 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2019-12-10 23:49 UTC (permalink / raw
To: gentoo-commits
commit: 0a974963abe38bdf75897266c595c501cd32ee20
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 23:48:58 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 23:48:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a974963
media-sound/ttaenc: Port to EAPI 7
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/ttaenc-3.4.1-fix-build-system.patch | 21 +++++++++++++++++++++
media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild | 22 +++++++---------------
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch
new file mode 100644
index 00000000000..794316d2489
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,16 +2,12 @@
+ # $Id: Makefile,v 1.4 2007/04/04 00:00:00 root Exp $
+ #
+
+-CFLAGS = -Wall -O3 -fomit-frame-pointer -funroll-loops \
+- -fforce-addr -falign-functions=4 -msse
++CFLAGS += -Wall
+ TTAENC = ttaenc
+ INSDIR = /usr/bin
+
+ ttaenc: $(patsubst %.c, %.o, $(wildcard *.c))
+- gcc $^ -o $@ $(CFLAGS)
+-
+-%.o: %.c
+- gcc -c $(CFLAGS) $<
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+
+ install:
+ [ -d "$(INSDIR)" ] || mkdir $(INSDIR)
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
index d7697469bc3..34f01191dd6 100644
--- a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
inherit toolchain-funcs
@@ -12,23 +12,15 @@ SRC_URI="mirror://sourceforge/tta/${P}-src.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="sys-apps/sed"
+S="${WORKDIR}/${P}-src"
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
- sed -i -e "s:gcc:$(tc-getCC):g" \
- -e "s:-o:${LDFLAGS} -o:g" \
- Makefile || die
-}
-
-src_compile () {
- emake CFLAGS="${CFLAGS}"
+src_configure() {
+ tc-export CC
}
-src_install () {
+src_install() {
dobin ttaenc
dodoc ChangeLog-${PV} README
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ttaenc/, media-sound/ttaenc/files/
@ 2021-10-11 14:55 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-10-11 14:55 UTC (permalink / raw
To: gentoo-commits
commit: feda2a75f9c5e60c6be66ec04a69e9949d6db1ed
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Oct 11 14:55:13 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 14:55:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feda2a75
media-sound/ttaenc: fix build
Closes: https://github.com/gentoo/gentoo/pull/22445
Closes: https://bugs.gentoo.org/721988
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch | 13 +++++++++++++
media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild | 7 +++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch
new file mode 100644
index 00000000000..e6243dfae77
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-hybrid-filter.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/721988
+
+--- a/ttaenc.c
++++ b/ttaenc.c
+@@ -525,7 +525,7 @@ __inline void memshl (register int *pA, register int *pB) {
+ *pA = *pB;
+ }
+
+-__inline void hybrid_filter (fltst *fs, int *in, int mode) {
++static void hybrid_filter (fltst *fs, int *in, int mode) {
+ register int *pA = fs->dl;
+ register int *pB = fs->qm;
+ register int *pM = fs->dx;
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
index 34f01191dd6..833e61d88d2 100644
--- a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,10 @@ SLOT="0"
KEYWORDS="amd64 x86"
S="${WORKDIR}/${P}-src"
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-build-system.patch
+ "${FILESDIR}"/${P}-fix-hybrid-filter.patch
+)
src_configure() {
tc-export CC
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ttaenc/, media-sound/ttaenc/files/
@ 2021-12-02 4:43 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-12-02 4:43 UTC (permalink / raw
To: gentoo-commits
commit: 382751f8f2a3eca9691a976dc4f5e8a1558bd30c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 04:17:31 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 04:43:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382751f8
media-sound/ttaenc: fix build on musl
Closes: https://bugs.gentoo.org/646188
Thanks-to: Randy Palamar <palamar.randy <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ttaenc/files/ttaenc-3.4.1-fix-musl.patch | 22 ++++++++++++++++++++++
media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild | 3 ++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-musl.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-musl.patch
new file mode 100644
index 000000000000..674782fec91f
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-musl.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/646188
+--- a/ttaenc.h
++++ b/ttaenc.h
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <stdint.h>
+ #endif
+
+ #ifdef _MSC
+@@ -101,8 +102,8 @@
+ typedef unsigned __int32 uint32;
+ typedef unsigned __int64 uint64;
+ #else
+-typedef __uint32_t uint32;
+-typedef __uint64_t uint64;
++typedef uint32_t uint32;
++typedef uint64_t uint64;
+ #endif
+
+ #define PREDICTOR1(x, k) ((int)((((uint64)x << k) - x) >> k))
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
index 833e61d88d20..14a901304cbf 100644
--- a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -8,15 +8,16 @@ inherit toolchain-funcs
DESCRIPTION="True Audio Compressor Software"
HOMEPAGE="http://tta.sourceforge.net"
SRC_URI="mirror://sourceforge/tta/${P}-src.tgz"
+S="${WORKDIR}/${P}-src"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-S="${WORKDIR}/${P}-src"
PATCHES=(
"${FILESDIR}"/${P}-fix-build-system.patch
"${FILESDIR}"/${P}-fix-hybrid-filter.patch
+ "${FILESDIR}"/${P}-fix-musl.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-02 4:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-02 4:43 [gentoo-commits] repo/gentoo:master commit in: media-sound/ttaenc/, media-sound/ttaenc/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-10-11 14:55 David Seifert
2019-12-10 23:49 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox