'[xine-cvs] CVS: gnome-xine gxine.desktop.in, NONE, 1.1 mime.default,'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: gnome-xine gxine.desktop.in, NONE, 1.1 mime.default,
From:       Darren Salt <dsalt () users ! sourceforge ! net>
Date:       2007-02-27 18:04:22
Message-ID: E1HM6gY-0003Vt-Go () sc8-pr-cvs10 ! sourceforge ! net
[Download RAW message or body]

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Added Files:
	gxine.desktop.in mime.default 
Removed Files:
	gxine.desktop 
Log Message:
Resync with hg (cset 1907).

--- NEW FILE: gxine.desktop.in ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=gxine
GenericName=Video Player
Comment=Watch videos or TV and listen to audio in a variety of formats
Exec=gxine
X-MultipleArgs=true
Icon=gxine
Terminal=false
Type=Application
StartupNotify=true
Categories=AudioVideo;GTK;Player;TV;
MimeType=
--- NEW FILE: mime.default ---
application/ogg
application/vnd.ms-asf
application/vnd.rn-realmedia
application/x-annodex
application/x-mplayer2
application/x-ogg
application/x-quicktimeplayer
audio/168sv
audio/8svx
audio/aiff
audio/basic
audio/mp3
audio/mpeg
audio/mpeg2
audio/mpeg3
audio/mpegurl
audio/wav
audio/x-16sv
audio/x-8svx
audio/x-aiff
audio/x-basic
audio/x-m4a
audio/x-mp3
audio/x-mpeg
audio/x-mpeg2
audio/x-mpeg3
audio/x-mpegurl
audio/x-ms-wma
audio/x-ogg
audio/x-pn-aiff
audio/x-pn-au
audio/x-pn-realaudio
audio/x-pn-realaudio-plugin
audio/x-pn-wav
audio/x-pn-windows-acm
audio/x-real-audio
audio/x-realaudio
audio/x-speex
audio/x-wav
image/ilbm
image/png
image/x-ilbm
image/x-png
video/anim
video/mkv
video/mng
video/mpeg
video/msvideo
video/quicktime
video/x-anim
video/x-flic
video/x-flv
video/x-mng
video/x-mpeg
video/x-ms-asf
video/x-ms-asf-plugin
video/x-ms-wax
video/x-ms-wmv
video/x-ms-wvx
video/x-msvideo
video/x-quicktime

Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- ChangeLog	3 Feb 2007 15:26:20 -0000	1.219
+++ ChangeLog	27 Feb 2007 18:03:49 -0000	1.220
@@ -5,6 +5,8 @@
 	  Updated the skip forward/back key bindings accordingly.
 	* Display some device information in the prefs window and in file
 	  chooser dboxes (requires HAL).
+	* Added revert buttons (to default & to saved) for each config item
+	  in the prefs window.
 	* 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
@@ -19,6 +21,8 @@
 	  - separate toolbar;
 	  - windowed-mode blanking prevention.
 	  Existing configurations are unaffected.
+	* Allow slider widgets to be presented as buttons with pop-up windows.
+	  The volume slider in the default windowed-mode toolbar is a pop-up.
 	* 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.
@@ -26,7 +30,27 @@
 	  obsoleted next year.
 	* Brought vo_deinterlace into line with the other two chain objects
 	  by adding the missing property & method.
+	* Added a config item to control whether, when in full-screen mode,
+	  the video window is forcibly stuck to all desktops & viewports.
+	  This is currently only checked at startup.
 	* Reworked the JS property code somewhat. No user-visible changes.
