diff -Nru weston-1.4.0/debian/changelog weston-1.4.0/debian/changelog --- weston-1.4.0/debian/changelog 2014-01-31 01:12:46.000000000 +0000 +++ weston-1.4.0/debian/changelog 2014-03-23 23:25:41.000000000 +0000 @@ -1,3 +1,20 @@ +weston (1.4.0-1.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/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 gl 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.4.0-1.1) unstable; urgency=medium * Fixup release. diff -Nru weston-1.4.0/debian/control weston-1.4.0/debian/control --- weston-1.4.0/debian/control 2014-01-31 00:58:14.000000000 +0000 +++ weston-1.4.0/debian/control 2014-03-23 14:46:29.000000000 +0000 @@ -18,9 +18,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-composite0-dev, @@ -39,6 +36,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.5 Homepage: http://wayland.freedesktop.org/ Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/weston diff -Nru weston-1.4.0/debian/patches/disable-vertex-clip-test.patch weston-1.4.0/debian/patches/disable-vertex-clip-test.patch --- weston-1.4.0/debian/patches/disable-vertex-clip-test.patch 1970-01-01 00:00:00.000000000 +0000 +++ weston-1.4.0/debian/patches/disable-vertex-clip-test.patch 2014-03-23 14:44:53.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.4.0/tests/Makefile.am +=================================================================== +--- weston-1.4.0.orig/tests/Makefile.am 2014-03-23 14:44:46.000000000 +0000 ++++ weston-1.4.0/tests/Makefile.am 2014-03-23 14:44:46.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 \ +@@ -85,10 +84,10 @@ + 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 = \ + libtest-runner.la \ + -lm -lrt diff -Nru weston-1.4.0/debian/patches/series weston-1.4.0/debian/patches/series --- weston-1.4.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ weston-1.4.0/debian/patches/series 2014-03-23 14:42:11.000000000 +0000 @@ -0,0 +1 @@ +disable-vertex-clip-test.patch diff -Nru weston-1.4.0/debian/rules weston-1.4.0/debian/rules --- weston-1.4.0/debian/rules 2014-01-30 22:47:43.000000000 +0000 +++ weston-1.4.0/debian/rules 2014-03-23 14:37:15.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.4.0/debian/weston.install weston-1.4.0/debian/weston.install --- weston-1.4.0/debian/weston.install 2014-01-30 22:47:43.000000000 +0000 +++ weston-1.4.0/debian/weston.install 2014-03-23 23:26:08.000000000 +0000 @@ -6,7 +6,7 @@ usr/include/weston 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 @@ -15,9 +15,9 @@ usr/lib/*/weston/desktop-shell.so usr/lib/*/weston/drm-backend.so usr/lib/*/weston/fbdev-backend.so -usr/lib/*/weston/gl-renderer.so +#usr/lib/*/weston/gl-renderer.so usr/lib/*/weston/headless-backend.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 @@ -35,16 +35,16 @@ clients/weston-eventdemo usr/lib/weston/ clients/weston-flower usr/lib/weston/ clients/weston-fullscreen usr/lib/weston/ -clients/weston-gears usr/lib/weston/ +#clients/weston-gears usr/lib/weston/ clients/weston-image usr/lib/weston/ clients/weston-info usr/lib/weston/ clients/weston-keyboard usr/lib/weston/ clients/weston-multi-resource usr/lib/weston/ clients/weston-resizor usr/lib/weston/ clients/weston-scaler usr/lib/weston/ -clients/weston-screensaver usr/lib/weston/ +#clients/weston-screensaver usr/lib/weston/ clients/weston-screenshooter usr/lib/weston/ -clients/weston-simple-egl usr/lib/weston/ +#clients/weston-simple-egl usr/lib/weston/ clients/weston-simple-im usr/lib/weston/ clients/weston-simple-shm usr/lib/weston/ clients/weston-simple-touch usr/lib/weston/