commit: 204d1ca3dc246b65cc1a107c945e8920a03a34b6 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Tue Mar 23 11:04:35 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Mar 23 11:04:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=204d1ca3
media-sound/moc: fixed compilation issue in 2.6* thanks to Stefan Michelsson <stefan <AT> michelsson.me> for the fix Closes: https://bugs.gentoo.org/716330 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../files/moc-2.6_alpha3-stdint_uint_types.patch | 39 ++++++++++++++++++++++ media-sound/moc/moc-2.6_alpha3-r2.ebuild | 15 +++++++-- media-sound/moc/moc-2.6_alpha3-r3.ebuild | 13 +++++++- 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch new file mode 100644 index 00000000000..1600af599b2 --- /dev/null +++ b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch @@ -0,0 +1,39 @@ +diff -ru a/configure.in b/configure.in +--- a/configure.in 2016-11-16 02:29:53.000000000 +0200 ++++ b/configure.in 2020-11-21 06:07:06.778092416 +0200 +@@ -152,9 +152,9 @@ + CFLAGS="$save_CFLAGS" + LDFLAGS="$LDFLAGS $BDB_LDFLAGS" + EXTRA_LIBS="$EXTRA_LIBS $BDB_LIBS" +- AC_CHECK_TYPES([u_int], , , [[#include "${srcdir}/compiler.h"] ++ AC_CHECK_TYPES([u_int,u_int32_t], , , [[#include "${srcdir}/compiler.h"] + [#include <sys/types.h>] +- [#include <db.h>]]) ++ [#include <stdint.h>]]) + fi + + AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss], +diff -ru a/tags_cache.c b/tags_cache.c +--- a/tags_cache.c 2016-11-16 02:29:53.000000000 +0200 ++++ b/tags_cache.c 2020-11-21 06:02:55.043214842 +0200 +@@ -24,6 +24,7 @@ + #include <time.h> + #include <unistd.h> + #include <dirent.h> ++#include <stdint.h> + + #ifdef HAVE_DB_H + # ifndef HAVE_U_INT +@@ -32,6 +33,12 @@ + typedef unsigned int u_int; + typedef unsigned long int u_long; + # endif ++# ifndef HAVE_U_INT32_T ++typedef uint8_t u_int8_t; ++typedef uint16_t u_int16_t; ++typedef uint32_t u_int32_t; ++typedef uint64_t u_int64_t; ++# endif + #include <db.h> + #endif + diff --git a/media-sound/moc/moc-2.6_alpha3-r2.ebuild b/media-sound/moc/moc-2.6_alpha3-r2.ebuild index 649ff0ddc2e..08d50ec155f 100644 --- a/media-sound/moc/moc-2.6_alpha3-r2.ebuild +++ b/media-sound/moc/moc-2.6_alpha3-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools + MY_P=${PN}-${PV/_/-} DESCRIPTION="Music On Console - ncurses interface for playing audio files" HOMEPAGE="https://moc.daper.net"; @@ -57,7 +59,16 @@ DEPEND="${RDEPEND} " S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/ffmpeg4.patch" ) +PATCHES=( + "${FILESDIR}/ffmpeg4.patch" + "${FILESDIR}/${P}-stdint_uint_types.patch" +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} src_configure() { local myconf=( diff --git a/media-sound/moc/moc-2.6_alpha3-r3.ebuild b/media-sound/moc/moc-2.6_alpha3-r3.ebuild index 76ce4397128..dcbc7632857 100644 --- a/media-sound/moc/moc-2.6_alpha3-r3.ebuild +++ b/media-sound/moc/moc-2.6_alpha3-r3.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit autotools + MY_P=${PN}-${PV/_/-} DESCRIPTION="Music On Console - ncurses interface for playing audio files" HOMEPAGE="https://moc.daper.net"; @@ -58,7 +60,16 @@ DEPEND="${RDEPEND} " S=${WORKDIR}/${MY_P} -PATCHES=( "${FILESDIR}/ffmpeg4.patch" ) +PATCHES=( + "${FILESDIR}/ffmpeg4.patch" + "${FILESDIR}/${P}-stdint_uint_types.patch" +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} src_configure() { local myconf=(
