commit: 0c415d03184760ec8865b0652071f69f2cad5e76 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Thu Jul 8 03:21:32 2021 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Thu Jul 8 03:23:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c415d03
app-accessibility/mbrola: rev bump to respect LDFLAGS and GCC Closes: https://bugs.gentoo.org/800962 Closes: https://bugs.gentoo.org/800965 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> .../mbrola/files/mbrola-3.3-Makefile.patch | 87 ++++++++++++++++++++++ app-accessibility/mbrola/mbrola-3.3-r1.ebuild | 31 ++++++++ 2 files changed, 118 insertions(+) diff --git a/app-accessibility/mbrola/files/mbrola-3.3-Makefile.patch b/app-accessibility/mbrola/files/mbrola-3.3-Makefile.patch new file mode 100644 index 00000000000..291735c69be --- /dev/null +++ b/app-accessibility/mbrola/files/mbrola-3.3-Makefile.patch @@ -0,0 +1,87 @@ +diff --git a/Makefile b/Makefile +index 47cf410..ac3eac5 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,14 +3,20 @@ + # Mbrola Speech Synthesize Makefile ( tune the #define and type "make" ) + VERSION=3.3 + ++# set CC ++CC = gcc ++ + # To test strict C ANSI compliance +-CC = gcc -ansi -pedantic ++ANSIFLAGS = -ansi -pedantic + LIB= -lm + + # This allow you to write commands like "make PURE=purify demo1" + # or "make PURE=quantify lib2" + CCPURE = $(PURE) $(CC) + ++# To test strict C ANSI compliance ++CFLAGS += $(ANSIFLAGS) ++ + ######################## + # Machine specific #define, uncomment as needed + # If your OS is not here, may be it provides some __linux or __sunos +@@ -33,7 +39,7 @@ CFLAGS += -DLITTLE_ENDIAN + # GENERAL FLAGS FOR GCC + + # Optimized code +-CFLAGS += -O6 ++#CFLAGS += -O6 + + # Debug mode with gdb + #CFLAGS += -g +@@ -128,7 +134,7 @@ BINOBJS = $(BINSRCS:%.c=Bin/Standalone/%.o) + PROJ = mbrola + + $(PROJ): install_dir $(BINOBJS) +- $(CCPURE) $(CFLAGS) -o $(MBRDIR)/$(PROJ) $(BINOBJS) $(LIB) ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o $(MBRDIR)/$(PROJ) $(BINOBJS) $(LIB) + + clean: + \rm -f $(MBRDIR)/$(PROJ) $(PROJ).a core demo* TAGS $(BIN)/lib*.o $(BINOBJS) +@@ -147,7 +153,7 @@ net: + \rm -f *~ */*~ + + $(BINDIR)/%.o: %.c +- $(CCPURE) $(CFLAGS) -o $@ -c $< ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< + + # to create the compilation directory, if necessary + install_dir: +@@ -156,25 +162,25 @@ install_dir: + fi + + lib1 : LibOneChannel/lib1.c +- $(CCPURE) $(CFLAGS) -o Bin/LibOneChannel/lib1.o -c LibOneChannel/lib1.c ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -o Bin/LibOneChannel/lib1.o -c LibOneChannel/lib1.c + + demo1: install_dir lib1 LibOneChannel/demo1.c +- $(CCPURE) $(CFLAGS) -c -o Bin/LibOneChannel/demo1.o LibOneChannel/demo1.c +- $(CCPURE) $(CFLAGS) -o demo1 Bin/LibOneChannel/demo1.o Bin/LibOneChannel/lib1.o $(LIB) ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -c -o Bin/LibOneChannel/demo1.o LibOneChannel/demo1.c ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o demo1 Bin/LibOneChannel/demo1.o Bin/LibOneChannel/lib1.o $(LIB) + + # END_WWW + + demo1b: install_dir lib1 LibOneChannel/demo1b.c +- $(CCPURE) $(CFLAGS) -c -o Bin/LibOneChannel/demo1b.o LibOneChannel/demo1b.c +- $(CCPURE) $(CFLAGS) -o demo1b Bin/LibOneChannel/demo1b.o Bin/LibOneChannel/lib1.o $(LIB) ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -c -o Bin/LibOneChannel/demo1b.o LibOneChannel/demo1b.c ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o demo1b Bin/LibOneChannel/demo1b.o Bin/LibOneChannel/lib1.o $(LIB) + + + lib2 : LibMultiChannel/lib2.c +- $(CCPURE) $(CFLAGS) -o Bin/LibMultiChannel/lib2.o -c LibMultiChannel/lib2.c ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -o Bin/LibMultiChannel/lib2.o -c LibMultiChannel/lib2.c + + demo2: install_dir lib2 LibMultiChannel/demo2.c +- $(CCPURE) $(CFLAGS) -c -o Bin/LibMultiChannel/demo2.o LibMultiChannel/demo2.c +- $(CCPURE) $(CFLAGS) -o demo2 Bin/LibMultiChannel/demo2.o Bin/LibMultiChannel/lib2.o $(LIB) ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -c -o Bin/LibMultiChannel/demo2.o LibMultiChannel/demo2.c ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o demo2 Bin/LibMultiChannel/demo2.o Bin/LibMultiChannel/lib2.o $(LIB) + # END_COMM + + # Check the integrity of the new Mbrola version by comparing the output diff --git a/app-accessibility/mbrola/mbrola-3.3-r1.ebuild b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild new file mode 100644 index 00000000000..4d2b0e0161a --- /dev/null +++ b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Speech synthesizer based on the concatenation of diphones" +HOMEPAGE="https://github.com/numediart/MBROLA"; +SRC_URI="https://github.com/numediart/MBROLA/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="app-accessibility/mbrola-voices" + +S="${WORKDIR}/MBROLA-${PV}" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch +) + +src_compile() { + emake -j1 CC="$(tc-getCC)" +} + +src_install() { + dobin Bin/mbrola + DOCS=( README.md Documentation/*.txt ) + einstalldocs +}
