Version bump

1 files changed, 29 insertions, 84 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3d61d6fbc58f..d14a6c7be258 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,98 +1,43 @@
-# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-
-desktop_arch=(i686 x86_64)
-# Let me know what ARM architectures are compatible
-mobile_arch=()
+# Maintainer: kikadf <kikadf.01@gmail.com>
 
 pkgname=mir
-_actual_ver=0.13.2
-_extra_ver=+15.10.20150605
-pkgver=${_actual_ver}${_extra_ver}
+pkgver=0.26.2
 pkgrel=1
-pkgdesc="Ubuntu's new display server"
-arch=(${desktop_arch[@]} ${mobile_arch[@]})
+pkgdesc="Ubuntu's display server"
 url="https://launchpad.net/mir"
-# Server is GPL, client is LGPL, various other files are BSD and Apache
-license=(GPL LGPL BSD Apache)
-
-depends=(boost gflags google-glog liburcu lttng-ust libxkbcommon protobuf)
-# At the moment, Mir does require Mesa's libGL
-depends+=(glm mesa-libgl mesa)
-
-if in_array "${CARCH}" "${desktop_arch[@]}"; then
-    depends+=(libdrm)
-elif in_array "${CARCH}" "${mobile_arch[@]}"; then
-    # Currently unpackaged. Presumably, Ubuntu's fork will need to be used
-    depends+=(libhybris)
-fi
-
-makedepends=(cmake30 doxygen graphviz libxslt umockdev)
-
-source=("https://launchpad.net/ubuntu/+archive/primary/+files/mir_${_actual_ver}${_extra_ver}.orig.tar.gz"
-        0001-Build-fixes.patch)
-sha512sums=('440db939bf53224b52fddfd254c76ff259908aefb56d7e7571f8fcc6d6705be4d2c39d560c267cc131a00ccb22ec091897b998280b9f8294561ce334653193c7'
-            '8e10a13a9d55ece03e0ed88fdaa84beb3e04d28ac8b2f05ba6c9518a5c24974059b8a35b6cc8fcf1b2be0fdc2e610b18db774c76d21950d86fd44f8950c4fecf')
+arch=('x86_64')
+license=('GPL' 'LGPL' 'BSD' 'Apache')
+depends=('boost' 'libglvnd' 'protobuf-mir' 'capnproto' 'google-glog' 'gflags' 'glib2' \
+         'nettle' 'libinput-mir' 'udev' 'libxkbcommon' 'freetype2' 'abi-compliance-checker' \
+         'lttng-ust')
+makedepends=('extra-cmake-modules' 'glm' 'doxygen' 'libdrm')
+source=("https://launchpad.net/mir/0.26/$pkgver/+download/$pkgname-$pkgver.tar.xz"
+        "https://raw.githubusercontent.com/sandstorm-io/capnproto/master/c%2B%2B/cmake/FindCapnProto.cmake")
+md5sums=('3c85ee4798ba6929f568c758fad18192'
+         '16e3a086ca0afe4eb71771da72c5e406')
 
 prepare() {
-    cd "mir-${_actual_ver}${_extra_ver}"
-
-    patch -p1 -i ../0001-Build-fixes.patch
+    cd $pkgname-$pkgver
+    rm -rf build cmake/FindCapnProto.cmake
+    cp ../FindCapnProto.cmake cmake/
+    mkdir build
+    sed -i 's|#include <drm/drm.h>|#include <libdrm/drm.h>|' src/platforms/mesa/server/kms/cursor.cpp
 }
 
 build() {
-    cd "mir-${_actual_ver}${_extra_ver}"
-
-    local params=(
-        -DCMAKE_C_COMPILER=gcc
-        -DCMAKE_CXX_COMPILER=g++
-        -DCMAKE_INSTALL_PREFIX=/usr
-        -DCMAKE_INSTALL_LIBDIR=/usr/lib
-        -DCMAKE_BUILD_TYPE=Release
-        -DMIR_ENABLE_TESTS=NO
-        `# doxygen crashes # -DBUILD_DOXYGEN=YES`)
-  
-    if in_array "${CARCH}" "${desktop_arch[@]}"; then
-        params+=(
-            -DMIR_PLATFORM=mesa
-        )
-    elif in_array "${CARCH}" "${mobile_arch[@]}"; then
-        params+=(
-            -DMIR_RUN_ACCEPTANCE_TESTS=OFF
-            -DMIR_RUN_INTEGRATION_TESTS=OFF
-            -DMIR_PLATFORM='android;mesa'
-        )
-    fi
-
-  cmake-3.0 . "${params[@]}"
-  make
+    CXXFLAGS="${CXXFLAGS} -Wno-error=missing-field-initializers"
+    cd $pkgname-$pkgver/build
+    cmake .. -DMIR_PLATFORM='mesa-kms;mesa-x11' \
+             -DCMAKE_BUILD_TYPE=Release \
+             -DCMAKE_INSTALL_PREFIX=/usr \
+             -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+             -DMIR_ENABLE_TESTS=NO
+    make -j2
 }
 
 package() {
-    cd "mir-${_actual_ver}${_extra_ver}"
+    cd $pkgname-$pkgver/build
     make DESTDIR="${pkgdir}/" install
-
-    # Install examples
-    install -dm755 "${pkgdir}"/usr/share/doc/mir/examples/
-    install -m644 examples/basic.c            \
-                  examples/flicker.c          \
-                  examples/graphics.h         \
-                  examples/graphics_utils.cpp \
-                  examples/mir_image.h        \
-                  examples/scroll.cpp         \
-                  examples/README             \
-                  "${pkgdir}"/usr/share/doc/mir/examples/
-
-    platform_types=(platform4driver client8driver)
-    platforms=(mesa android)
-
-    install -dm755 "${pkgdir}"/etc/ld.so.conf.d/
-
-    for i in "${platform_types[@]}"; do
-        for j in "${platforms[@]}"; do
-            dir="/usr/lib/mir/${i}/${j}"
-            if [[ -d "${pkgdir}${dir}" ]]; then
-                echo "${dir}" >> "${pkgdir}"/etc/ld.so.conf.d/mir.conf
-            fi
-        done
-    done
+    mv ${pkgdir}/usr/usr/lib/mir/server-platform ${pkgdir}/usr/lib/mir/
+    rm -rf ${pkgdir}/usr/usr
 }