From 7924f39aa78ca47e5a38e26bee92642dfd3ba609535185f1fbc190bb224f9452 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Jan 2014 12:04:42 +0000 Subject: [PATCH 1/3] Accepting request 214568 from home:scarabeus_iv - Version bump to 1.3.93: * Various bugfixes to another RC release - Add patch wayland-1.3.93-resourcestest.patch fixing tests from upstream git - Cleanup the spec with spec-cleaner - Always run tests do not conditionalize them. They wether fail or not - Add missing dep on xsltproc as per configure OBS-URL: https://build.opensuse.org/request/show/214568 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=42 --- wayland-1.3.91.tar.xz | 3 -- wayland-1.3.93-resourcestest.patch | 33 ++++++++++++++ wayland-1.3.93.tar.xz | 3 ++ wayland.changes | 12 +++++ wayland.spec | 73 +++++++++++++++--------------- 5 files changed, 85 insertions(+), 39 deletions(-) delete mode 100644 wayland-1.3.91.tar.xz create mode 100644 wayland-1.3.93-resourcestest.patch create mode 100644 wayland-1.3.93.tar.xz diff --git a/wayland-1.3.91.tar.xz b/wayland-1.3.91.tar.xz deleted file mode 100644 index 4b94cc6..0000000 --- a/wayland-1.3.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:209800291d73c607baacd398b16c1d9f8e0090514e3f64718a6b420d640ce7c7 -size 421068 diff --git a/wayland-1.3.93-resourcestest.patch b/wayland-1.3.93-resourcestest.patch new file mode 100644 index 0000000..106ebb3 --- /dev/null +++ b/wayland-1.3.93-resourcestest.patch @@ -0,0 +1,33 @@ +From 3b8a1c7fed80dc9465115888610b82cd2fed1bd0 Mon Sep 17 00:00:00 2001 +From: Kristian Høgsberg +Date: Mon, 20 Jan 2014 23:07:55 +0000 +Subject: resources-test: Don't send invalid event + +Even if nothing receives the even, the arguments still need to be valid. +The test is sending out event 0 from the wl_display interface, which is +the error event. This requires arg 0 to be a valid object and arg 2 to +be a non-null string. The test just leaves that undefined, causing +intermittent test failures. + +As it is, the resource destroy test doesn't need to send an event to +validate the various resource destroy hooks, so we can just remove the +call to wl_resource_post_event() alltogether. + +Thanks to Matt Turner for pointing out the failure. +--- +diff --git a/tests/resources-test.c b/tests/resources-test.c +index 514c031..a6ce3ae 100644 +--- a/tests/resources-test.c ++++ b/tests/resources-test.c +@@ -107,9 +107,6 @@ TEST(destroy_res_tst) + wl_resource_set_implementation(res, NULL, &destroyed, res_destroy_func); + wl_resource_add_destroy_listener(res, &destroy_listener); + +- /* without implementation this should be ignored .. */ +- wl_resource_post_event(res, 0); +- + id = wl_resource_get_id(res); + link = wl_resource_get_link(res); + assert(link); +-- +cgit v0.9.0.2-2-gbebe diff --git a/wayland-1.3.93.tar.xz b/wayland-1.3.93.tar.xz new file mode 100644 index 0000000..6b47eae --- /dev/null +++ b/wayland-1.3.93.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98b8eda896b1e33a4e301ef81c233afa117ea031f3e3f2cb71108ff936d68cab +size 421292 diff --git a/wayland.changes b/wayland.changes index 987a8cb..22c182a 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jan 21 11:10:29 UTC 2014 - tchvatal@suse.com + +- Version bump to 1.3.93: + * Various bugfixes to another RC release +- Add patch wayland-1.3.93-resourcestest.patch fixing tests from + upstream git +- Cleanup the spec with spec-cleaner +- Always run tests do not conditionalize them. They wether fail or + not +- Add missing dep on xsltproc as per configure + ------------------------------------------------------------------- Tue Dec 24 21:15:33 UTC 2013 - jengelh@inai.de diff --git a/wayland.spec b/wayland.spec index 2fccb6d..8a5b116 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,7 +1,7 @@ # # spec file for package wayland # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,30 @@ # -Name: wayland %define lname libwayland0 -Version: 1.3.91 +Name: wayland +Version: 1.3.93 Release: 0 Summary: Wayland Compositor Infrastructure License: HPND Group: Development/Libraries/C and C++ Url: http://wayland.freedesktop.org/ - #Git-Clone: git://anongit.freedesktop.org/wayland/wayland #Git-Web: http://cgit.freedesktop.org/wayland/wayland/ -Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +Patch0: wayland-1.3.93-resourcestest.patch #git#BuildRequires: autoconf >= 2.64 #git#BuildRequires: automake >= 1.11 -#git#BuildRequires: libtool >= 2.2 +#git#BuildRequires: libtool >= 2.2 BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: libexpat-devel BuildRequires: libxml2-tools +BuildRequires: libxslt-tools BuildRequires: pkgconfig BuildRequires: xz +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libffi) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Wayland is a protocol for a compositor to talk to its clients as well @@ -85,9 +86,9 @@ fullscreen) or other display servers. %package devel Summary: Development files for the Wayland Compositor Infrastructure Group: Development/Libraries/C and C++ -Requires: libwayland-client0 = %version -Requires: libwayland-cursor0 = %version -Requires: libwayland-server0 = %version +Requires: libwayland-client0 = %{version} +Requires: libwayland-cursor0 = %{version} +Requires: libwayland-server0 = %{version} %description devel Wayland is a protocol for a compositor to talk to its clients as well @@ -102,61 +103,61 @@ to develop applications that require these. %prep %setup -q +%patch0 -p1 %build if [ ! -e configure ]; then autoreconf -fi; fi; -# Ensure people will use pkgconfig to locate headers -%configure --disable-static --includedir="%_includedir/pkg/%name" -make %{?_smp_mflags} +%configure --disable-static --includedir="%{_includedir}/pkg/%{name}" +make %{?_smp_mflags} V=1 %install -b="%buildroot"; -make install DESTDIR="$b"; -rm -f "$b/%_libdir"/*.la; -%fdupes %buildroot/%_prefix +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print +%fdupes %{buildroot}/%{_prefix} %check %if !0%{?qemu_user_space_build} -mkdir -m go-rwx xdg +mkdir xdg +chmod 700 xdg export XDG_RUNTIME_DIR="$PWD/xdg" -if ! make check %{?_smp_mflags}; then - cat tests/test-suite.log - prj="%_project" - # Ignore testsuite errors in the develprj - if [ "${prj:0:8}" = "openSUSE" ]; then exit 1; fi -fi +make check %{?_smp_mflags} V=1 %endif %post -n libwayland-client0 -p /sbin/ldconfig + %postun -n libwayland-client0 -p /sbin/ldconfig + %post -n libwayland-cursor0 -p /sbin/ldconfig + %postun -n libwayland-cursor0 -p /sbin/ldconfig + %post -n libwayland-server0 -p /sbin/ldconfig + %postun -n libwayland-server0 -p /sbin/ldconfig %files -n libwayland-client0 %defattr(-,root,root) -%_libdir/libwayland-client.so.0* +%{_libdir}/libwayland-client.so.0* %files -n libwayland-cursor0 %defattr(-,root,root) -%_libdir/libwayland-cursor.so.0* +%{_libdir}/libwayland-cursor.so.0* %files -n libwayland-server0 %defattr(-,root,root) -%_libdir/libwayland-server.so.0* +%{_libdir}/libwayland-server.so.0* %files devel %defattr(-,root,root) -%_bindir/wayland-scanner -%_includedir/pkg/ -%_libdir/libwayland-*.so -%_libdir/pkgconfig/wayland-*.pc -%_datadir/aclocal/ -%_datadir/pkgconfig/wayland-*.pc -%_datadir/wayland/ -%_mandir/man3/wl_*.3* +%{_bindir}/wayland-scanner +%{_includedir}/pkg/ +%{_libdir}/libwayland-*.so +%{_libdir}/pkgconfig/wayland-*.pc +%{_datadir}/aclocal/ +%{_datadir}/pkgconfig/wayland-*.pc +%{_datadir}/wayland/ +%{_mandir}/man3/wl_*.3* %changelog From aef99008cfa502959cf7204b3823292e9fdf2cd628543d738b01c435264ab009 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Jan 2014 12:04:57 +0000 Subject: [PATCH 2/3] Run spec-beautifier OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=43 --- wayland.spec | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/wayland.spec b/wayland.spec index 8a5b116..10313ee 100644 --- a/wayland.spec +++ b/wayland.spec @@ -23,10 +23,10 @@ Release: 0 Summary: Wayland Compositor Infrastructure License: HPND Group: Development/Libraries/C and C++ -Url: http://wayland.freedesktop.org/ +URL: http://wayland.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/wayland/wayland #Git-Web: http://cgit.freedesktop.org/wayland/wayland/ -Source: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz Patch0: wayland-1.3.93-resourcestest.patch #git#BuildRequires: autoconf >= 2.64 #git#BuildRequires: automake >= 1.11 @@ -39,7 +39,7 @@ BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libffi) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %_tmppath/%name-%version-build %description Wayland is a protocol for a compositor to talk to its clients as well @@ -86,9 +86,9 @@ fullscreen) or other display servers. %package devel Summary: Development files for the Wayland Compositor Infrastructure Group: Development/Libraries/C and C++ -Requires: libwayland-client0 = %{version} -Requires: libwayland-cursor0 = %{version} -Requires: libwayland-server0 = %{version} +Requires: libwayland-client0 = %version +Requires: libwayland-cursor0 = %version +Requires: libwayland-server0 = %version %description devel Wayland is a protocol for a compositor to talk to its clients as well @@ -109,13 +109,13 @@ to develop applications that require these. if [ ! -e configure ]; then autoreconf -fi; fi; -%configure --disable-static --includedir="%{_includedir}/pkg/%{name}" +%configure --disable-static --includedir="%_includedir/pkg/%name" make %{?_smp_mflags} V=1 %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -find %{buildroot} -type f -name "*.la" -delete -print -%fdupes %{buildroot}/%{_prefix} +make DESTDIR=%buildroot install %{?_smp_mflags} +find %buildroot -type f -name "*.la" -delete -print +%fdupes %buildroot/%_prefix %check %if !0%{?qemu_user_space_build} @@ -139,25 +139,25 @@ make check %{?_smp_mflags} V=1 %files -n libwayland-client0 %defattr(-,root,root) -%{_libdir}/libwayland-client.so.0* +%_libdir/libwayland-client.so.0* %files -n libwayland-cursor0 %defattr(-,root,root) -%{_libdir}/libwayland-cursor.so.0* +%_libdir/libwayland-cursor.so.0* %files -n libwayland-server0 %defattr(-,root,root) -%{_libdir}/libwayland-server.so.0* +%_libdir/libwayland-server.so.0* %files devel %defattr(-,root,root) -%{_bindir}/wayland-scanner -%{_includedir}/pkg/ -%{_libdir}/libwayland-*.so -%{_libdir}/pkgconfig/wayland-*.pc -%{_datadir}/aclocal/ -%{_datadir}/pkgconfig/wayland-*.pc -%{_datadir}/wayland/ -%{_mandir}/man3/wl_*.3* +%_bindir/wayland-scanner +%_includedir/pkg/ +%_libdir/libwayland-*.so +%_libdir/pkgconfig/wayland-*.pc +%_datadir/aclocal/ +%_datadir/pkgconfig/wayland-*.pc +%_datadir/wayland/ +%_mandir/man3/wl_*.3* %changelog From ba3888e0218a3b88f3f34430067a6e3f14ec9e4edc2e81cd4b1ee179c324b1e3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 24 Jan 2014 12:01:30 +0000 Subject: [PATCH 3/3] wayland-1.4.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=44 --- wayland-1.3.93-resourcestest.patch | 33 ------------------------------ wayland-1.3.93.tar.xz | 3 --- wayland-1.4.0.tar.xz | 3 +++ wayland.changes | 8 ++++++++ wayland.spec | 4 +--- 5 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 wayland-1.3.93-resourcestest.patch delete mode 100644 wayland-1.3.93.tar.xz create mode 100644 wayland-1.4.0.tar.xz diff --git a/wayland-1.3.93-resourcestest.patch b/wayland-1.3.93-resourcestest.patch deleted file mode 100644 index 106ebb3..0000000 --- a/wayland-1.3.93-resourcestest.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3b8a1c7fed80dc9465115888610b82cd2fed1bd0 Mon Sep 17 00:00:00 2001 -From: Kristian Høgsberg -Date: Mon, 20 Jan 2014 23:07:55 +0000 -Subject: resources-test: Don't send invalid event - -Even if nothing receives the even, the arguments still need to be valid. -The test is sending out event 0 from the wl_display interface, which is -the error event. This requires arg 0 to be a valid object and arg 2 to -be a non-null string. The test just leaves that undefined, causing -intermittent test failures. - -As it is, the resource destroy test doesn't need to send an event to -validate the various resource destroy hooks, so we can just remove the -call to wl_resource_post_event() alltogether. - -Thanks to Matt Turner for pointing out the failure. ---- -diff --git a/tests/resources-test.c b/tests/resources-test.c -index 514c031..a6ce3ae 100644 ---- a/tests/resources-test.c -+++ b/tests/resources-test.c -@@ -107,9 +107,6 @@ TEST(destroy_res_tst) - wl_resource_set_implementation(res, NULL, &destroyed, res_destroy_func); - wl_resource_add_destroy_listener(res, &destroy_listener); - -- /* without implementation this should be ignored .. */ -- wl_resource_post_event(res, 0); -- - id = wl_resource_get_id(res); - link = wl_resource_get_link(res); - assert(link); --- -cgit v0.9.0.2-2-gbebe diff --git a/wayland-1.3.93.tar.xz b/wayland-1.3.93.tar.xz deleted file mode 100644 index 6b47eae..0000000 --- a/wayland-1.3.93.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98b8eda896b1e33a4e301ef81c233afa117ea031f3e3f2cb71108ff936d68cab -size 421292 diff --git a/wayland-1.4.0.tar.xz b/wayland-1.4.0.tar.xz new file mode 100644 index 0000000..a34b26a --- /dev/null +++ b/wayland-1.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f33b9f15b4c8b662fb1968e7636e7926b419dfc48de8a164b3a3d7095c5a58 +size 421564 diff --git a/wayland.changes b/wayland.changes index 22c182a..972308e 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 24 11:59:47 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 1.4.0 +* SHM Buffer SIBGUS protection +* Subsurfaces protocol moved to wayland +- Remove wayland-1.3.93-resourcestest.patch + ------------------------------------------------------------------- Tue Jan 21 11:10:29 UTC 2014 - tchvatal@suse.com diff --git a/wayland.spec b/wayland.spec index 10313ee..d8cce28 100644 --- a/wayland.spec +++ b/wayland.spec @@ -18,7 +18,7 @@ %define lname libwayland0 Name: wayland -Version: 1.3.93 +Version: 1.4.0 Release: 0 Summary: Wayland Compositor Infrastructure License: HPND @@ -27,7 +27,6 @@ URL: http://wayland.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/wayland/wayland #Git-Web: http://cgit.freedesktop.org/wayland/wayland/ Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz -Patch0: wayland-1.3.93-resourcestest.patch #git#BuildRequires: autoconf >= 2.64 #git#BuildRequires: automake >= 1.11 #git#BuildRequires: libtool >= 2.2 @@ -103,7 +102,6 @@ to develop applications that require these. %prep %setup -q -%patch0 -p1 %build if [ ! -e configure ]; then