From 4ab3ed86e2b601c37d31f3209892c93147817b076dd070a77d83b90a62def695 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Thu, 6 Jul 2017 11:31:33 +0000
Subject: [PATCH 1/4] Accepting request 508481 from
 home:olh:branches:multimedia:xine

- Remove dependency to gcc5
- Use simple bcond for ffmpeg

OBS-URL: https://build.opensuse.org/request/show/508481
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=97
---
 xine-lib.changes |  6 ++++++
 xine-lib.spec    | 31 ++++++++++++-------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

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

From 15fb9b0f8747e1527ee7d6a2ecbe998c9242be36a0701cc9c2da492b1ceb455b Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Thu, 6 Jul 2017 15:32:59 +0000
Subject: [PATCH 2/4] Accepting request 508599 from home:plater

Fix gcc5 dependency hell

OBS-URL: https://build.opensuse.org/request/show/508599
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=98
---
 xine-lib.spec | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/xine-lib.spec b/xine-lib.spec
index 10d68ae..cd155cf 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -30,13 +30,10 @@ Name:           xine-lib
 %if 0%{?suse_version} > 1320
 BuildRequires:  gcc
 %else
-%if 0%{?sle_version} == 120100
-# Leap 42.1
+# Leap 42.1 / Leap 42.2+ / SLE12SP2Backports
 BuildRequires:  gcc5
-%else
-# Leap 42.2+ / SLE12SP2Backports
-BuildRequires:  gcc6
-%endif
+BuildRequires:  libcilkrts5-gcc5
+BuildRequires:  liblsan0-gcc5
 %endif
 %bcond_without ffmpeg
 %bcond_with sdl

From aa956db4a89b4833f968548e163ad7b75506482343d1dec05a573ee2670f41a8 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Fri, 7 Jul 2017 05:52:01 +0000
Subject: [PATCH 3/4] Accepting request 508667 from home:plater

Next try for 42,2 unresolvables

OBS-URL: https://build.opensuse.org/request/show/508667
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=99
---
 xine-lib.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/xine-lib.spec b/xine-lib.spec
index cd155cf..31858f4 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -30,10 +30,13 @@ Name:           xine-lib
 %if 0%{?suse_version} > 1320
 BuildRequires:  gcc
 %else
-# Leap 42.1 / Leap 42.2+ / SLE12SP2Backports
+# Leap 42.2+ / SLE12SP2Backports
+%if 0%{?sle_version} == 120200
+BuildRequires:  gcc6
+%else
+# Leap 42.1
 BuildRequires:  gcc5
-BuildRequires:  libcilkrts5-gcc5
-BuildRequires:  liblsan0-gcc5
+%endif
 %endif
 %bcond_without ffmpeg
 %bcond_with sdl

From 17fdc1e5154e73c0abde061e7b7e4462d1b624924dbbd04f4c2ee8f4665b9d41 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Fri, 7 Jul 2017 05:59:11 +0000
Subject: [PATCH 4/4] Accepting request 508669 from home:plater

Buildignore libgcc_s1 to fix gcc6 conflict for 42.2

OBS-URL: https://build.opensuse.org/request/show/508669
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=100
---
 xine-lib.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xine-lib.spec b/xine-lib.spec
index 31858f4..322087c 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -33,6 +33,7 @@ BuildRequires:  gcc
 # Leap 42.2+ / SLE12SP2Backports
 %if 0%{?sle_version} == 120200
 BuildRequires:  gcc6
+#!Buildignore:  libgcc_s1
 %else
 # Leap 42.1
 BuildRequires:  gcc5