[weston] Update to a git snapshot based on what will become 1.1.90
Richard Hughes
rhughes at fedoraproject.org
Wed May 15 09:46:11 UTC 2013
commit abc244150d897a178a6f8cf4d294cd582a735753
Author: Richard Hughes <richard at hughsie.com>
Date: Wed May 15 10:46:07 2013 +0100
Update to a git snapshot based on what will become 1.1.90
.gitignore | 1 +
make-git-snapshot.sh | 2 +-
sources | 2 +-
weston-1.0.5-11-g9a576c3.patch | 693 ----------------------------------------
weston-fixes.patch | 51 +++
weston.spec | 19 +-
6 files changed, 69 insertions(+), 699 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 34c601d..b7412ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/weston-1.0.5.tar.xz
/weston-1.0.6.tar.xz
/weston-1.1.0.tar.xz
+/weston-20130515.tar.bz2
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
index fec8ab5..7c6f10b 100755
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@@ -14,7 +14,7 @@ echo HEAD ${1:-HEAD}
rm -rf $DIRNAME
git clone ${REF:+--reference $REF} \
- git://anongit.freedesktop.org/wayland/wayland-demos $DIRNAME
+ git://anongit.freedesktop.org/wayland/weston $DIRNAME
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
| bzip2 > $DIRNAME.tar.bz2
diff --git a/sources b/sources
index ab3df0c..41f3e43 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd9f3043fc5228c6bc4e99873fae2254 weston-1.1.0.tar.xz
+3d83b295e0f8757a37b0bb8702de38a7 weston-20130515.tar.bz2
diff --git a/weston-fixes.patch b/weston-fixes.patch
new file mode 100644
index 0000000..d072c39
--- /dev/null
+++ b/weston-fixes.patch
@@ -0,0 +1,51 @@
+diff --git a/src/cms-colord.c b/src/cms-colord.c
+index 33f23b2..6056407 100644
+--- a/src/cms-colord.c
++++ b/src/cms-colord.c
+@@ -127,6 +127,7 @@ static void
+ update_device_with_profile_in_idle(struct cms_output *ocms)
+ {
+ gboolean signal_write = FALSE;
++ ssize_t rc;
+ struct cms_colord *cms = ocms->cms;
+
+ colord_idle_cancel_for_output(cms, ocms->o);
+@@ -139,7 +140,9 @@ update_device_with_profile_in_idle(struct cms_output *ocms)
+ /* signal we've got updates to do */
+ if (signal_write) {
+ gchar tmp = '\0';
+- write(cms->writefd, &tmp, 1);
++ rc = write(cms->writefd, &tmp, 1);
++ if (rc == 0)
++ weston_log("colord: failed to write to pending fd");
+ }
+ }
+
+@@ -365,6 +368,7 @@ colord_dispatch_all_pending(int fd, uint32_t mask, void *data)
+ {
+ gchar tmp;
+ GList *l;
++ ssize_t rc;
+ struct cms_colord *cms = data;
+ struct cms_output *ocms;
+
+@@ -387,7 +391,9 @@ colord_dispatch_all_pending(int fd, uint32_t mask, void *data)
+ g_mutex_unlock(&cms->pending_mutex);
+
+ /* done */
+- read(cms->readfd, &tmp, 1);
++ rc = read(cms->readfd, &tmp, 1);
++ if (rc == 0)
++ weston_log("colord: failed to read from pending fd");
+ return 1;
+ }
+
+@@ -478,7 +484,7 @@ colord_cms_output_destroy(gpointer data)
+
+ WL_EXPORT int
+ module_init(struct weston_compositor *ec,
+- int *argc, char *argv[], const char *config_file)
++ int *argc, char *argv[])
+ {
+ gboolean ret;
+ GError *error = NULL;
diff --git a/weston.spec b/weston.spec
index 5d91d08..295b042 100644
--- a/weston.spec
+++ b/weston.spec
@@ -1,8 +1,8 @@
-#define gitdate 20120424
+%define gitdate 20130515
Name: weston
-Version: 1.1.0
-Release: 1%{?alphatag}%{?dist}
+Version: 1.1.90
+Release: 0.1%{?alphatag}%{?dist}
Summary: Reference compositor for Wayland
Group: User Interface/X
License: BSD and CC-BY-SA
@@ -17,6 +17,9 @@ Source1: make-git-snapshot.sh
# git diff-tree -p 1.0.6..origin/1.0 > weston-$(git describe origin/1.0).patch
#Patch0: weston-1.0.5-11-g9a576c3.patch
+# Sent upstream
+Patch1: weston-fixes.patch
+
BuildRequires: autoconf
BuildRequires: cairo-devel >= 1.10.0
BuildRequires: glib2-devel
@@ -30,7 +33,7 @@ BuildRequires: libudev-devel
%endif
BuildRequires: libunwind-devel
BuildRequires: libwayland-client-devel
-BuildRequires: libwayland-server-devel >= 1.1.0
+BuildRequires: libwayland-server-devel >= 1.1.90
BuildRequires: libwayland-cursor-devel
BuildRequires: libxcb-devel
BuildRequires: libXcursor-devel
@@ -46,6 +49,8 @@ BuildRequires: pixman-devel
BuildRequires: poppler-devel
BuildRequires: poppler-glib-devel
BuildRequires: systemd-devel
+BuildRequires: lcms2-devel
+BuildRequires: colord-devel
%description
Weston is the reference wayland compositor that can run on KMS, under X11
@@ -60,6 +65,7 @@ Common headers for weston
%prep
%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
#%patch0 -p1 -b .git
+%patch1 -p1 -b .fixes
%build
# temporary force to pick up configure.ac changes
@@ -84,6 +90,8 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
%{_bindir}/weston-terminal
%{_bindir}/wcap-decode
%dir %{_libdir}/weston
+%{_libdir}/weston/cms-colord.so
+%{_libdir}/weston/cms-static.so
%{_libdir}/weston/desktop-shell.so
%{_libdir}/weston/drm-backend.so
%{_libdir}/weston/fbdev-backend.so
@@ -109,6 +117,9 @@ find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
%{_libdir}/pkgconfig/weston.pc
%changelog
+* Wed May 15 2013 Richard Hughes <rhughes at redhat.com> - 1.1.90-0.1.20130515
+- Update to a git snapshot based on what will become 1.1.90
+
* Tue Apr 16 2013 Richard Hughes <richard at hughsie.com> 1.1.0-1
- weston 1.1.0
More information about the scm-commits
mailing list