X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=SDL2.spec;h=8410a6601226aa977fb2706183b1e5e914fc9bec;hb=9c1618f078e6b44afc57f9fc231bc6681a1a1aa3;hp=b23ed571fc6ff748024c080cf58c823587184bff;hpb=16c10f9cce6046841027a118c7723ca4b6c49411;p=packages%2FSDL2.git

diff --git a/SDL2.spec b/SDL2.spec
index b23ed57..8410a66 100644
--- a/SDL2.spec
+++ b/SDL2.spec
@@ -5,10 +5,14 @@
 %bcond_without	alsa		# ALSA audio support
 %bcond_with	arts		# aRts audio support
 %bcond_with	esd		# EsounD audio support
-%bcond_without	gl		# OpenGL (GLX) support
+%bcond_with	jack		# JACK audio support
+%bcond_without	opengl		# OpenGL (GLX) support
 %bcond_without	gles		# OpenGL ES (EGL) support
-%bcond_with	mir		# Mir graphics support
-%bcond_with	wayland		# Wayland graphics support
+%bcond_with	kms		# KMS/DRM graphics support
+%bcond_without	vulkan		# Vulkan graphics support
+%bcond_without	wayland		# Wayland graphics support
+%bcond_without	fcitx		# Fcitx IM support
+%bcond_without	ibus		# IBus IM support
 %bcond_without	static_libs	# don't build static libraries
 %bcond_with	mmx		# MMX instructions
 %bcond_with	sse		# SSE instructions
@@ -21,81 +25,89 @@
 # libasound.so.2		[if with alsa]
 # libaudio.so.2			[if with nas]
 # libdirectfb-*.so --needs patch (-release not supported by configure)
+# libdrm.so.2			[if with kms]
 # libesd.so.0			[if with esd]
 # libfusionsound-*.so --needs patch (-release not supported by configure)
-# libmirclient.so.7		[if with mir]
+# libgbm.so.1			[if with kms]
+# libjack.so.0			[if with jack]
+# libpipewire-0.3.so.0
 # libpulse-simple.so.0
+# libsamplerate.so.0
 # libwayland-client.so.0	[if with wayland]
 # libwayland-cursor.so.0	[if with wayland]
 # libwayland-egl.so.1		[if with wayland]
-# libxkbcommon.so.0		[if with wayland or mir]
+# libxkbcommon.so.0		[if with wayland]
 # libX11.so.6
 # libXcursor.so.1
 # libXext.so.6
 # libXi.so.6
-# libXinerama.so.1
 # libXrandr.so.2
 # libXrender.so.1
 # libXss.so.1
-# libXxf86vm.so.1
 %ifarch k6 athlon
 %define	with_3dnow	1
 %endif
-%ifarch %{x8664} pentium2 pentium3 pentium4 athlon
+%ifarch %{x8664} x32 pentium2 pentium3 pentium4 athlon
 %define	with_mmx	1
 %endif
-%ifarch %{x8664} pentium3 pentium4
+%ifarch %{x8664} x32 pentium3 pentium4
 %define	with_sse	1
 %endif
-%ifarch %{x8664} pentium4
+%ifarch %{x8664} x32 pentium4
 %define	with_sse2	1
 %endif
 Summary:	SDL (Simple DirectMedia Layer) - Game/Multimedia Library
 Summary(pl.UTF-8):	SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów
 Summary(zh_CN.UTF-8):	SDL (Simple DirectMedia Layer) Generic APIs - 游戏/多媒体库
 Name:		SDL2
-Version:	2.0.3
-Release:	2
+Version:	2.26.4
+Release:	1
 License:	Zlib (BSD-like)
 Group:		Libraries
 Source0:	http://www.libsdl.org/release/%{name}-%{version}.tar.gz
-# Source0-md5:	fe6c61d2e9df9ef570e7e80c6e822537
+# Source0-md5:	a8a81a12f3181071fe87ef2eab1202b9
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-cflags.patch
 URL:		http://www.libsdl.org/
-%{?with_wayland:BuildRequires:	Mesa-libwayland-egl-devel}
+%{?with_kms:BuildRequires:	Mesa-libgbm-devel >= 11.1.0}
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 1.0.0}
+%if %{with opengl} || %{with gles}
+BuildRequires:	EGL-devel
+%endif
 %{?with_directfb:BuildRequires:	FusionSound-devel >= 1.1.1}
-%{?with_gl:BuildRequires:	OpenGL-GLX-devel}
+%{?with_opengl:BuildRequires:	OpenGL-GLX-devel}
 %{?with_gles:BuildRequires:	OpenGLES-devel}
