pool/xine-lib
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 508670 from multimedia:xine

Browse Source 
Fix libgcc_s1 conflict for 42.2

OBS-URL: https://build.opensuse.org/request/show/508670
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2017-07-08 10:34:54 +00:00 committed by Git OBS Bridge
commit 51adf56e5d
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xine-lib.changes
View File

@ -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

32
xine-lib.spec
View File

@ -27,20 +27,19 @@ 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
# Leap 42.2+ / SLE12SP2Backports
%if 0%{?sle_version} == 120200
BuildRequires: gcc6
#!Buildignore: libgcc_s1
%else
# Leap 42.1
BuildRequires: gcc5
%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 +48,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 +588,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