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

Changes of Revision 7

[-] Added vlc.changes
 
1
@@ -0,0 +1,5 @@
2
+-------------------------------------------------------------------
3
+Sat Mar 12 21:30:21 UTC 2011 - cs@linux-administrator.com
4
+
5
+- re-import
6
+
7
​
[-] Changed vlc.spec ^
193
 
1
@@ -7,7 +7,7 @@
2
3
 Name:      vlc
4
 Version:   1.1.7
5
-Release:   14
6
+Release:   16
7
 Summary:   VLC - Video Lan Client
8
 URL:       http://www.videolan.org/
9
 License:   GNU General Public License (GPL)
10
@@ -17,11 +17,13 @@
11
12
 Patch0:        %{name}-fix_font_path.patch
13
 Patch1:        %{name}-no_return_in_non_void.patch
14
-Patch2:        %{name}-1.1.5-assert.diff
15
-Patch4:        %{name}-aboutmessage.patch
16
-Patch6:        %{name}-opencv22.patch
17
-Patch7:        %{name}-errno_h.patch
18
-Patch8:        %{name}-asserts_h.patch
19
+Patch2:        %{name}-buildcompare.patch
20
+Patch3:        %{name}-opencv22.patch
21
+Patch4:        %{name}-errno_h.patch
22
+Patch5:        %{name}-asserts_h.patch
23
+Patch6:        %{name}-matroska_110.patch
24
+# pbleser adds X-KDE-Protocols=http,ftp,smb,sftp to vlc.desktop to enable proper streaming in KDE, thanks to martin.frueh@online.de
25
+Patch7:     vlc-add_X-KDE-Protocols_to_desktop.patch
26
27
 Requires:  vlc-noX = %{version}-%{release}
28
 Requires:  vlc-qt = %{version}-%{release}
29
@@ -53,7 +55,7 @@
30
 %endif
31
32
 %if %suse_version >= 1120
33
-BuildRequires: libva-devel
34
+BuildRequires: libva-devel libvdpau-devel
35
 %endif
36
37
 %if %suse_version <= 1120
38
@@ -80,7 +82,9 @@
39
 %if %{with ggi}
40
 BuildRequires:  libggi-devel
41
 %endif
42
+%if %suse_version >= 1120 || 0%{?sles_version} >= 11
43
 BuildRequires:  mozilla-xulrunner192-devel
44
+%endif
45
 BuildRequires: opencv-devel
46
 BuildRequires:  pcre-devel vcdimager-devel xosd-devel
47
48
@@ -160,6 +164,7 @@
49
 for gnome-vfs2.
50
51
52
+%if %suse_version >= 1120 || 0%{?sles_version} >= 11
53
 %package mozillaplugin
54
 Summary:   The mozilaplugin enables VLC inside Mozilla Browser
55
 Group:     Productivity/Multimedia/Video/Players
56
@@ -167,6 +172,7 @@
57
58
 %description mozillaplugin
59
 With this plugin, you enable video content withing the Mozilla Browser Suites
60
+%endif
61
62
63
 %if %suse_version >= 1120 || 0%{?sles_version} >= 11
64
@@ -182,7 +188,7 @@
65
 %endif
66
67
68
-%debug_package
69
+
70
71
72
 %prep
73
@@ -190,10 +196,16 @@
74
 %patch0 -p1
75
 %patch1 -p1
76
 %patch2 -p1
77
+%patch3 -p1
78
 %patch4 -p1
79
+%patch5 -p1
80
 %patch6 -p1
81
-%patch7 -p1
82
-%patch8 -p1
83
+%patch7
84
+
85
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
86
+sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" modules/gui/qt4/dialogs/help.cpp src/libvlc.c
87
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
88
+sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" modules/gui/qt4/dialogs/help.cpp src/libvlc.c
89
90
91
 %build
92
@@ -217,7 +229,9 @@
93
 %endif
94
    --enable-id3tag \
95
    --enable-lirc \
96
+%if %suse_version >= 1120 || 0%{?sles_version} >= 11
97
    --enable-mozilla \
98
+%endif
99
    --enable-ncurses \
100
    --enable-omxil \
101
    --enable-opencv \
102
@@ -231,6 +245,9 @@
103
    --enable-v4l \
104
    --enable-vcdx \
105
    --enable-wma-fixed \