-%{?with_alsa:BuildRequires:	alsa-lib-devel >= 0.9.0}
+%{?with_alsa:BuildRequires:	alsa-lib-devel >= 1.0.11}
 %{?with_arts:BuildRequires:	artsc-devel >= 1.1}
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
 BuildRequires:	dbus-devel
 %{?with_esd:BuildRequires:	esound-devel >= 0.2.8}
+%{?with_fcitx:BuildRequires:	fcitx-devel}
 BuildRequires:	gcc >= 5:4.0
+BuildRequires:	hidapi-devel
+%{?with_ibus:BuildRequires:	ibus-devel >= 1.0}
+%{?with_jack:BuildRequires:	jack-audio-connection-kit-devel >= 0.125}
+%{?with_kms:BuildRequires:	libdrm-devel >= 1.4.82}
+BuildRequires:	libsamplerate-devel
 BuildRequires:	libtool >= 2:2.0
-%{?with_mir:BuildRequires:	mir-devel}
 %{?with_nas:BuildRequires:	nas-devel}
 BuildRequires:	perl-modules
+BuildRequires:	pipewire-devel >= 0.3.20
 BuildRequires:	pkgconfig >= 1:0.7
 BuildRequires:	pulseaudio-devel >= 0.9
-BuildRequires:	tslib-devel
 BuildRequires:	udev-devel
 # wayland-client, wayland-cursor
-%{?with_wayland:BuildRequires:	wayland-devel}
+%{?with_wayland:BuildRequires:	wayland-devel >= 1.18}
+%{?with_wayland:BuildRequires:	wayland-egl-devel}
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXScrnSaver-devel
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXi-devel
-BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
-BuildRequires:	xorg-lib-libXxf86vm-devel
-%if %{with mir} || %{with wayland}
-BuildRequires:	xorg-lib-libxkbcommon-devel
+%if %{with wayland}
+BuildRequires:	xorg-lib-libxkbcommon-devel >= 0.5.0
 %endif
 BuildRequires:	xorg-proto-xextproto-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -137,7 +149,6 @@ Summary(zh_CN.UTF-8):	SDL (Simple DirectMedia Layer) 开发库
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 %{?with_directfb:Requires:	DirectFB-devel >= 1.0.0}
-Requires:	tslib-devel
 Requires:	xorg-lib-libX11-devel
 Suggests:	OpenGL-GLU-devel
 
@@ -201,7 +212,6 @@ SDL - przykładowe programy.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -213,6 +223,9 @@ SDL - przykładowe programy.
 	%{!?with_altiveca:--disable-altivec} \
 	%{!?with_arts:--disable-arts} \
 	%{!?with_esd:--disable-esd} \
+	%{!?with_fcitx:--disable-fcitx} \
+	%{!?with_ibus:--disable-ibus} \
+	%{!?with_jack:--disable-jack} \
 	%{!?with_mmx:--disable-mmx} \
 	%{!?with_nas:--disable-nas} \
 	--enable-pthreads \
@@ -223,13 +236,15 @@ SDL - przykładowe programy.
 	%{?with_sse:--enable-ssemath} \
 	%{!?with_static_libs:--disable-static} \
 	%{!?with_directfb:--disable-video-directfb} \
-	%{?with_mir:--enable-video-mir} \
+	%{?with_kms:--enable-video-kmsdrm} \
 	--enable-video-opengl%{!?with_opengl:=no} \
 	--enable-video-opengles%{!?with_gles:=no} \
-	%{?with_wayland:--enable-video-wayland} \
+	--enable-video-vulkan%{!?with_vulkan:=no} \
+	--enable-video-wayland%{!?with_wayland:=no} \
 	--with-x
 
-%{__make}
+%{__make} \
+	V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -250,7 +265,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 # non-Linux READMEs packaged for portability information
-%doc BUGS.txt COPYING.txt CREDITS.txt README*.txt TODO.txt WhatsNew.txt
+%doc BUGS.txt CREDITS.txt LICENSE.txt README*.txt TODO.txt WhatsNew.txt
 %attr(755,root,root) %{_libdir}/libSDL2-2.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libSDL2-2.0.so.0
 
@@ -260,10 +275,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libSDL2.so
 %{_libdir}/libSDL2.la
 %{_libdir}/libSDL2_test.a
+%{_libdir}/libSDL2_test.la
 %{_libdir}/libSDL2main.a
+%{_libdir}/libSDL2main.la
 %{_includedir}/SDL2
 %{_aclocaldir}/sdl2.m4
 %{_pkgconfigdir}/sdl2.pc
+%{_libdir}/cmake/SDL2
 
 %if %{with static_libs}
 %files static