[gentoo-commits] repo/gentoo:master commit in: media-sound/moc/, media-sound/moc/files/
commit: 204d1ca3dc246b65cc1a107c945e8920a03a34b6
Author: Miroslav Šulc gentoo org>
AuthorDate: Tue Mar 23 11:04:35 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Mar 23 11:04:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=204d1ca3
media-sound/moc: fixed compilation issue in 2.6*
thanks to Stefan Michelsson 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 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 000..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.0 +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 ]
+- [#include ]])
++ [#include ]])
+ 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.0 +0200
b/tags_cache.c 2020-11-21 06:02:55.043214842 +0200
+@@ -24,6 +24,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #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
+ #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=(
[gentoo-commits] repo/gentoo:master commit in: media-sound/moc/, media-sound/moc/files/
commit: 6b3d75d72176eea6a04efd494105f0af5781255d
Author: David Seifert gentoo org>
AuthorDate: Sun Feb 21 23:22:25 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sun Feb 21 23:22:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3d75d7
media-sound/moc: Patch for converting 'audioconvert.h' to 'channel_layout.h'
Gentoo-Bug: 575328
Package-Manager: portage-2.2.27
.../moc/files/moc-2.6_alpha1-audioconvert.h.patch| 20
media-sound/moc/moc-2.6_alpha1-r1.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
new file mode 100644
index 000..9ade090
--- /dev/null
+++ b/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch
@@ -0,0 +1,20 @@
+Patch for building with latest FFmpeg 3.0
+https://bugs.gentoo.org/show_bug.cgi?id=575328
+
+Inspired by
+https://raw.githubusercontent.com/Homebrew/patches/1282e60/moc/moc-2.5.0.diff
+
+We can unconditionally depend on the existence of 'channel_layout.h',
+as even the oldest version in the Gentoo tree contains this header.
+
+--- moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
moc-2.6-alpha1/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -66,7 +66,7 @@
+ GCC_DIAG_ON(deprecated-declarations)
+ #include
+ #ifdef HAVE_AV_GET_CHANNEL_LAYOUT_NB_CHANNELS
+-#include
++#include
+ #endif
+
+ /* FFmpeg also likes common names, without that, our common.h and log.h
diff --git a/media-sound/moc/moc-2.6_alpha1-r1.ebuild
b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
index a5b24cd..3901a15 100644
--- a/media-sound/moc/moc-2.6_alpha1-r1.ebuild
+++ b/media-sound/moc/moc-2.6_alpha1-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-fix-ncurses-underlinking.patch"
+ "${FILESDIR}/${P}-audioconvert.h.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
[gentoo-commits] repo/gentoo:master commit in: media-sound/moc/, media-sound/moc/files/
commit: 3f0f37a8631c9ed6b863bbfe3ac13d57eafb145b Author: David Seifert gentoo org> AuthorDate: Wed Jan 27 23:15:44 2016 + Commit: David Seifert gentoo org> CommitDate: Wed Jan 27 23:16:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0f37a8 media-sound/moc: Use pkgconfig to detect sys-libs/ncurses flags Gentoo-Bug: 521860 * EAPI=6 * Remove .la files unconditionally Package-Manager: portage-2.2.27 .../moc-2.6_alpha1-fix-ncurses-underlinking.patch | 180 + media-sound/moc/moc-2.6_alpha1-r1.ebuild | 90 +++ 2 files changed, 270 insertions(+) diff --git a/media-sound/moc/files/moc-2.6_alpha1-fix-ncurses-underlinking.patch b/media-sound/moc/files/moc-2.6_alpha1-fix-ncurses-underlinking.patch new file mode 100644 index 000..a5715ba --- /dev/null +++ b/media-sound/moc/files/moc-2.6_alpha1-fix-ncurses-underlinking.patch @@ -0,0 +1,180 @@ +Fix missing ncurses underlinking issue caused by broken detection mechanisms. +https://bugs.gentoo.org/show_bug.cgi?id=521860 + +--- moc-2.6-alpha1/configure.ac moc-2.6-alpha1/configure.ac +@@ -340,17 +340,13 @@ + [Define if we have __attribute__ extension])]) + + dnl ncurses +-MP_WITH_CURSES +-if test -z "$CURSES_LIB" +-then +- AC_MSG_ERROR([You need curses/ncurses library and header files.]) +-else +- AC_CHECK_LIB([$CURSES_LIB], [set_escdelay], +- AC_DEFINE([HAVE_SET_ESCDELAY], 1, [Define if you have set_escdelay.]), +- [AC_CHECK_FUNC([setenv], , +- AC_MSG_ERROR([Required function setenv not found.]))]) +- EXTRA_LIBS="$EXTRA_LIBS -l$CURSES_LIB" +-fi ++AC_ARG_WITH([ncursesw], ++ AS_HELP_STRING([--without-ncursesw], [Don't use ncursesw (UTF-8 support)])) ++AS_IF([test "x$with_ncursesw" != "xno"], ++ [PKG_CHECK_MODULES([CURSES],[ncursesw]) ++ AC_DEFINE([HAVE_NCURSESW], [1], [Define if you have ncursesw])], ++ [PKG_CHECK_MODULES([CURSES],[ncurses]) ++ AC_DEFINE([HAVE_CURSES], [1], [Define if you have curses])]) + + dnl popt + AC_CHECK_LIB([popt], [poptGetContext], [true], [POPT_MISSING="yes"]) +--- moc-2.6-alpha1/interface_elements.c moc-2.6-alpha1/interface_elements.c +@@ -37,11 +37,10 @@ + # define _XOPEN_SOURCE_EXTENDED /* for wget_wch() */ + #endif + +-#ifdef HAVE_NCURSESW_H ++#ifdef HAVE_NCURSESW + # include +-#elif HAVE_NCURSES_H + # include +-#elif HAVE_CURSES_H ++#elif HAVE_CURSES + # include + #endif + +--- moc-2.6-alpha1/interface_elements.h moc-2.6-alpha1/interface_elements.h +@@ -1,11 +1,10 @@ + #ifndef INTERFACE_ELEMENTS_H + #define INTERFACE_ELEMENTS_H + +-#ifdef HAVE_NCURSESW_H ++#ifdef HAVE_NCURSESW + # include +-#elif HAVE_NCURSES_H + # include +-#elif HAVE_CURSES_H ++#elif HAVE_CURSES + # include + #endif + +--- moc-2.6-alpha1/keys.c moc-2.6-alpha1/keys.c +@@ -17,11 +17,10 @@ + #include + #include + +-#ifdef HAVE_NCURSESW_H ++#ifdef HAVE_NCURSESW + # include +-#elif HAVE_NCURSES_H + # include +-#elif HAVE_CURSES_H ++#elif HAVE_CURSES + # include + #endif + +--- moc-2.6-alpha1/Makefile.am moc-2.6-alpha1/Makefile.am +@@ -2,6 +2,7 @@ + SUBDIRS = themes decoder_plugins + AM_CPPFLAGS = -DSYSTEM_THEMES_DIR=\"$(pkgdatadir)/themes\" \ + -DPLUGIN_DIR=\"$(plugindir)/$(DECODER_PLUGIN_DIR)\" ++AM_CFLAGS = @CURSES_CFLAGS@ + + bin_PROGRAMS = mocp + mocp_SOURCES = log.c \ +@@ -81,7 +82,7 @@ +jack.c \ +jack.h + man_MANS = mocp.1 +-mocp_LDADD = @EXTRA_OBJS@ -lltdl ++mocp_LDADD = @EXTRA_OBJS@ -lltdl @CURSES_LIBS@ + mocp_DEPENDENCIES = @EXTRA_OBJS@ + mocp_LDFLAGS = @EXTRA_LIBS@ $(RCC_LIBS) -export-dynamic + EXTRA_DIST = README_equalizer mocp.1 THANKS keymap.example Doxyfile \ +--- moc-2.6-alpha1/menu.c moc-2.6-alpha1/menu.c +@@ -17,11 +17,10 @@ + #include + #include + +-#ifdef HAVE_NCURSESW_H ++#ifdef HAVE_NCURSESW + # include +-#elif HAVE_NCURSES_H + # include +-#elif HAVE_CURSES_H ++#elif HAVE_CURSES + # include + #endif + +--- moc-2.6-alpha1/menu.h moc-2.6-alpha1/menu.h +@@ -1,11 +1,10 @@ + #ifndef MENU_H + #define MENU_H + +-#ifdef HAVE_NCURSESW_H ++#ifdef HAVE_NCURSESW + # include +-#elif HAVE_NCURSES_H + # include +-#elif HAVE_CURSES_H ++#elif HAVE_CURSES + # include + #endif + +--- moc-2.6-alpha1/themes.c moc-2.6-alpha1/themes.c +@@ -13,11 +13,10 @@ + # include "config.h" + #endif + +-#ifdef HAVE_NCURSESW_H ++#ifdef HAVE_NCURSESW + # include +-#elif HAVE_NCURSES_H + # include +-#elif HAVE_CURSES_H ++#elif HAVE_CURSES + # include + #endif + +--- moc-2.6-alpha1/utf8.c moc-2.6-alpha1/utf8.c +@@ -30,13 +30,13 @@ + # include + #endif + +-#ifdef HAVE_NCURSESW_H ++#ifdef HAVE_NCURSESW + # include +-#elif HAVE_NCURSES_H + # include +-#else ++#elif HAVE_CURSES + # include + #endif ++ + #include + #include + #include +--- moc-2.6-alpha1/utf8.h moc-2.6-alpha1/utf8.h +@@ -1,11 +1,10 @@ + #ifndef UTF8_H + #define UTF8_H +