106
+%if %suse_version >= 1120
107
+    --enable-libva \
108
+%endif
109
    --enable-xosd
110
111
 %__make V=1 %{?jobs:-j%jobs}
112
@@ -246,8 +263,10 @@
113
 %suse_update_desktop_file %name AudioVideo Player Video
114
115
116
+%if %suse_version >= 1120 || 0%{?sles_version} >= 11
117
 %__install -d %{buildroot}/%{_libdir}/browser-plugins/
118
 %__ln_s %{_libdir}/mozilla/plugins/libvlcplugin.so %{buildroot}/%{_libdir}/browser-plugins/libvlcplugin.so
119
+%endif
120
121
 # delete .la files
122
 find %{buildroot} -name *.la -exec rm {} \;
123
@@ -376,13 +395,18 @@
124
 %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
125
 %{_libdir}/vlc/plugins/access/libaccess_mmap_plugin.so
126
 %{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so
127
+%if %suse_version >= 1120
128
 %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so
129
+%endif
130
 %{_libdir}/vlc/plugins/access/libaccess_oss_plugin.so
131
 %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
132
 %{_libdir}/vlc/plugins/access/libaccess_smb_plugin.so
133
 %{_libdir}/vlc/plugins/access/libaccess_tcp_plugin.so
134
 %{_libdir}/vlc/plugins/access/libaccess_udp_plugin.so
135
 %{_libdir}/vlc/plugins/access/libcdda_plugin.so
136
+%if %suse_version >= 1140
137
+%{_libdir}/vlc/plugins/access/libdc1394_plugin.so
138
+%endif
139
 %{_libdir}/vlc/plugins/access/libdvb_plugin.so
140
 %{_libdir}/vlc/plugins/access/libdvdnav_plugin.so
141
 %{_libdir}/vlc/plugins/access/libdvdread_plugin.so
142
@@ -449,11 +473,10 @@
143
 %{_libdir}/vlc/plugins/codec/libflac_plugin.so
144
 %{_libdir}/vlc/plugins/codec/libinvmem_plugin.so
145
 %{_libdir}/vlc/plugins/codec/libkate_plugin.so
146
-%if %suse_version >= 1130 || 0%{?sles_version} >= 11
147
+%if %suse_version >= 1130
148
 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so
149
-%endif
150
+%else
151
 %ifarch ppc
152
-%if %suse_version = 1110
153
 %{_libdir}/vlc/plugins/codec/liblibass_plugin.so
154
 %endif
155
 %endif
156
@@ -584,7 +607,9 @@
157
 %dir %{_libdir}/vlc/plugins/services_discovery
158
 %{_libdir}/vlc/plugins/services_discovery/libbonjour_plugin.so
159
 %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so
160
+%if %suse_version >= 1120
161
 %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so
162
+%endif
163
 %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so
164
 %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so
165
 %if %suse_version >= 1120
166
@@ -760,8 +785,10 @@
167
 %dir %{_datadir}/vlc/utils
168
 %{_datadir}/vlc/utils/audio-vlc-default.sh
169
 %{_datadir}/vlc/utils/video-vlc-default.sh
170
+%if %suse_version <= 1130
171
 %dir %{_datadir}/locale/co
172
 %dir %{_datadir}/locale/co/LC_MESSAGES
173
+%endif
174
 %dir %{_datadir}/locale/tet
175
 %dir %{_datadir}/locale/tet/LC_MESSAGES
176
177
@@ -798,6 +825,7 @@
178
 %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
179
 %endif
180
181
+%if %suse_version >= 1120 || 0%{?sles_version} >= 11
182
 %files mozillaplugin
183
 %defattr(-,root,root)
184
 %dir %{_libdir}/mozilla
185
@@ -806,6 +834,7 @@
186
 %{_libdir}/mozilla/plugins/libvlcplugin.so
187
 %dir %{_datadir}/vlc/mozilla
188
 %{_datadir}/vlc/mozilla/*.xpm
189
+%endif
190
191
192
 %changelog
193
​
[+] Deleted vlc-1.1.5-assert.diff ^
[+] Deleted vlc-aboutmessage.patch ^
[+] Added vlc-add_X-KDE-Protocols_to_desktop.patch ^
[+] Added vlc-buildcompare.patch ^
[+] Added vlc-matroska_110.patch ^

Cancel