Logoj0ke.net Open Build Service > Projects > multimedia:SL11 > xine-lib > Changes
Sign Up | Log In

Changes of Revision 17

[-] Changed xine-lib.spec
​x
 
1
@@ -26,19 +26,20 @@
2
 # --without distributable   -> build libxine1-codecs
3
 #
4
 # default for buildservice is no patented codecs
5
+%bcond_without distributable
6
 %bcond_with onlynondistributable
7
 %if 0%{suse_version} >= 1100
8
 %bcond_without pulseaudio
9
 %else
10
 %bcond_with pulseaudio
11
 %endif
12
-%bcond_without sdl
13
-%bcond_without aalib
14
-%bcond_without arts
15
-%bcond_without esd
16
-%bcond_without jack
17
+%bcond_with sdl
18
+%bcond_with aalib
19
+%bcond_with arts
20
+%bcond_with esd
21
+%bcond_with jack
22
 %bcond_without gnome_vfs
23
-%bcond_without directfb
24
+%bcond_with directfb
25
 %if 0%{suse_version} > 1110
26
 %bcond_without modplug
27
 %else
28
@@ -52,7 +53,7 @@
29
 BuildRequires:  libcdio-devel libdrm-devel libmng-devel libsmbclient
30
 BuildRequires:  Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel
31
 BuildRequires:  readline-devel update-desktop-files vcdimager-devel
32
-BuildRequires:  libspeex-devel
33
+BuildRequires:  speex-devel
34
 %if 0%{suse_version} >= 1110
35
 BuildRequires:  libv4l-devel
36
 %endif
37
@@ -100,7 +101,7 @@
38
 BuildRequires:  libmodplug-devel
39
 %endif
40
 Version:        1.1.19
41
-Release:        1.pm.44.5
42
+Release:        45
43
 # bug437293
44
 %ifarch ppc64
45
 Obsoletes:      xine-lib-64bit
46
@@ -123,6 +124,7 @@
47
 Patch26:        xine-lib-doc-fix-X11R6.diff
48
 Patch28:        xine-lib-%{version}-ia64-is-not-alpha.diff
49
 Patch31:        xine-lib-%{version}-glitch-free-pulseaudio.patch
50
+Patch32:        http://repos.archlinux.org/wsvn/packages/xine-lib/trunk/xine-lib-1.1.19-xvmc.patch
51
 # *** Addons
52
 Patch50:        vdr-xine-0.9.3.diff.bz2
53
 Patch51:        vdr-xine-SUSE.diff
54
@@ -630,6 +632,7 @@
55
 %patch26
56
 %patch28 -p1
57
 %patch31 -p1
58
+%patch32 -p0
59
 %if 0%{suse_version} >= 1110
60
 # set fuzzy=2 to get patch work with crippled and noncrippled tarball
61
 %patch50 -p1 -F2
62
@@ -721,7 +724,7 @@
63
 # install documentation
64
 install -m 0644 %{SOURCE10} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/
65
 %if !%{with distributable}
66
-touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad || echo "can't touch"
67
+touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad
68
 %endif
69
 # remove usless READMEs
70
 rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32}
71
@@ -896,7 +899,7 @@
72
 xargs -i+ strip --strip-debug %{buildroot}/+ <files.codecs
73
 %endif
74
 %endif
75
-%if %{with distributable}
76
+%if %{with onlynondistributable}
77
 for i in files files.*; do
78
   test "$i" = 'files.codecs' || xargs -i+ rm -f %{buildroot}/+ < $i
79
 done
80
@@ -909,7 +912,7 @@
81
82
 %clean
83
 rm -rf %{buildroot}
84
-%if !%{with distributable}
85
+%if !%{with onlynondistributable}
86
87
 %post -n libxine1 -p /sbin/ldconfig
88
89
@@ -1002,6 +1005,8 @@
90
 %endif
91
92
 %changelog
93
+* Thu Nov 18 2010 coolo@novell.com
94
+- add patch from arch linux to fix build with newer xorg
95
 * Tue Aug  3 2010 lnussel@suse.de
96
 - remove unneeded libcdio-mini-devel buildignore again
97
 * Mon Jul 26 2010 Manfred.Tremmel@iiv.de
98
​
[+] Added xine-lib-1.1.19-xvmc.patch ^

Cancel