commit vdr-plugin-xine for openSUSE:Factory
Hello community, here is the log from the commit of package vdr-plugin-xine for openSUSE:Factory checked in at Wed Nov 25 15:57:01 CET 2009. -------- --- vdr-plugin-xine/vdr-plugin-xine.changes 2009-06-04 10:05:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr-plugin-xine/vdr-plugin-xine.changes 2009-11-23 09:34:14.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 23 09:07:46 CET 2009 - lnussel@suse.de + +- new version 0.9.3 + * better recovery from bad weather conditions + * OSD improvements + * aspect ratio fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vdr-xine-0.8.2.diff vdr-xine-0.8.2-nodebug.diff vdr-xine-0.8.2.tar.bz2 New: ---- vdr-xine-0.9.3.diff vdr-xine-0.9.3-nodebug.diff vdr-xine-0.9.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr-plugin-xine.spec ++++++ --- /var/tmp/diff_new_pack.L6yfHO/_old 2009-11-25 15:55:44.000000000 +0100 +++ /var/tmp/diff_new_pack.L6yfHO/_new 2009-11-25 15:55:44.000000000 +0100 @@ -17,7 +17,7 @@ # norootforbuild -%define pluginversion 0.8.2 +%define pluginversion 0.9.3 %define pluginname xine %define pluginurl http://home.vr-web.de/~rnissl/ # @@ -28,21 +28,21 @@ Name: vdr-plugin-xine Version: %pkgversion -Release: 3 +Release: 4 Source: %plugintarball BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: VDR %pluginname plugin License: GPL v2 or later Group: Applications/Multimedia -BuildRequires: gcc-c++ vdr-devel +BuildRequires: gcc-c++ pkg-config vdr-devel PreReq: vdr(abi) = %{vdr_apiversion} Url: %pluginurl # -BuildRequires: xine-devel +BuildRequires: libxine-devel PreReq: %fillup_prereq Source1: sysconfig.vdr-xine -Patch0: vdr-xine-0.8.2.diff -Patch1: vdr-xine-0.8.2-nodebug.diff +Patch0: vdr-xine-0.9.3.diff +Patch1: vdr-xine-0.9.3-nodebug.diff Patch2: vdr-xine-CAN-2005-0071.diff # only needed for packages that used the old naming scheme Obsoletes: vdr-%pluginname < %pkgversion @@ -66,7 +66,7 @@ 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 644 data/*.mpg %{buildroot}%{vdr_sysconfdir}/plugins/xine install -m 755 xineplayer %{buildroot}%{_bindir} # sysconfig install -d -m 755 %{buildroot}/var/adm/fillup-templates @@ -93,4 +93,5 @@ %{_bindir}/xineplayer %attr(755, vdr, video) /var/lib/vdr-xine /var/adm/fillup-templates/sysconfig.%vdrname-xine + %changelog ++++++ vdr-xine-0.8.2.diff -> vdr-xine-0.9.3.diff ++++++ --- vdr-plugin-xine/vdr-xine-0.8.2.diff 2008-04-25 16:47:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr-plugin-xine/vdr-xine-0.9.3.diff 2009-11-23 09:34:15.000000000 +0100 @@ -1,22 +1,23 @@ -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 +diff -ur xine-0.9.3.orig/Makefile xine-0.9.3/Makefile +--- xine-0.9.3.orig/Makefile 2009-04-04 21:01:49.000000000 +0200 ++++ xine-0.9.3/Makefile 2009-06-19 21:44:20.000000000 +0200 +@@ -25,18 +25,20 @@ ### The directory environment: -VDRDIR = ../../.. -LIBDIR = ../../lib +-TMPDIR = /tmp ++DVBDIR = . +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) @@ -25,11 +26,19 @@ # 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 +@@ -116,7 +118,7 @@ + ### Internationalization (I18N): + + PODIR = po +-LOCALEDIR = $(VDRDIR)/locale ++LOCALEDIR = locale + I18Npo = $(wildcard $(PODIR)/*.po) + I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) + I18Ndirs = $(notdir $(foreach file, $(I18Npo), $(basename $(file)))) +diff -ur xine-0.9.3.orig/xineLib.c xine-0.9.3/xineLib.c +--- xine-0.9.3.orig/xineLib.c 2009-06-01 19:32:05.000000000 +0200 ++++ xine-0.9.3/xineLib.c 2009-06-19 21:44:20.000000000 +0200 +@@ -2270,7 +2270,7 @@ return false; \ } } while (0) @@ -38,11 +47,10 @@ { 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 @@ +diff -ur xine-0.9.3.orig/xineLib.h xine-0.9.3/xineLib.h +--- xine-0.9.3.orig/xineLib.h 2009-06-01 19:31:04.000000000 +0200 ++++ xine-0.9.3/xineLib.h 2009-06-19 21:44:20.000000000 +0200 +@@ -29,6 +29,7 @@ #include "xineExternal.h" #include "xineSettings.h" ++++++ vdr-xine-0.8.2-nodebug.diff -> vdr-xine-0.9.3-nodebug.diff ++++++ --- vdr-plugin-xine/vdr-xine-0.8.2-nodebug.diff 2008-04-25 16:47:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/vdr-plugin-xine/vdr-xine-0.9.3-nodebug.diff 2009-11-23 09:34:15.000000000 +0100 @@ -1,36 +1,35 @@ -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 +diff -ur xine-0.9.3.orig/xineDevice.c xine-0.9.3/xineDevice.c +--- xine-0.9.3.orig/xineDevice.c 2009-06-17 20:06:35.000000000 +0200 ++++ xine-0.9.3/xineDevice.c 2009-11-22 13:55:49.429468182 +0100 +@@ -1328,7 +1328,12 @@ || 0x00 != Data[ 1 ] || 0x01 != Data[ 2 ]) { - VERBOSE_NOP(); -+ static int beenhere = 0; -+ if(!beenhere) -+ { -+ VERBOSE_NOP(); -+ beenhere = 1; -+ } ++ static int beenhere = 0; ++ if(!beenhere) ++ { ++ VERBOSE_NOP(); ++ beenhere = 1; ++ } break; } -@@ -1617,7 +1622,12 @@ if (blahblah) +@@ -2037,7 +2042,12 @@ } else { - VERBOSE_NOP(); -+ static int beenhere = 0; -+ if(!beenhere) -+ { -+ VERBOSE_NOP(); -+ beenhere = 1; -+ } ++ static int beenhere = 0; ++ if(!beenhere) ++ { ++ VERBOSE_NOP(); ++ beenhere = 1; ++ } ch = '2'; } } -@@ -1651,7 +1661,12 @@ if (blahblah) +@@ -2071,7 +2081,12 @@ || 0x00 != Data[ 1 ] || 0x01 != Data[ 2 ]) { @@ -38,8 +37,8 @@ + static int beenhere = 0; + if(!beenhere) + { -+ VERBOSE_NOP1(); -+ beenhere = 1; ++ VERBOSE_NOP1(); ++ beenhere = 1; + } return; } ++++++ vdr-xine-0.8.2.tar.bz2 -> vdr-xine-0.9.3.tar.bz2 ++++++ ++++ 11541 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de