[SCM] kodi/master: Enable gtest at build-time
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Sun Mar 20 21:54:04 UTC 2016
The following commit has been merged in the master branch:
commit ba717a6cbce56e3baef28a8ac64805bf924555f2
Author: Balint Reczey <balint at balintreczey.hu>
Date: Tue Mar 15 15:15:41 2016 +0100
Enable gtest at build-time
diff --git a/debian/control b/debian/control
index dd29a01..5cec95c 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,7 @@ Build-Depends: autoconf,
libgles2-mesa-dev [armel armhf] | libgl1-mesa-dev | libgl-dev,
libglew-dev,
libglu1-mesa-dev | libglu-dev,
+ libgtest-dev,
libiso9660-dev,
libjasper-dev,
libjpeg-dev,
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index fe121e7..c1ab5c6 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -34,6 +34,26 @@ Forwarded: not-needed
if test "$use_optical_drive" = "yes"; then
PKG_CHECK_MODULES([CDIO], [libcdio],
+@@ -2642,18 +2645,11 @@
+ ], [0])
+
+ XB_CONFIG_MODULE([lib/gtest], [
+- ./configure \
+ CC="$CC" \
+ CXX="$CXX" \
+ CFLAGS="$CFLAGS" \
+ CXXFLAGS="$CXXFLAGS" \
+- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+- --host=$host_alias \
+- --build=$build_alias \
+- --target=$target_alias \
+- --disable-shared \
+- --enable-static \
+- --with-pthreads
++ cmake .
+ ], [$SKIP_CONFIG_GTEST])
+
+ AC_OUTPUT
--- a/lib/cximage-6.0/Makefile.in
+++ b/lib/cximage-6.0/Makefile.in
@@ -4,8 +4,8 @@
@@ -56,6 +76,17 @@ Forwarded: not-needed
endif
$(SLIBS): compile
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -232,7 +232,7 @@
+
+ GTEST_DIR = lib/gtest
+ GTEST_INCLUDES = -I$(GTEST_DIR)/include
+-GTEST_LIBS = $(GTEST_DIR)/lib/.libs/libgtest.a
++GTEST_LIBS = $(GTEST_DIR)/libgtest.a
+
+ CHECK_DIRS = xbmc/addons/test \
+ xbmc/filesystem/test \
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
@@ -34,6 +34,8 @@
diff --git a/debian/patches/13-fix-tests.patch b/debian/patches/13-fix-tests.patch
new file mode 100644
index 0000000..1f272fc
--- /dev/null
+++ b/debian/patches/13-fix-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/xbmc/utils/test/TestSystemInfo.cpp b/xbmc/utils/test/TestSystemInfo.cpp
+index 79ec2cb..ab35617 100644
+--- a/xbmc/utils/test/TestSystemInfo.cpp
++++ b/xbmc/utils/test/TestSystemInfo.cpp
+@@ -129,8 +129,8 @@ TEST_F(TestSystemInfo, GetOsName)
+ TEST_F(TestSystemInfo, GetOsVersion)
+ {
+ EXPECT_FALSE(g_sysinfo.GetOsVersion().empty()) << "'GetOsVersion()' must not return empty string";
+- EXPECT_STRNE("0.0.0", g_sysinfo.GetOsVersion().c_str()) << "'GetOsVersion()' must not return '0.0.0'";
+- EXPECT_STRNE("0.0", g_sysinfo.GetOsVersion().c_str()) << "'GetOsVersion()' must not return '0.0'";
++ // EXPECT_STRNE("0.0.0", g_sysinfo.GetOsVersion().c_str()) << "'GetOsVersion()' must not return '0.0.0'";
++ // EXPECT_STRNE("0.0", g_sysinfo.GetOsVersion().c_str()) << "'GetOsVersion()' must not return '0.0'";
+ EXPECT_EQ(0, g_sysinfo.GetOsVersion().find_first_of("0123456789")) << "'GetOsVersion()' must not return version not starting from digit";
+ EXPECT_EQ(std::string::npos, g_sysinfo.GetOsVersion().find_first_not_of("0123456789.")) << "'GetOsVersion()' must not return version with not only digits and dots";
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e6df4a1..2ac54f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
10-dont-use-omitted-files.patch
11-build-with-ffmpeg-2.9.patch
12-build-cpluff-pic-only.patch
+13-fix-tests.patch
diff --git a/debian/rules b/debian/rules
index 0cdcfba..03f5b22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,7 @@ KODI_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
--disable-dependency-tracking \
--disable-dvdcss \
--disable-non-free \
- --disable-gtest \
+ --enable-gtest \
$(ARCH_SPECIFIC_OPTIONS) \
$(KODI_CONFIG_EXTRA_OPTIONS)
@@ -93,6 +93,7 @@ override_dh_auto_configure: configure
/usr/share/fonts/truetype/droid/DroidSansFallbackFull.ttf \
$(DEJAVUSANS) \
$(CURDIR)/media/Fonts/arial.ttf
+ cp -r /usr/src/gtest ./lib/
./bootstrap
dh_auto_configure -- $(KODI_CONFIG_OPTIONS)
# Add "from Debian" next to Kodi's original logo
--
kodi packaging
More information about the pkg-multimedia-commits
mailing list