| 1 |
xmw 12/11/30 01:22:46 |
| 2 |
|
| 3 |
Added: splashutils-1.5.4.4-r3-bzip2.patch |
| 4 |
Log: |
| 5 |
Revbump to add -lbz2 to libfbsplashrender.pc (bug 408283) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 62EEF090) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: splashutils-1.5.4.4-r3-bzip2.patch |
| 16 |
=================================================================== |
| 17 |
core/configure.ac | 6 ++++++ |
| 18 |
core/src/Makefile.am | 2 +- |
| 19 |
2 files changed, 7 insertions(+), 1 deletions(-) |
| 20 |
|
| 21 |
diff --git a/core/configure.ac b/core/configure.ac |
| 22 |
index c5fbb84..ae9e235 100644 |
| 23 |
--- a/core/configure.ac |
| 24 |
+++ b/core/configure.ac |
| 25 |
@@ -616,6 +616,7 @@ AS_IF( |
| 26 |
AC_SUBST([PNG_CFLAGS]) |
| 27 |
AC_SUBST([PNG_LIBS]) |
| 28 |
|
| 29 |
+BZ2_LIBS= |
| 30 |
AS_IF( |
| 31 |
[test "x${config_ttf}" = "xyes"], |
| 32 |
[ |
| 33 |
@@ -625,8 +626,13 @@ AS_IF( |
| 34 |
, |
| 35 |
[AC_MSG_ERROR([freetype was not found.])] |
| 36 |
) |
| 37 |
+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress], |
| 38 |
+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"], |
| 39 |
+ [AC_MSG_ERROR(['libbz2' library was not found.])] |
| 40 |
+ ) |
| 41 |
] |
| 42 |
) |
| 43 |
+AC_SUBST([BZ2_LIBS]) |
| 44 |
|
| 45 |
AH_TOP([#ifndef __SPLASH_CONFIG_H |
| 46 |
#define __SPLASH_CONFIG_H]) |
| 47 |
diff --git a/core/src/Makefile.am b/core/src/Makefile.am |
| 48 |
index d6ce315..349b5e7 100644 |
| 49 |
--- a/core/src/Makefile.am |
| 50 |
+++ b/core/src/Makefile.am |
| 51 |
@@ -121,6 +121,9 @@ |
| 52 |
libfbsplashrender_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version) |
| 53 |
libfbsplashrender_la_LIBADD = libfbsplash.la |
| 54 |
|
| 55 |
+libfbsplashrender_la_CFLAGS += $(BZ2_CFLAGS) |
| 56 |
+libfbsplashrender_la_LIBADD += $(BZ2_LIBS) |
| 57 |
+ |
| 58 |
libfbsplashrender_la_CFLAGS += $(JPEG_CFLAGS) |
| 59 |
libfbsplashrender_la_LIBADD += $(JPEG_LIBS) |
| 60 |
|
| 61 |
@@ -190,7 +193,7 @@ |
| 62 |
fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD |
| 63 |
fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS) |
| 64 |
fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static |
| 65 |
-fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) |
| 66 |
+fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS) |
| 67 |
|
| 68 |
if CONFIG_FBCON_DECOR |
| 69 |
fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES) |
Archives