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

Changes of Revision 2

[-] Changed x264.spec
​x
 
1
@@ -1,27 +1,19 @@
2
 # norootforbuild
3
-#!BuildIgnore:          post-build-checks
4
+
5
+%define     soname      94
6
+%define     svn         20100425
7
 %define     binname     x264
8
 %define     realname    libx264
9
-%define     soname      67
10
-%define     svn         20090627
11
-%define     sonamecompa 66
12
-%define     svncompa    20090228
13
-%define     sonamecompb 65
14
-%define     svncompb    20090119
15
-%define     sonamecompc 64
16
-%define     svncompc    20081001
17
18
 Name:           %{binname}
19
 Summary:        A free h264/avc encoder - encoder binary
20
-Version:        0.0svn%{svn}
21
-Release:        15
22
+Version:        0.%{soname}svn%{svn}
23
+Release:        0.pm.1.1
24
 License:        GNU General Public License (GPL)
25
-Group:          Productivity/Multimedia/Video
26
+Group:          Productivity/Multimedia/Video/Editors and Convertors
27
 URL:            http://developers.videolan.org/x264.html
28
 Source0:        ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svn}-2245.tar.bz2
29
-Source1:        ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompa}-2245.tar.bz2
30
-Source2:        ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompb}-2245.tar.bz2
31
-Source3:        ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{svncompc}-2245.tar.bz2
32
+Patch0:         x264-rewrite-ffmpeg-defaults.patch
33
 BuildRoot:      %{_tmppath}/build-root-%{name}
34
 Requires:       %{realname}-%{soname} = %{version}-%{release}
35
 BuildRequires:  nasm
36
@@ -59,7 +51,7 @@
37
38
 %package -n %{realname}-%{soname}
39
 Summary:        A free h264/avc encoder - encoder binary
40
-Group:          Productivity/Multimedia/Video
41
+Group:          Productivity/Multimedia/Video/Editors and Convertors
42
43
 %description -n %{realname}-%{soname}
44
 x264 is a free library for encoding next-generation H264/AVC video
45
@@ -72,51 +64,6 @@
46
 mplayer/mencoder with H264 encoding support.
47
48
49
-%package -n %{realname}-%{sonamecompa}
50
-Summary:        A free h264/avc encoder - encoder binary
51
-Group:          Productivity/Multimedia/Video
52
-
53
-%description -n %{realname}-%{sonamecompa}
54
-x264 is a free library for encoding next-generation H264/AVC video
55
-streams. The code is written from scratch by Laurent Aimar, Loren
56
-Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
57
-Rullgard, Radek Czyz, Christian Heine (asm), Alex Izvorski (asm), and
58
-Alex Wright. It is released under the terms of the GPL license. This
59
-package contains a static library and a header needed for the
60
-development with libx264. This library is needed to build
61
-mplayer/mencoder with H264 encoding support.
62
-
63
-
64
-%package -n %{realname}-%{sonamecompb}
65
-Summary:        A free h264/avc encoder - encoder binary
66
-Group:          Productivity/Multimedia/Video
67
-
68
-%description -n %{realname}-%{sonamecompb}
69
-x264 is a free library for encoding next-generation H264/AVC video
70
-streams. The code is written from scratch by Laurent Aimar, Loren
71
-Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
72
-Rullgard, Radek Czyz, Christian Heine (asm), Alex Izvorski (asm), and
73
-Alex Wright. It is released under the terms of the GPL license. This
74
-package contains a static library and a header needed for the
75
-development with libx264. This library is needed to build
76
-mplayer/mencoder with H264 encoding support.
77
-
78
-
79
-%package -n %{realname}-%{sonamecompc}
80
-Summary:        A free h264/avc encoder - encoder binary
81
-Group:          Productivity/Multimedia/Video
82
-
83
-%description -n %{realname}-%{sonamecompc}
84
-x264 is a free library for encoding next-generation H264/AVC video
85
-streams. The code is written from scratch by Laurent Aimar, Loren
86
-Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans
87
-Rullgard, Radek Czyz, Christian Heine (asm), Alex Izvorski (asm), and
88
-Alex Wright. It is released under the terms of the GPL license. This
89
-package contains a static library and a header needed for the
90
-development with libx264. This library is needed to build
91
-mplayer/mencoder with H264 encoding support.
92
-
93
-
94
 %package -n %{realname}-devel
95
 Summary:        Libraries and include file for the x264 encoder
96
 Group:          Development/Libraries/C and C++
97
@@ -138,90 +85,26 @@
98
 %debug_package
99
100
 %prep
