Hello community,
here is the log from the commit of package xine-ui for openSUSE:Factory checked
in at 2012-06-16 06:57:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xine-ui (Old)
and /work/SRC/openSUSE:Factory/.xine-ui.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-ui", Maintainer is "mh...@novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xine-ui/xine-ui.changes 2012-01-25
11:09:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xine-ui.new/xine-ui.changes 2012-06-16
06:57:40.000000000 +0200
@@ -1,0 +2,123 @@
+Fri Jun 15 04:02:00 UTC 2012 - co...@suse.de
+
+- cleanup unused patches
+
+-------------------------------------------------------------------
+Mon Jun 11 17:46:00 UTC 2012 - manfred.trem...@iiv.de
+
+- fixed stringcompare problems rpmlint reported
+
+-------------------------------------------------------------------
+Sun Jun 10 15:05:00 UTC 2012 - manfred.trem...@iiv.de
+
+- update to 0.99.7:
+ * Support for comments in .m3u playlists
+ * Avoid possible overflows when handling media marks & M3U files.
+ * Fixes for libpng 1.5 and header checking.
+ * xine-bugreport uses $TMPDIR.
+ * Spanish translation update from Carlos E. Robinson M.
+ * Czech translation update.
+ * Use only ASCII for "picture" texts in skin.
+ * Fix of the help texts encoding.
+ * Avoid a deadlock in the tooltips code.
+ * Set combo box menu windows' override-redirect flags.
+ * MRL browser recognises a few more extensions.
+ * Fix LIRC library detection (build time).
+ * Fix a segfault which prevented the display of the help window.
+ * Make building of fbxine optional (--with-fb; enabled by default).
+ * "ToggleFullscreen" command takes an optional numeric parameter,
+ controlling whether full-screen mode is switched on or off.
+ * New command "Close".
+ * Rename default.avi to default.mpv since it's actually an MPEG.
+ * Replace the splash .mpv with a PNG (from xine-lib).
+ * Support use of JPEG images for splash etc.
+ * Make use of XScreenSaver.
+ * Set dialogue windows' maximum sizes.
+ * Fix LIRC check so that it doesn't fail if liblircclient0.pc (which is
+ Debian-specific) is missing.
+ * Recognise "authentication needed" messages from xine-lib 1.2.
+ * Handle "file is empty" messages from xine-lib.
+ * Add support for XINE_EVENT_MRL_REFERENCE_EXT.
+ * Use re-entrant XML parser functions (if available).
+ * Distribute xine_splash.xcf (source for xine_splash.png).
+ * Tidy up building of common function libraries; ensure all replacement
+ function sources are distributed.
+ * xine.desktop now says that xine can accept files or URLs.
+
+-------------------------------------------------------------------
+Sat Jun 02 00:00:00 UTC 2012 - manfred.trem...@iiv.de
+
+- deactivated xine-ui-libpng15.diff causes crashes
+
+-------------------------------------------------------------------
+Sat May 26 13:45:00 UTC 2012 - manfred.trem...@iiv.de
+
+- update to 0.99.6:
+ * Use pkg-config only; xine-config is deprecated.
+ * Fix build with libpng 1.4.
+ * Fix build on Mac OS X.
+ * Fix segfaults caused by our getline() (only used if no system getline()).
+ * Add front-end support for .ass subtitles.
+ * Point xine-bugreport at the current bugs list; note the bug tracker URL.
+ * Disable character substitution code (xine bug 30). Let's see what breaks...
+ * Set menu windows' override-redirect flag (xine bug 24)
+ * Automatically load opensubtitle-like filenames <name>.*.<subext>
+ * New/updated spanish manpage translations from Carlos E. Robinson
+ * Fixed possible corruption and overflow of keybindings table
+ * Mark the toolbar window as such; should fix control panel visibility issues
+ in full-screen mode with some window managers. [bug SF 1750100]
+ * New command/keybinding from Richard van Paasen:
+ "PVRSetFrequency" changes frequency on ivtv cards (input_pvr).
+ * Install a shared-mime-info entry for .tox files, contributed by
+ Peter Fox in bug #10.
+ * New commands/keybindings from Richard van Paasen:
+ "PVRSetInput" changes input on ivtv cards (input_pvr);
+ "PVRSetMark", "PVRSetName", "PVRSave" enable saving
+ of live streams from ivtv cards (input_pvr).
+ * New command/keybinding from Richard van Paasen:
+ "SetPosition100%" jumps to end of stream.
+ * Recognize .rmvb files, closes debian bug #437864.
+ * Recognize .m2p files, closes debian bug #419002.
+ * Fixes for stdctl race conditions, contributed by Stas Sergeev
+ * Resetting the video controls restores the driver default settings
+ instead of fixed center values
+ * New commands/keybindings from Stas Sergeev:
+ "SelectMrl" with a numeric parameter allows to select an MRL directly
+ by its position number in the playlist.
+ "KeyBindingsEnable" with optional numeric parameter allows to
enable/disable
+ the keybindings (disabled by param equal to 0, else enabled), so stdctl can
+ get exclusive control over the keys with disabled bindings; this command is
+ not bound to a key by default for an obvious reason (don't dare to bind)
;-)
+ * Enhanced commands/keybindings with contributions from Stas Sergeev:
+ "PlaylistStop" accepts a numeric parameter to set the stop state absolutely
+ (continue if param equals 0, else stop) and persistent, i.e. not reset to
+ "continue" after playing current stream, as opposed to the usual toggling
+ without parameter; usual toggling is now also possible when no stream is
+ currently played, allowing to change the selection at any time.
+ "ToggleLoopMode" and "ToggleAspectRatio" accept a numeric parameter as
index
+ to make a direct selection from the list of their possible states
+ * Stdctl enhancements and fixes from Stas Sergeev:
+ Feedback messages and echoing of key presses to standard output added,
+ clean exit upon closing standard input connection or quitting xine-ui,
+ multiple commands in one command string handled
+ * Fixed wrong locale path (introduced in previous release) and related crash
+ concerning tooltips, closes debian bug #432798.
+ * ASCII Art updates:
+ * fixed aalib detection in configure
+ * build with libcaca >= 0.99, fixes xine bug #50
+ * update CACA output due to changes in xine-lib
+ * Various memleak and memory access fixes, for example:
+ * skin downloader crash
+ * cleaner destroy of the widgets in xine toolkit ("kamikaze patch")
+ * proper free after strsep()
+ * opening multiple times TV settings window
+ * Fixed string encoding conversion, closes xine bug #14.
+ * Fixed loading of playlist containing relative paths, closes xine bug #52,
+ save old playlist with absolute paths on exit.
+ * Fixed possible integer overflow when parsing PNG files in skins, closes
+ xine bug #153.
+ * Lock display on exit, xine bug #193.
+ * Drag & drop race condition fixes.
+- build against xine-lib 1.2 not 1.1
+
+-------------------------------------------------------------------
Old:
----
locale_fix.diff
xine-curl-types.patch
xine-ui-0.99.5.tar.bz2
xine-ui-broken-configure.diff
xine-ui-libs.diff
xine-ui-logopng.diff
xine-ui-png_check_sig.diff
New:
----
xine-ui-0.99.7.tar.bz2
xine-ui-lirc.diff
xine-ui-rpmlintrc.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-ui.spec ++++++
--- /var/tmp/diff_new_pack.sZNGFX/_old 2012-06-16 06:57:42.000000000 +0200
+++ /var/tmp/diff_new_pack.sZNGFX/_new 2012-06-16 06:57:42.000000000 +0200
@@ -15,19 +15,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xine-ui
BuildRequires: aalib-devel
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: curl-devel
+BuildRequires: libjpeg62-devel
BuildRequires: libpng-devel
+BuildRequires: libxine-devel
BuildRequires: lirc-devel
BuildRequires: readline-devel
BuildRequires: update-desktop-files
-BuildRequires: xine-devel
BuildRequires: xorg-x11-devel
Summary: Video player with plugins
License: GPL-2.0+ ; SUSE-Public-Domain
Group: Productivity/Multimedia/Video/Players
-Version: 0.99.5
+Version: 0.99.7
Release: 0
Url: http://xine.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,10 +46,8 @@
Source99: baselibs.conf
# *** xine-lib: Bugfixes
Patch0: xine-ui-various.diff
-Patch1: xine-ui-logopng.diff
-Patch20: xine-ui-broken-configure.diff
-Patch21: locale_fix.diff
-Patch22: xine-ui-libs.diff
+Patch2: xine-ui-lirc.diff
+Patch22: xine-ui-rpmlintrc.diff
Patch23: xine-ui-array-overflow.diff
# PATCH-FIX-UPSTREAM xine-ui-libpng15.patch -- pgaj...@suse.com; build with
libpng15; sent today to f1...@users.sourceforge.net
# build against libpng14 should not be affected, otherwise please let me know
@@ -53,8 +55,6 @@
# *** SUSE only changes
Patch50: xine-ui-crippled-LOCAL.diff
Patch60: xine-ui-AUTOMAKE.diff
-Patch61: xine-ui-png_check_sig.diff
-Patch62: xine-curl-types.patch
%description
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
@@ -71,23 +71,30 @@
%prep
%setup -q
+%if %suse_version > 1110
+%patch2 -p1
+%endif
%patch0
-%patch1
-%patch20
-%patch21
%patch22 -p1
%patch23 -p1
-%patch24 -p1
-%patch50
+#%patch24 -p1
+%patch50 -p1
%patch60
-%patch61
-%patch62 -p0
+install -m 0644 %SOURCE1 misc/splash-default/xine-ui_logo.png
+install -m 0644 %SOURCE2 misc/splash-default/xine-ui_logo-crippled.png
+%ifarch x86_64
+sed -i -e
"s/lirc_libprefix=\"\$LIRC_PREFIX\/lib\"/lirc_libprefix=\"\$LIRC_PREFIX\/lib64\"/g"
\
+ -e "s/for llirc in \$lirc_libprefix \/lib \/usr\/lib \/usr\/local\/lib;
do/for llirc in \$lirc_libprefix \/lib64 \/usr\/lib64 \/usr\/local\/lib64;
do/g" m4/_xine.m4
+%endif
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# ignore nonupdated automake+co files
rm -f missing ; touch missing
export XINE_DOCPATH=/usr/share/doc/packages/xine-ui
+
+NO_CONFIGURE=1 ./autogen.sh
+
%configure \
--enable-vdr-keys \
--with-pic \
@@ -99,10 +106,7 @@
install -d -m755 $RPM_BUILD_ROOT%{_defaultdocdir}
mv $RPM_BUILD_ROOT/usr/share/doc/xitk $RPM_BUILD_ROOT%{_defaultdocdir}/xine-ui
mkdir -p $RPM_BUILD_ROOT/usr/share/applications/
-rm $RPM_BUILD_ROOT/usr/share/xine/desktop/xine.desktop
-rmdir $RPM_BUILD_ROOT/usr/share/xine/desktop
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/xine/skins/xine-ui_logo.png
-rm -f $RPM_BUILD_ROOT/usr/share/xine/skins/xine-ui_logo.mpv
+rm -rf $RPM_BUILD_ROOT/usr/share/xine/desktop
install -m 0644 %SOURCE2
$RPM_BUILD_ROOT/usr/share/xine/skins/xine-ui_logo-crippled.png
# extra skins
install -d -m755 %buildroot/usr/share/xine/skins/
@@ -138,6 +142,7 @@
%dir /usr/share/icons/hicolor/*
%dir /usr/share/icons/hicolor/*/apps
/usr/share/icons/hicolor/*/apps/xine.png
+%dir /usr/share/xine
%dir /usr/share/xine/skins
/usr/share/xine/skins/xine-ui_logo.png
/usr/share/xine/skins/xine-ui_logo-crippled.png
@@ -147,10 +152,11 @@
/usr/share/xine/skins/caramel
/usr/share/xine/skins/lcd
%dir /usr/share/xine/visuals
-/usr/share/xine/visuals/default.avi
+/usr/share/xine/visuals/default.mpv
/usr/share/applications/xine.desktop
/usr/share/xine/oxine
/usr/share/pixmaps/*
+/usr/share/mime/packages/xine-ui.xml
%_defaultdocdir/xine-ui
%doc %_mandir/*/man1/xine-bugreport.1.gz
%doc %_mandir/man1/xine-bugreport.1.gz
++++++ xine-ui-0.99.5.tar.bz2 -> xine-ui-0.99.7.tar.bz2 ++++++
++++ 142743 lines of diff (skipped)
++++++ xine-ui-AUTOMAKE.diff ++++++
--- /var/tmp/diff_new_pack.sZNGFX/_old 2012-06-16 06:57:43.000000000 +0200
+++ /var/tmp/diff_new_pack.sZNGFX/_new 2012-06-16 06:57:43.000000000 +0200
@@ -1,41 +1,12 @@
-Index: config.h.in
-===================================================================
---- config.h.in.orig
-+++ config.h.in
-@@ -193,6 +193,9 @@
+--- config.h.in.orig 2012-06-10 17:44:46.285173374 +0200
++++ config.h.in 2012-06-10 17:44:46.300172986 +0200
+@@ -228,6 +228,9 @@
/* Location of documentation files */
#undef XINE_DOCDIR
+/* logo mrl for reduced functionality */
+#undef XINE_LOGO_CRIPPLED_MRL
+
- /* official logo mrl */
+ /* official logo MRL */
#undef XINE_LOGO_MRL
-Index: configure
-===================================================================
---- configure.orig
-+++ configure
-@@ -15100,13 +15100,21 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
-
--XINE_LOGO_MRL="file:$XINE_SKINDIR/xine-ui_logo.mpv"
-+XINE_LOGO_MRL="file:$XINE_SKINDIR/xine-ui_logo.png"
-
- cat >>confdefs.h <<_ACEOF
- #define XINE_LOGO_MRL "`makeexpand $XINE_LOGO_MRL`"
- _ACEOF
-
-
-+XINE_LOGO_CRIPPLED_MRL="file:$XINE_SKINDIR/xine-ui_logo-crippled.png"
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define XINE_LOGO_CRIPPLED_MRL "`makeexpand $XINE_LOGO_CRIPPLED_MRL`"
-+_ACEOF
-+
-+
- XINE_SPLASH="$XINE_SKINDIR/xine_splash.png"
-
- cat >>confdefs.h <<_ACEOF
++++++ xine-ui-array-overflow.diff ++++++
--- /var/tmp/diff_new_pack.sZNGFX/_old 2012-06-16 06:57:43.000000000 +0200
+++ /var/tmp/diff_new_pack.sZNGFX/_new 2012-06-16 06:57:43.000000000 +0200
@@ -1,8 +1,7 @@
-Index: xine-ui-0.99.5/src/xitk/xine-toolkit/dnd.c
-===================================================================
---- xine-ui-0.99.5.orig/src/xitk/xine-toolkit/dnd.c
-+++ xine-ui-0.99.5/src/xitk/xine-toolkit/dnd.c
-@@ -46,7 +46,7 @@ static int _is_atom_match(xitk_dnd_t *xd
+diff -ur xine-ui-0.99.7.orig/src/xitk/xine-toolkit/dnd.c
xine-ui-0.99.7/src/xitk/xine-toolkit/dnd.c
+--- xine-ui-0.99.7.orig/src/xitk/xine-toolkit/dnd.c 2012-01-19
12:04:00.000000000 +0100
++++ xine-ui-0.99.7/src/xitk/xine-toolkit/dnd.c 2012-06-10 17:31:12.361285418
+0200
+@@ -44,7 +44,7 @@
int i, j;
for(i = 0; (*atom)[i] != 0; i++) {
++++++ xine-ui-crippled-LOCAL.diff ++++++
--- /var/tmp/diff_new_pack.sZNGFX/_old 2012-06-16 06:57:43.000000000 +0200
+++ /var/tmp/diff_new_pack.sZNGFX/_new 2012-06-16 06:57:43.000000000 +0200
@@ -1,23 +1,19 @@
-Index: configure.ac
-===================================================================
---- configure.ac.orig
-+++ configure.ac
-@@ -621,6 +621,9 @@ AC_DEFINE_UNQUOTED(XINE_SKINDIR, "$XINE_
- XINE_LOGO_MRL="file:$XINE_SKINDIR/xine-ui_logo.png"
- AC_DEFINE_UNQUOTED(XINE_LOGO_MRL, "`makeexpand $XINE_LOGO_MRL`",[official
logo mrl])
-
-+XINE_LOGO_CRIPPLED_MRL="file:$XINE_SKINDIR/xine-ui_logo-crippled.png"
-+AC_DEFINE_UNQUOTED(XINE_LOGO_CRIPPLED_MRL, "`makeexpand
$XINE_LOGO_CRIPPLED_MRL`",[logo mrl for reduced functionality])
-+
- XINE_SPLASH="$XINE_SKINDIR/xine_splash.png"
- AC_DEFINE_UNQUOTED(XINE_SPLASH, "`makeexpand $XINE_SPLASH`",[splash image])
-
-Index: misc/xine-check.sh.in
-===================================================================
---- misc/xine-check.sh.in.orig
-+++ misc/xine-check.sh.in
-@@ -644,7 +644,13 @@ if test -n "$skindir"; then
- if test -f xine-ui_logo.png; then
+diff -ur xine-ui-0.99.7.orig/configure.ac xine-ui-0.99.7/configure.ac
+--- xine-ui-0.99.7.orig/configure.ac 2012-02-19 20:36:56.000000000 +0100
++++ xine-ui-0.99.7/configure.ac 2012-06-10 17:37:43.479136483 +0200
+@@ -694,6 +694,7 @@
+ ])
+
+ XINE_LOCATE_MEDIA([XINE_LOGO_MRL], [jpg png mpv], [mpv], [xine-ui_logo],
[logo], [official logo MRL])
++XINE_LOCATE_MEDIA([XINE_LOGO_CRIPPLED_MRL], [jpg png mpv], [mpv],
[xine-ui_logo-crippled], [logo], [logo mrl for reduced functionality])
+ XINE_LOCATE_MEDIA([XINE_SPLASH], [jpg png], [png], [xine_splash], [splash],
[splash image filename])
+
+ XINE_VISDIR="${datadir}/xine/visuals"
+diff -ur xine-ui-0.99.7.orig/misc/xine-check.sh.in
xine-ui-0.99.7/misc/xine-check.sh.in
+--- xine-ui-0.99.7.orig/misc/xine-check.sh.in 2012-06-10 17:22:31.538813887
+0200
++++ xine-ui-0.99.7/misc/xine-check.sh.in 2012-06-10 17:34:07.029752044
+0200
+@@ -602,7 +602,13 @@
+ if test -f xine-ui_logo.mpv || test -f xine-ui_logo.png || test -f
xine-ui_logo.jpg; then
msg logo-exists
else
- msg no-xine-logo 2
@@ -31,11 +27,10 @@
fi
skins=
for dir in *; do
-Index: src/xitk/actions.c
-===================================================================
---- src/xitk/actions.c.orig
-+++ src/xitk/actions.c
-@@ -220,7 +220,10 @@ void gui_display_logo(void) {
+diff -ur xine-ui-0.99.7.orig/src/xitk/actions.c
xine-ui-0.99.7/src/xitk/actions.c
+--- xine-ui-0.99.7.orig/src/xitk/actions.c 2011-09-11 03:37:46.000000000
+0200
++++ xine-ui-0.99.7/src/xitk/actions.c 2012-06-10 17:34:07.029752044 +0200
+@@ -218,7 +218,10 @@
panel_update_channel_display();
if(gGui->display_logo)
@@ -47,24 +42,22 @@
gGui->logo_mode = 1;
-Index: src/xitk/common.h
-===================================================================
---- src/xitk/common.h.orig
-+++ src/xitk/common.h
-@@ -235,6 +235,8 @@ typedef struct {
- int experience_level;
+diff -ur xine-ui-0.99.7.orig/src/xitk/common.h xine-ui-0.99.7/src/xitk/common.h
+--- xine-ui-0.99.7.orig/src/xitk/common.h 2010-08-18 20:34:11.000000000
+0200
++++ xine-ui-0.99.7/src/xitk/common.h 2012-06-10 17:34:07.032751966 +0200
+@@ -245,6 +245,8 @@
+ int logo_mode;
const char *logo_mrl;
+ const char *logo_crippled_mrl;
+ int logo_select;
- int logo_mode;
+ pthread_mutex_t logo_mutex;
int logo_has_changed;
int display_logo;
-Index: src/xitk/main.c
-===================================================================
---- src/xitk/main.c.orig
-+++ src/xitk/main.c
-@@ -415,6 +415,9 @@ static void xrm_parse(void) {
+diff -ur xine-ui-0.99.7.orig/src/xitk/main.c xine-ui-0.99.7/src/xitk/main.c
+--- xine-ui-0.99.7.orig/src/xitk/main.c 2012-01-19 12:04:00.000000000
+0100
++++ xine-ui-0.99.7/src/xitk/main.c 2012-06-10 17:34:07.035751888 +0200
+@@ -414,6 +414,9 @@
static void main_change_logo_cb(void *data, xine_cfg_entry_t *cfg) {
gGui->logo_mrl = cfg->str_value;
}
@@ -74,21 +67,21 @@
static void sub_autoload_cb(void *data, xine_cfg_entry_t *cfg) {
gGui->subtitle_autoload = cfg->num_value;
}
-@@ -1351,6 +1354,9 @@ int main(int argc, char *argv[]) {
+@@ -1406,6 +1409,9 @@
char **session_argv = NULL;
int session_argv_num = 0;
int retval = 0;
+ const char * const *decoders;
+ const char * const *d;
+ int i;
+ pthread_mutexattr_t mutexattr;
- #ifdef ENABLE_NLS
- if((xitk_set_locale()) != NULL) {
-@@ -2145,6 +2151,25 @@ int main(int argc, char *argv[]) {
+ /* Set stdout always line buffered to get every */
+@@ -2224,6 +2230,25 @@
CONFIG_LEVEL_EXP,
main_change_logo_cb,
CONFIG_NO_DATA);
-+ gGui->logo_crippled_mrl = xine_config_register_string (gGui->xine,
"gui.logo_crippled_mrl", XINE_LOGO_CRIPPLED_MRL,
++ gGui->logo_crippled_mrl = xine_config_register_string
(__xineui_global_xine_instance, "gui.logo_crippled_mrl", XINE_LOGO_CRIPPLED_MRL,
+ _("Logo mrl (reduced
functionality)"),
+ CONFIG_NO_HELP,
+ CONFIG_LEVEL_EXP,
@@ -98,7 +91,7 @@
+ /*
+ * Check for important codecs and select logo
+ */
-+ decoders = xine_list_video_decoder_plugins (gGui->xine);
++ decoders = xine_list_video_decoder_plugins (__xineui_global_xine_instance);
+ i = 0;
+ for (d = decoders; *d; d++) {
+ if (strcmp (*d, "mpeg2") == 0)
@@ -110,11 +103,10 @@
gGui->event_queue = xine_event_new_queue(gGui->stream);
xine_event_create_listener_thread(gGui->event_queue, event_listener, NULL);
-Index: src/xitk/videowin.c
-===================================================================
---- src/xitk/videowin.c.orig
-+++ src/xitk/videowin.c
-@@ -2056,11 +2056,23 @@ void video_window_get_mag (float *xmag,
+diff -ur xine-ui-0.99.7.orig/src/xitk/videowin.c
xine-ui-0.99.7/src/xitk/videowin.c
+--- xine-ui-0.99.7.orig/src/xitk/videowin.c 2011-09-26 00:11:15.000000000
+0200
++++ xine-ui-0.99.7/src/xitk/videowin.c 2012-06-10 17:34:07.044751654 +0200
+@@ -2050,11 +2050,23 @@
* Change displayed logo, if selected skin want to customize it.
*/
void video_window_update_logo(void) {
@@ -124,7 +116,7 @@
char *skin_logo;
int cfg_err_result;
-
-- cfg_err_result = xine_config_lookup_entry(gGui->xine, "gui.logo_mrl",
&cfg_entry);
+- cfg_err_result = xine_config_lookup_entry(__xineui_global_xine_instance,
"gui.logo_mrl", &cfg_entry);
+
+ if (gGui->logo_select == 0) {
+ mrl_entry = "gui.logo_mrl";
@@ -134,13 +126,13 @@
+ mrl_default = XINE_LOGO_CRIPPLED_MRL;
+ }
+
-+ cfg_err_result = xine_config_lookup_entry(gGui->xine, mrl_entry,
++ cfg_err_result = xine_config_lookup_entry(__xineui_global_xine_instance,
mrl_entry,
+ &cfg_entry);
+
skin_logo = xitk_skin_get_logo(gGui->skin_config);
if(skin_logo) {
-@@ -2071,7 +2083,7 @@ void video_window_update_logo(void) {
+@@ -2065,7 +2077,7 @@
goto __done;
}
@@ -149,13 +141,13 @@
goto __play_logo_now;
}
-@@ -2081,8 +2093,9 @@ void video_window_update_logo(void) {
+@@ -2075,8 +2087,9 @@
* Back to default logo only on a skin
* change, not at the first skin loading.
**/
-- if(gVw->logo_synthetic && (cfg_err_result) &&
(strcmp(cfg_entry.str_value, XINE_LOGO_MRL))) {
+- if(gVw.logo_synthetic && (cfg_err_result) && (strcmp(cfg_entry.str_value,
XINE_LOGO_MRL))) {
- config_update_string("gui.logo_mrl", XINE_LOGO_MRL);
-+ if(gVw->logo_synthetic && (cfg_err_result) &&
++ if(gVw.logo_synthetic && (cfg_err_result) &&
+ (strcmp(cfg_entry.str_value, mrl_default))) {
+ config_update_string(mrl_entry, mrl_default);
++++++ xine-ui-libpng15.diff ++++++
--- /var/tmp/diff_new_pack.sZNGFX/_old 2012-06-16 06:57:43.000000000 +0200
+++ /var/tmp/diff_new_pack.sZNGFX/_new 2012-06-16 06:57:43.000000000 +0200
@@ -1,8 +1,7 @@
-Index: xine-ui-0.99.5/src/xitk/Imlib-light/load.c
-===================================================================
---- xine-ui-0.99.5.orig/src/xitk/Imlib-light/load.c
-+++ xine-ui-0.99.5/src/xitk/Imlib-light/load.c
-@@ -58,7 +58,18 @@ unsigned char *_LoadPNG(ImlibData * id,
+diff -uNr xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
xine-ui-0.99.6/src/xitk/Imlib-light/load.c
+--- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c 2010-03-01
18:02:05.000000000 +0100
++++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c 2012-05-26 14:28:07.263658527
+0200
+@@ -61,7 +61,18 @@
png_destroy_read_struct(&png_ptr, NULL, NULL);
return NULL;
}
++++++ xine-ui-lirc.diff ++++++
diff -ur xine-ui-0.99.7.orig/src/xitk/lirc.c xine-ui-0.99.7/src/xitk/lirc.c
--- xine-ui-0.99.7.orig/src/xitk/lirc.c 2011-11-08 21:49:07.000000000 +0100
+++ xine-ui-0.99.7/src/xitk/lirc.c 2012-06-10 17:27:44.844673614 +0200
@@ -32,6 +32,7 @@
#include <string.h>
#include "common.h"
+#include "common/globals.h"
#ifdef DEBUG
#define LIRC_VERBOSE 1
++++++ xine-ui-rpmlintrc.diff ++++++
diff -ur xine-ui-0.99.7.orig/src/xitk/i18n.h xine-ui-0.99.7/src/xitk/i18n.h
--- xine-ui-0.99.7.orig/src/xitk/i18n.h 2010-12-05 12:23:36.000000000 +0100
+++ xine-ui-0.99.7/src/xitk/i18n.h 2012-06-11 20:09:47.594016791 +0200
@@ -33,7 +33,7 @@
# define N_(String) (String)
# endif
# define XITK_GETTEXT_SEP "\004"
-# define pgettext(Ctx, String) gettext(Ctx XITK_GETTEXT_SEP String) == Ctx
XITK_GETTEXT_SEP String ? String : gettext(Ctx XITK_GETTEXT_SEP String)
+# define pgettext(Ctx, String) strcmp(gettext(Ctx XITK_GETTEXT_SEP String),
Ctx XITK_GETTEXT_SEP String) == 0 ? String : gettext(Ctx XITK_GETTEXT_SEP
String)
#else
/* Stubs that do something close enough. */
++++++ xine-ui-various.diff ++++++
--- /var/tmp/diff_new_pack.sZNGFX/_old 2012-06-16 06:57:43.000000000 +0200
+++ /var/tmp/diff_new_pack.sZNGFX/_new 2012-06-16 06:57:43.000000000 +0200
@@ -1,6 +1,6 @@
---- m4/aa.m4
-+++ m4/aa.m4 2005/07/28 12:50:58
-@@ -140,6 +140,22 @@
+--- m4/aa.m4 2009-12-19 00:14:27.000000000 +0100
++++ m4/aa.m4 2012-05-26 13:56:48.462636319 +0200
+@@ -53,6 +53,22 @@
#include <stdlib.h>
#include <aalib.h>
@@ -22,51 +22,19 @@
+
int main () {
int major, minor;
- char *tmp_version;
-@@ -147,7 +163,7 @@
+ char *tmp_version;
+@@ -60,7 +76,7 @@
system ("touch conf.aalibtest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = (char *) strdup("$min_aalib_version");
+ tmp_version = my_strdup("$min_aalib_version");
if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
- printf("%s, bad version string\n", "$min_aalib_version");
- exit(1);
-@@ -210,6 +226,22 @@
- #include <stdlib.h>
- #include <aalib.h>
-
-+char*
-+my_strdup (char *str)
-+{
-+ char *new_str;
-+
-+ if (str)
-+ {
-+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-+ strcpy (new_str, str);
-+ }
-+ else
-+ new_str = NULL;
-+
-+ return new_str;
-+}
-+
- int main () {
- int major, minor;
- char *tmp_version;
-@@ -217,7 +249,7 @@
- system ("touch conf.aalibtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
-- tmp_version = (char *) strdup("$min_aalib_version");
-+ tmp_version = my_strdup("$min_aalib_version");
- if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
- printf("%s, bad version string\n", "$min_aalib_version");
- exit(1);
---- misc/xine-check.sh.in
-+++ misc/xine-check.sh.in 2005/07/28 12:50:58
-@@ -470,7 +470,16 @@
+ printf("%s, bad version string\n", "$min_aalib_version");
+ exit(1);
+--- misc/xine-check.sh.in 2010-03-06 02:14:50.000000000 +0100
++++ misc/xine-check.sh.in 2012-05-26 13:49:20.113298133 +0200
+@@ -481,7 +481,16 @@
msg found-xine 0
fi
else
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
