Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
@ -1 +1 @@
|
|||||||
b2f722941eafea5dffc6d9001352f50340ff829c SOURCES/clutter-1.26.2.tar.xz
|
34d24ef08b27798f00bb09afa54b7d49e0a0ef0e SOURCES/clutter-1.26.4.tar.xz
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/clutter-1.26.2.tar.xz
|
SOURCES/clutter-1.26.4.tar.xz
|
||||||
|
@ -1,130 +0,0 @@
|
|||||||
From 1b8c6d5f4895edf64aad804e2461d896e4c5c08d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ray Strode <rstrode@redhat.com>
|
|
||||||
Date: Tue, 18 Dec 2018 14:42:11 -0500
|
|
||||||
Subject: [PATCH] conform: only listen to after-paint after paint
|
|
||||||
|
|
||||||
The after-paint signal is emitted after painting, obviously,
|
|
||||||
but also, maybe less obviously, also emitted after picking.
|
|
||||||
|
|
||||||
The actor-shader-effect test does read-pixels, so needs to
|
|
||||||
know when painting has actually happened, not just picking.
|
|
||||||
|
|
||||||
This commit changes that test to only look for the after-paint
|
|
||||||
signal after the paint signal.
|
|
||||||
|
|
||||||
In the picking case, after-paint would follow a pick signal
|
|
||||||
instead.
|
|
||||||
|
|
||||||
Fixes Xvfb installed-tests testing.
|
|
||||||
---
|
|
||||||
tests/conform/actor-shader-effect.c | 15 ++++++++++++---
|
|
||||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/conform/actor-shader-effect.c b/tests/conform/actor-shader-effect.c
|
|
||||||
index d3ddd384f..8114aab8a 100644
|
|
||||||
--- a/tests/conform/actor-shader-effect.c
|
|
||||||
+++ b/tests/conform/actor-shader-effect.c
|
|
||||||
@@ -197,88 +197,97 @@ static ClutterActor *
|
|
||||||
make_actor (GType shader_type)
|
|
||||||
{
|
|
||||||
ClutterActor *rect;
|
|
||||||
const ClutterColor white = { 0xff, 0xff, 0xff, 0xff };
|
|
||||||
|
|
||||||
rect = clutter_rectangle_new ();
|
|
||||||
clutter_rectangle_set_color (CLUTTER_RECTANGLE (rect), &white);
|
|
||||||
clutter_actor_set_size (rect, 50, 50);
|
|
||||||
|
|
||||||
clutter_actor_add_effect (rect, g_object_new (shader_type, NULL));
|
|
||||||
|
|
||||||
return rect;
|
|
||||||
}
|
|
||||||
|
|
||||||
static guint32
|
|
||||||
get_pixel (int x, int y)
|
|
||||||
{
|
|
||||||
guint8 data[4];
|
|
||||||
|
|
||||||
cogl_read_pixels (x, y, 1, 1,
|
|
||||||
COGL_READ_PIXELS_COLOR_BUFFER,
|
|
||||||
COGL_PIXEL_FORMAT_RGBA_8888_PRE,
|
|
||||||
data);
|
|
||||||
|
|
||||||
return (((guint32) data[0] << 16) |
|
|
||||||
((guint32) data[1] << 8) |
|
|
||||||
data[2]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
-paint_cb (ClutterStage *stage,
|
|
||||||
- gpointer data)
|
|
||||||
+after_paint_cb (ClutterStage *stage,
|
|
||||||
+ gpointer data)
|
|
||||||
{
|
|
||||||
gboolean *was_painted = data;
|
|
||||||
|
|
||||||
/* old shader effect */
|
|
||||||
g_assert_cmpint (get_pixel (50, 50), ==, 0xff0000);
|
|
||||||
/* new shader effect */
|
|
||||||
g_assert_cmpint (get_pixel (150, 50), ==, 0x00ffff);
|
|
||||||
/* another new shader effect */
|
|
||||||
g_assert_cmpint (get_pixel (250, 50), ==, 0xff00ff);
|
|
||||||
/* new shader effect */
|
|
||||||
g_assert_cmpint (get_pixel (350, 50), ==, 0x00ffff);
|
|
||||||
|
|
||||||
*was_painted = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void
|
|
||||||
+paint_cb (ClutterStage *stage,
|
|
||||||
+ gpointer data)
|
|
||||||
+{
|
|
||||||
+ g_signal_connect (stage, "after-paint",
|
|
||||||
+ G_CALLBACK (after_paint_cb),
|
|
||||||
+ data);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void
|
|
||||||
actor_shader_effect (void)
|
|
||||||
{
|
|
||||||
ClutterActor *stage;
|
|
||||||
ClutterActor *rect;
|
|
||||||
gboolean was_painted;
|
|
||||||
|
|
||||||
if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
|
|
||||||
return;
|
|
||||||
|
|
||||||
stage = clutter_stage_new ();
|
|
||||||
|
|
||||||
rect = make_actor (foo_old_shader_effect_get_type ());
|
|
||||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
|
|
||||||
|
|
||||||
rect = make_actor (foo_new_shader_effect_get_type ());
|
|
||||||
clutter_actor_set_x (rect, 100);
|
|
||||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
|
|
||||||
|
|
||||||
rect = make_actor (foo_another_new_shader_effect_get_type ());
|
|
||||||
clutter_actor_set_x (rect, 200);
|
|
||||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
|
|
||||||
|
|
||||||
rect = make_actor (foo_new_shader_effect_get_type ());
|
|
||||||
clutter_actor_set_x (rect, 300);
|
|
||||||
clutter_container_add_actor (CLUTTER_CONTAINER (stage), rect);
|
|
||||||
|
|
||||||
clutter_actor_show (stage);
|
|
||||||
|
|
||||||
was_painted = FALSE;
|
|
||||||
- g_signal_connect (stage, "after-paint",
|
|
||||||
+ g_signal_connect (stage, "paint",
|
|
||||||
G_CALLBACK (paint_cb),
|
|
||||||
&was_painted);
|
|
||||||
|
|
||||||
while (!was_painted)
|
|
||||||
g_main_context_iteration (NULL, FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
CLUTTER_TEST_SUITE (
|
|
||||||
CLUTTER_TEST_UNIT ("/actor/shader-effect", actor_shader_effect)
|
|
||||||
)
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@ -2,25 +2,22 @@
|
|||||||
|
|
||||||
%global with_tests 1
|
%global with_tests 1
|
||||||
|
|
||||||
%global glib2_version 2.44.0
|
%global glib2_version 2.53.4
|
||||||
%global cogl_version 1.21.2
|
%global cogl_version 1.21.2
|
||||||
%global json_glib_version 0.12.0
|
%global json_glib_version 0.12.0
|
||||||
%global cairo_version 1.14.0
|
%global cairo_version 1.14.0
|
||||||
%global libinput_version 0.19.0
|
%global libinput_version 0.19.0
|
||||||
|
|
||||||
Name: clutter
|
Name: clutter
|
||||||
Version: 1.26.2
|
Version: 1.26.4
|
||||||
Release: 8%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: Open Source software library for creating rich graphical user interfaces
|
Summary: Open Source software library for creating rich graphical user interfaces
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.clutter-project.org/
|
URL: http://www.clutter-project.org/
|
||||||
Source0: https://download.gnome.org/sources/%{name}/1.26/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/%{name}/1.26/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Patch0: 0001-conform-only-listen-to-after-paint-after-paint.patch
|
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: git
|
|
||||||
BuildRequires: pkgconfig(atk)
|
BuildRequires: pkgconfig(atk)
|
||||||
BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version}
|
BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version}
|
||||||
BuildRequires: pkgconfig(cogl-1.0) >= %{cogl_version}
|
BuildRequires: pkgconfig(cogl-1.0) >= %{cogl_version}
|
||||||
@ -33,6 +30,7 @@ BuildRequires: pkgconfig(pangocairo)
|
|||||||
BuildRequires: pkgconfig(xcomposite)
|
BuildRequires: pkgconfig(xcomposite)
|
||||||
BuildRequires: pkgconfig(xdamage)
|
BuildRequires: pkgconfig(xdamage)
|
||||||
BuildRequires: pkgconfig(xi)
|
BuildRequires: pkgconfig(xi)
|
||||||
|
BuildRequires: mesa-libEGL-devel
|
||||||
BuildRequires: mesa-libGL-devel
|
BuildRequires: mesa-libGL-devel
|
||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
BuildRequires: pkgconfig(gudev-1.0)
|
BuildRequires: pkgconfig(gudev-1.0)
|
||||||
@ -41,6 +39,7 @@ BuildRequires: pkgconfig(wayland-client)
|
|||||||
BuildRequires: pkgconfig(wayland-cursor)
|
BuildRequires: pkgconfig(wayland-cursor)
|
||||||
BuildRequires: pkgconfig(wayland-server)
|
BuildRequires: pkgconfig(wayland-server)
|
||||||
BuildRequires: pkgconfig(xkbcommon)
|
BuildRequires: pkgconfig(xkbcommon)
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
Requires: cairo%{?_isa} >= %{cairo_version}
|
Requires: cairo%{?_isa} >= %{cairo_version}
|
||||||
Requires: cogl%{?_isa} >= %{cogl_version}
|
Requires: cogl%{?_isa} >= %{cogl_version}
|
||||||
@ -87,7 +86,7 @@ the functionality of the installed clutter package.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -S git
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
@ -112,19 +111,26 @@ find %{buildroot} -name '*.la' -delete
|
|||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
%files -f clutter-1.0.lang
|
%files -f clutter-1.0.lang
|
||||||
%doc NEWS README
|
%doc NEWS README.md
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_libdir}/*.so.0
|
%{_libdir}/*.so.0
|
||||||
%{_libdir}/*.so.0.*
|
%{_libdir}/*.so.0.*
|
||||||
|
%dir %{_libdir}/girepository-1.0
|
||||||
%{_libdir}/girepository-1.0/*.typelib
|
%{_libdir}/girepository-1.0/*.typelib
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
%{_libdir}/pkgconfig/*.pc
|
%{_libdir}/pkgconfig/*.pc
|
||||||
|
%dir %{_datadir}/clutter-1.0
|
||||||
|
%dir %{_datadir}/clutter-1.0/valgrind
|
||||||
|
%{_datadir}/clutter-1.0/valgrind/clutter.supp
|
||||||
|
%dir %{_datadir}/gir-1.0
|
||||||
%{_datadir}/gir-1.0/*.gir
|
%{_datadir}/gir-1.0/*.gir
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
|
%dir %{_datadir}/gtk-doc
|
||||||
|
%dir %{_datadir}/gtk-doc/html
|
||||||
%{_datadir}/gtk-doc/html/clutter
|
%{_datadir}/gtk-doc/html/clutter
|
||||||
|
|
||||||
%if 0%{?with_tests}
|
%if 0%{?with_tests}
|
||||||
@ -134,12 +140,45 @@ find %{buildroot} -name '*.la' -delete
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Feb 19 2020 Tomas Pelka <tpelka@redhat.com> - 1.26.2-8
|
* Fri Feb 04 2022 Tomas Popela <tpopela@redhat.com> - 1.26.4-7
|
||||||
- rebuild to get the new in 8.2.0
|
- Enable LTO
|
||||||
- plus address #1785233
|
Resolves: rhbz#1986479
|
||||||
|
|
||||||
* Mon Dec 17 2018 Ray Strode <rstrode@redhat.com> - 1.26.2-7
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.26.4-6
|
||||||
- rebuild
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.26.4-5
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jun 30 2020 Jeff Law <law@redhat.com> - 1.26.4-2
|
||||||
|
Disable LTO
|
||||||
|
|
||||||
|
* Mon Mar 09 2020 Kalev Lember <klember@redhat.com> - 1.26.4-1
|
||||||
|
- Update to 1.26.4
|
||||||
|
- Include clutter.supp valgrind suppression file
|
||||||
|
- Fix issues with various unowned directories
|
||||||
|
|
||||||
|
* Tue Mar 03 2020 Kalev Lember <klember@redhat.com> - 1.26.2-11
|
||||||
|
- Backport fixes for 10-bit color (#1800865)
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.2-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.2-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.2-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.2-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Apr 18 2018 Kalev Lember <klember@redhat.com> - 1.26.2-6
|
* Wed Apr 18 2018 Kalev Lember <klember@redhat.com> - 1.26.2-6
|
||||||
- Remove wayland conditionals
|
- Remove wayland conditionals
|
||||||
|
Loading…
Reference in New Issue
Block a user