| 1 |
flameeyes 10/12/01 05:10:42 |
| 2 |
|
| 3 |
Added: tvtime-1.0.2-autotools.patch |
| 4 |
Log: |
| 5 |
Fix (twice) the build problems with libtool 2.4 and automake 1.7: don't require libtool at all (since there are no libraries built), but also allow building with automake 1.11; both fixes are actually needed, since disabling libtool causes a couple of side problems. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-tv/tvtime/files/tvtime-1.0.2-autotools.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2-autotools.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/tvtime/files/tvtime-1.0.2-autotools.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: tvtime-1.0.2-autotools.patch |
| 16 |
=================================================================== |
| 17 |
Index: tvtime-1.0.2/src/Makefile.am |
| 18 |
=================================================================== |
| 19 |
--- tvtime-1.0.2.orig/src/Makefile.am |
| 20 |
+++ tvtime-1.0.2/src/Makefile.am |
| 21 |
@@ -19,9 +19,6 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@ |
| 22 |
tmpdir = /tmp |
| 23 |
localedir = $(datadir)/locale |
| 24 |
|
| 25 |
-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags` |
| 26 |
-TTF_LIBS = `$(FREETYPE_CONFIG) --libs` |
| 27 |
- |
| 28 |
# Set the following if you want to specify an additional font directory |
| 29 |
# FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/' |
| 30 |
|
| 31 |
@@ -76,20 +73,20 @@ tvtime_SOURCES = $(COMMON_SRCS) $(OUTPUT |
| 32 |
tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \ |
| 33 |
$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \ |
| 34 |
$(FONT_CFLAGS) $(AM_CFLAGS) |
| 35 |
-tvtime_LDFLAGS = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \ |
| 36 |
+tvtime_LDADD = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \ |
| 37 |
$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++ |
| 38 |
|
| 39 |
tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \ |
| 40 |
tvtime-command.c |
| 41 |
tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS) |
| 42 |
-tvtime_command_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) |
| 43 |
+tvtime_command_LDADD = $(ZLIB_LIBS) $(XML2_LIBS) |
| 44 |
tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \ |
| 45 |
tvtime-configure.c |
| 46 |
tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS) |
| 47 |
-tvtime_configure_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) |
| 48 |
+tvtime_configure_LDADD = $(ZLIB_LIBS) $(XML2_LIBS) |
| 49 |
tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \ |
| 50 |
tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \ |
| 51 |
mixer.h mixer.c |
| 52 |
tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS) |
| 53 |
-tvtime_scanner_LDFLAGS = $(ZLIB_LIBS) $(XML2_LIBS) |
| 54 |
+tvtime_scanner_LDADD = $(ZLIB_LIBS) $(XML2_LIBS) |
| 55 |
|
| 56 |
Index: tvtime-1.0.2/configure.ac |
| 57 |
=================================================================== |
| 58 |
--- tvtime-1.0.2.orig/configure.ac |
| 59 |
+++ tvtime-1.0.2/configure.ac |
| 60 |
@@ -10,6 +10,7 @@ if test x"$host_alias" = x""; then host_ |
| 61 |
|
| 62 |
# Check for compilers. |
| 63 |
AC_PROG_CC |
| 64 |
+AM_PROG_CC_C_O |
| 65 |
AC_CHECK_PROG(found_cc, "$CC", yes, no) |
| 66 |
test "x$found_cc" = "xyes" || exit 1 |
| 67 |
|
| 68 |
@@ -17,9 +18,6 @@ AC_PROG_CXX |
| 69 |
AC_CHECK_PROG(found_cxx, "$CXX", yes, no) |
| 70 |
test "x$found_cxx" = "xyes" || exit 1 |
| 71 |
|
| 72 |
-# Check for libtool. |
| 73 |
-AC_PROG_LIBTOOL |
| 74 |
- |
| 75 |
# Checks for header files. |
| 76 |
AC_HEADER_STDC |
| 77 |
AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h getopt.h langinfo.h math.h netinet/in.h pwd.h signal.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/wait.h sys/types.h unistd.h wordexp.h locale.h]) |
| 78 |
@@ -65,10 +63,7 @@ dnl ------------------------------------ |
| 79 |
dnl freetype |
| 80 |
dnl --------------------------------------------- |
| 81 |
dnl Test for freetype |
| 82 |
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) |
| 83 |
-if test "$FREETYPE_CONFIG" = "no" ; then |
| 84 |
- AC_MSG_ERROR(freetype2 needed and freetype-config not found) |
| 85 |
-fi |
| 86 |
+PKG_CHECK_MODULES([TTF], [freetype2]) |
| 87 |
|
| 88 |
dnl --------------------------------------------- |
| 89 |
dnl libxml2 |
Archives