Update of /cvsroot/xine/gnome-xine
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18456
Modified Files:
ChangeLog INSTALL autogen.sh configure.ac
Log Message:
Resync with hg.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- ChangeLog 9 Dec 2006 14:05:28 -0000 1.213
+++ ChangeLog 11 Dec 2006 19:45:00 -0000 1.214
@@ -34,6 +34,7 @@
"image" (logo.jpg; requires the image demuxer). The default is mpeg.
* Added JS playlist.repeat & playlist.random, both with value 'v' and
method 'toggle()'.
+ * Bumped minimum automake requirement to 1.9.
[dpettenò]
* Fix building on FreeBSD, replace a recursive pthread mutex with
Index: INSTALL
===================================================================
RCS file: /cvsroot/xine/gnome-xine/INSTALL,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- INSTALL 27 Aug 2006 16:34:06 -0000 1.16
+++ INSTALL 11 Dec 2006 19:45:00 -0000 1.17
@@ -44,8 +44,7 @@
Your C compiler must support C99.
Should you need to run autogen.sh (you probably don't, unless you've fetched
-the source via CVS), you need autoconf 2.59 and automake 1.6 or 1.7; later
-versions should work too.
+the source via CVS), you need autoconf >= 2.59 and automake >= 1.9.
Pango 1.12.0 or later is recommended. If you have an older version of this
library, text containing invalid UTF-8 may not be displayed.
Index: autogen.sh
===================================================================
RCS file: /cvsroot/xine/gnome-xine/autogen.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- autogen.sh 12 Nov 2006 14:02:39 -0000 1.13
+++ autogen.sh 11 Dec 2006 19:45:00 -0000 1.14
@@ -27,8 +27,8 @@
PROG=gxine
# Minimum value required to build
-WANT_AUTOMAKE_1_6=1 export WANT_AUTOMAKE_1_6
-AUTOMAKE_MIN=1.6.0
+WANT_AUTOMAKE_1_9=1 export WANT_AUTOMAKE_1_9
+AUTOMAKE_MIN=1.9.0
AUTOCONF_MIN=2.53
LIBTOOL_MIN=1.4.0
@@ -56,7 +56,7 @@
chomp $v;
my @v = split (" ", $v);
$v = $v[$#v];
- $v =~ s/[^0-9.]//g;
+ $v =~ s/[^0-9.].*$//;
@v = split (/\./, $v);
push @v, 0 while $#v < 2;
print $v[0] * 10000 + $v[1] * 100 + $v[2], "\n"'
Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- configure.ac 9 Dec 2006 14:05:28 -0000 1.102
+++ configure.ac 11 Dec 2006 19:45:00 -0000 1.103
@@ -3,7 +3,7 @@
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([include/config.h])
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
dnl AM_ACLOCAL_INCLUDE(m4)
@@ -108,9 +108,14 @@
PKG_CHECK_MODULE_ATLEAST(GLIB2, glib-2.0, 2.6.0)
PKG_CHECK_MODULE_ATLEAST(GTK2, gtk+-2.0, 2.6.0)
PKG_CHECK_MODULE_ATLEAST(GTHREAD2, gthread-2.0, 2.6.0)
-PKG_CHECK_EXISTS(pango >= 1.12.0, [],
- [AC_MSG_WARN([you have libpango older than 1.12.0 - text containing
invalid UTF-8 may not be displayed])])
-
+dnl PKG_CHECK_EXISTS(pango >= 1.12.0, [],
+dnl [AC_MSG_WARN([you have libpango older than 1.12.0 - text containing
invalid UTF-8 may not be displayed])])
+dnl (replaced for compatibility with pkg-config in sarge)
+if AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "pango >= 1.12.0"]); then
+ :
+else
+ AC_MSG_WARN([you have libpango older than 1.12.0 - text containing invalid
UTF-8 may not be displayed])
+fi
saved_CFLAGS="$CFLAGS"
saved_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB2_CFLAGS"
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
