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

Changes of Revision 4

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

Cancel