diff --git a/xine-lib.changes b/xine-lib.changes index 23de360..0451969 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 6 10:15:58 UTC 2017 - olaf@aepfle.de + +- Remove dependency to gcc5 +- Use simple bcond for ffmpeg + ------------------------------------------------------------------- Sun Apr 9 14:25:06 UTC 2017 - davejplater@gmail.com diff --git a/xine-lib.spec b/xine-lib.spec index 90d58b4..10d68ae 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -27,20 +27,18 @@ Name: xine-lib %bcond_without distributable %bcond_with onlynondistributable %bcond_without pulseaudio -%if 0%{?suse_version} == 1315 -%bcond_without gcc5 +%if 0%{?suse_version} > 1320 +BuildRequires: gcc %else -%bcond_with gcc5 +%if 0%{?sle_version} == 120100 +# Leap 42.1 +BuildRequires: gcc5 +%else +# Leap 42.2+ / SLE12SP2Backports +BuildRequires: gcc6 +%endif %endif -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 %bcond_without ffmpeg -%else -%if %{with distributable} -%bcond_with ffmpeg -%else -%bcond_without ffmpeg -%endif -%endif %bcond_with sdl %bcond_with aalib %bcond_with esd @@ -49,9 +47,6 @@ Name: xine-lib %bcond_with directfb %bcond_without modplug # -%if %{with gcc5} -BuildRequires: gcc5 -%endif BuildRequires: ImageMagick-devel BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -592,11 +587,9 @@ sed -i -e 's|/tmp/vdr-xine|/var/lib/vdr-xine|g' src/vdr/input_vdr.c %build export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fno-force-addr `pkg-config --cflags smbclient`" export CCASFLAGS=-Wa,--noexecstack -# Leap:42.2 won't build with gcc48 -%if %{with gcc5} -export CC="gcc-5" -export CPP="cpp-5" -%endif +test -x "$(type -p gcc-5)" && export CC=gcc-5 +test -x "$(type -p gcc-6)" && export CC=gcc-6 +test -x "$(type -p gcc-7)" && export CC=gcc-7 echo 'AC_DEFUN([AC_REQUIRE_AUX_FILE])dnl' >> acinclude.m4 # # hack for sles10 ## rm m4/gettext.m4 m4/intl.m4