Overview

Request 1258 (accepted)

- changed BuildRequires to pkgconfig where possible
- enable build for SLES, unfortunately without frontends qt and gtk
because SLES doesn't provide gtk3 and qt >= 4.7

Submit package home:enzokiel:...hes:Multimedia / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed
x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Fri Oct 17 2014 - joerg.lorenzen@ki.tng.de
4
+- changed BuildRequires to pkgconfig where possible
5
+- enable build for SLES, unfortunately without frontends qt and gtk
6
+  because SLES doesn't provide gtk3 and qt >= 4.7
7
+
8
+-------------------------------------------------------------------
9
 Fri Oct 10 2014 - joerg.lorenzen@ki.tng.de
10
 - update internal ffmpeg to version 1.2.9
11
 
12
avidemux3.spec Changed
292
 
1
@@ -27,11 +27,13 @@
2
 Source1:        avidemux3-qt4.desktop
3
 Source2:        avidemux3-gtk.desktop
4
 Source3:        ffmpeg-%{ffmpeg_version}.tar.bz2
5
-Source4:        xvba_support_from_xbmc_xvba.patch
6
+Source4:        config.mak.diff
7
+Source5:        xvba_support_from_xbmc_xvba.patch
8
 Patch0:         avidemux-cmake-2.8.8.patch
9
 Patch1:         avidemux-linking.patch
10
 Patch2:         avidemux-x264_plugins.patch
11
 Patch3:         avidemux-package_version.patch
12
+Patch4:         avidemux-bootStrap.patch
13
 License:        GPL-2.0
14
 Group:          Productivity/Multimedia/Video/Editors and Convertors
15
 
16
@@ -39,71 +41,99 @@
17
 BuildRequires:  cmake
18
 BuildRequires:  gettext-tools
19
 BuildRequires:  intltool
20
-BuildRequires:  libxslt-devel
21
 BuildRequires:  desktop-file-utils
22
 BuildRequires:  pkg-config
23
-BuildRequires:  sqlite-devel
24
 BuildRequires:  fdupes
25
 BuildRequires:  dos2unix
26
+BuildRequires:  pkgconfig(libxslt)
27
+%if 0%{?sles_version}
28
+BuildRequires:  sqlite-devel
29
+%else
30
+BuildRequires:  pkgconfig(sqlite3)
31
+%endif
32
 
33
 # Libraries
34
 BuildRequires:  yasm-devel
35
-BuildRequires:  libxml2-devel >= 2.6.8
36
-BuildRequires:  fontconfig-devel
37
+BuildRequires:  pkgconfig(libxml-2.0)
38
+BuildRequires:  pkgconfig(fontconfig)
39
+BuildRequires:  pkgconfig(freetype2)
40
 %if 0%{?suse_version} > 1140
41
-BuildRequires:  freetype-devel
42
-BuildRequires:  js-devel
43
+BuildRequires:  pkgconfig(mozjs185)
44
 %else
45
-BuildRequires:  freetype2-devel
46
+%if 0%{?sles_version}
47
 BuildRequires:  mozilla-xulrunner192-devel
48
+%else
49
+BuildRequires:  pkgconfig(mozilla-js) >= 2.0
50
+%endif
51
 %endif
52
 BuildRequires:  pkgconfig(xv)
53
 BuildRequires:  pkgconfig(xmu)
54
-BuildRequires:  libsamplerate-devel
55
-BuildRequires:  jack-audio-connection-kit-devel
56
-BuildRequires:  libass-devel
57
+BuildRequires:  pkgconfig(samplerate)
58
+BuildRequires:  pkgconfig(jack)
59
+BuildRequires:  pkgconfig(libass)
60
 
61
 # Sound out
62
-BuildRequires:  alsa-devel
63
-BuildRequires:  libpulse-devel
64
 BuildRequires:  arts-devel
65
+BuildRequires:  pkgconfig(alsa)
66
+BuildRequires:  pkgconfig(libpulse)
67
+%if 0%{?sles_version}
68
 BuildRequires:  libesd-devel
69
+%else
70
+BuildRequires:  pkgconfig(esound)
71
+%endif
72
 
73
 # Video out
74
-BuildRequires:  SDL-devel >= 1.2.7
75
+BuildRequires:  pkgconfig(sdl)
76
 BuildRequires:  pkgconfig(gl)
77
 BuildRequires:  pkgconfig(glu)
78
-BuildRequires:  libvdpau-devel
79
+BuildRequires:  pkgconfig(vdpau)
80
 ## newer version of libav are not compatible to avidemux
81
 %if 0%{?suse_version} < 1310
82
-BuildRequires:  libva-devel
83
+BuildRequires:  pkgconfig(libva)
84
 %endif
85
 
86
 # Audio Codecs
87
-BuildRequires:  liba52-devel
88
 BuildRequires:  libfaac-devel
89
 BuildRequires:  libfaad-devel
90
 BuildRequires:  libmp3lame-devel
