diff -Nru mir-0.13.1+15.10.20150520/debian/changelog mir-0.13.1+15.10.20150520.1/debian/changelog --- mir-0.13.1+15.10.20150520/debian/changelog 2015-06-04 02:38:13.000000000 +0000 +++ mir-0.13.1+15.10.20150520.1/debian/changelog 2015-06-04 02:38:14.000000000 +0000 @@ -1,3 +1,11 @@ +mir (0.13.1+15.10.20150520.1-0ubuntu1) wily; urgency=medium + + * Bump upstream version number to add test binaries to orig tarball. + * Do minimal porting required to prepare for building on ppc/ppc64el. + * Disable testsuite on powerpc until big-endian porting is complete. + + -- Adam Conrad Wed, 03 Jun 2015 16:27:46 -0600 + mir (0.13.1+15.10.20150520-0ubuntu1) wily; urgency=medium [ Cemil Azizoglu ] diff -Nru mir-0.13.1+15.10.20150520/debian/control mir-0.13.1+15.10.20150520.1/debian/control --- mir-0.13.1+15.10.20150520/debian/control 2015-06-04 02:38:13.000000000 +0000 +++ mir-0.13.1+15.10.20150520.1/debian/control 2015-06-04 02:38:14.000000000 +0000 @@ -38,7 +38,7 @@ libudev-dev, libgtest-dev, google-mock (>= 1.6.0+svn437), - valgrind [!arm64], + valgrind [!arm64 !powerpc !ppc64el], libglib2.0-dev, libfreetype6-dev, abi-compliance-checker, @@ -50,7 +50,7 @@ Package: libmirprotobuf0 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -66,7 +66,7 @@ # ala pkg-xorg's xviddriver:Provides and ABI detection. Package: libmirserver31 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -79,7 +79,7 @@ Package: libmirplatform7 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -93,7 +93,7 @@ Package: libmircommon-dev Section: libdevel -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libmircommon4 (= ${binary:Version}), @@ -110,7 +110,7 @@ Package: libmirplatform-dev Section: libdevel -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libmirplatform7 (= ${binary:Version}), @@ -127,7 +127,7 @@ Package: libmirserver-dev Section: libdevel -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libmirserver31 (= ${binary:Version}), @@ -143,7 +143,7 @@ Package: libmirclient8 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -156,7 +156,7 @@ Package: libmirclient-dev Section: libdevel -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libmirclient8 (= ${binary:Version}), @@ -171,7 +171,7 @@ Package: libmirclient-debug-extension1 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -192,7 +192,7 @@ Package: libmirclient-debug-extension-dev Section: libdevel -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libmirclient-debug-extension1 (= ${binary:Version}), @@ -216,7 +216,7 @@ the debug extensions. Package: mir-demos -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Depends: ${misc:Depends}, ${shlibs:Depends}, Recommends: fonts-liberation @@ -227,7 +227,7 @@ Contains demo applications (with source) that use the Mir display server Package: mir-utils -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Depends: ${misc:Depends}, ${shlibs:Depends}, Description: Display server for Ubuntu - utility programs @@ -244,7 +244,7 @@ This package installs the mir API documentation. Package: mir-test-tools -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -258,7 +258,7 @@ Package: libmircommon4 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -272,7 +272,7 @@ # Longer-term these drivers should move out-of-tree Package: mir-platform-graphics-mesa2 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -300,7 +300,7 @@ Package: mir-client-platform-mesa2 Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, @@ -314,7 +314,7 @@ Package: mir-client-platform-mesa-dev Section: libdevel -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libmircommon-dev, @@ -342,7 +342,7 @@ Package: mir-graphics-drivers-desktop Section: libs -Architecture: i386 amd64 armhf arm64 +Architecture: i386 amd64 armhf arm64 powerpc ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, diff -Nru mir-0.13.1+15.10.20150520/debian/create_postinst_prerm_scripts.sh mir-0.13.1+15.10.20150520.1/debian/create_postinst_prerm_scripts.sh --- mir-0.13.1+15.10.20150520/debian/create_postinst_prerm_scripts.sh 2015-06-04 02:38:13.000000000 +0000 +++ mir-0.13.1+15.10.20150520.1/debian/create_postinst_prerm_scripts.sh 2015-06-04 02:38:14.000000000 +0000 @@ -8,7 +8,7 @@ mir_platform_types="${PLATFORM_DRIVER}" case $deb_host_arch in - arm64) + arm64|powerpc|ppc64el) mir_platforms="mesa" ;; *) diff -Nru mir-0.13.1+15.10.20150520/debian/install_ld_so_conf.sh mir-0.13.1+15.10.20150520.1/debian/install_ld_so_conf.sh --- mir-0.13.1+15.10.20150520/debian/install_ld_so_conf.sh 2015-06-04 02:38:13.000000000 +0000 +++ mir-0.13.1+15.10.20150520.1/debian/install_ld_so_conf.sh 2015-06-04 02:38:14.000000000 +0000 @@ -7,7 +7,7 @@ mir_platform_types="${PLATFORM_DRIVER} ${CLIENT_DRIVER}" case $DEB_HOST_ARCH in - arm64) + arm64|powerpc|ppc64el) mir_platforms="mesa" ;; *) diff -Nru mir-0.13.1+15.10.20150520/debian/rules mir-0.13.1+15.10.20150520.1/debian/rules --- mir-0.13.1+15.10.20150520/debian/rules 2015-06-04 02:38:13.000000000 +0000 +++ mir-0.13.1+15.10.20150520.1/debian/rules 2015-06-04 02:38:14.000000000 +0000 @@ -19,7 +19,11 @@ # Enable verbose debugging output from the testsuite export MIR_SERVER_LOGGING = on override_dh_auto_test: +ifneq ($(DEB_HOST_ARCH),powerpc) GTEST_OUTPUT=xml:./ dh_auto_test --max-parallel=1 -- ARGS="-V" +else + echo "Testsuite disabled on powerpc due to lack of big-endian support." +endif COMMON_CONFIGURE_OPTIONS = \ -DCMAKE_INSTALL_LIBEXECDIR="lib/$(DEB_HOST_MULTIARCH)/mir" @@ -32,7 +36,7 @@ -DMIR_RUN_INTEGRATION_TESTS=OFF \ -DMIR_PLATFORM=android\;mesa else -ifeq ($(DEB_HOST_ARCH),arm64) +ifneq ($(filter arm64 powerpc ppc64el,$(DEB_HOST_ARCH)),) dh_auto_configure -- \ $(COMMON_CONFIGURE_OPTIONS) \ -DMIR_PLATFORM=mesa Binary files /tmp/qA5g_PglyQ/mir-0.13.1+15.10.20150520/tests/unit-tests/test_data/libpowerpc.so and /tmp/5Hrx9J0eTt/mir-0.13.1+15.10.20150520.1/tests/unit-tests/test_data/libpowerpc.so differ Binary files /tmp/qA5g_PglyQ/mir-0.13.1+15.10.20150520/tests/unit-tests/test_data/libppc64el.so and /tmp/5Hrx9J0eTt/mir-0.13.1+15.10.20150520.1/tests/unit-tests/test_data/libppc64el.so differ diff -Nru mir-0.13.1+15.10.20150520/tests/unit-tests/test_shared_library_prober.cpp mir-0.13.1+15.10.20150520.1/tests/unit-tests/test_shared_library_prober.cpp --- mir-0.13.1+15.10.20150520/tests/unit-tests/test_shared_library_prober.cpp 2015-05-20 21:20:01.000000000 +0000 +++ mir-0.13.1+15.10.20150520.1/tests/unit-tests/test_shared_library_prober.cpp 2015-06-04 02:38:14.000000000 +0000 @@ -162,6 +162,8 @@ EXPECT_CALL(report, loading_library(FilenameMatches("libarmhf.so"))); EXPECT_CALL(report, loading_library(FilenameMatches("libi386.so"))); EXPECT_CALL(report, loading_library(FilenameMatches("libarm64.so"))); + EXPECT_CALL(report, loading_library(FilenameMatches("libpowerpc.so"))); + EXPECT_CALL(report, loading_library(FilenameMatches("libppc64el.so"))); EXPECT_CALL(report, loading_library(FilenameMatches("libinvalid.so.3"))); mir::libraries_for_path(library_path, report); @@ -176,6 +178,8 @@ bool amd64_failed{false}; bool i386_failed{false}; bool arm64_failed{false}; + bool powerpc_failed{false}; + bool ppc64el_failed{false}; bool invalid_failed{false}; ON_CALL(report, loading_failed(FilenameMatches("libamd64.so"), _)) @@ -186,11 +190,15 @@ .WillByDefault(InvokeWithoutArgs([&i386_failed]() { i386_failed = true; })); ON_CALL(report, loading_failed(FilenameMatches("libarm64.so"), _)) .WillByDefault(InvokeWithoutArgs([&arm64_failed]() { arm64_failed = true; })); + ON_CALL(report, loading_failed(FilenameMatches("libpowerpc.so"), _)) + .WillByDefault(InvokeWithoutArgs([&powerpc_failed]() { powerpc_failed = true; })); + ON_CALL(report, loading_failed(FilenameMatches("libppc64el.so"), _)) + .WillByDefault(InvokeWithoutArgs([&ppc64el_failed]() { ppc64el_failed = true; })); ON_CALL(report, loading_failed(FilenameMatches("libinvalid.so.3"), _)) .WillByDefault(InvokeWithoutArgs([&invalid_failed]() { invalid_failed = true; })); mir::libraries_for_path(library_path, report); EXPECT_TRUE(invalid_failed); - EXPECT_TRUE(i386_failed || amd64_failed || armhf_failed || arm64_failed); + EXPECT_TRUE(i386_failed || amd64_failed || armhf_failed || arm64_failed || powerpc_failed || ppc64el_failed); }