From 4ce222371bd2b2148d673ade0b925cc0a703570a2ce15210ccbb02d5af7677f2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 26 May 2014 07:36:24 +0000 Subject: [PATCH 1/3] 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 From 3970081f613f91a740ec96a982a1bbe9171ee6eb6c39df5ba66b15b759185330 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 26 May 2014 13:26:59 +0000 Subject: [PATCH 2/3] Accepting request 235354 from home:Mailaender:branches:games OBS-URL: https://build.opensuse.org/request/show/235354 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=24 --- SDL2.changes | 10 ++++++++++ SDL2.spec | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/SDL2.changes b/SDL2.changes index 6e077d5..ecab899 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon May 26 07:48:54 UTC 2014 - mailaender@opensuse.org + +- Added missing build dependencies + * arts + * dbus + * udev + * tslib +- Removed unrecognized options: --disable-video-svga, --disable-video-ps3 + ------------------------------------------------------------------- Mon May 26 07:00:15 UTC 2014 - mailaender@opensuse.org diff --git a/SDL2.spec b/SDL2.spec index 6134e98..03b591a 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -30,11 +30,14 @@ Source2: http://libsdl.org/release/%name-%version.tar.gz.sig Source3: %name.keyring Source4: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: arts-devel BuildRequires: alsa-devel >= 0.9.0 BuildRequires: dos2unix BuildRequires: esound-devel >= 0.2.8 +BuildRequires: gcc gcc-c++ BuildRequires: nasm BuildRequires: pkgconfig +BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gl) @@ -44,6 +47,9 @@ BuildRequires: pkgconfig(glesv1_cm) BuildRequires: pkgconfig(glesv2) %endif BuildRequires: pkgconfig(ice) +%if 0%{?suse_version} > 1120 +BuildRequires: pkgconfig(tslib) +%endif BuildRequires: pkgconfig(x11) %if 0%{?suse_version} > 1120 BuildRequires: pkgconfig(xscrnsaver) @@ -55,6 +61,7 @@ BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(libpulse-simple) >= 0.9 +BuildRequires: pkgconfig(udev) %ifarch ppc ppc64 BuildRequires: libspe2-devel %endif @@ -108,8 +115,6 @@ dos2unix COPYING.txt --with-pic \ --disable-rpath \ --disable-alsa-shared \ - --disable-video-svga \ - --disable-video-ps3 \ --disable-video-directfb make %{?_smp_mflags} From 30d11de82a16808e0c81485181256e2b073de0f0d269ebf9e90a60b321edbf1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 26 May 2014 13:28:38 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=25 --- SDL2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL2.spec b/SDL2.spec index 03b591a..058a213 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -47,7 +47,7 @@ BuildRequires: pkgconfig(glesv1_cm) BuildRequires: pkgconfig(glesv2) %endif BuildRequires: pkgconfig(ice) -%if 0%{?suse_version} > 1120 +%if 0%{?suse_version} > 1220 BuildRequires: pkgconfig(tslib) %endif BuildRequires: pkgconfig(x11)