| 1 |
hasufell 14/06/30 20:27:40 |
| 2 |
|
| 3 |
Added: libsdl-1.2.15-caca.patch |
| 4 |
Log: |
| 5 |
fix various multilib failures wrt #514486 |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/libsdl/files/libsdl-1.2.15-caca.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/files/libsdl-1.2.15-caca.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libsdl/files/libsdl-1.2.15-caca.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libsdl-1.2.15-caca.patch |
| 16 |
=================================================================== |
| 17 |
--- SDL-1.2.15/configure.in |
| 18 |
+++ SDL-1.2.15/configure.in |
| 19 |
@@ -1507,11 +1507,10 @@ |
| 20 |
, enable_video_caca=no) |
| 21 |
if test x$enable_video = xyes -a x$enable_video_caca = xyes; then |
| 22 |
video_caca=no |
| 23 |
- AC_PATH_PROG(CACACONFIG, caca-config, no) |
| 24 |
- if test x$CACACONFIG != xno; then |
| 25 |
+ PKG_PROG_PKG_CONFIG([0.20]) |
| 26 |
+ PKG_CHECK_MODULES(CACA, caca, has_caca_pc=yes, has_caca_pc=no]) |
| 27 |
+ if test x$has_caca_pc == xyes; then |
| 28 |
AC_MSG_CHECKING(for libcaca support) |
| 29 |
- CACA_CFLAGS=`$CACACONFIG --cflags` |
| 30 |
- CACA_LDFLAGS=`$CACACONFIG --libs` |
| 31 |
save_CFLAGS="$CFLAGS" |
| 32 |
AC_TRY_COMPILE([ |
| 33 |
#include <caca.h> |
| 34 |
@@ -1524,7 +1523,7 @@ |
| 35 |
if test x$video_caca = xyes; then |
| 36 |
AC_DEFINE(SDL_VIDEO_DRIVER_CACA) |
| 37 |
EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS" |
| 38 |
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS" |
| 39 |
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LIBS" |
| 40 |
SOURCES="$SOURCES $srcdir/src/video/caca/*.c" |
| 41 |
fi |
| 42 |
fi |
Archives