diff --git a/.gitignore b/.gitignore index 9a72935..9bc1505 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /mir-0.31.1.tar.xz /mir-0.32.1.tar.xz /mir-1.0.0.tar.xz +/mir-1.1.0.tar.xz diff --git a/0001-Detect-GTest-GMock-via-pkg-config.patch b/0001-Detect-GTest-GMock-via-pkg-config.patch deleted file mode 100644 index 0b6132d..0000000 --- a/0001-Detect-GTest-GMock-via-pkg-config.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 09fd82659b56a257c6a9703435f30c764e42ec03 Mon Sep 17 00:00:00 2001 -From: Luca Weiss -Date: Thu, 27 Sep 2018 11:53:46 +0200 -Subject: [PATCH 1/2] Detect GTest/GMock via pkg-config - ---- - cmake/FindGtestGmock.cmake | 8 ++++++++ - tests/CMakeLists.txt | 5 ++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/cmake/FindGtestGmock.cmake b/cmake/FindGtestGmock.cmake -index 230d988442..77ba4a33e0 100644 ---- a/cmake/FindGtestGmock.cmake -+++ b/cmake/FindGtestGmock.cmake -@@ -2,6 +2,14 @@ include(FindPackageHandleStandardArgs) - - find_package(GTest) - -+pkg_check_modules (GTEST REQUIRED "gtest >= 1.8.0") -+pkg_check_modules (GTEST_MAIN REQUIRED "gtest_main >= 1.8.0") -+if (GTEST_FOUND AND GTEST_MAIN_FOUND) -+ set(GTEST_LIBRARY ${GTEST_LIBRARIES}) -+ set(GTEST_MAIN_LIBRARY ${GTEST_MAIN_LIBRARIES}) -+ set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY}) -+endif() -+ - if (NOT GTEST_FOUND) - include(ExternalProject) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index e71a8a1067..bbfd5ba180 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,5 +1,8 @@ - # get a gtest version string the regex will match --if (DEFINED ENV{GTEST_VERSION}) -+if (DEFINED GTEST_VERSION) -+ set(GTEST_VERSION_STR ${GTEST_VERSION}) -+ set(GTEST_DETECTION_METHOD "pkg-config") -+elseif (DEFINED ENV{GTEST_VERSION}) - set(GTEST_VERSION_STR $ENV{GTEST_VERSION}) - set(GTEST_DETECTION_METHOD "GTEST_VERSION environment variable") - else() - -From f536e78249c9f021137db9a679ca817bd2ba4828 Mon Sep 17 00:00:00 2001 -From: Luca Weiss -Date: Thu, 27 Sep 2018 22:47:12 +0200 -Subject: [PATCH 2/2] Remove REQUIRED - ---- - cmake/FindGtestGmock.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindGtestGmock.cmake b/cmake/FindGtestGmock.cmake -index 77ba4a33e0..c2bf4f4b59 100644 ---- a/cmake/FindGtestGmock.cmake -+++ b/cmake/FindGtestGmock.cmake -@@ -2,8 +2,8 @@ include(FindPackageHandleStandardArgs) - - find_package(GTest) - --pkg_check_modules (GTEST REQUIRED "gtest >= 1.8.0") --pkg_check_modules (GTEST_MAIN REQUIRED "gtest_main >= 1.8.0") -+pkg_check_modules (GTEST "gtest >= 1.8.0") -+pkg_check_modules (GTEST_MAIN "gtest_main >= 1.8.0") - if (GTEST_FOUND AND GTEST_MAIN_FOUND) - set(GTEST_LIBRARY ${GTEST_LIBRARIES}) - set(GTEST_MAIN_LIBRARY ${GTEST_MAIN_LIBRARIES}) diff --git a/0001-tests-Use-the-correct-package-name-to-detect-gtest-o.patch b/0001-tests-Use-the-correct-package-name-to-detect-gtest-o.patch deleted file mode 100644 index 5c035d8..0000000 --- a/0001-tests-Use-the-correct-package-name-to-detect-gtest-o.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ebe2765a8daf4fe099573d3be083d43b8e4a8203 Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Sun, 23 Sep 2018 12:28:41 -0400 -Subject: [PATCH] tests: Use the correct package name to detect gtest on RPM - distributions - -This check was incorrectly using the Debian package name (libgtest-dev) -instead of the RPM package name (gtest-devel). Fixing this check -makes Mir build properly against Google Test 1.8.1. - -Signed-off-by: Neal Gompa ---- - tests/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index f5be66f..e71a8a1 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -18,7 +18,7 @@ else() - set(GTEST_DETECTION_METHOD "output of apt") - elseif(RPM_EXECUTABLE) - EXEC_PROGRAM(${RPM_EXECUTABLE} "/" -- ARGS "-q" "libgtest-dev" -+ ARGS "-q" "gtest-devel" - OUTPUT_VARIABLE GTEST_VERSION_STR) - set(GTEST_DETECTION_METHOD "output of rpm") - elseif(PACMAN_EXECUTABLE) --- -2.17.1 - diff --git a/mir.spec b/mir.spec index 4dc55d9..e91bb6e 100644 --- a/mir.spec +++ b/mir.spec @@ -8,8 +8,8 @@ %bcond_with run_tests Name: mir -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Next generation display server # mirclient is LGPLv2/LGPLv3, everything else is GPLv2/GPLv3 @@ -17,12 +17,6 @@ License: (GPLv2 or GPLv3) and (LGPLv2 or LGPLv3) URL: https://mir-server.io/ Source0: https://github.com/MirServer/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz -# Patches proposed upstream -# From: https://github.com/MirServer/mir/pull/614 -Patch0100: 0001-tests-Use-the-correct-package-name-to-detect-gtest-o.patch -# From: https://github.com/MirServer/mir/pull/615 -Patch0101: 0001-Detect-GTest-GMock-via-pkg-config.patch - # Fedora-specific patches # Force vendored wlcs to be built as a static library Patch1001: mir-1.0.0-tests-Make-wlcs-build-as-a-static-library.patch @@ -57,6 +51,7 @@ BuildRequires: pkgconfig(libxml++-2.6) BuildRequires: pkgconfig(nettle) BuildRequires: pkgconfig(umockdev-1.0) >= 0.6 BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(wayland-eglstream) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(xcb) @@ -285,7 +280,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/miral-shell.desktop %{_libdir}/libmirclient.so.* %dir %{_libdir}/mir/client-platform %{_libdir}/mir/client-platform/mesa.so.* -%{_libdir}/mir/client-platform/eglstream.so.* %files client-libs-debugext %{_libdir}/libmirclient-debug-extension.so.* @@ -327,6 +321,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/miral-shell.desktop %changelog +* Sat Dec 22 2018 Neal Gompa - 1.1.0-1 +- Update to 1.1.0 + * Tue Dec 04 2018 Igor Gnatenko - 1.0.0-3 - Rebuild for new protobuf diff --git a/sources b/sources index 54a47f6..a2438b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mir-1.0.0.tar.xz) = af13707fca4c3961f23e0dd7d202b5aaae587e251af897e4720537f36158013bf4a6999ba162753569f5b53d3e90d45090268630ceff82ed9d7b5f8086f71531 +SHA512 (mir-1.1.0.tar.xz) = 6120ee84a0261a672e800d12e8836fc32f2bd24eb85bea703dc32adf1af94ef07b81a2e9d67d9687c68406392e249987d70987a80014bf8010c855002660cee4