Update of /cvsroot/xine/gnome-xine
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17136

Modified Files:
        ChangeLog INSTALL README README.cs README.de autogen.sh 
        configure.ac 
Log Message:
Resync with hg head.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- ChangeLog   3 Feb 2007 15:04:44 -0000       1.218
+++ ChangeLog   3 Feb 2007 15:26:20 -0000       1.219
@@ -1,13 +1,48 @@
-0.5.11:        2007/??/??
+0.5.900:2007/??/??
+       [dsalt]
+       * Added get_pos(), has_time() so that it's possible to seek in streams
+         without time information.
+         Updated the skip forward/back key bindings accordingly.
+       * Display some device information in the prefs window and in file
+         chooser dboxes (requires HAL).
+       * Added a "repeat track" option to the playlist window.
+       * Added a system tray icon with two menus - left click for a short
+         playback control menu, right click for the main menu. Also middle
+         to show or hide the main window and its toolbar (note that other
+         windows will remain visible).
+       * Make the prev/next buttons in the playlist window shaded if there
+         are fewer than 2 playlist items (previously, if there are none).
+       * Added menus to the playlist & media marks windows.
+       * Enable by default a few options:
+         - magnify low-res video;
+         - video & audio post-plugin enabling at startup;
+         - separate toolbar;
+         - windowed-mode blanking prevention.
+         Existing configurations are unaffected.
+       * Obsoleted and disabled most of the deprecated JS functions, except
+         for set_fullscreen() and toolbar_show() which remain deprecated.
+         If you need the others, build with --enable-obsolete.
+         Obsolete functions will be removed and deprecated functions
+         obsoleted next year.
+       * Brought vo_deinterlace into line with the other two chain objects
+         by adding the missing property & method.
+       * Reworked the JS property code somewhat. No user-visible changes.
+
+0.5.11:        2007/02/01
        [dsalt]
        * Always connect to the "toggled" signal for post-plugin prefs buttons.
          Without this, they wouldn't work if they were initially shaded.
        * The plugin chain configuration menu items are duplicated in
          File->Configure.
+       * Fixed a hang which occurs when a stream ends and some modal
+         dialogue box, opened via a JS command, is open.
+       * Fixed some prefs segfaults and file/device/directory configuration
+         loss. This only appears with GTK+2.10 and xine-lib 1.1.4, and of
+         course I didn't have GTK+2.10 when I released 0.5.10...
 
 0.5.10:        2007/01/08
        [dsalt]
-       * SECURITY FIX (local exploit) 
+       * SECURITY FIX (local exploit, CVE-2007-0406)
          This version fixes a potential buffer overflow in gxine's server
          component and in gxine_client. This overflow would occur were $HOME
          sufficiently long - 94 bytes or more would cause socket creation or

Index: INSTALL
===================================================================
RCS file: /cvsroot/xine/gnome-xine/INSTALL,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- INSTALL     3 Feb 2007 15:04:44 -0000       1.19
+++ INSTALL     3 Feb 2007 15:26:20 -0000       1.20
@@ -6,11 +6,10 @@
   Name                 Version         In package
   ----                 -------         ---.deb---              --RPM--
   xine-lib             >= 1.0.1        libxine-dev
-  GTK+                 >= 2.6          libgtk2.0-dev
-  GLib                 >= 2.6          libglib2.0-dev
+  GTK+                 >= 2.8          libgtk2.0-dev
+  GLib                 >= 2.10         libglib2.0-dev
   gettext              *               (part of GNU libc)
-  libjs                        >= 1.5rc*       libsmjs-dev (sarge)     
js-devel (FC5)
-                                       libmozjs-dev (etch)
+  libjs                        >= 1.5rc*       libmozjs-dev (etch)     
js-devel  (FC*)
                                        firefox-dev (Ubuntu)
 
 libjs may be downloaded from <URL:http://ftp.mozilla.org/pub/mozilla.org/js/>.
@@ -27,7 +26,8 @@
   XTest                        *               libxtst-dev
   LIRC                 *               liblircclient-dev
   Xinerama             *               libxinerama-dev
-  dbus (glib)          *               libdbus-glib-1-dev | dbus-glib-1-dev
+  dbus (glib)          *               libdbus-glib-1-dev
+  hal                  *               libhal-dev
 
 gxine requires the following packages at compile time:
 
@@ -47,11 +47,11 @@
 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.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.
+Pango 1.12.0 or later is required as of 0.6.0 because, with older versions,
+text containing invalid UTF-8 may not be displayed.
 
 PACKAGERS: you should set VENDOR_PKG_VERSION at configure time. Something of
-the form "0.5.0-1; Debian" is adequate.
+the form "0.6.0-1; Debian" is adequate.
 
 
 Browser plugin location

Index: README
===================================================================
RCS file: /cvsroot/xine/gnome-xine/README,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- README      16 Dec 2006 23:42:19 -0000      1.19
+++ README      3 Feb 2007 15:26:20 -0000       1.20
@@ -3,8 +3,8 @@
   ===============================
 
 (C) 2001-2004 Guenter Bartsch
-(C) 2004-2006 Darren Salt
-(C) 2001-2006 the xine project team
+(C) 2004-2007 Darren Salt
+(C) 2001-2007 the xine project team
 
 gxine is free software released under the GPL.
 
@@ -86,6 +86,12 @@
 There's a Javascript reference at
   http://developer.mozilla.org/en/docs/JavaScript
 