+	* Only display the "broken xine-lib" message (for when there is no
+	  demuxer for the logo image) at most once.
+	* Fixed a possible initialisation failure which would cause various GDK
+	  "window != NULL" assertion failures and a segfault. This is known to
+	  affect gxine in a chrooted environment when talking to a non-chrooted
+	  X server on the same machine, and includes a partial reversion of a
+	  change which was made between 0.5.9 and 0.5.10.
+	* Moved the windowed-mode blanking menu item into a new submenu in
+	  the View menu.
+	* Tweaked and re-rendered the splash and logo images.
+	* Allow blanking if the video window is hidden, iconised or shaded.
+	* Fixed toolbar positioning with multiple monitors arranged to make a
+	  non-rectangular display. (This may require the enabling of an option
+	  such as radeon(4)'s "MergedNonRectangular" option.)
+	* Fixed a logic error which could cause full-screen focus grabbing to
+	  be active even when Xinerama is active.
+	* Fixed some problems with prefs window initialisation and redisplay.
 
 0.5.11:	2007/02/01
 	[dsalt]
@@ -35,7 +59,7 @@
 	* 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.
+	  dialogue box, opened via a JS command, is open. [Bug 1643093]
 	* 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...

Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/gnome-xine/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.am	17 Dec 2006 01:10:26 -0000	1.28
+++ Makefile.am	27 Feb 2007 18:03:49 -0000	1.29
@@ -1,11 +1,14 @@
 SUBDIRS = m4 pixmaps include src doc browser-plugin misc po
 
 #DEB_FILES = debian/rules debian/changelog debian/control debian/copyright \
                debian/README.Debian debian/menu
-EXTRA_DIST = config.rpath gxine.desktop autogen.sh gxine-test \
+EXTRA_DIST = config.rpath gxine.desktop.in mime.default autogen.sh gxine-test \
 	BUGS README.de README.cs README_l10n
 
 Applicationsdir = $(datadir)/applications
-Applications_DATA = gxine.desktop
+nodist_Applications_DATA = gxine.desktop
+
+BUILT_SOURCES = gxine.desktop
+CLEANFILES = $(BUILT_SOURCES)
 
 debug:
 	@list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -54,4 +57,12 @@
 	$(MAKE) -C $(top_builddir)/po update-po
 	$(MAKE) -C $(top_builddir)/misc/po update-po
 
+XINE_MIME = $(shell $(XINE_CONFIG) --plugindir)/mime.types
+MIME = $(if $(shell test -f $(XINE_MIME) && echo \
y),$(XINE_MIME),$(srcdir)/mime.default) +
+gxine.desktop: gxine.desktop.in $(MIME)
+	exec > $@; \
+	cat $<; \
+	awk 'BEGIN { s = "%s" } { printf s, $$1; s = ";%s" } END { print }' <$(MIME)
+
 ACLOCAL_AMFLAGS = -I m4

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- configure.ac	3 Feb 2007 15:26:20 -0000	1.107
+++ configure.ac	27 Feb 2007 18:03:49 -0000	1.108
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([gxine], [0.5.900])
+AC_INIT([gxine], [0.5.900-dev])
 AC_CONFIG_SRCDIR([src/main.c])
 
 AC_CONFIG_HEADERS([include/config.h])
@@ -76,6 +76,16 @@
 AC_PATH_XTRA
 
 dnl ---------------------------------------------
+dnl socket library
+dnl ---------------------------------------------
+
+dnl Test for socket and network support library
+NET_LIBS=""
+AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)
+AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
+AC_SUBST(NET_LIBS)
+
+dnl ---------------------------------------------
 dnl Check for libsmjs (spidermonkey)
 dnl ---------------------------------------------
 
@@ -154,6 +164,7 @@
 fi
 if test "$with_hal" = yes; then
   AC_DEFINE(WITH_HAL, 1, [Define if HAL is present and you want to use it.])
+  GXINE_HAL_DEVICE_INFO
 fi
 
 dnl ---------------------------------------------
@@ -286,12 +297,12 @@
 dnl ---------------------------------------------
 dnl Check for xine-lib
 dnl ---------------------------------------------
-AM_PATH_XINE(1.0.1,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
+AM_PATH_XINE(1.1.0,, AC_MSG_ERROR([*** Please install xine-lib (devel) first ***]))
 
 dnl Extract xine-lib's text domain name
 LIB_PACKAGE="libxine`echo '#define ENABLE_NLS
   #include <xine/xine_internal.h>
-  XINE_MAJOR_VERSION' | $CPP $CPPFLAGS - | sed -e '$! d; s/^ \+//'`"
+  XINE_MAJOR_VERSION' | $CPP $CPPFLAGS - | sed -e '$!d; s/^ \+//'`"
 if test "$LIB_PACKAGE" = ''; then
   AC_MSG_ERROR([Couldn't determine xine-lib's text domain name])
 fi
@@ -551,9 +562,10 @@
 AC_DEFINE_UNQUOTED(GXINE_CONFDIR,"$GXINE_CONFPATH",[where to install conf files])
 AC_SUBST(GXINE_CONFPATH)
 
-AC_ARG_VAR([VENDOR_PKG_VERSION], [vendor build identifier string (default is the \
upstream version number, suffixed with "release" or "CVS snapshot")]) \
+AC_ARG_VAR([VENDOR_PKG_VERSION], [vendor build identifier string (default is the \
upstream version number, suffixed with "release" or identifying a snapshot type)])  \
                POST_VERSION=release
-if test -d .hg || expr "$(basename "$(pwd)")" : 'gxine-[[0123456789abcdef]]\{12\}$' \
>/dev/null; then +PWD="`pwd`"
+if test -d .hg || expr "`basename $PWD`" : 'gxine-[[0123456789abcdef]]\{12\}$' \
>/dev/null; then  POST_VERSION='hg snapshot'
 elif test -d CVS; then
   POST_VERSION='CVS snapshot'
@@ -583,5 +595,10 @@
 ])
 
 dnl doc/C/Makefile
-AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/build_rpms.sh]],[[]])
+AC_CONFIG_COMMANDS([default],
+	[[chmod +x ./misc/build_rpms.sh; echo '
+#ifdef DEBUG
+# undef WITH_WATCHDOG
+#endif' >> include/config.h
+]],[[]])
 AC_OUTPUT

--- gxine.desktop DELETED ---


-------------------------------------------------------------------------
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
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic