[gentoo-commits] repo/gentoo:master commit in: media-sound/mpfc/, media-sound/mpfc/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/mpfc/, media-sound/mpfc/files/

[David Seifert]

commit:     f948795a7c099bcbb245ee0a02b39951547734f9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 23:41:24 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 23:42:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f948795a

media-sound/mpfc: Add missing AC_SEARCH_LIBS for libm to prevent underlinking

Gentoo-Bug: 529490
In addition, correct ncurses underlinking by properly
checking via PKG_CHECK_MODULES. Also fix QA warnings caused
by implicit declarations.

Package-Manager: portage-2.2.26

 .../mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch |  32 ++++
 .../mpfc-1.3.8.1-qa-implicit-declarations.patch    | 193 +++++++++++++++++++++
 media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild            |  58 +++++++
 3 files changed, 283 insertions(+)

diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
new file mode 100644
index 0000000..0fb96ae
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
@@ -0,0 +1,32 @@
+Fix libm (and ncurses) underlinking issues.
+https://bugs.gentoo.org/show_bug.cgi?id=529490
+
+--- mpfc-1.3.8.1/configure.ac
++++ mpfc-1.3.8.1/configure.ac
+@@ -13,13 +13,13 @@
+ COMMON_LIBS=""
+ AC_SUBST(COMMON_LIBS)
+ 
++dnl Check for libm for rintf()
++AC_SEARCH_LIBS([rintf], [m], [], [
++	AC_MSG_ERROR([unable to find the rintf() function])
++])
++
+ # Check for ncurses
+-LIBS_save=$LIBS
+-AC_CHECK_HEADERS([curses.h],,[AC_MSG_ERROR(*** Can't find curses.h ***)])
+-AC_CHECK_LIB(ncursesw, waddch,,[AC_MSG_ERROR(*** Can't find ncurses library ***)])
+-CURSES_LIBS="-lncursesw"
+-AC_SUBST(CURSES_LIBS)
+-LIBS=$LIBS_save
++PKG_CHECK_MODULES([CURSES], [ncursesw])
+ 
+ # Check for pthread
+ LIBS_save=$LIBS
+--- mpfc-1.3.8.1/libmpfcwnd/Makefile.am
++++ mpfc-1.3.8.1/libmpfcwnd/Makefile.am
+@@ -1,3 +1,4 @@
++AM_CPPFLAGS = @CURSES_CFLAGS@
+ lib_LTLIBRARIES = libmpfcwnd.la
+ libmpfcwndhdrdir = $(includedir)/mpfc/libmpfcwnd
+ libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \

diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
new file mode 100644
index 0000000..3195858
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
@@ -0,0 +1,193 @@
+Fix QA warnings caused by implicit declarations, such as
+
+* QA Notice: Package triggers severe warnings which indicate that it
+*            may exhibit random runtime failures.
+* wnd.c:1081:4: warning: implicit declaration of function ‘add_wch’ [-Wimplicit-function-declaration]
+
+--- mpfc-1.3.8.1/libmpfc/file_http.c
++++ mpfc-1.3.8.1/libmpfc/file_http.c
+@@ -35,6 +35,7 @@
+ #include "file.h"
+ #include "file_http.h"
+ #include "mystring.h"
++#include "util.h"
+ 
+ /* Get file data */
+ #define FHTTP_GET_DATA(data, file) \
+--- mpfc-1.3.8.1/libmpfc/id3.c
++++ mpfc-1.3.8.1/libmpfc/id3.c
+@@ -26,6 +26,7 @@
+ #include <unicode/ucnv.h>
+ #include "types.h"
+ #include "myid3.h"
++#include "util.h"
+ 
+ /* Create a new empty tag */
+ id3_tag_t *id3_new( void )
+--- mpfc-1.3.8.1/libmpfc/logger.c
++++ mpfc-1.3.8.1/libmpfc/logger.c
+@@ -28,6 +28,8 @@
+ #include "cfg.h"
+ #include "logger.h"
+ 
++int logger_get_level( logger_t *log );
++
+ /* Initialize logger */
+ logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
+ {
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.h
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.h
+@@ -23,7 +23,6 @@
+ #ifndef __SG_MPFC_WND_H__
+ #define __SG_MPFC_WND_H__
+ 
+-#define _XOPEN_SOURCE_EXTENDED
+ #include <curses.h>
+ #include "types.h"
+ #include "cfg.h"
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.c
+@@ -29,6 +29,8 @@
+ #include "logger.h"
+ #include "wnd.h"
+ #include "wnd_root.h"
++#include "util.h"
++#include <curses.h>
+ 
+ /* Initialize window system and create root window */
+ wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
+@@ -28,6 +28,8 @@
+ #include "wnd_dlgitem.h"
+ #include "wnd_editbox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+ 
+ /* Create a new combo box */
+ combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter, 
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
+@@ -24,7 +24,6 @@
+ #include <fnmatch.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#define __USE_GNU
+ #include <string.h>
+ #include <unistd.h>
+ #include "types.h"
+@@ -33,6 +32,8 @@
+ #include "wnd_editbox.h"
+ #include "wnd_filebox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+ 
+ /* Create a new file box */
+ filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include "wnd.h"
++#include "util.h"
+ 
+ /* Initialize mouse */
+ wnd_mouse_data_t *wnd_mouse_init( wnd_global_data_t *global )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
+@@ -32,6 +32,7 @@
+ #include "types.h"
+ #include "wnd.h"
+ #include "wnd_print.h"
++#include "util.h"
+ 
+ /* Move cursor to a specified position */
+ void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
+@@ -25,6 +25,7 @@
+ #include "wnd_dialog.h"
+ #include "wnd_editbox.h"
+ #include "wnd_repval.h"
++#include "wnd_label.h"
+ 
+ /* Create a repeat value dialog */
+ dialog_t *wnd_repval_new( wnd_t *parent, void *on_ok, int dig )
+--- mpfc-1.3.8.1/src/browser.c
++++ mpfc-1.3.8.1/src/browser.c
+@@ -24,6 +24,7 @@
+ #include <glob.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <fnmatch.h>
+ #include "types.h"
+ #include "browser.h"
+ #include "help_screen.h"
+--- mpfc-1.3.8.1/src/info_rw_thread.c
++++ mpfc-1.3.8.1/src/info_rw_thread.c
+@@ -27,6 +27,7 @@
+ #include "info_rw_thread.h"
+ #include "player.h"
+ #include "song.h"
++#include "util.h"
+ 
+ /* Thread queue */
+ irw_queue_t *irw_head, *irw_tail;
+--- mpfc-1.3.8.1/src/player.c
++++ mpfc-1.3.8.1/src/player.c
+@@ -35,6 +35,7 @@
+ #include "command.h"
+ #include "eqwnd.h"
+ #include "file.h"
++#include "genp.h"
+ #include "help_screen.h"
+ #include "logger.h"
+ #include "logger_view.h"
+@@ -57,8 +58,13 @@
+ #include "wnd_listbox.h"
+ #include "wnd_multiview_dialog.h"
+ #include "wnd_radio.h"
++#include "wnd_repval.h"
+ #include "wnd_root.h"
+ #include "xconvert.h"
++#include "info_rw_thread.h"
++
++void pmng_hook( pmng_t *pmng, char *hook );
++void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
+ 
+ /*****
+  *
+--- mpfc-1.3.8.1/src/plist.c
++++ mpfc-1.3.8.1/src/plist.c
+@@ -36,6 +36,7 @@
+ #include "util.h"
+ #include "undo.h"
+ #include "wnd.h"
++#include "info_rw_thread.h"
+ 
+ extern void pmng_hook( pmng_t *pmng, char *hook );
+ 
+--- mpfc-1.3.8.1/src/util.h
++++ mpfc-1.3.8.1/src/util.h
+@@ -26,6 +26,8 @@
+ #include <stdio.h>
+ #include "types.h"
+ 
++int mbslen( char *str );
++
+ /* Write message to log file */
+ void util_log( char *format, ... );
+ 
+--- mpfc-1.3.8.1/src/vfs.h
++++ mpfc-1.3.8.1/src/vfs.h
+@@ -36,6 +36,7 @@
+ } vfs_t;
+ 
+ /* Check that input plugin uses VFS */
++dword inp_get_flags( in_plugin_t *p );
+ #define VFS_INP_HAS(inp)	(inp_get_flags(inp) & INP_VFS)
+ 
+ /* Get logger object */

diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
new file mode 100644
index 0000000..e92361e
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Music Player For Console"
+HOMEPAGE="http://mpfc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	flac? ( media-libs/flac )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	mad? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis )
+	sys-libs/ncurses:0=[unicode]
+	dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-underlinking.patch"
+	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable cdda audiocd) \
+		$(use_enable flac) \
+		$(use_enable gpm) \
+		$(use_enable mad mp3) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable static-libs static) \
+		$(use_enable vorbis ogg) \
+		$(use_enable wav)
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins mpfcrc
+
+	prune_libtool_files --all
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/mpfc/, media-sound/mpfc/files/

[David Seifert]

commit:     11b7949c20c54405763d8b5425da5cb1ad34f0e3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 19:06:31 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 19:07:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b7949c

media-sound/mpfc: Remove old

Closes: https://bugs.gentoo.org/648298
Package-Manager: Portage-2.3.30, Repoman-2.3.9

 media-sound/mpfc/Manifest                        |   1 -
 media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch  |  20 ----
 media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch |  26 ------
 media-sound/mpfc/files/mpfc-1.3.7-libdir.patch   | 113 -----------------------
 media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch  |  20 ----
 media-sound/mpfc/files/mpfc-gcc4.patch           |  13 ---
 media-sound/mpfc/mpfc-1.3.7-r1.ebuild            |  55 -----------
 7 files changed, 248 deletions(-)

diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
index e3105eef53a..adbbd7aa1bc 100644
--- a/media-sound/mpfc/Manifest
+++ b/media-sound/mpfc/Manifest
@@ -1,2 +1 @@
-DIST mpfc-1.3.7.tar.gz 869364 BLAKE2B 4ce61a80efad417c138b51ae1b994a2db64ed0ed07e5d0af47d69569edb1f2f8fed6a653ac18ef5c10bf2cdc83f21ded71947614c43fe9a79efeee5c9f27da81 SHA512 bef536c639a4d2422d0e04ca9aa6c18cee28e4936349ec796a4a25dd069fe0a7996c0d32b18b29b25f5acfa11e4fd4fe78becfe447d6726574bc320041fdf3d6
 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573

diff --git a/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch b/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch
deleted file mode 100644
index 8bca2f38036..00000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/input/audiocd/audiocd.c
-+++ plugins/input/audiocd/audiocd.c
-@@ -21,6 +21,7 @@
-  */
- 
- #include <stdio.h>
-+#include <limits.h> /* cdrom.h and INT_MAX */
- #include <linux/cdrom.h>
- #include <errno.h>
- #include <string.h>
---- plugins/input/audiocd/audiocd.h
-+++ plugins/input/audiocd/audiocd.h
-@@ -23,6 +23,7 @@
- #ifndef __SG_MPFC_AUDIOCD_H__
- #define __SG_MPFC_AUDIOCD_H__
- 
-+#include <limits.h> /* cdrom.h and INT_MAX */
- #include <linux/cdrom.h>
- #include "types.h"
- #include "logger.h"

diff --git a/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch b/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch
deleted file mode 100644
index d681e8784f7..00000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: mpfc-1.3.7/libmpfc/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/libmpfc/Makefile.am
-+++ mpfc-1.3.7/libmpfc/Makefile.am
-@@ -18,6 +18,6 @@ libmpfc_la_SOURCES = cfg.c charset.c fil
- 					 song_info.c string.c vfs.c logger.c cfg_rcfile.c \
- 					 plugin.c plugin_general.c command.c \
- 					 $(libmpfchdr_HEADERS)
--libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ 
-+libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ @DL_LIBS@
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
- localedir = $(datadir)/locale
-Index: mpfc-1.3.7/src/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/src/Makefile.am
-+++ mpfc-1.3.7/src/Makefile.am
-@@ -13,6 +13,7 @@ localedir = $(datadir)/locale
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" \
- 	   -DSYSCONFDIR=\"$(sysconfdir)\" @DEFS@
- INCLUDES = -I$(top_builddir)/libmpfcwnd/
--mpfc_LDADD = @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@ \
-+mpfc_LDADD =  \
- 			 $(top_builddir)/libmpfc/libmpfc.la \
--			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la
-+			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la \
-+                         @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@

diff --git a/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch b/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch
deleted file mode 100644
index 52a31846315..00000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: mpfc-1.3.7/libmpfc/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/libmpfc/Makefile.am
-+++ mpfc-1.3.7/libmpfc/Makefile.am
-@@ -1,7 +1,5 @@
- lib_LTLIBRARIES = libmpfc.la
- 
--libdir = $(prefix)/lib/
--
- libmpfchdrdir = $(prefix)/include/mpfc
- libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \
- 					 ../src/charset.h \
-Index: mpfc-1.3.7/libmpfcwnd/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/libmpfcwnd/Makefile.am
-+++ mpfc-1.3.7/libmpfcwnd/Makefile.am
-@@ -1,5 +1,4 @@
- lib_LTLIBRARIES = libmpfcwnd.la
--libdir = $(prefix)/lib/
- libmpfcwndhdrdir = $(prefix)/include/mpfc/libmpfcwnd
- libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
- 						wnd_def_handlers.h wnd_root.h wnd_mouse.h wnd_types.h \
-Index: mpfc-1.3.7/plugins/input/audiocd/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/audiocd/Makefile.am
-+++ mpfc-1.3.7/plugins/input/audiocd/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libaudiocd.la
-+plugin_LTLIBRARIES = libaudiocd.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h
- libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@
-Index: mpfc-1.3.7/plugins/input/mp3/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/mp3/Makefile.am
-+++ mpfc-1.3.7/plugins/input/mp3/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libmp3.la
-+plugin_LTLIBRARIES = libmp3.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libmp3_la_SOURCES = mp3.c mp3.h 
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-Index: mpfc-1.3.7/plugins/input/ogg/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/ogg/Makefile.am
-+++ mpfc-1.3.7/plugins/input/ogg/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libogg_vorbis.la
-+plugin_LTLIBRARIES = libogg_vorbis.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-Index: mpfc-1.3.7/plugins/input/wav/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/input/wav/Makefile.am
-+++ mpfc-1.3.7/plugins/input/wav/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libwav.la
-+plugin_LTLIBRARIES = libwav.la
- 
--libdir = $(prefix)/lib/mpfc/input
-+plugindir = $(libdir)/mpfc/input
- 
- libwav_la_SOURCES = wav.c wav.h
- libwav_la_LIBADD = @COMMON_LIBS@
-Index: mpfc-1.3.7/plugins/output/alsa/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/output/alsa/Makefile.am
-+++ mpfc-1.3.7/plugins/output/alsa/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libalsa.la
-+plugin_LTLIBRARIES = libalsa.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+plugindir = $(libdir)/mpfc/output
- 
- libalsa_la_SOURCES = alsa.c
- INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
-Index: mpfc-1.3.7/plugins/output/disk_writer/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/output/disk_writer/Makefile.am
-+++ mpfc-1.3.7/plugins/output/disk_writer/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libdisk_writer.la
-+plugin_LTLIBRARIES = libdisk_writer.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+plugindir = $(libdir)/mpfc/output
- 
- libdisk_writer_la_SOURCES = writer.c
- libdisk_writer_la_LIBADD = @COMMON_LIBS@
-Index: mpfc-1.3.7/plugins/output/oss/Makefile.am
-===================================================================
---- mpfc-1.3.7.orig/plugins/output/oss/Makefile.am
-+++ mpfc-1.3.7/plugins/output/oss/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = liboss.la
-+plugin_LTLIBRARIES = liboss.la
- 
--libdir = $(prefix)/lib/mpfc/output
-+plugindir = $(libdir)/mpfc/output
- 
- liboss_la_SOURCES = oss.c
- liboss_la_LIBADD = @COMMON_LIBS@

diff --git a/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch b/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch
deleted file mode 100644
index 09471407398..00000000000
--- a/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: mpfc-1.3.7/configure.in
-===================================================================
---- mpfc-1.3.7.orig/configure.in
-+++ mpfc-1.3.7/configure.in
-@@ -66,7 +66,6 @@ LIBS=$LIBS_save
- AC_ARG_ENABLE(mp3, 
- [	--disable-mp3		Disable mp3 input plugin [default=enabled]],,
- 		enable_mp3="yes")
--if test "x$enable_mp3" = xyes; then
- 	# Check for math lib
- 	LIBS_save=$LIBS
- 	AC_CHECK_HEADERS([math.h],,[AC_MSG_ERROR(*** Can't find math header ***)])
-@@ -75,6 +74,7 @@ if test "x$enable_mp3" = xyes; then
- 	AC_SUBST(MATH_LIBS)
- 	LIBS=$LIBS_save
- 
-+if test "x$enable_mp3" = xyes; then
- 	# Check for libmad
- 	LIBS_save=$LIBS
- 	AC_CHECK_HEADERS([mad.h],,[AC_MSG_ERROR(*** Can't find libmad header ***)])

diff --git a/media-sound/mpfc/files/mpfc-gcc4.patch b/media-sound/mpfc/files/mpfc-gcc4.patch
deleted file mode 100644
index 5cb1efb6834..00000000000
--- a/media-sound/mpfc/files/mpfc-gcc4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mpfc-1.3.7/plugins/input/audiocd/audiocd.c.old	2006-11-05 21:13:25.000000000 +0100
-+++ mpfc-1.3.7/plugins/input/audiocd/audiocd.c	2006-11-05 21:13:35.000000000 +0100
-@@ -60,8 +60,8 @@
- /* Tracks information array */
- struct acd_trk_info_t acd_tracks_info[ACD_MAX_TRACKS];
- int acd_num_tracks = 0;
--static int acd_cur_track = -1;
--static bool_t acd_info_read = FALSE;
-+int acd_cur_track = -1;
-+bool_t acd_info_read = FALSE;
- 
- /* Current time */
- static int acd_time = 0;

diff --git a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
deleted file mode 100644
index 9dc80425d13..00000000000
--- a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Music Player For Console"
-HOMEPAGE="http://mpfc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alsa gpm mad vorbis oss wav cdda nls"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	mad? ( media-libs/libmad )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's:../src/file.h ../src/file.h:../src/file.h:' \
-		libmpfc/Makefile.am || die #335449
-
-	epatch "${FILESDIR}"/${P}-libdir.patch \
-		"${FILESDIR}"/${PN}-gcc4.patch \
-		"${FILESDIR}"/${P}-mathlib.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-INT_MAX.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa) \
-		$(use_enable gpm) \
-		$(use_enable mad mp3) \
-		$(use_enable vorbis ogg) \
-		$(use_enable oss) \
-		$(use_enable wav) \
-		$(use_enable cdda audiocd) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	insinto /etc
-	doins mpfcrc || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/mpfc/, media-sound/mpfc/files/

[Sam James]

commit:     d96581112c9694ea14771d83b0df107ac12bb20f
Author:     NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Mon Apr  1 17:20:03 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May  8 16:56:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9658111

media-sound/mpfc: Fix incompatible-pointer-types

Closes: https://bugs.gentoo.org/921021
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36045
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../mpfc-1.3.8.1-c99-incompatible-pointers.patch   | 49 ++++++++++++++++++++++
 media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild            |  1 +
 2 files changed, 50 insertions(+)

diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch
new file mode 100644
index 000000000000..2145184c2528
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-c99-incompatible-pointers.patch
@@ -0,0 +1,49 @@
+diff -ur  mpfc-1.3.8.1.orig/src/player.c mpfc-1.3.8.1/src/player.c
+--- a/src/player.c	2024-04-01 17:05:09.855312224 +0000
++++ b/src/player.c	2024-04-01 17:08:54.586992161 +0000
+@@ -2673,14 +2673,14 @@
+ 	{
+ 		player_pmng_view_t *v = &views[i];
+ 		int index = v->m_list->m_cursor;
+-		plugin_t *p;
++		general_plugin_t *p;
+ 
+ 		/* Get info */
+ 		if (!v->m_list->m_list_size)
+ 			continue;
+-		p = (plugin_t *)v->m_list->m_list[index].m_data;
+-		char *author = plugin_get_author(p);
+-		char *desc = plugin_get_desc(p);
++		p = v->m_list->m_list[index].m_data;
++		char *author = plugin_get_author(&p->m_plugin);
++		char *desc = plugin_get_desc(&p->m_plugin);
+ 
+ 		/* Set labels */
+ 		editbox_set_text(v->m_author, author == NULL ? "" : author);
+@@ -2688,7 +2688,7 @@
+ 
+ 		/* Synchronize effect checkbox */
+ 		if (i == PLAYER_PMNG_EFFECT)
+-			v->m_enabled_cb->m_checked = pmng_is_effect_enabled(player_pmng, p);
++			v->m_enabled_cb->m_checked = pmng_is_effect_enabled(player_pmng, &p->m_plugin);
+ 		else if (i == PLAYER_PMNG_GENERAL)
+ 		{
+ 			bool_t started = genp_is_started(p);
+@@ -3198,7 +3198,7 @@
+ 	player_pmng_view_t *v = NULL;
+ 	player_pmng_view_t *views; 
+ 	wnd_t *dlg;
+-	plugin_t *p;
++	general_plugin_t *p;
+ 	int index;
+ 
+ 	/* Determine our view */
+@@ -3212,7 +3212,7 @@
+ 	index = v->m_list->m_cursor;
+ 	if (!v->m_list->m_list_size)
+ 		return WND_MSG_RETCODE_OK;
+-	p = (plugin_t *)v->m_list->m_list[index].m_data;
++	p = v->m_list->m_list[index].m_data;
+ 
+ 	/* Change state */
+ 	if (!genp_is_started(p))

diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
index 7c1422cff42e..b7120a8c0b73 100644
--- a/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r5.ebuild
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-underlinking.patch"
 	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+	"${FILESDIR}/${P}-c99-incompatible-pointers.patch"
 )
 
 src_prepare() {