From 4ce222371bd2b2148d673ade0b925cc0a703570a2ce15210ccbb02d5af7677f2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 26 May 2014 07:36:24 +0000 Subject: [PATCH] Accepting request 235344 from home:Mailaender:branches:games changes to https://build.opensuse.org/project/prjconf/games are already applied OBS-URL: https://build.opensuse.org/request/show/235344 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=23 --- SDL2.changes | 6 ++++++ SDL2.spec | 30 +++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/SDL2.changes b/SDL2.changes index d38e102..6e077d5 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 26 07:00:15 UTC 2014 - mailaender@opensuse.org + +- Use pkgconfig everywhere +- Fix the build on SLE using prjconf + ------------------------------------------------------------------- Thu Mar 13 18:50:31 UTC 2014 - mailaender@opensuse.org diff --git a/SDL2.spec b/SDL2.spec index b085607..6134e98 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -30,26 +30,30 @@ Source2: http://libsdl.org/release/%name-%version.tar.gz.sig Source3: %name.keyring Source4: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: Mesa-libEGL-devel -BuildRequires: Mesa-libGL-devel -BuildRequires: Mesa-libGLESv1_CM-devel -BuildRequires: Mesa-libGLESv2-devel BuildRequires: alsa-devel >= 0.9.0 BuildRequires: dos2unix BuildRequires: esound-devel >= 0.2.8 -BuildRequires: libICE-devel -BuildRequires: libX11-devel -BuildRequires: libXScrnSaver-devel -BuildRequires: libXcursor-devel -BuildRequires: libXext-devel -BuildRequires: libXi-devel -BuildRequires: libXinerama-devel -BuildRequires: libXrandr-devel -BuildRequires: libXxf86vm-devel BuildRequires: nasm BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gl) +%if 0%{?suse_version} > 1120 +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(glesv1_cm) +BuildRequires: pkgconfig(glesv2) +%endif +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(x11) +%if 0%{?suse_version} > 1120 +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xrandr) +BuildRequires: pkgconfig(xxf86vm) +%endif +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(libpulse-simple) >= 0.9 %ifarch ppc ppc64 BuildRequires: libspe2-devel