91
+BuildRequires:  libaften-devel
92
+%if 0%{?sles_version}
93
+BuildRequires:  liba52-devel
94
 BuildRequires:  libmad-devel
95
-BuildRequires:  libogg-devel
96
 BuildRequires:  libvorbis-devel
97
 BuildRequires:  libdca-devel
98
 BuildRequires:  libopencore-amr-devel
99
 BuildRequires:  libvpx-devel
100
 BuildRequires:  libtwolame-devel
101
-BuildRequires:  libaften-devel
102
 BuildRequires:  libdcaenc-devel
103
+%else
104
+BuildRequires:  pkgconfig(liba52)
105
+BuildRequires:  pkgconfig(mad)
106
+BuildRequires:  pkgconfig(vorbis)
107
+BuildRequires:  pkgconfig(libdca)
108
+BuildRequires:  pkgconfig(opencore-amrnb)
109
+BuildRequires:  pkgconfig(vpx)
110
+BuildRequires:  pkgconfig(twolame)
111
+BuildRequires:  pkgconfig(dcaenc)
112
+%endif
113
+BuildRequires:  pkgconfig(ogg)
114
 
115
 # Video Codecs
116
 BuildRequires:  libxvidcore-devel
117
+%if 0%{?sles_version}
118
 BuildRequires:  libx264-devel
119
+%else
120
+BuildRequires:  pkgconfig(x264)
121
+%endif
122
 
123
+%if ! 0%{?sles_version}
124
 # QT4-GUI
125
-BuildRequires:  libqt4-devel
126
+BuildRequires:  pkgconfig(QtCore) >= 4.7
127
 
128
 # GTK-GUI
129
-BuildRequires:  gtk3-devel
130
-BuildRequires:  cairo-devel
131
+BuildRequires:  pkgconfig(gtk+-3.0)
132
+BuildRequires:  pkgconfig(cairo)
133
+%endif
134
 
135
 # Main package requires at least one frontend (cli, gtk or qt4)
136
 Requires:       avidemux3-frontend = %{version}-%{release}
137
@@ -139,6 +169,7 @@
138
 
139
 This package provides a command-line interface to editing videos with avidemux.
140
 
141
+%if ! 0%{?sles_version}
142
 %package gtk
143
 Summary:        GTK interface for avidemux
144
 Group:          Productivity/Multimedia/Video/Editors and Convertors
145
@@ -180,6 +211,8 @@
146
 
147
 This package contains the Qt graphical interface for avidemux.
148
 
149
+%lang_package -n avidemux3-qt4
150
+
151
 %package help
152
 Summary:        Help files for avidemux
153
 Group:          Productivity/Multimedia/Video/Editors and Convertors
154
@@ -198,38 +231,59 @@
155
 
156
 This package contains the help files for avidemux.
157
 
158
-%lang_package -n avidemux3-qt4
159
+%endif
160
 
161
 %prep
162
 %setup -q -n avidemux_%{version}
163
+%if 0%{?sles_version}
164
+echo '# This line is mandatory to access the configuration functions' > %{_sourcedir}/avidemux3-rpmlintrc
165
+echo '' >> %{_sourcedir}/avidemux3-rpmlintrc
166
+echo 'from Config import *' >> %{_sourcedir}/avidemux3-rpmlintrc
167
+echo 'addFilter("libdir-macro-in-noarch-package")' >> %{_sourcedir}/avidemux3-rpmlintrc
168
+%endif
169
 find . -type f -exec dos2unix -q {} \;
170
 sed -i -e 's|set(FFMPEG_VERSION "1.2.1")|set(FFMPEG_VERSION "%{ffmpeg_version}")|g' cmake/admFFmpegBuild.cmake
171
 rm -f avidemux_core/ffmpeg_package/ffmpeg-1.2.1.tar.bz2
172
 cp %{S:3} avidemux_core/ffmpeg_package/
173
-pushd avidemux_core/ffmpeg_package/patches/xvba
174
-rm -f xvba_support_from_xbmc_xvba.patch
175
+pushd avidemux_core/ffmpeg_package/patches
176
+rm -f config.mak.diff
177
 cp %{S:4} .
178
+pushd xvba
179
+rm -f xvba_support_from_xbmc_xvba.patch
180
+cp %{S:5} .
181
+popd
182
 popd
183
 %patch0 -p0
184
 %patch1 -p0
185
 %patch2 -p0
186
 %patch3 -p0
187
+%patch4 -p0
188
 
189
 %build
190
+%if ! 0%{?sles_version}
191
 export CXXFLAGS="%optflags -fno-strict-aliasing"
192
+%else
193
+export CXXFLAGS="%optflags -D__STDC_CONSTANT_MACROS -fno-strict-aliasing"
194
+%endif
195
 
196
 chmod 755 bootStrap.bash
197
+%if ! 0%{?sles_version}
198
 ./bootStrap.bash --with-cli --with-gtk
