Packman Build Service PMBS

Changes of Revision 55

avidemux3.spec Changed

@@ -16,9 +16,7 @@
 #
 
 
-%if 0%{?is_opensuse} || 0%{?suse_version} > 1500
 %bcond_without vapoursynth
-%endif
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
@@ -44,7 +42,11 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
-BuildRequires:  gcc-c++ >= 5
+%if 0%{?suse_version} > 1500
+BuildRequires:  gcc-c++
+%else
+BuildRequires:  gcc7-c++
+%endif
 BuildRequires:  gettext-tools
 BuildRequires:  intltool
 BuildRequires:  pkg-config
@@ -200,6 +202,12 @@
 chmod 644 AUTHORS COPYING README
 
 %build
+test -x "$(type -P gcc)"   && CC="$_"
+test -x "$(type -P g++)"   && CXX="$_"
+test -x "$(type -P gcc-7)" && CC="$_"
+test -x "$(type -P g++-7)" && CXX="$_"
+export CC="$(readlink -f ${CC})"
+export CXX="$(readlink -f ${CXX})"
 flags+="%optflags -fno-strict-aliasing "
 export CXXFLAGS="$flags"
 
@@ -279,7 +287,6 @@
 %dir %{_libdir}/ADM_plugins6/pluginSettings/x264
 %dir %{_libdir}/ADM_plugins6/pluginSettings/x264/3
 %dir %{_libdir}/ADM_plugins6/scriptEngines
-%dir %{_libdir}/ADM_plugins6/videoDecoders
 %dir %{_libdir}/ADM_plugins6/videoEncoders
 %dir %{_libdir}/ADM_plugins6/videoFilters
 %{_libdir}/ADM_plugins6/audioDecoder/libADM_ad_a52.so
@@ -352,6 +359,7 @@
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
 %if 0%{?is_opensuse}
+%dir %{_libdir}/ADM_plugins6/videoDecoders
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_aom.so
 %endif
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so