Purge Cap'n Proto dependency

Author: AlanGriffiths

CMakeLists.txt

@@ -282,7 +282,6 @@ endforeach(platform)
 find_package(EGL REQUIRED)
 find_package(GLESv2 REQUIRED)
 find_package(GLM REQUIRED)
-find_package(CapnProto REQUIRED)
 find_package(GLog REQUIRED)
 find_package(GFlags REQUIRED)
 
@@ -365,7 +364,7 @@ if (MIR_ENABLE_TESTS)
 
   # There's no nice way to format this. Thanks CMake.
   mir_add_test(NAME LGPL-required
-    COMMAND /bin/sh -c "! grep -rl --exclude-dir=protocol --exclude=org_kde* 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/include/core ${PROJECT_SOURCE_DIR}/src/common ${PROJECT_SOURCE_DIR}/include/common ${PROJECT_SOURCE_DIR}/src/include/common ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform ${PROJECT_SOURCE_DIR}/src/include/platform ${PROJECT_SOURCE_DIR}/src/platforms ${PROJECT_SOURCE_DIR}/include/platforms ${PROJECT_SOURCE_DIR}/src/include/platforms ${PROJECT_SOURCE_DIR}/src/renderers ${PROJECT_SOURCE_DIR}/include/renderers ${PROJECT_SOURCE_DIR}/src/include/renderers ${PROJECT_SOURCE_DIR}/src/capnproto"
+    COMMAND /bin/sh -c "! grep -rl --exclude-dir=protocol --exclude=org_kde* 'GNU General' ${PROJECT_SOURCE_DIR}/src/client ${PROJECT_SOURCE_DIR}/include/client ${PROJECT_SOURCE_DIR}/src/core ${PROJECT_SOURCE_DIR}/include/core ${PROJECT_SOURCE_DIR}/src/common ${PROJECT_SOURCE_DIR}/include/common ${PROJECT_SOURCE_DIR}/src/include/common ${PROJECT_SOURCE_DIR}/src/platform ${PROJECT_SOURCE_DIR}/include/platform ${PROJECT_SOURCE_DIR}/src/include/platform ${PROJECT_SOURCE_DIR}/src/platforms ${PROJECT_SOURCE_DIR}/include/platforms ${PROJECT_SOURCE_DIR}/src/include/platforms ${PROJECT_SOURCE_DIR}/src/renderers ${PROJECT_SOURCE_DIR}/include/renderers ${PROJECT_SOURCE_DIR}/src/include/renderers"
   )
   mir_add_test(NAME GPL-required
     COMMAND /bin/sh -c "! grep -rl --exclude-dir=protocol --exclude=org_kde* 'GNU Lesser' ${PROJECT_SOURCE_DIR}/src/server ${PROJECT_SOURCE_DIR}/include/server ${PROJECT_SOURCE_DIR}/src/include/server ${PROJECT_SOURCE_DIR}/tests ${PROJECT_SOURCE_DIR}/examples"

debian/control

@@ -44,7 +44,6 @@ Build-Depends: cmake,
                dh-python,
                nettle-dev,
                libcapnp-dev,
-               capnproto:native | capnproto,
                libepoxy-dev,
                python3-pil:native,
                linux-libc-dev,

doc/getting_involved_in_mir.md

@@ -30,8 +30,7 @@ With these installed you can checkout Mir and get the remaining dependencies:
 You’ll need some development tools and packages installed:
 
     sudo dnf install git cmake make gcc-c++ boost-devel mesa-libEGL-devel \
-    mesa-libGLES-devel glm-devel \
-    capnproto-devel capnproto glog-devel gflags-devel systemd-devel \
+    mesa-libGLES-devel glm-devel glog-devel gflags-devel systemd-devel \
     glib2-devel wayland-devel mesa-libgbm-devel libepoxy-devel nettle-devel \
     libinput-devel libxml++-devel libuuid-devel libxkbcommon-devel \
     freetype-devel lttng-ust-devel libatomic qterminal qt5-qtwayland \

snap/snapcraft.yaml

@@ -20,7 +20,6 @@ parts:
     - -DMIR_PLATFORM='gbm-kms;eglstream-kms;x11;wayland'
     build-packages:
     - build-essential
-    - capnproto
     - eglexternalplatform-dev
     - git
     - libboost-date-time-dev

spread/build/alpine/task.yaml

@@ -5,7 +5,6 @@ variants: [amd64]
 execute: |
     apk add \
         boost-dev \
-        capnproto-dev \
         cmake \
         coreutils \
         elogind \

spread/build/fedora/task.yaml

@@ -11,8 +11,6 @@ execute: |
         mesa-libEGL-devel \
         mesa-libGLES-devel \
         glm-devel \
-        capnproto-devel \
-        capnproto \
         glog-devel \
         gflags-devel \
         systemd-devel \

spread/build/ubuntu/task.yaml

@@ -76,9 +76,6 @@ execute: |
         # Install the Pi userland
         snap install --edge rpi-userland
 
-        # Install the right capnproto binary
-        apt-get --yes install capnproto:amd64
-
         # Prepend the normal pkgconfig so that we pick up as much as possible from the standard environment
         export PKG_CONFIG_PATH=/usr/share/pkgconfig:/usr/lib/pkgconfig:/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig:/snap/rpi-userland/current/opt/vc/lib/pkgconfig
 

src/CMakeLists.txt

@@ -16,7 +16,6 @@ add_subdirectory(platforms/)
 # the src/include/... directories should be private to the implementation
 include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
-add_subdirectory(capnproto/)
 add_subdirectory(common/)
 include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})