X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=libinput.spec;h=e471bd1ac388c4b21bf94baac9d5add0617189c8;hb=ac1a509;hp=2ace8de7afa5b74108fc740ad1ca86aa1612b6bf;hpb=5f5898768c8d71d7feb7f0d54f67bdc40d2bf246;p=packages%2Flibinput.git

diff --git a/libinput.spec b/libinput.spec
index 2ace8de..e471bd1 100644
--- a/libinput.spec
+++ b/libinput.spec
@@ -3,6 +3,7 @@
 #
 # Conditional build:
 %bcond_without	gui		# libinput-debug-gui
+%bcond_with	gtk4		# build libinput-debug-gui with gtk4
 %bcond_without	libunwind	# libunwind debugging support
 %bcond_without	doc		# documentation
 %bcond_without	tests		# tests
@@ -13,29 +14,40 @@
 Summary:	Input device library
 Summary(pl.UTF-8):	Biblioteka urządzeń wejściowych
 Name:		libinput
-Version:	1.14.3
-Release:	2
+Version:	1.19.2
+Release:	1
 License:	MIT
 Group:		Libraries
 Source0:	https://www.freedesktop.org/software/libinput/%{name}-%{version}.tar.xz
-# Source0-md5:	d052faa64eb6d2e649e582cc0fcf6e32
+# Source0-md5:	2c7f2aa4032bacb562a535b74829c56d
 URL:		https://www.freedesktop.org/wiki/Software/libinput/
 BuildRequires:	check-devel >= 0.9.10
 BuildRequires:	libevdev-devel >= 1.3
 %{?with_libunwind:BuildRequires:	libunwind-devel}
 BuildRequires:	libwacom-devel >= 0.20
-BuildRequires:	meson >= 0.41.0
+BuildRequires:	meson >= 0.49.0
 BuildRequires:	mtdev-devel >= 1.1.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.728
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
 BuildRequires:	valgrind
+BuildRequires:	xz
 %if %{with gui}
 BuildRequires:	cairo-devel
 BuildRequires:	glib2-devel >= 2.0
+%if %{with gtk4}
+BuildRequires:	gtk4-devel >= 4.0
+%else
 BuildRequires:	gtk+3-devel >= 3.20
 %endif
+BuildRequires:	wayland-devel
+BuildRequires:	wayland-protocols
+BuildRequires:	xorg-lib-libX11-devel
+%endif
 %if %{with doc}
 BuildRequires:	doxygen >= 1.8.3
 BuildRequires:	graphviz >= 2.26.0
@@ -72,7 +84,11 @@ Summary:	Debugging GUI for libinput
 Summary(pl.UTF-8):	Graficzny interfejs diagnostyczny do libinput
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
+%if %{with gtk4}
+Requires:	gtk4 >= 4.0
+%else
 Requires:	gtk+3 >= 3.20
+%endif
 
 %description gui
 Debugging GUI for libinput.
@@ -95,25 +111,11 @@ that use libinput.
 Ten pakiet zawiera pliki nagłówkowe niezbędne do tworzenia aplikacji
 wykorzystujących bibliotekę libinput.
 
-%package static
-Summary:	Static libinput library
-Summary(pl.UTF-8):	Statyczna biblioteka libinput
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static libinput library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka libinput.
-
 %package apidocs
 Summary:	API documentation for libinput library
 Summary(pl.UTF-8):	Dokumentacja API biblioteki libinput
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description apidocs
 API documentation for libinput library.
@@ -138,8 +140,13 @@ Dopełnianie parametrów w zsh dla polecenia libinput.
 %setup -q
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
+	tools/libinput-analyze-{per-slot-delta,recording,touch-down-state}.py \
 	tools/libinput-measure-{fuzz,touchpad-pressure,touch-size,touchpad-tap}.py \
-	tools/libinput-replay
+	tools/libinput-{replay,measure-touchpad-size}.py
+
+%if %{without gtk4}
+%{__sed} -i -e "/dependency('gtk4'/ s/'gtk4'/'gtk4-disabled'/" meson.build
+%endif
 
 %build
 %meson build \
@@ -147,14 +154,15 @@ Dopełnianie parametrów w zsh dla polecenia libinput.
 	-Ddocumentation=%{__true_false doc} \
 	-Dudev-dir=/lib/udev \
 	-Dzshcompletiondir=%{zsh_compdir}
-%meson_build -C build
 
-%{?with_tests:%meson_test -C build}
+%ninja_build -C build
+
+%{?with_tests:%ninja_test -C build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/libinput-test-suite.1
 
@@ -171,28 +179,41 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libinput.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libinput.so.10
 %dir %{_libexecdir}/libinput
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze-per-slot-delta
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze-recording
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-analyze-touch-down-state
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-debug-events
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-debug-tablet
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-list-devices
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-fuzz
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touchpad-pressure
+%attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touchpad-size
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touchpad-tap
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-measure-touch-size
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-quirks
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-record
 %attr(755,root,root) %{_libexecdir}/libinput/libinput-replay
 %attr(755,root,root) /lib/udev/libinput-device-group
-%attr(755,root,root) /lib/udev/libinput-fuzz-override
+%attr(755,root,root) /lib/udev/libinput-fuzz-extract
+%attr(755,root,root) /lib/udev/libinput-fuzz-to-zero
 /lib/udev/rules.d/80-libinput-device-groups.rules
 /lib/udev/rules.d/90-libinput-fuzz-override.rules
 %dir %{_datadir}/libinput
 %{_datadir}/libinput/*.quirks
 %{_mandir}/man1/libinput.1*
+%{_mandir}/man1/libinput-analyze.1*
+%{_mandir}/man1/libinput-analyze-per-slot-delta.1*
+%{_mandir}/man1/libinput-analyze-recording.1*
+%{_mandir}/man1/libinput-analyze-touch-down-state.1*
 %{_mandir}/man1/libinput-debug-events.1*
+%{_mandir}/man1/libinput-debug-tablet.1*
 %{_mandir}/man1/libinput-list-devices.1*
 %{_mandir}/man1/libinput-measure.1*
 %{_mandir}/man1/libinput-measure-fuzz.1*
 %{_mandir}/man1/libinput-measure-touchpad-pressure.1*
+%{_mandir}/man1/libinput-measure-touchpad-size.1*
 %{_mandir}/man1/libinput-measure-touchpad-tap.1*
 %{_mandir}/man1/libinput-measure-touch-size.1*
 %{_mandir}/man1/libinput-quirks.1*
@@ -217,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with doc}
 %files apidocs
 %defattr(644,root,root,755)
-%doc build/api/*
+%doc build/doc/html/*
 %endif
 
 %files -n zsh-completion-%{name}