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

Changes of Revision 14

[-] Changed ffmpeg.spec
​x
 
1
@@ -1,19 +1,17 @@
2
-# norootforbuild
3
-
4
-%define lib       libffmpeg
5
-%define majoravcodec     53
6
+%define lib              libffmpeg
7
+%define majoravcodec     54
8
 %define libavcodec       libavcodec
9
 %define libnameavcodec   %{libavcodec}%{majoravcodec}
10
-%define majoravdevice    53
11
+%define majoravdevice    54
12
 %define libavdevice      libavdevice
13
 %define libnameavdevice  %{libavdevice}%{majoravdevice}
14
-%define majoravformat    53
15
+%define majoravformat    54
16
 %define libavformat      libavformat
17
 %define libnameavformat  %{libavformat}%{majoravformat}
18
 %define majoravutil      51
19
 %define libavutil        libavutil
20
 %define libnameavutil    %{libavutil}%{majoravutil}
21
-%define majoravfilter    2
22
+%define majoravfilter    3
23
 %define libavfilter      libavfilter
24
 %define libnameavfilter  %{libavfilter}%{majoravfilter}
25
 %define majorpostproc    52
26
@@ -25,61 +23,76 @@
27
 %define majorswresample  0
28
 %define libswresample    libswresample
29
 %define libnameswresample %{libswresample}%{majorswresample}
30
-%define lastrelease      0.10
31
+%define majoravresample  0
32
+%define libavresample    libavresample
33
+%define libnameavresample %{libavresample}%{majoravresample}
34
+%define lastrelease      1.0.1
35
36
 %bcond_without avfilter
37
 %bcond_without libvpx
38
-%bcond_with libfaac
39
-%bcond_with libopenjpeg
40
-
41
+%bcond_with    libfaac
42
+%bcond_with    libopenjpeg
43
+%if 0%{?suse_version} >= 1140
44
+%bcond_without pulse
45
+%else
46
+%bcond_with    pulse
47
+%endif
48
49
 Name:           ffmpeg
50
 Version:        %{lastrelease}
51
-Release:        3
52
-License:        LGPL v2 or later and some code GPL v2 or later
53
-Group:          Productivity/Multimedia/Video/Editors and Convertors
54
+Release:        3.1
55
+License:        LGPL-2.0+ and some code GPL-2.0+
56
 Summary:        Hyper fast MPEG1/MPEG4/H263/RV and AC3/MPEG audio encoder
57
 Summary(de):    Hyperschneller MPEG1/MPEG4/H263/RV Und AC3/MPEG Audio-Encoder
58
-URL:            http://www.ffmpeg.org
59
+Url:            http://www.ffmpeg.org
60
+Group:          Productivity/Multimedia/Video/Editors and Convertors
61
 Source0:        ffmpeg-%{version}.tar.bz2
62
 Source1:        ffmpeg.rpmlintrc
63
-BuildRoot:      %{_tmppath}/%{name}-buildroot
64
-Provides:       libav = %{version}-%{release}
65
-Obsoletes:      libav < %{version}-%{release}
66
-BuildRequires:  yasm
67
+Source2:        baselibs.conf
68
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
69
+Provides:       libav                = %{version}
70
+Obsoletes:      libav                < %{version}
71
+BuildRequires:  SDL-devel
72
+BuildRequires:  alsa-devel
73
+BuildRequires:  freetype2-devel
74
+BuildRequires:  imlib2-devel
75
 BuildRequires:  libgsm
76
 BuildRequires:  libgsm-devel
77
-BuildRequires:  imlib2-devel
78
+BuildRequires:  libjack-devel
79
 BuildRequires:  libmp3lame-devel
80
 BuildRequires:  libogg-devel
81
-BuildRequires:  libvorbis-devel
82
 BuildRequires:  libtheora-devel >= 1.1
83
+BuildRequires:  libvorbis-devel
84
 BuildRequires:  ncurses-devel
85
-BuildRequires:  libjack-devel
86
-BuildRequires:  alsa-devel
87
-BuildRequires:  freetype2-devel
88
-BuildRequires:  SDL-devel
89
 BuildRequires:  slang-devel
90
 BuildRequires:  xorg-x11-devel
91
+BuildRequires:  yasm
92
 BuildRequires:  zlib-devel
93
+%if %{with pulse}
94
+BuildRequires:  libpulse-devel
95
+%endif
96
 %if %{with libfaac}
97
 BuildRequires:  libfaac-devel >= 1.28
98
 %endif
99
-BuildRequires:  libx264-devel
100
-BuildRequires:  libxvidcore-devel
101
-BuildRequires:  texinfo
102
-BuildRequires:  libopencore-amr-devel
103
 BuildRequires:  libdc1394
104
 BuildRequires:  libdc1394-devel
105
-BuildRequires:  speex-devel
106
-BuildRequires:  schroedinger-devel
107
 BuildRequires:  liboil-devel >= 0.3.15
