packages: xine-lib/xine-lib.spec, xine-lib/xine-lib-vdr.patch (REMOVED) - u...

[gotar]

Author: gotar                        Date: Mon Dec 26 11:39:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use VDR patch source directly, patch this in our repo when needed (it is
  now, patch doesn't apply)

---- Files affected:
packages/xine-lib:
   xine-lib.spec (1.296 -> 1.297) , xine-lib-vdr.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xine-lib/xine-lib.spec
diff -u packages/xine-lib/xine-lib.spec:1.296 packages/xine-lib/xine-lib.spec:1.297
--- packages/xine-lib/xine-lib.spec:1.296	Fri Nov 25 20:20:16 2011
+++ packages/xine-lib/xine-lib.spec	Mon Dec 26 12:39:02 2011
@@ -34,6 +34,8 @@
 %undefine	with_dxr3
 %endif
 
+%define		_vdr_plugin_ver	0.9.4
+
 Summary:	A Free Video Player
 Summary(ko.UTF-8):	공개 동영상 플레이어
 Summary(pl.UTF-8):	Odtwarzacz filmów
@@ -46,11 +48,12 @@
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
 # Source0-md5:	1213457c42e2370155eb26e1c862dab2
+Source1:	http://home.vrweb.de/~rnissl/vdr-xine-%{_vdr_plugin_ver}.tgz
+# Source1-md5:	0374123d6991f55d91122b020361d8f6
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-win32-path.patch
 Patch2:		%{name}-am.patch
 Patch3:		%{name}-sh.patch
-Patch4:		%{name}-vdr.patch
 Patch5:		%{name}-ac.patch
 Patch6:		%{name}-a52.patch
 Patch7:		%{name}-pvr.patch
@@ -112,7 +115,7 @@
 Obsoletes:	xine-output-audio-arts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define 	_noautoreqdep	libGL.so.1 libGLU.so.1
+%define		_noautoreqdep	libGL.so.1 libGLU.so.1
 
 # based on libtool numbers
 %define		xine_pluginsdir	%{_libdir}/xine/plugins/1.30
@@ -891,12 +894,12 @@
 XINE - wtyczka postprocessingu oparta na libpostproc z pakietu FFmpeg.
 
 %prep
-%setup -q
+%setup -q -a 1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{?with_vdr:%patch4 -p1}
+%{?with_vdr:%{__patch} -p1 < xine-%{_vdr_plugin_ver}/patches/xine-lib.patch}
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -1310,6 +1313,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.297  2011/12/26 11:39:02  gotar
+- use VDR patch source directly, patch this in our repo when needed (it is
+  now, patch doesn't apply)
+
 Revision 1.296  2011/11/25 19:20:16  qboosh
 - versioned install time dependencies
 - release 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xine-lib/xine-lib.spec?r1=1.296&r2=1.297&f=u