+As of 0.6.0, various deprecated functions are obsolete and are not included
+by default. You can enable them with --enable-obsolete, but this is not
+recommended; you should migrate to the vo_* and ao_* objects.
+
+Obsolete functions will be removed and deprecated functions obsoleted in 2008.
+
 
 VDR support
 -----------

Index: README.cs
===================================================================
RCS file: /cvsroot/xine/gnome-xine/README.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.cs   7 Oct 2006 16:42:04 -0000       1.2
+++ README.cs   3 Feb 2007 15:26:20 -0000       1.3
@@ -3,8 +3,8 @@
   =============================
 
 (C) 2001-2004 Guenter Bartsch
-(C) 2004-2005 Darren Salt
-(C) 2001-2006 tým projektu xine
+(C) 2004-2007 Darren Salt
+(C) 2001-2007 tým projektu xine
 
 gxine je svobodný software vydaný pod GPL.
 

Index: README.de
===================================================================
RCS file: /cvsroot/xine/gnome-xine/README.de,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.de   13 Dec 2005 23:10:58 -0000      1.2
+++ README.de   3 Feb 2007 15:26:20 -0000       1.3
@@ -3,8 +3,8 @@
   ===============================
 
 (C) 2001-2004 Guenter Bartsch
-(C) 2004-2005 Darren Salt
-(C) 2001-2005 the xine project team
+(C) 2004-2007 Darren Salt
+(C) 2001-2007 the xine project team
 
 gxine ist unter der GPL veröffentlichte freie Software.
 

Index: autogen.sh
===================================================================
RCS file: /cvsroot/xine/gnome-xine/autogen.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- autogen.sh  11 Dec 2006 19:45:00 -0000      1.14
+++ autogen.sh  3 Feb 2007 15:26:20 -0000       1.15
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2003 the xine project
+# Copyright (C) 2000-2006 the xine project
 #
 # This file is part of xine, a unix video player.
 # 
@@ -18,8 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 #
-# $Id$
-#
 # Maintained by Stephen Torri <[EMAIL PROTECTED]>
 #
 # run this to generate all the initial makefiles, etc.

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- configure.ac        3 Feb 2007 14:59:30 -0000       1.106
+++ configure.ac        3 Feb 2007 15:26:20 -0000       1.107
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([gxine], [0.5.10])
+AC_INIT([gxine], [0.5.900])
 AC_CONFIG_SRCDIR([src/main.c])
 
 AC_CONFIG_HEADERS([include/config.h])
@@ -105,17 +105,10 @@
 dnl ---------------------------------------------
 dnl check for gtk 2.6 or later
 dnl ---------------------------------------------
-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)
-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
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.8.0)
+PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.10.0)
+PKG_CHECK_MODULES(GTHREAD2, gthread-2.0 >= 2.10.0)
+PKG_CHECK_MODULES(PANGO, pango >= 1.12.0)
 saved_CFLAGS="$CFLAGS"
 saved_LIBS="$LIBS"
 CFLAGS="$CFLAGS $GLIB2_CFLAGS"
@@ -145,12 +138,31 @@
 LIBS="$saved_LIBS"
 
 dnl ---------------------------------------------
+dnl HAL (for hardware information)
+dnl ---------------------------------------------
+
+AC_ARG_WITH([hal],
+       AS_HELP_STRING([--without-hal], [disable HAL support (for device info 
etc.)]),
+       [requested=Y], [requested=N])
+if test "x$with_hal" != 'xno'; then
+  with_hal=yes
+  if test "x$requested" = "xY"; then
+    PKG_CHECK_MODULES(HAL, hal)
+  else
+    PKG_CHECK_MODULES(HAL, hal, [], [with_hal=no; AC_MSG_RESULT([no])])
+  fi
+fi
+if test "$with_hal" = yes; then
+  AC_DEFINE(WITH_HAL, 1, [Define if HAL is present and you want to use it.])
+fi
+
+dnl ---------------------------------------------
 dnl GNOME screensaver, DBus
 dnl ---------------------------------------------
 AC_PATH_PROG(GSSCMD, gnome-screensaver-command)
 if test -n "$GSSCMD"; then
   AC_ARG_WITH([dbus],
-       AS_HELP_STRING([--with-dbus], [enable dbus support (for GNOME 
screensaver)]),
+       AS_HELP_STRING([--without-dbus], [disable dbus support (for GNOME 
screensaver)]),
        [requested=Y], [requested=N])
   if test "x$with_dbus" != 'xno'; then
     with_dbus=yes
@@ -446,6 +458,20 @@
 fi
 AC_MSG_RESULT($deprecated)
 
+if test "$deprecated" = yes; then
+  AC_MSG_CHECKING([whether to include obsolete features])
+  AC_ARG_ENABLE(obsolete,
+           AS_HELP_STRING(--enable-obsolete,
+                          [include obsolete features, e.g. old Javascript 
functions]),
+           if test "$enableval" != yes; then obsolete=no; else obsolete=yes; 
fi,
+           obsolete=no)
+  if test "$obsolete" = yes; then
+    AC_DEFINE(WITH_OBSOLETE, 1,
+           [Define if you want gxine to be built with obsolete features])
+  fi
+  AC_MSG_RESULT($obsolete)
+fi
+
 dnl ---------------------------------------------
 dnl Debugging options
 dnl ---------------------------------------------


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog

Reply via email to