Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Deleted	_service:tar_git:weston-rpi.changes
@@ -1,17 +0,0 @@ -* Tue May 20 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> - 1.5.0-1 -- [rpm] Add wayland-cursor dependency -- [rpm] Apply patch to fix input -- [rpm] Remove compositor-rpi-fix-input.patch that was taken from master -- [upstream] Update to 1.5 - -* Thu Apr 24 2014 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> - 1.4.0-1 -- [rpm] Apply patch to fix input -- [rpm] Change configure arguments and remove commented build requires -- [rpm] Comment out egl and glesv2 build requires -- [rpm] Disable tests since they won't work on Raspberry Pi -- [rpm] Force gfx-rpi dependencies -- [rpm] Remove 000_simple_clients_programs_LDADD.patch -- [rpm] Remove man 7 files -- [rpm] Remove unrecognized options to configure -- [rpm] Remove useless configure flags -
[-] [+]	Changed	_service:tar_git:weston-rpi.spec ^
@@ -1,34 +1,53 @@ -%define with-cairo yes +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.27 +# + +Name: weston-rpi + +# >> macros +# << macros + +# >> bcond_with +%bcond_with cairo +# << bcond_with + +# >> bcond_without +%bcond_without X11 +%bcond_without xwayland +# << bcond_without -Name: weston-rpi -Version: 1.5.0 +Summary: Wayland Compositor Infrastructure +Version: 1.5.93+master.1.7d11c33 Release: 1 -Summary: Wayland Compositor Infrastructure -License: MIT -Group: System/GUI/Other -Url: http://weston.freedesktop.org/ -Source: %name-%version.tar.xz -Patch1: compositor-rpi-fix-input.patch -BuildRequires: gcc-c++ -BuildRequires: pkgconfig(expat) -BuildRequires: libjpeg-devel -#BuildRequires: libvpx-devel -BuildRequires: pam-devel -BuildRequires: pkgconfig -#BuildRequires: rsvg-view -BuildRequires: xkeyboard-config -%if "%{with-cairo}" == "yes" -BuildRequires: pkgconfig(cairo) +Group: System/GUI/Other +License: MIT +URL: http://wayland.freedesktop.org/ +Source0: %{name}-%{version}.tar.xz +Source100: weston.yaml +Requires: xkeyboard-config +%if %{with cairo} BuildRequires: pkgconfig(cairo-egl) >= 1.11.3 -BuildRequires: pkgconfig(cairo-xcb) +%endif +%if %{with xwayland} +BuildRequires: pkgconfig(cairo-xcb) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-xfixes) +BuildRequires: pkgconfig(xcursor) +%endif +%ifarch %{ix86} +BuildRequires: pkgconfig(egl) >= 7.10 +BuildRequires: pkgconfig(glesv2) +%endif +%if "%{name}" == "weston-rpi" +BuildRequires: pkgconfig(gfx-rpi-libEGL-devel) +BuildRequires: pkgconfig(gfx-rpi-libGLESv2-devel) +BuildRequires: pkgconfig(gfx-rpi-libOMXIL-devel) %endif BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gio-2.0) -BuildRequires: gfx-rpi-libEGL-devel -BuildRequires: gfx-rpi-libGLESv2-devel -BuildRequires: gfx-rpi-libOMXIL-devel BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libdrm) >= 2.4.30 BuildRequires: pkgconfig(libffi) @@ -37,22 +56,18 @@ BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(poppler-glib) -BuildRequires: pkgconfig(wayland-client) >= 1.0.0 -BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(pango) -BuildRequires: pkgconfig(libunwind) +BuildRequires: pkgconfig(wayland-client) >= 1.5.0 +BuildRequires: pkgconfig(wayland-egl) >= 1.5.0 +BuildRequires: pkgconfig(wayland-server) >= 1.5.0 +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(libunwind) BuildRequires: pkgconfig(xkbcommon) >= 0.0.578 -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-xfixes) -BuildRequires: pkgconfig(xcursor) -Requires: xkeyboard-config -Requires: gfx-rpi-libEGL -Requires: gfx-rpi-libGLESv2 -Requires: gfx-rpi-libOMXIL -Conflicts: weston = %{version} -Provides: weston = %{version} +BuildRequires: pkgconfig(expat) +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig +BuildRequires: xkeyboard-config %description Weston is the reference implementation of a Wayland compositor, and a @@ -66,61 +81,89 @@ Xorg server and can pull X clients into the Wayland desktop and act as a X window manager. + %package devel -Summary: Weston SDK +Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Provides: weston-devel = %{version} %description devel -Weston SDK files +This package contains the files necessary to develop applications +that use %{name}. + %prep %setup -q -n %{name}-%{version}/upstream -%patch1 -p1 + +# >> setup +# << setup %build +# >> build pre + +%if "%{name}" == "weston-rpi" export WESTON_NATIVE_BACKEND=rpi-backend.so -%reconfigure \ -%if "%{with-cairo}" == "yes" - --with-cairo=image \ -%endif - --disable-static \ - --disable-x11-compositor \ - --disable-drm-compositor \ - --disable-wayland-compositor \ +%endif + +# << build pre + +%autogen --disable-static \ +%if %{with X11} + --enable-x11-compositor \ +%endif +%if %{with xwayland} + --enable-xwayland \ +%endif +%if %{with cairo} + %if "%{name}" == "weston" + --with-cairo-glesv2 \ + %else + --with-cairo=image \ + %endif +%endif + --enable-tablet-shell \ + --enable-drm-compositor \ + --enable-wayland-compositor \ + --enable-fbdev-compositor \ + --disable-rdp-compositor \ --enable-weston-launch \ - --disable-simple-egl-clients \ - --disable-egl \ - --disable-libunwind \ + --enable-simple-clients \ + --enable-simple-egl-clients \ + --enable-clients \ + --enable-demo-clients=yes \ --disable-colord \ - --disable-resize-optimization \ - --disable-xwayland-test -make %{?_smp_mflags}; + --disable-setuid-install + +make %{?_smp_mflags} + +# >> build post +# << build post %install -make install DESTDIR="%buildroot"; -rm -f "%buildroot/%_libdir"/.la "%buildroot/%_libdir/weston"/.la; +rm -rf %{buildroot} +# >> install pre +# << install pre +%make_install
[-] [+]	Changed	_service ^
@@ -1,3 +1,6 @@ <services> - <service name="tar_git"><param name="url">https://github.com/maui-mer-packages/weston-rpi.git</param></service> -</services> \ No newline at end of file + <service name="tar_git"> + <param name="url">git://github.com/maui-packages/weston.git</param> + <param name="branch">master</param> + </service> +</services>
[-] [+]	Added	_service:tar_git:precheckin.sh ^
@@ -0,0 +1,4 @@ +#!/bin/sh + +cp weston.spec weston-rpi.spec +sed -i 's@Name:\s*weston$@Name: weston-rpi@g' weston-rpi.spec
	Deleted	_service:tar_git:weston-rpi-1.5.0.tar.xz ^
	Added	_service:tar_git:weston-rpi-1.5.93+master.1.7d11c33.tar.xz ^