From: Michael Mair-Keimberger (asterix) Date: Mon, 2 Jan 2017 16:21:10 +0000 (+0100) Subject: media-sound/moc: remove unused patches X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6f0574abef75db59e96eaebc2d7b2bc154099835;p=gentoo.git media-sound/moc: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3305 --- 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 deleted file mode 100644 index 9ade09033976..000000000000 --- a/media-sound/moc/files/moc-2.6_alpha1-audioconvert.h.patch +++ /dev/null @@ -1,20 +0,0 @@ -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/files/moc-2.6_alpha1-fix-ncurses-underlinking.patch b/media-sound/moc/files/moc-2.6_alpha1-fix-ncurses-underlinking.patch deleted file mode 100644 index a5715ba69ab4..000000000000 --- a/media-sound/moc/files/moc-2.6_alpha1-fix-ncurses-underlinking.patch +++ /dev/null @@ -1,180 +0,0 @@ -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 - --#ifdef HAVE_NCURSESW_H -+#ifdef HAVE_NCURSESW - # include --#elif HAVE_NCURSES_H - # include --#else -+#elif HAVE_CURSES - # include - #endif -