199
+%else
200
+./bootStrap.bash --with-cli --without-qt4
201
+%endif
202
 
203
 %install
204
 cp -r install/* %{buildroot}
205
 
206
+%if ! 0%{?sles_version}
207
 # Install desktop files
208
 install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3-qt4.desktop
209
 install -D -m644 %{S:2} %{buildroot}%{_datadir}/applications/avidemux3-gtk.desktop
210
 
211
 # Install icon
212
 install -D -m644 avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux3.png
213
+%endif
214
 
215
 # Install man
216
 install -D -m644 man/avidemux.1 %{buildroot}%{_mandir}/man1/avidemux.1
217
@@ -247,6 +301,7 @@
218
 
219
 %postun cli -p /sbin/ldconfig
220
 
221
+%if ! 0%{?sles_version}
222
 %post gtk -p /sbin/ldconfig
223
 
224
 %postun gtk -p /sbin/ldconfig
225
@@ -254,6 +309,7 @@
226
 %post qt4 -p /sbin/ldconfig
227
 
228
 %postun qt4 -p /sbin/ldconfig
229
+%endif
230
 
231
 %files
232
 %defattr(-,root,root)
233
@@ -363,7 +419,9 @@
234
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
235
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/fast.json
236
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/iPhone.json
237
+%if ! 0%{?sles_version}
238
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_qt.so
239
+%endif
240
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_spiderMonkey.so
241
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
242
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_vpx.so
243
@@ -405,6 +463,9 @@
244
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_removePlane.so
245
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_resampleFps.so
246
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_rotate.so
247
+%if 0%{?sles_version}
248
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ssa.so
249
+%endif
250
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_separateField.so
251
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_sharpen.so
252
 %if 0%{?suse_version} > 1210
253
@@ -420,9 +481,11 @@
254
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
255
 %dir %{_datadir}/ADM6_addons
256
 %dir %{_datadir}/ADM6_addons/avsfilter
257
+%if ! 0%{?sles_version}
258
 %{_datadir}/ADM6_addons/avsfilter/avsload.exe
259
 %{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
260
 %{_datadir}/pixmaps/avidemux3.png
261
+%endif
262
 %{_mandir}/man1/avidemux.1.gz
263
 %doc AUTHORS COPYING README
264
 
265
@@ -440,6 +503,7 @@
266
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_mpdelogoCli.so
267
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_cli.so
268
 
269
+%if ! 0%{?sles_version}
270
 %files gtk
271
 %defattr(-,root,root)
272
 %{_bindir}/avidemux3_gtk
273
@@ -521,13 +585,14 @@
274
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_swscaleResize_qt4.so
275
 %{_datadir}/applications/avidemux3-qt4.desktop
276
 
277
+%files -n avidemux3-qt4-lang
278
+%defattr(-,root,root)
279
+%{_datadir}/avidemux3/i18n/
280
+
281
 %files help
282
 %defattr(-,root,root)
283
 %dir %{_datadir}/avidemux3
284
 %{_datadir}/avidemux3/help/
285
-
286
-%files -n avidemux3-qt4-lang
287
-%defattr(-,root,root)
288
-%{_datadir}/avidemux3/i18n/
289
+%endif
290
 
291
 %changelog
292
avidemux-bootStrap.patch Added
12
 
1
@@ -0,0 +1,10 @@
2
+--- bootStrap.bash.orig    2014-03-12 07:15:23.000000000 +0100
3
++++ bootStrap.bash 2014-10-16 13:17:27.202466100 +0200
4
+@@ -12,6 +12,7 @@
5
+ export O_PARAL="-j 2"
6
+ fail()
7
+ {
8
++        cat /tmp/log$BUILDDIR
9
+         echo "** Failed at $1**"
10
+         exit 1
11
+ }
12
config.mak.diff Added
13
 
1
@@ -0,0 +1,11 @@
2
+--- config.mak.orig    2014-10-14 00:23:55.903217057 +0200
3
++++ config.mak 2014-10-14 00:23:55.919216855 +0200
4
+@@ -94,7 +94,7 @@
5
+ EXEOBJS=
6
+ INSTALL=install
7
+ LIBTARGET=
8
+-SLIBNAME=$(SLIBPREF)$(FULLNAME)$(SLIBSUF)
9
++SLIBNAME=$(SLIBPREF)ADM6$(FULLNAME)$(SLIBSUF)
10
+ SLIBNAME_WITH_VERSION=$(SLIBNAME).$(LIBVERSION)
11
+ SLIBNAME_WITH_MAJOR=$(SLIBNAME).$(LIBMAJOR)
12
+ SLIB_CREATE_DEF_CMD=
13
Refresh
Refresh
Request History
enzokiel's avatar

enzokiel created request over 10 years ago

- changed BuildRequires to pkgconfig where possible
- enable build for SLES, unfortunately without frontends qt and gtk
because SLES doesn't provide gtk3 and qt >= 4.7


Olaf Hering's avatar

olh accepted request over 10 years ago