[SCM] kodi/master: Eliminate __DATE__ macros from source to make build more reproducible
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Mon Aug 3 08:20:40 UTC 2015
The following commit has been merged in the master branch:
commit 65c694ce62ec5af7253d29345e6902341c2806d9
Author: Balint Reczey <balint at balintreczey.hu>
Date: Sun Aug 2 21:15:40 2015 +0200
Eliminate __DATE__ macros from source to make build more reproducible
diff --git a/debian/patches/01_reproducible_build.patch b/debian/patches/01_reproducible_build.patch
new file mode 100644
index 0000000..8e834d1
--- /dev/null
+++ b/debian/patches/01_reproducible_build.patch
@@ -0,0 +1,29 @@
+Description: Make build reproducible
+ .
+Author: Balint Reczey <balint at balintreczey.hu>
+Forwarded: not-needed
+
+--- a/xbmc/Application.cpp
++++ b/xbmc/Application.cpp
+@@ -512,7 +512,7 @@ bool CApplication::Create()
+ // specialVersion = " (version for XXXX)";
+ #endif
+ CLog::Log(LOGNOTICE, "Using %s %s x%d build%s", buildType.c_str(), g_infoManager.GetAppName().c_str(), g_sysinfo.GetXbmcBitness(), specialVersion.c_str());
+- CLog::Log(LOGNOTICE, "%s compiled " __DATE__ " by %s for %s %s %d-bit %s (%s)", g_infoManager.GetAppName().c_str(), g_sysinfo.GetUsedCompilerNameAndVer().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(),
++ CLog::Log(LOGNOTICE, "%s compiled from " DEB_VERSION " by %s for %s %s %d-bit %s (%s)", g_infoManager.GetAppName().c_str(), g_sysinfo.GetUsedCompilerNameAndVer().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(),
+ g_sysinfo.GetBuildTargetCpuFamily().c_str(), g_sysinfo.GetXbmcBitness(), g_sysinfo.GetBuildTargetPlatformVersionDecoded().c_str(),
+ g_sysinfo.GetBuildTargetPlatformVersion().c_str());
+
+diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
+index 8cf1202..65ad32c 100644
+--- a/xbmc/GUIInfoManager.cpp
++++ b/xbmc/GUIInfoManager.cpp
+@@ -4362,7 +4362,7 @@ std::string CGUIInfoManager::GetVersion()
+
+ std::string CGUIInfoManager::GetBuild()
+ {
+- return StringUtils::Format("%s", __DATE__);
++ return StringUtils::Format("%s", DEB_VERSION);
+ }
+
+ std::string CGUIInfoManager::GetAppName()
diff --git a/debian/patches/series b/debian/patches/series
index efdf6b8..9c16054 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_reproducible_build.patch
03-privacy.patch
04-differentiate-from-vanilla-Kodi.patch
06-use-external-libraries.patch
diff --git a/debian/rules b/debian/rules
index 5e02a76..44f9e72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ DEJAVUSANS=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
endif
override_dh_auto_configure: configure
- sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp
+ sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/GUIInfoManager.cpp xbmc/Application.cpp
mkdir -p xbmc/visualizations/XBMCProjectM/libprojectM/fonts
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
-ln -s /usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf xbmc/visualizations/XBMCProjectM/libprojectM/fonts/
--
kodi packaging
More information about the pkg-multimedia-commits
mailing list