101
-%setup -q -n "x264-snapshot-%{svn}-2245" -b 1 -b 2 -b 3
102
+%setup -q -n "x264-snapshot-%{svn}-2245"
103
+%patch0 -p1
104
105
 %build
106
-%ifarch i586
107
-#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu
108
-%configure --enable-shared --enable-pic --disable-asm
109
-%else
110
-%configure --enable-shared \
111
-%if 0%{?sles_version} == 10
112
- --disable-asm \
113
-%endif
114
- --enable-pic
115
-%endif
116
-%__make %{?jobs:-j%{jobs}}
117
-
118
-cd ../x264-snapshot-%{svncompa}-2245
119
-%ifarch i586
120
-#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu
121
-%configure --enable-shared --enable-pic --disable-asm
122
-%else
123
-%configure --enable-shared \
124
-%if 0%{?sles_version} == 10
125
- --disable-asm \
126
-%endif
127
- --enable-pic
128
-%endif
129
-%__make %{?jobs:-j%{jobs}}
130
-
131
-cd ../x264-snapshot-%{svncompb}-2245
132
-%ifarch i586
133
-#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu
134
-%configure --enable-shared --enable-pic --disable-asm
135
-%else
136
-%configure --enable-shared \
137
-%if 0%{?sles_version} == 10
138
- --disable-asm \
139
-%endif
140
- --enable-pic
141
-%endif
142
-%__make %{?jobs:-j%{jobs}}
143
-
144
-cd ../x264-snapshot-%{svncompc}-2245
145
-%ifarch i586
146
-#no mmx or sse on the i586 package, therefore use i686 package, should run on every i586 cpu
147
-%configure --enable-shared --enable-pic --disable-asm
148
-%else
149
-%configure --enable-shared \
150
-%if 0%{?sles_version} == 10
151
- --disable-asm \
152
-%endif
153
- --enable-pic
154
-%endif
155
+%configure --enable-shared --enable-pic
156
 %__make %{?jobs:-j%{jobs}}
157
158
 %install
159
 %makeinstall
160
161
-%__rm -f "%{buildroot}/%{_libdir}/libx264.so"
162
-%__ln_s libx264.so.%{soname} "%{buildroot}%{_libdir}/libx264.so"
163
-
164
-cd ../x264-snapshot-%{svncompa}-2245
165
-%{__install} -m 644 libx264.so.%{sonamecompa} %{buildroot}%{_libdir}/
166
-
167
-cd ../x264-snapshot-%{svncompb}-2245
168
-%{__install} -m 644 libx264.so.%{sonamecompb} %{buildroot}%{_libdir}/
169
-
170
-cd ../x264-snapshot-%{svncompc}-2245
171
-%{__install} -m 644 libx264.so.%{sonamecompc} %{buildroot}%{_libdir}/
172
+%{__rm} -f "%{buildroot}/%{_libdir}/libx264.so"
173
+%{__rm} -f "%{buildroot}/%{_libdir}/libx264.a"
174
+%{__ln_s} libx264.so.%{soname} "%{buildroot}%{_libdir}/libx264.so"
175
176
 %clean
177
-%__rm -rf "%{buildroot}"
178
+[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
179
180
 %post -n %{realname}-%{soname} -p /sbin/ldconfig
181
 %postun -n %{realname}-%{soname} -p /sbin/ldconfig
182
183
-%post -n %{realname}-%{sonamecompa} -p /sbin/ldconfig
184
-%postun -n %{realname}-%{sonamecompa} -p /sbin/ldconfig
185
-
186
-%post -n %{realname}-%{sonamecompb} -p /sbin/ldconfig
187
-%postun -n %{realname}-%{sonamecompb} -p /sbin/ldconfig
188
-
189
-%post -n %{realname}-%{sonamecompc} -p /sbin/ldconfig
190
-%postun -n %{realname}-%{sonamecompc} -p /sbin/ldconfig
191
-
192
 %files
193
 %defattr(-,root,root)
194
 %doc doc/*.txt
195
@@ -231,25 +114,116 @@
196
 %defattr(0644,root,root)
197
 %attr(0755,root,root) %{_libdir}/libx264.so.%{soname}
198
199
-%files -n %{realname}-%{sonamecompa}
200
-%defattr(0644,root,root)
201
​
[+] Added x264-rewrite-ffmpeg-defaults.patch ^
Deleted x264-snapshot-20090119-2245.tar.bz2 ^
Deleted x264-snapshot-20090228-2245.tar.bz2 ^
Deleted x264-snapshot-20090627-2245.tar.bz2 ^
Changed x264-snapshot-20100425-2245.tar.bz2 ^

Cancel