| 1 |
flameeyes 08/04/20 18:16:36 |
| 2 |
|
| 3 |
Added: mpfc-1.3.7-libdir.patch mpfc-1.3.7-mathlib.patch |
| 4 |
mpfc-1.3.7-asneeded.patch |
| 5 |
Removed: mpfc-mathlib.patch |
| 6 |
Log: |
| 7 |
Add a patch to fix building with --as-needed, also patch pre-autotools files and run eautoreconf rather than patching post-autotools files which might lead to unexpected results. |
| 8 |
(Portage version: 2.1.5_rc5) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-sound/mpfc/files/mpfc-1.3.7-libdir.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: mpfc-1.3.7-libdir.patch |
| 17 |
=================================================================== |
| 18 |
Index: mpfc-1.3.7/libmpfc/Makefile.am |
| 19 |
=================================================================== |
| 20 |
--- mpfc-1.3.7.orig/libmpfc/Makefile.am |
| 21 |
+++ mpfc-1.3.7/libmpfc/Makefile.am |
| 22 |
@@ -1,7 +1,5 @@ |
| 23 |
lib_LTLIBRARIES = libmpfc.la |
| 24 |
|
| 25 |
-libdir = $(prefix)/lib/ |
| 26 |
- |
| 27 |
libmpfchdrdir = $(prefix)/include/mpfc |
| 28 |
libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \ |
| 29 |
../src/charset.h \ |
| 30 |
Index: mpfc-1.3.7/libmpfcwnd/Makefile.am |
| 31 |
=================================================================== |
| 32 |
--- mpfc-1.3.7.orig/libmpfcwnd/Makefile.am |
| 33 |
+++ mpfc-1.3.7/libmpfcwnd/Makefile.am |
| 34 |
@@ -1,5 +1,4 @@ |
| 35 |
lib_LTLIBRARIES = libmpfcwnd.la |
| 36 |
-libdir = $(prefix)/lib/ |
| 37 |
libmpfcwndhdrdir = $(prefix)/include/mpfc/libmpfcwnd |
| 38 |
libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \ |
| 39 |
wnd_def_handlers.h wnd_root.h wnd_mouse.h wnd_types.h \ |
| 40 |
Index: mpfc-1.3.7/plugins/input/audiocd/Makefile.am |
| 41 |
=================================================================== |
| 42 |
--- mpfc-1.3.7.orig/plugins/input/audiocd/Makefile.am |
| 43 |
+++ mpfc-1.3.7/plugins/input/audiocd/Makefile.am |
| 44 |
@@ -1,6 +1,6 @@ |
| 45 |
-lib_LTLIBRARIES = libaudiocd.la |
| 46 |
+plugin_LTLIBRARIES = libaudiocd.la |
| 47 |
|
| 48 |
-libdir = $(prefix)/lib/mpfc/input |
| 49 |
+plugindir = $(libdir)/mpfc/input |
| 50 |
|
| 51 |
libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h |
| 52 |
libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ |
| 53 |
Index: mpfc-1.3.7/plugins/input/mp3/Makefile.am |
| 54 |
=================================================================== |
| 55 |
--- mpfc-1.3.7.orig/plugins/input/mp3/Makefile.am |
| 56 |
+++ mpfc-1.3.7/plugins/input/mp3/Makefile.am |
| 57 |
@@ -1,6 +1,6 @@ |
| 58 |
-lib_LTLIBRARIES = libmp3.la |
| 59 |
+plugin_LTLIBRARIES = libmp3.la |
| 60 |
|
| 61 |
-libdir = $(prefix)/lib/mpfc/input |
| 62 |
+plugindir = $(libdir)/mpfc/input |
| 63 |
|
| 64 |
libmp3_la_SOURCES = mp3.c mp3.h |
| 65 |
INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd |
| 66 |
Index: mpfc-1.3.7/plugins/input/ogg/Makefile.am |
| 67 |
=================================================================== |
| 68 |
--- mpfc-1.3.7.orig/plugins/input/ogg/Makefile.am |
| 69 |
+++ mpfc-1.3.7/plugins/input/ogg/Makefile.am |
| 70 |
@@ -1,6 +1,6 @@ |
| 71 |
-lib_LTLIBRARIES = libogg_vorbis.la |
| 72 |
+plugin_LTLIBRARIES = libogg_vorbis.la |
| 73 |
|
| 74 |
-libdir = $(prefix)/lib/mpfc/input |
| 75 |
+plugindir = $(libdir)/mpfc/input |
| 76 |
|
| 77 |
libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h |
| 78 |
INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd |
| 79 |
Index: mpfc-1.3.7/plugins/input/wav/Makefile.am |
| 80 |
=================================================================== |
| 81 |
--- mpfc-1.3.7.orig/plugins/input/wav/Makefile.am |
| 82 |
+++ mpfc-1.3.7/plugins/input/wav/Makefile.am |
| 83 |
@@ -1,6 +1,6 @@ |
| 84 |
-lib_LTLIBRARIES = libwav.la |
| 85 |
+plugin_LTLIBRARIES = libwav.la |
| 86 |
|
| 87 |
-libdir = $(prefix)/lib/mpfc/input |
| 88 |
+plugindir = $(libdir)/mpfc/input |
| 89 |
|
| 90 |
libwav_la_SOURCES = wav.c wav.h |
| 91 |
libwav_la_LIBADD = @COMMON_LIBS@ |
| 92 |
Index: mpfc-1.3.7/plugins/output/alsa/Makefile.am |
| 93 |
=================================================================== |
| 94 |
--- mpfc-1.3.7.orig/plugins/output/alsa/Makefile.am |
| 95 |
+++ mpfc-1.3.7/plugins/output/alsa/Makefile.am |
| 96 |
@@ -1,6 +1,6 @@ |
| 97 |
-lib_LTLIBRARIES = libalsa.la |
| 98 |
+plugin_LTLIBRARIES = libalsa.la |
| 99 |
|
| 100 |
-libdir = $(prefix)/lib/mpfc/output |
| 101 |
+plugindir = $(libdir)/mpfc/output |
| 102 |
|
| 103 |
libalsa_la_SOURCES = alsa.c |
| 104 |
INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd |
| 105 |
Index: mpfc-1.3.7/plugins/output/disk_writer/Makefile.am |
| 106 |
=================================================================== |
| 107 |
--- mpfc-1.3.7.orig/plugins/output/disk_writer/Makefile.am |
| 108 |
+++ mpfc-1.3.7/plugins/output/disk_writer/Makefile.am |
| 109 |
@@ -1,6 +1,6 @@ |
| 110 |
-lib_LTLIBRARIES = libdisk_writer.la |
| 111 |
+plugin_LTLIBRARIES = libdisk_writer.la |
| 112 |
|
| 113 |
-libdir = $(prefix)/lib/mpfc/output |
| 114 |
+plugindir = $(libdir)/mpfc/output |
| 115 |
|
| 116 |
libdisk_writer_la_SOURCES = writer.c |
| 117 |
libdisk_writer_la_LIBADD = @COMMON_LIBS@ |
| 118 |
Index: mpfc-1.3.7/plugins/output/oss/Makefile.am |
| 119 |
=================================================================== |
| 120 |
--- mpfc-1.3.7.orig/plugins/output/oss/Makefile.am |
| 121 |
+++ mpfc-1.3.7/plugins/output/oss/Makefile.am |
| 122 |
@@ -1,6 +1,6 @@ |
| 123 |
-lib_LTLIBRARIES = liboss.la |
| 124 |
+plugin_LTLIBRARIES = liboss.la |
| 125 |
|
| 126 |
-libdir = $(prefix)/lib/mpfc/output |
| 127 |
+plugindir = $(libdir)/mpfc/output |
| 128 |
|
| 129 |
liboss_la_SOURCES = oss.c |
| 130 |
liboss_la_LIBADD = @COMMON_LIBS@ |
| 131 |
|
| 132 |
|
| 133 |
|
| 134 |
1.1 media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch |
| 135 |
|
| 136 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch?rev=1.1&view=markup |
| 137 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch?rev=1.1&content-type=text/plain |
| 138 |
|
| 139 |
Index: mpfc-1.3.7-mathlib.patch |
| 140 |
=================================================================== |
| 141 |
Index: mpfc-1.3.7/configure.in |
| 142 |
=================================================================== |
| 143 |
--- mpfc-1.3.7.orig/configure.in |
| 144 |
+++ mpfc-1.3.7/configure.in |
| 145 |
@@ -66,7 +66,6 @@ LIBS=$LIBS_save |
| 146 |
AC_ARG_ENABLE(mp3, |
| 147 |
[ --disable-mp3 Disable mp3 input plugin [default=enabled]],, |
| 148 |
enable_mp3="yes") |
| 149 |
-if test "x$enable_mp3" = xyes; then |
| 150 |
# Check for math lib |
| 151 |
LIBS_save=$LIBS |
| 152 |
AC_CHECK_HEADERS([math.h],,[AC_MSG_ERROR(*** Can't find math header ***)]) |
| 153 |
@@ -75,6 +74,7 @@ if test "x$enable_mp3" = xyes; then |
| 154 |
AC_SUBST(MATH_LIBS) |
| 155 |
LIBS=$LIBS_save |
| 156 |
|
| 157 |
+if test "x$enable_mp3" = xyes; then |
| 158 |
# Check for libmad |
| 159 |
LIBS_save=$LIBS |
| 160 |
AC_CHECK_HEADERS([mad.h],,[AC_MSG_ERROR(*** Can't find libmad header ***)]) |
| 161 |
|
| 162 |
|
| 163 |
|
| 164 |
1.1 media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch |
| 165 |
|
| 166 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch?rev=1.1&view=markup |
| 167 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch?rev=1.1&content-type=text/plain |
| 168 |
|
| 169 |
Index: mpfc-1.3.7-asneeded.patch |
| 170 |
=================================================================== |
| 171 |
Index: mpfc-1.3.7/libmpfc/Makefile.am |
| 172 |
=================================================================== |
| 173 |
--- mpfc-1.3.7.orig/libmpfc/Makefile.am |
| 174 |
+++ mpfc-1.3.7/libmpfc/Makefile.am |
| 175 |
@@ -18,6 +18,6 @@ libmpfc_la_SOURCES = cfg.c charset.c fil |
| 176 |
song_info.c string.c vfs.c logger.c cfg_rcfile.c \ |
| 177 |
plugin.c plugin_general.c command.c \ |
| 178 |
$(libmpfchdr_HEADERS) |
| 179 |
-libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ |
| 180 |
+libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ @DL_LIBS@ |
| 181 |
INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd |
| 182 |
localedir = $(datadir)/locale |
| 183 |
Index: mpfc-1.3.7/src/Makefile.am |
| 184 |
=================================================================== |
| 185 |
--- mpfc-1.3.7.orig/src/Makefile.am |
| 186 |
+++ mpfc-1.3.7/src/Makefile.am |
| 187 |
@@ -13,6 +13,7 @@ localedir = $(datadir)/locale |
| 188 |
DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" \ |
| 189 |
-DSYSCONFDIR=\"$(sysconfdir)\" @DEFS@ |
| 190 |
INCLUDES = -I$(top_builddir)/libmpfcwnd/ |
| 191 |
-mpfc_LDADD = @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@ \ |
| 192 |
+mpfc_LDADD = \ |
| 193 |
$(top_builddir)/libmpfc/libmpfc.la \ |
| 194 |
- $(top_builddir)/libmpfcwnd/libmpfcwnd.la |
| 195 |
+ $(top_builddir)/libmpfcwnd/libmpfcwnd.la \ |
| 196 |
+ @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@ |
| 197 |
|
| 198 |
|
| 199 |
|
| 200 |
-- |
| 201 |
gentoo-commits@l.g.o mailing list |
Archives