108
-BuildRequires:  dirac-devel >= 1.0.0
109
+BuildRequires:  libopencore-amr-devel
110
 BuildRequires:  librtmp-devel
111
 BuildRequires:  libva-devel
112
+BuildRequires:  libx264-devel
113
+BuildRequires:  libxvidcore-devel
114
+BuildRequires:  schroedinger-devel
115
+BuildRequires:  speex-devel
116
+BuildRequires:  libtwolame-devel
117
+BuildRequires:  texinfo
118
 %if 0%{?suse_version} <= 1130
119
 BuildRequires:  libdc1394_control12-devel
120
 %endif
121
+%if 0%{?suse_version} >= 1140
122
+BuildRequires:  libopus-devel
123
+BuildRequires:  libass-devel
124
+%endif
125
 %if %{with libopenjpeg}
126
 BuildRequires:  libopenjpeg-devel
127
 %endif
128
@@ -89,12 +102,14 @@
129
 BuildRequires:  libvpx-devel
130
 %endif
131
 %endif
132
-Requires:       %{libnameavcodec} = %{version}-%{release}
133
-Requires:       %{libnameavdevice} = %{version}-%{release}
134
-Requires:       %{libnameavformat} = %{version}-%{release}
135
-Requires:       %{libnameavutil} = %{version}-%{release}
136
-Requires:       %{libnamepostproc} = %{version}-%{release}
137
-Requires:       %{libnameswscale} = %{version}-%{release}
138
+Requires:       %{libnameavcodec}    = %{version}
139
+Requires:       %{libnameavdevice}   = %{version}
140
+Requires:       %{libnameavformat}   = %{version}
141
+Requires:       %{libnameavutil}     = %{version}
142
+Requires:       %{libnamepostproc}   = %{version}
143
+Requires:       %{libnameswscale}    = %{version}
144
+Requires:       %{libnameswresample} = %{version}
145
+Requires:       %{libnameavresample} = %{version}
146
147
 %description
148
 ffmpeg is a hyper fast realtime audio/video encoder, a streaming  server
149
@@ -112,16 +127,11 @@
150
 Dateiformate basierend auf einer DCT/motion compensation konvertiern.
151
 Sound wird in einen MPEG audio layer 2 oder AC3 Stream geschrieben.
152
153
-
154
 %package -n %{libnameavcodec}
155
 Group:          System/Libraries
156
 Summary:        FFmpeg %{libavcodec}
157
-Provides:       %{libavcodec} = %{version}-%{release}
158
-Provides:       libffmpeg = %{version}-%{release}
159
-Obsoletes:      libffmpeg < %{version}-%{release}
160
-Provides:       libffmpeg0 = %{version}-%{release}
161
-Obsoletes:      libffmpeg0 < %{version}-%{release}
162
-Requires:       %{libnameavutil} = %{version}-%{release}
163
+Provides:       %{libavcodec}        = %{version}
164
+Requires:       %{libnameavutil}     = %{version}
165
166
 %description -n %{libnameavcodec}
167
 ffmpeg %{libavcodec} shared library
168
@@ -129,14 +139,14 @@
169
 %description -n %{libnameavcodec} -l de
170
 ffmpeg %{libavcodec} Bibliothek
171
172
-
173
 %package -n %{libnameavdevice}
174
 Group:          System/Libraries
175
 Summary:        FFmpeg %{libavdevice}
176
-Provides:       %{libavdevice} = %{version}-%{release}
177
-Requires:       %{libnameavcodec} = %{version}-%{release}
178
-Requires:       %{libnameavformat} = %{version}-%{release}
179
-Requires:       %{libnameavutil} = %{version}-%{release}
180
+Provides:       %{libavdevice}       = %{version}
181
+Requires:       %{libnameavcodec}    = %{version}
182
+Requires:       %{libnameavformat}   = %{version}
183
+Requires:       %{libnameavutil}     = %{version}
184
+Requires:       %{libnameswresample} = %{version}
185
186
 %description -n %{libnameavdevice}
187
 ffmpeg %{libavdevice} shared library
188
@@ -144,15 +154,14 @@
189
 %description -n %{libnameavdevice} -l de
190
 ffmpeg %{libavdevice} Bibliothek
191
192
-
193
 %package -n %{libnameavformat}
194
 Group:          System/Libraries
195
 Summary:        FFmpeg %{libavformat}
196
-Provides:       %{libavformat} = %{version}-%{release}
197
-Requires:       %{libnameavcodec} = %{version}-%{release}
198
-Requires:       %{libnameavutil} = %{version}-%{release}
199
+Provides:       %{libavformat}       = %{version}
200
+Requires:       %{libnameavcodec}    = %{version}
201
​
[+] Added baselibs.conf ^
Changed ffmpeg-1.0.1.tar.bz2 ^

Cancel