Hello community, here is the log from the commit of package vdr-plugin-xine for openSUSE:Factory checked in at Sat Jul 11 02:17:13 CEST 2009. -------- New Changes file: --- /dev/null 2009-04-14 11:55:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr-plugin-xine/vdr-plugin-xine.changes 2009-06-04 10:05:49.000000000 +0200 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Thu Jun 4 09:53:39 CEST 2009 - lnussel@suse.de + +- split vdr-plugin-xine off vdr-plugins calling whatdependson for head-i586 New: ---- sysconfig.vdr-xine vdr-plugin-xine.changes vdr-plugin-xine.spec vdr-xine-0.8.2-nodebug.diff vdr-xine-0.8.2.diff vdr-xine-0.8.2.tar.bz2 vdr-xine-CAN-2005-0071.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr-plugin-xine.spec ++++++ # # spec file for package vdr-plugin-xine (Version MACRO) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define pluginversion 0.8.2 %define pluginname xine %define pluginurl http://home.vr-web.de/~rnissl/ # %define plugindir %pluginname-%pluginversion %define plugintarball vdr-%pluginname-%pluginversion.tar.bz2 # %define pkgversion %pluginversion Name: vdr-plugin-xine Version: %pkgversion Release: 3 Source: %plugintarball BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: VDR %pluginname plugin License: GPL v2 or later Group: Applications/Multimedia BuildRequires: gcc-c++ vdr-devel PreReq: vdr(abi) = %{vdr_apiversion} Url: %pluginurl # BuildRequires: xine-devel PreReq: %fillup_prereq Source1: sysconfig.vdr-xine Patch0: vdr-xine-0.8.2.diff Patch1: vdr-xine-0.8.2-nodebug.diff Patch2: vdr-xine-CAN-2005-0071.diff # only needed for packages that used the old naming scheme Obsoletes: vdr-%pluginname < %pkgversion # used to be in vdr-plugins Provides: vdr-plugins:/usr/share/doc/packages/vdr/plugins/%{pluginname} Conflicts: vdr-plugins <= 0.5 %description %vdrname %pluginname plugin %prep %setup -q -n %plugindir %patch0 -p1 %patch1 -p1 %patch2 -p1 %build %vdr_make %install install -d -m 755 %{buildroot}%{_bindir} install -d -m 755 %{buildroot}%{vdr_sysconfdir}/plugins/xine install -d -m 755 %{buildroot}/var/lib/vdr-xine install -m 644 data/* %{buildroot}%{vdr_sysconfdir}/plugins/xine install -m 755 xineplayer %{buildroot}%{_bindir} # sysconfig install -d -m 755 %{buildroot}/var/adm/fillup-templates install -m 644 %{SOURCE1} %{buildroot}/var/adm/fillup-templates/sysconfig.%vdrname-xine # %vdr_install_plugin %pluginname %vdr_install_plugin_locale # %find_lang vdr-%pluginname %clean rm -rf "${RPM_BUILD_ROOT}" %post %{fillup_only -n %vdrname -s xine} %files -f vdr-%pluginname.lang %defattr(-,root,root) %doc COPYING HISTORY INSTALL MANUAL README %{vdr_libdir}/* %attr(-,vdr,root) %dir %{vdr_sysconfdir}/plugins/xine # not really config files %attr(-,vdr,root) %{vdr_sysconfdir}/plugins/xine/*.mpg %{_bindir}/xineplayer %attr(755, vdr, video) /var/lib/vdr-xine /var/adm/fillup-templates/sysconfig.%vdrname-xine %changelog ++++++ sysconfig.vdr-xine ++++++ ## Type: string ## Default: # # Arguments for xine plugin # VDR_PLUGIN_ARGS_xine="-r" ++++++ vdr-xine-0.8.2-nodebug.diff ++++++ Index: xine-0.8.2/xineDevice.c =================================================================== --- xine-0.8.2.orig/xineDevice.c +++ xine-0.8.2/xineDevice.c @@ -1154,7 +1154,12 @@ int ScanVideoPacket(const uchar *Data, i || 0x00 != Data[ 1 ] || 0x01 != Data[ 2 ]) { - VERBOSE_NOP(); + static int beenhere = 0; + if(!beenhere) + { + VERBOSE_NOP(); + beenhere = 1; + } break; } @@ -1617,7 +1622,12 @@ if (blahblah) } else { - VERBOSE_NOP(); + static int beenhere = 0; + if(!beenhere) + { + VERBOSE_NOP(); + beenhere = 1; + } ch = '2'; } } @@ -1651,7 +1661,12 @@ if (blahblah) || 0x00 != Data[ 1 ] || 0x01 != Data[ 2 ]) { - VERBOSE_NOP1(); + static int beenhere = 0; + if(!beenhere) + { + VERBOSE_NOP1(); + beenhere = 1; + } return; } ++++++ vdr-xine-0.8.2.diff ++++++ Index: xine-0.8.2/Makefile =================================================================== --- xine-0.8.2.orig/Makefile +++ xine-0.8.2/Makefile @@ -25,18 +25,19 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloa ### The directory environment: -VDRDIR = ../../.. -LIBDIR = ../../lib +VDRDIR = /usr/include/vdr +LIBDIR = . TMPDIR = /tmp ### Allow user defined options to overwrite defaults: -include $(VDRDIR)/Make.config +CXXFLAGS += -fno-strict-aliasing INCLUDES += `pkg-config --cflags libxine` # where to create fifos (xine expects them at /tmp/vdr-xine) -VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine +VDR_XINE_FIFO_DIR ?= /var/lib/vdr-xine # can be used to detect inefficient OSD drawing # 0 - do not verify whether the dirty area of a bitmap is really dirty Index: xine-0.8.2/xineLib.c =================================================================== --- xine-0.8.2.orig/xineLib.c +++ xine-0.8.2/xineLib.c @@ -2230,7 +2230,7 @@ namespace PluginXine return false; \ } } while (0) - if (::mkdir(m_fifoDir.c_str(), 0755) < 0) + if (::mkdir(m_fifoDir.c_str(), 0755) < 0 && errno != EEXIST) { string msg = "vdr-xine: error: couldn't create directory '" + m_fifoDir + "'"; perror(msg.c_str()); Index: xine-0.8.2/xineLib.h =================================================================== --- xine-0.8.2.orig/xineLib.h +++ xine-0.8.2/xineLib.h @@ -24,6 +24,7 @@ #include "xineExternal.h" #include "xineSettings.h" +class cPlugin; namespace PluginXine ++++++ vdr-xine-CAN-2005-0071.diff ++++++ Index: xine-0.8.2/xineLib.c =================================================================== --- xine-0.8.2.orig/xineLib.c +++ xine-0.8.2/xineLib.c @@ -3946,7 +3946,7 @@ namespace PluginXine if (FileName) { - outfd = ::open(FileName, O_CREAT /* | O_EXCL */ | O_TRUNC | O_RDWR, 0644); + outfd = ::open(FileName, O_CREAT | O_EXCL | O_TRUNC | O_RDWR, 0644); } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org