| 1 |
vapier 14/04/29 03:09:40 |
| 2 |
|
| 3 |
Added: timidity++-2.14.0-pkg-config.patch |
| 4 |
Log: |
| 5 |
Move non-binary files from /usr/lib/timidity to /usr/share/timidity #377245 by Michał Górny. Fix pkg-config handling and use it to get ncurses info #497362 by Dave Kemper. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: timidity++-2.14.0-pkg-config.patch |
| 16 |
=================================================================== |
| 17 |
use $PKG_CONFIG rather than `pkg-config` |
| 18 |
|
| 19 |
https://bugs.gentoo.org/497362 |
| 20 |
get ncurses info via pkg-config while we're at it |
| 21 |
|
| 22 |
patch by Mike Frysinger <vapier@g.o> |
| 23 |
|
| 24 |
--- a/configure.in |
| 25 |
+++ b/configure.in |
| 26 |
@@ -148,6 +148,7 @@ AC_SUBST(xawresdir) |
| 27 |
|
| 28 |
# Checks for programs. |
| 29 |
AM_PATH_LISPDIR |
| 30 |
+PKG_PROG_PKG_CONFIG |
| 31 |
AC_PROG_CC |
| 32 |
AC_PROG_GCC_TRADITIONAL |
| 33 |
AC_PROG_INSTALL |
| 34 |
@@ -1318,8 +1319,8 @@ AC_MSG_CHECKING(enable_audio=jack) |
| 35 |
if test "x$au_enable_jack" = xyes; then |
| 36 |
AC_MSG_RESULT(yes) |
| 37 |
SYSEXTRAS="$SYSEXTRAS jack_a.c" |
| 38 |
- EXTRALIBS="$EXTRALIBS $(pkg-config --libs jack)" |
| 39 |
- EXTRADEFS="$EXTRADEFS -DAU_JACK $(pkg-config --cflags jack)" |
| 40 |
+ EXTRALIBS="$EXTRALIBS $(${PKG_CONFIG} --libs jack)" |
| 41 |
+ EXTRADEFS="$EXTRADEFS -DAU_JACK $(${PKG_CONFIG} --cflags jack)" |
| 42 |
else |
| 43 |
AC_MSG_RESULT(no) |
| 44 |
fi |
| 45 |
@@ -1635,60 +1636,8 @@ dnl ncurses |
| 46 |
AM_CONDITIONAL(ENABLE_NCURSES, false) |
| 47 |
CONFIG_INTERFACE(ncurses,NCURSES,n, |
| 48 |
AS_HELP_STRING([--enable-ncurses], [Enable ncurses interface (default is no)]), |
| 49 |
- [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h) |
| 50 |
- |
| 51 |
-dnl #include <ncurses/curses.h> is failure on Plamo Linux 1.3/ncurses 1.9.9e |
| 52 |
-dnl because <ncurses/curses.h> includes <unctrl.h>: |
| 53 |
-dnl /usr/include/ncurses/curses.h:34: unctrl.h: No such file or directory |
| 54 |
-dnl But surely there is unctl.h at /usr/include/ncurses/unctrl.h. |
| 55 |
-dnl configure must check ncurses header with -I/usr/include/ncurses option. |
| 56 |
- |
| 57 |
- case "$ac_cv_header_curses_h$ac_cv_header_ncurses_curses_h$ac_cv_header_ncurses_h" in |
| 58 |
- *yes*);; |
| 59 |
- *) for i in /usr/include /usr/local/include; do |
| 60 |
- if test -f "$i/ncurses/curses.h" -a -f "$i/ncurses/unctrl.h"; then |
| 61 |
- AC_MSG_WARN(ncurses test is failure. Please check config.h and common.makefile later) |
| 62 |
- CPPFLAGS="$CPPFLAGS -I$i/ncurses" |
| 63 |
- break |
| 64 |
- fi |
| 65 |
- done |
| 66 |
- ;; |
| 67 |
- esac |
| 68 |
- |
| 69 |
- AC_CHECK_LIB(ncurses,initscr,lib_curses_opt=-lncurses, |
| 70 |
- [ dnl checking pdcurses |
| 71 |
- AC_CHECK_LIB(curses,PDC_set_ctrl_break, |
| 72 |
- [ lib_curses_opt=-lcurses |
| 73 |
- AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses) |
| 74 |
- lib_user32_opt="$lib_user32_test" |
| 75 |
- ], |
| 76 |
- [ dnl checking libpdcurses |
| 77 |
- AC_CHECK_LIB(pdcurses,PDC_set_ctrl_break, |
| 78 |
- [ lib_curses_opt=-lpdcurses |
| 79 |
- AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses) |
| 80 |
- lib_user32_opt="$lib_user32_test" |
| 81 |
- ], |
| 82 |
- [ dnl OpenBSD use -lcurses instead of -lncurses. |
| 83 |
- case "$target" in |
| 84 |
- *openbsd*) |
| 85 |
- AC_CHECK_LIB(curses,initscr,lib_curses_opt=-lcurses, |
| 86 |
- [ AC_MSG_WARN(ncurses interface is not enabled) |
| 87 |
- enable_ncurses=no ]) |
| 88 |
- ;; |
| 89 |
- *) |
| 90 |
- if test "x$VCPP" = xyes || test "x$BORLANDC" = xyes || test "x$WATCOM_C" = xyes || test "x$DMC" = xyes || test "x$POCC" = xyes; then |
| 91 |
- lib_curses_opt=libpdcurses.lib |
| 92 |
- AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses) |
| 93 |
- else |
| 94 |
- AC_MSG_WARN(ncurses interface is not enabled) |
| 95 |
- enable_ncurses=no |
| 96 |
- fi |
| 97 |
- ;; |
| 98 |
- esac |
| 99 |
- ]) |
| 100 |
- ], |
| 101 |
- $lib_user32_test) |
| 102 |
- ]) |
| 103 |
+ [ CPPFLAGS="$CPPFLAGS $(${PKG_CONFIG} --cflags ncurses)" |
| 104 |
+ lib_curses_opt=$(${PKG_CONFIG} --libs ncurses) |
| 105 |
], |
| 106 |
[ LIBS="$LIBS $lib_curses_opt" |
| 107 |
case "$target" in |
| 108 |
@@ -1855,7 +1804,7 @@ CONFIG_INTERFACE(xaw,XAW,a, |
| 109 |
lib_xmu_opt=-lXmu |
| 110 |
lib_xt_opt=-lXt |
| 111 |
if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then |
| 112 |
- XFT_CFLAGS="$(pkg-config --cflags xft)"; |
| 113 |
+ XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)"; |
| 114 |
EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS) |
| 115 |
lib_xft_opt="-lXft"; |
| 116 |
fi |
| 117 |
@@ -1909,7 +1858,7 @@ CONFIG_INTERFACE(xaw,XAW,a, |
| 118 |
;; |
| 119 |
esac |
| 120 |
if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then |
| 121 |
- XFT_CFLAGS="$(pkg-config --cflags xft)"; |
| 122 |
+ XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)"; |
| 123 |
EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS) |
| 124 |
a_so_libs="$a_so_libs -lXft"; |
| 125 |
fi |
Archives