Changes of Revision 55

avidemux3.spec Changed
x
 
1
@@ -16,9 +16,7 @@
2
 #
3
 
4
 
5
-%if 0%{?is_opensuse} || 0%{?suse_version} > 1500
6
 %bcond_without vapoursynth
7
-%endif
8
 
9
 Name:           avidemux3
10
 Summary:        Graphical video editing and transcoding tool
11
@@ -44,7 +42,11 @@
12
 BuildRequires:  desktop-file-utils
13
 BuildRequires:  dos2unix
14
 BuildRequires:  fdupes
15
-BuildRequires:  gcc-c++ >= 5
16
+%if 0%{?suse_version} > 1500
17
+BuildRequires:  gcc-c++
18
+%else
19
+BuildRequires:  gcc7-c++
20
+%endif
21
 BuildRequires:  gettext-tools
22
 BuildRequires:  intltool
23
 BuildRequires:  pkg-config
24
@@ -200,6 +202,12 @@
25
 chmod 644 AUTHORS COPYING README
26
 
27
 %build
28
+test -x "$(type -P gcc)"   && CC="$_"
29
+test -x "$(type -P g++)"   && CXX="$_"
30
+test -x "$(type -P gcc-7)" && CC="$_"
31
+test -x "$(type -P g++-7)" && CXX="$_"
32
+export CC="$(readlink -f ${CC})"
33
+export CXX="$(readlink -f ${CXX})"
34
 flags+="%optflags -fno-strict-aliasing "
35
 export CXXFLAGS="$flags"
36
 
37
@@ -279,7 +287,6 @@
38
 %dir %{_libdir}/ADM_plugins6/pluginSettings/x264
39
 %dir %{_libdir}/ADM_plugins6/pluginSettings/x264/3
40
 %dir %{_libdir}/ADM_plugins6/scriptEngines
41
-%dir %{_libdir}/ADM_plugins6/videoDecoders
42
 %dir %{_libdir}/ADM_plugins6/videoEncoders
43
 %dir %{_libdir}/ADM_plugins6/videoFilters
44
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_a52.so
45
@@ -352,6 +359,7 @@
46
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
47
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
48
 %if 0%{?is_opensuse}
49
+%dir %{_libdir}/ADM_plugins6/videoDecoders
50
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_aom.so
51
 %endif
52
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
53