diff -Nru weston-1.3.0/debian/changelog weston-1.3.0/debian/changelog --- weston-1.3.0/debian/changelog 2013-10-11 11:04:50.000000000 +0000 +++ weston-1.3.0/debian/changelog 2014-01-16 01:17:20.000000000 +0000 @@ -1,3 +1,24 @@ +weston (1.3.0-1+rpi1) jessie-staging; urgency=medium + + * Move egl/gles stuff from build-depends to build-conflicts to prevent + building against it (and causing conflicts with raspberry pi foundation + libraries). + * Add --disable-egl to configure options. + * Remove config.log in clean target. + * Switch cairo to "image" mode to avoid it failing on cairo-egl not found. + * Add patch debian/patches/fix-compilation-without-egl.patch + to avoid errors in build without egl + * Add patch debian/patches/unconditionally-include-xf86drm.patch to prevent + missing identifiers. + * Add patch debian/patches/disable-vertex-clip-test.patch to disable build + of test that fails to build. + * For some reason weston-screensaver isn't getting built, exclude it from + the packaging. + * Our changes have meant that the drm and wayland backends are not + built, so exclude them from the packaging. + + -- Peter Michael Green Thu, 16 Jan 2014 00:01:48 +0000 + weston (1.3.0-1) unstable; urgency=low [ Sven Joachim ] diff -Nru weston-1.3.0/debian/control weston-1.3.0/debian/control --- weston-1.3.0/debian/control 2013-10-11 10:58:17.000000000 +0000 +++ weston-1.3.0/debian/control 2014-01-16 00:01:24.000000000 +0000 @@ -17,9 +17,6 @@ libcolord-dev (>= 0.1.27), mesa-common-dev, libglu1-mesa-dev, - libegl1-mesa-dev (>= 9.0~), - libegl1-mesa-drivers (>= 9.0~), - libgles2-mesa-dev (>= 9.0~), libwayland-dev (>= 1.2.0), libxcb1-dev, libxcb-xfixes0-dev, @@ -35,6 +32,10 @@ libpam0g-dev, libvpx-dev, libsystemd-login-dev, +Build-Conflicts: + libegl1-mesa-dev (>= 9.0~), + libegl1-mesa-drivers (>= 9.0~), + libgles2-mesa-dev (>= 9.0~) Standards-Version: 3.9.4 Homepage: http://wayland.freedesktop.org/ Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/weston diff -Nru weston-1.3.0/debian/patches/disable-vertex-clip-test.patch weston-1.3.0/debian/patches/disable-vertex-clip-test.patch --- weston-1.3.0/debian/patches/disable-vertex-clip-test.patch 1970-01-01 00:00:00.000000000 +0000 +++ weston-1.3.0/debian/patches/disable-vertex-clip-test.patch 2014-01-16 00:59:44.000000000 +0000 @@ -0,0 +1,46 @@ +Description: Disable build of vertex clip test + * Test fails to build in our configuration. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: weston-1.3.0/tests/Makefile.am +=================================================================== +--- weston-1.3.0.orig/tests/Makefile.am 2014-01-16 00:55:54.000000000 +0000 ++++ weston-1.3.0/tests/Makefile.am 2014-01-16 00:59:17.000000000 +0000 +@@ -1,8 +1,7 @@ + TESTS = $(shared_tests) $(module_tests) $(weston_tests) + + shared_tests = \ +- config-parser.test \ +- vertex-clip.test ++ config-parser.test + + module_tests = \ + surface-test.la \ +@@ -79,10 +78,10 @@ + $(COMPOSITOR_LIBS) + config_parser_test_SOURCES = \ + config-parser-test.c +-vertex_clip_test_SOURCES = \ +- vertex-clip-test.c \ +- ../src/vertex-clipping.c \ +- ../src/vertex-clipping.h ++#vertex_clip_test_SOURCES = \ ++# vertex-clip-test.c \ ++# ../src/vertex-clipping.c \ ++# ../src/vertex-clipping.h + vertex_clip_test_LDADD = \ + libshared-test.la \ + -lm -lrt diff -Nru weston-1.3.0/debian/patches/fix-compilation-without-egl.patch weston-1.3.0/debian/patches/fix-compilation-without-egl.patch --- weston-1.3.0/debian/patches/fix-compilation-without-egl.patch 1970-01-01 00:00:00.000000000 +0000 +++ weston-1.3.0/debian/patches/fix-compilation-without-egl.patch 2014-01-16 00:25:47.000000000 +0000 @@ -0,0 +1,31 @@ +Taken from https://github.com/vxmdesign/buildroot/blob/9b3904543ca04c5d5fe5f6974539eed376de2290/package/weston/weston-0002-fbdev-fix-compilation-without-EGL.patch + +commit 9acd374822022793b09427d67ea4033915343dd8 +Author: Kristian Høgsberg +Date: Fri Oct 11 15:25:42 2013 -0700 + + fbdev: Fix compilation without EGL + + We have to duplicate #defines and typedefs for the EGL types and constants + we use in gl-renderer.h so we can compile the fbdev backend without EGL. + + https://bugs.freedesktop.org/show_bug.cgi?id=70392 + +--- +Signed-off-by: "Yann E. MORIN" + +To be noted: the bug referenced above was opened by me, +and quickly fixed during an IRC session. Nice! :-) + +diff --git a/src/gl-renderer.h b/src/gl-renderer.h +index 4919a1e..d16ade2 100644 +--- a/src/gl-renderer.h ++++ b/src/gl-renderer.h +@@ -56,6 +56,7 @@ typedef void *EGLDisplay; + typedef void *EGLSurface; + typedef intptr_t EGLNativeDisplayType; + typedef intptr_t EGLNativeWindowType; ++#define EGL_DEFAULT_DISPLAY NULL + + static const EGLint gl_renderer_opaque_attribs[]; + static const EGLint gl_renderer_alpha_attribs[]; diff -Nru weston-1.3.0/debian/patches/series weston-1.3.0/debian/patches/series --- weston-1.3.0/debian/patches/series 2013-10-11 10:46:03.000000000 +0000 +++ weston-1.3.0/debian/patches/series 2014-01-16 00:55:13.000000000 +0000 @@ -1 +1,4 @@ -#placeholder +fix-compilation-without-egl.patch + +unconditionally-include-xf86drm.patch +disable-vertex-clip-test.patch diff -Nru weston-1.3.0/debian/patches/unconditionally-include-xf86drm.patch weston-1.3.0/debian/patches/unconditionally-include-xf86drm.patch --- weston-1.3.0/debian/patches/unconditionally-include-xf86drm.patch 1970-01-01 00:00:00.000000000 +0000 +++ weston-1.3.0/debian/patches/unconditionally-include-xf86drm.patch 2014-01-16 00:42:56.000000000 +0000 @@ -0,0 +1,33 @@ +Description: Unconditionally include xf86drm.h + Include xf86drm.h unconditionally to fix an unknown type error. +Author: Peter Michael Green + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: weston-1.3.0/src/launcher-util.c +=================================================================== +--- weston-1.3.0.orig/src/launcher-util.c 2014-01-16 00:37:38.000000000 +0000 ++++ weston-1.3.0/src/launcher-util.c 2014-01-16 00:42:54.000000000 +0000 +@@ -40,9 +40,9 @@ + #include + #include + +-#ifdef BUILD_DRM_COMPOSITOR ++//#ifdef BUILD_DRM_COMPOSITOR + #include +-#endif ++//#endif + + #include "compositor.h" + #include "launcher-util.h" diff -Nru weston-1.3.0/debian/rules weston-1.3.0/debian/rules --- weston-1.3.0/debian/rules 2013-10-11 10:46:03.000000000 +0000 +++ weston-1.3.0/debian/rules 2014-01-16 00:43:53.000000000 +0000 @@ -1,8 +1,14 @@ #!/usr/bin/make -f +export CFLAGS += -I/usr/include/libdrm + override_dh_auto_configure: dh_auto_configure -- --disable-libunwind --libexec=/usr/lib/weston \ - --with-cairo=gl + --with-cairo=image --disable-egl + +override_dh_auto_clean: + dh_auto_clean + rm -f config.log override_dh_auto_test: # the test suite does not 100% pass in headless mode diff -Nru weston-1.3.0/debian/weston.install weston-1.3.0/debian/weston.install --- weston-1.3.0/debian/weston.install 2013-10-11 10:46:03.000000000 +0000 +++ weston-1.3.0/debian/weston.install 2014-01-16 01:22:58.000000000 +0000 @@ -7,21 +7,21 @@ usr/lib/weston/weston-tablet-shell usr/lib/weston/weston-desktop-shell usr/lib/weston/weston-keyboard -usr/lib/weston/weston-screensaver +#usr/lib/weston/weston-screensaver usr/lib/weston/weston-screenshooter usr/lib/weston/weston-simple-im usr/lib/*/pkgconfig/weston.pc usr/lib/*/weston/cms-colord.so usr/lib/*/weston/cms-static.so usr/lib/*/weston/desktop-shell.so -usr/lib/*/weston/drm-backend.so +#usr/lib/*/weston/drm-backend.so usr/lib/*/weston/fbdev-backend.so usr/lib/*/weston/headless-backend.so usr/lib/*/weston/tablet-shell.so -usr/lib/*/weston/wayland-backend.so +#usr/lib/*/weston/wayland-backend.so usr/lib/*/weston/x11-backend.so usr/lib/*/weston/xwayland.so usr/share/man/man1/weston.1 usr/share/man/man5/weston.ini.5 -usr/share/man/man7/weston-drm.7 +#usr/share/man/man7/weston-drm.7 usr/share/weston