And tge debdiff that is rejected by Gmail.
diff -Nru kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/changelog
kodi-19.0+dfsg1/debian/changelog
--- kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/changelog 2021-01-19
20:02:25.000000000 +0000
+++ kodi-19.0+dfsg1/debian/changelog 2021-02-19 00:02:45.000000000 +0000
@@ -1,3 +1,19 @@
+kodi (2:19.0+dfsg1-1) unstable; urgency=medium
+
+ * New upstream version 19.0+dfsg1
+ * Declare proper Debian release splitting kodi-addons-dev (Closes: #980846)
+ * Detect and honor big-endian architectures
+ * Refresh cdatetime-std-chrono patch
+
+ -- Vasyl Gello <vasek.ge...@gmail.com> Fri, 19 Feb 2021 00:02:45 +0000
+
+kodi (2:19.0~rc1+git20210119.8c761c4+dfsg1-2) experimental; urgency=medium
+
+ * Team upload.
+ * Re-instate the kodi-addons-dev-common package split.
+
+ -- Mattia Rizzolo <mat...@debian.org> Wed, 20 Jan 2021 01:56:06 +0100
+
kodi (2:19.0~rc1+git20210119.8c761c4+dfsg1-1) unstable; urgency=medium
[ Vasyl Gello ]
diff -Nru kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/control
kodi-19.0+dfsg1/debian/control
--- kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/control 2021-01-19
20:02:25.000000000 +0000
+++ kodi-19.0+dfsg1/debian/control 2021-02-19 00:02:45.000000000 +0000
@@ -373,12 +373,14 @@
.
This package is the ZeroConf script for Kodi Event Client.
-Package: kodi-addons-dev
-Architecture: any
+Package: kodi-addons-dev-common
+Architecture: all
+Multi-Arch: foreign
Section: libdevel
Depends: ${misc:Depends}
-Provides: dh-sequence-kodiaddon (= ${binary:Version})
-Description: Open Source Home Theatre (Addons Dev package)
+Breaks: kodi-addons-dev (<< 2:19.0~rc1+git20210119.8c761c4+dfsg1-2~),
+Replaces: kodi-addons-dev (<< 2:19.0~rc1+git20210119.8c761c4+dfsg1-2~),
+Description: Open Source Home Theatre (architecture-independent addon
development package)
Kodi, formerly known as XBMC is an award winning free and
open source software media-player and entertainment hub for all your digital
media. Kodi is available for Linux, Mac OS X (Leopard, Tiger and Apple TV)
@@ -398,8 +400,25 @@
.
This is the development package for Kodi Addons.
.
- This package contains independent headers for building Addons
- without the whole Kodi source tree.
+ This package contains independent headers for building addons without the need
+ to keep a whole Kodi source tree.
+
+Package: kodi-addons-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Provides: dh-sequence-kodiaddon (= ${binary:Version})
+Depends: kodi-addons-dev-common (= ${source:Version}),
+ ${misc:Depends}
+Description: Open Source Home Theatre (addon development package)
+ This package is a dummy package used in conjunction with kodi-addons-dev
+ to detect if a binary addon should be built for given Debian architecture.
+ .
+ The alternative to introducing this package is marking kodi-addons-dev back
+ as arch:any, but this makes Lintian and multi-arch hinter noisy.
+ .
+ If Kodi upstream starts shipping architecture-specific development libraries
+ again, they will land in this package.
Package: kodi-repository-kodi
Architecture: all
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/dh-addon/dh_kodiaddon_depends
kodi-19.0+dfsg1/debian/dh-addon/dh_kodiaddon_depends
---
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/dh-addon/dh_kodiaddon_depends
2021-01-19 20:02:25.000000000 +0000
+++ kodi-19.0+dfsg1/debian/dh-addon/dh_kodiaddon_depends 2021-02-19
00:02:45.000000000 +0000
@@ -96,7 +96,7 @@
}
}
-my $baseDir = "debian/kodi-addons-dev";
+my $baseDir = "debian/kodi-addons-dev-common";
if (! -d "$baseDir/usr/include/kodi") {
$baseDir = "debian/tmp";
if (! -d "$baseDir/usr/include/kodi") {
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev-common.install
kodi-19.0+dfsg1/debian/kodi-addons-dev-common.install
---
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev-common.install
1970-01-01 00:00:00.000000000 +0000
+++ kodi-19.0+dfsg1/debian/kodi-addons-dev-common.install 2021-02-19
00:02:45.000000000 +0000
@@ -0,0 +1,4 @@
+usr/include/kodi
+usr/share/kodi/cmake/*.cmake
+debian/dh-addon/kodiaddon.pm usr/share/perl5/Debian/Debhelper/Sequence/
+debian/dh-addon/dh_kodiaddon_depends usr/bin/
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev-common.manpages
kodi-19.0+dfsg1/debian/kodi-addons-dev-common.manpages
---
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev-common.manpages
1970-01-01 00:00:00.000000000 +0000
+++ kodi-19.0+dfsg1/debian/kodi-addons-dev-common.manpages 2021-02-19
00:02:45.000000000 +0000
@@ -0,0 +1 @@
+debian/dh-addon/*.1
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev-common.README.Debian
kodi-19.0+dfsg1/debian/kodi-addons-dev-common.README.Debian
---
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev-common.README.Debian
1970-01-01 00:00:00.000000000 +0000
+++ kodi-19.0+dfsg1/debian/kodi-addons-dev-common.README.Debian 2021-02-19
00:02:45.000000000 +0000
@@ -0,0 +1,2 @@
+The current PVR API version can be found in xbmc_pvr_types.h:
+XBMC_PVR_API_VERSION
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev.install
kodi-19.0+dfsg1/debian/kodi-addons-dev.install
--- kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev.install
2021-01-19 20:02:25.000000000 +0000
+++ kodi-19.0+dfsg1/debian/kodi-addons-dev.install 2021-02-19
00:02:45.000000000 +0000
@@ -1,4 +1 @@
-usr/include/kodi
-usr/share/kodi/cmake/*.cmake
-debian/dh-addon/kodiaddon.pm usr/share/perl5/Debian/Debhelper/Sequence/
-debian/dh-addon/dh_kodiaddon_depends usr/bin/
+usr/lib/*/kodi/arch-checker
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev.manpages
kodi-19.0+dfsg1/debian/kodi-addons-dev.manpages
--- kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev.manpages
2021-01-19 20:02:25.000000000 +0000
+++ kodi-19.0+dfsg1/debian/kodi-addons-dev.manpages 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/dh-addon/*.1
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev.README.Debian
kodi-19.0+dfsg1/debian/kodi-addons-dev.README.Debian
---
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/kodi-addons-dev.README.Debian
2021-01-19 20:02:25.000000000 +0000
+++ kodi-19.0+dfsg1/debian/kodi-addons-dev.README.Debian 1970-01-01
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-The current PVR API version can be found in xbmc_pvr_types.h:
-XBMC_PVR_API_VERSION
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/patches/cdatetime-std-chrono/0001-Replace-Kodi-date-time-implementation-with-std-c.patch
kodi-19.0+dfsg1/debian/patches/cdatetime-std-chrono/0001-Replace-Kodi-date-time-implementation-with-std-c.patch
---
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/patches/cdatetime-std-chrono/0001-Replace-Kodi-date-time-implementation-with-std-c.patch
2021-01-16 18:00:30.000000000 +0000
+++
kodi-19.0+dfsg1/debian/patches/cdatetime-std-chrono/0001-Replace-Kodi-date-time-implementation-with-std-c.patch
2021-02-19 00:02:45.000000000 +0000
@@ -1,4 +1,4 @@
-From 4fb9405a2dbdd6cff8b6b1a4eda6fcf2a528d17e Mon Sep 17 00:00:00 2001
+From 60adbc26eafaa4edd136f4f515cf494b62f24f4f Mon Sep 17 00:00:00 2001
From: Lukas Rusak <loru...@gmail.com>
Date: Mon, 17 Feb 2020 22:41:25 -0800
Subject: [PATCH 01/13] [cmake] add support for date library and tzdata
@@ -131,7 +131,7 @@
2.30.0
-From 68eda8eaf7ae49d1f9e33e258dfd7110e73583cc Mon Sep 17 00:00:00 2001
+From 91d5009265d14b958abf70980f5c14dd76df0363 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <loru...@gmail.com>
Date: Tue, 17 Mar 2020 13:12:04 -0700
Subject: [PATCH 02/13] add resource.timezone
@@ -218,7 +218,7 @@
addons/resource.images.weathericons.default/*
addons/service.xbmc.versioncheck/*
diff --git a/system/addon-manifest.xml b/system/addon-manifest.xml
-index d31205dfb7..47a3bf9a43 100644
+index e6de83fb02..33886951f9 100644
--- a/system/addon-manifest.xml
+++ b/system/addon-manifest.xml
@@ -40,6 +40,7 @@
@@ -230,7 +230,7 @@
<addon>screensaver.xbmc.builtin.black</addon>
<addon>screensaver.xbmc.builtin.dim</addon>
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
-index e8fd212f15..927590a5c5 100644
+index daf96d7be1..c8d8cf9321 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -200,6 +200,10 @@
@@ -406,7 +406,7 @@
2.30.0
-From 5dbb93855847f2a4d375c7c533b4f549b361c833 Mon Sep 17 00:00:00 2001
+From ed5a56c5e98885367a3f439e9ff89b26afc142f3 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <loru...@gmail.com>
Date: Mon, 10 Feb 2020 15:13:43 -0800
Subject: [PATCH 03/13] CDateTime: convert to use std::chrono
@@ -1554,7 +1554,7 @@
typedef enum _STATE
{
diff --git a/xbmc/platform/posix/PosixTimezone.cpp
b/xbmc/platform/posix/PosixTimezone.cpp
-index 10450bfd34..c68166803f 100644
+index 60ae5b9b2f..fbb705e2b4 100644
--- a/xbmc/platform/posix/PosixTimezone.cpp
+++ b/xbmc/platform/posix/PosixTimezone.cpp
@@ -144,8 +144,6 @@ void CPosixTimezone::OnSettingChanged(const
std::shared_ptr<const CSetting>& set
@@ -1594,7 +1594,7 @@
2.30.0
-From 4b304381cde095c84f55313b74acb4ae10dd251f Mon Sep 17 00:00:00 2001
+From 6f76b0a0d912b1816bc94d5984accb8ec5c641a0 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <loru...@gmail.com>
Date: Mon, 17 Feb 2020 22:40:56 -0800
Subject: [PATCH 04/13] [test] fix TestDateTime to work with std::chrono
@@ -1808,19 +1808,19 @@
2.30.0
-From 42a13c860bd2e1267f568572e5e3407e1c83f630 Mon Sep 17 00:00:00 2001
+From 9abc1b26dfa19b9dc27eefbcf42b0d9bb6d90fc5 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <loru...@gmail.com>
Date: Thu, 10 Sep 2020 08:19:35 -0700
Subject: [PATCH 05/13] [WIP] cleanup CPosixTimezone
---
xbmc/Application.cpp | 4 +
- xbmc/platform/posix/PosixTimezone.cpp | 273 ++++++++++----------------
+ xbmc/platform/posix/PosixTimezone.cpp | 278 ++++++++++----------------
xbmc/platform/posix/PosixTimezone.h | 8 +-
- 3 files changed, 117 insertions(+), 168 deletions(-)
+ 3 files changed, 117 insertions(+), 173 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
-index 927590a5c5..3b5ba0f9d7 100644
+index c8d8cf9321..ecbc4fb669 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -344,6 +344,8 @@ void CApplication::Preflight()
@@ -1842,7 +1842,7 @@
m_pAnnouncementManager =
std::make_shared<ANNOUNCEMENT::CAnnouncementManager>();
m_pAnnouncementManager->Start();
diff --git a/xbmc/platform/posix/PosixTimezone.cpp
b/xbmc/platform/posix/PosixTimezone.cpp
-index c68166803f..df3ffb9e36 100644
+index fbb705e2b4..df3ffb9e36 100644
--- a/xbmc/platform/posix/PosixTimezone.cpp
+++ b/xbmc/platform/posix/PosixTimezone.cpp
@@ -6,7 +6,6 @@
@@ -2065,7 +2065,7 @@
return;
const std::string &settingId = setting->GetId();
-@@ -158,77 +140,38 @@ void CPosixTimezone::OnSettingsLoaded()
+@@ -158,82 +140,38 @@ void CPosixTimezone::OnSettingsLoaded()
SetTimezone(CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(CSettings::SETTING_LOCALE_TIMEZONE));
}
@@ -2122,6 +2122,11 @@
- // try Slackware approach first
- ssize_t rlrc = readlink("/etc/localtime-copied-from"
- , timezoneName, sizeof(timezoneName)-1);
+-
+- // RHEL and maybe other distros make /etc/localtime a symlink
+- if (rlrc == -1)
+- rlrc = readlink("/etc/localtime", timezoneName, sizeof(timezoneName)-1);
+-
- if (rlrc != -1)
- {
- timezoneName[rlrc] = '\0';
@@ -2154,7 +2159,7 @@
}
void CPosixTimezone::SettingOptionsTimezoneCountriesFiller(
-@@ -237,9 +180,9 @@ void CPosixTimezone::SettingOptionsTimezoneCountriesFiller(
+@@ -242,9 +180,9 @@ void CPosixTimezone::SettingOptionsTimezoneCountriesFiller(
std::string& current,
void* data)
{
@@ -2167,7 +2172,7 @@
}
void CPosixTimezone::SettingOptionsTimezonesFiller(const
std::shared_ptr<const CSetting>& setting,
-@@ -250,12 +193,12 @@ void CPosixTimezone::SettingOptionsTimezonesFiller(const
std::shared_ptr<const C
+@@ -255,12 +193,12 @@ void CPosixTimezone::SettingOptionsTimezonesFiller(const
std::shared_ptr<const C
current = std::static_pointer_cast<const
CSettingString>(setting)->GetValue();
bool found = false;
std::vector<std::string> timezones =
g_timezone.GetTimezonesByCountry(CServiceBroker::GetSettingsComponent()->GetSettings()->GetString(CSettings::SETTING_LOCALE_TIMEZONECOUNTRY));
@@ -2220,7 +2225,7 @@
2.30.0
-From 79fd7639fefaab937692ffbf559702279564ca23 Mon Sep 17 00:00:00 2001
+From e6073bc3b3e267188347706e9dd60543f904c0de Mon Sep 17 00:00:00 2001
From: Lukas Rusak <loru...@gmail.com>
Date: Thu, 10 Sep 2020 08:41:57 -0700
Subject: [PATCH 06/13] utils/XTimeUtils: clean up SystemTime and FileTime
@@ -3374,7 +3379,7 @@
value = emptyString;
}
diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp
b/xbmc/music/infoscanner/MusicInfoScanner.cpp
-index b8eafbb1ef..7607d6f17c 100644
+index 72913b66b0..e1b19b9e7c 100644
--- a/xbmc/music/infoscanner/MusicInfoScanner.cpp
+++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -1246,8 +1246,8 @@ int CMusicInfoScanner::GetPathHash(const CFileItemList
&items, std::string &hash
@@ -3671,10 +3676,10 @@
if (!pItem->m_bIsFolder)
pItem->m_dwSize = buffer.st_size;
diff --git a/xbmc/platform/posix/filesystem/SMBDirectory.cpp
b/xbmc/platform/posix/filesystem/SMBDirectory.cpp
-index d94742eab7..f76bfb6391 100644
+index 127cd7993b..8902d34dd0 100644
--- a/xbmc/platform/posix/filesystem/SMBDirectory.cpp
+++ b/xbmc/platform/posix/filesystem/SMBDirectory.cpp
-@@ -103,9 +103,8 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
+@@ -105,9 +105,8 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
&& strFile != "lost+found"
&& aDir.type != SMBC_PRINTER_SHARE && aDir.type != SMBC_IPC_SHARE)
{
@@ -3685,7 +3690,7 @@
bool hidden = false;
if(StringUtils::EndsWith(strFile, "$") && aDir.type == SMBC_FILE_SHARE )
-@@ -145,9 +144,6 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
+@@ -152,9 +151,6 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
CLog::Log(LOGERROR, "Getting extended attributes for the share:
'%s'\nunix_err:'%x' error: '%s'", CURL::GetRedacted(strFullName).c_str(),
errno, strerror(errno));
bIsDir = S_ISDIR(info.st_mode);
@@ -3695,7 +3700,7 @@
iSize = info.st_size;
}
else
-@@ -157,10 +153,6 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
+@@ -164,10 +160,6 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
}
}
@@ -3706,7 +3711,7 @@
if (bIsDir)
{
CFileItemPtr pItem(new CFileItem(strFile));
-@@ -180,7 +172,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
+@@ -187,7 +179,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
URIUtils::AddSlashAtEnd(path);
pItem->SetPath(path);
pItem->m_bIsFolder = true;
@@ -3715,7 +3720,7 @@
if (hidden)
pItem->SetProperty("file:hidden", true);
items.Add(pItem);
-@@ -191,7 +183,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
+@@ -198,7 +190,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
pItem->SetPath(strRoot + aDir.name);
pItem->m_bIsFolder = false;
pItem->m_dwSize = iSize;
@@ -4178,7 +4183,7 @@
2.30.0
-From 8551209d7e00f3b28f3d9486ca782a12e7ab1e61 Mon Sep 17 00:00:00 2001
+From da1f29dfad2f26613e0606213658ccfb0d0c6887 Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.ge...@gmail.com>
Date: Tue, 20 Oct 2020 09:23:44 +0300
Subject: [PATCH 07/13] SMBDirectory.cpp: Fix compile error
@@ -4188,10 +4193,10 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/platform/posix/filesystem/SMBDirectory.cpp
b/xbmc/platform/posix/filesystem/SMBDirectory.cpp
-index f76bfb6391..a3c42f3c3d 100644
+index 8902d34dd0..4a3b488182 100644
--- a/xbmc/platform/posix/filesystem/SMBDirectory.cpp
+++ b/xbmc/platform/posix/filesystem/SMBDirectory.cpp
-@@ -106,6 +106,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
+@@ -108,6 +108,7 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
int64_t iSize = 0;
bool bIsDir = true;
bool hidden = false;
@@ -4199,7 +4204,7 @@
if(StringUtils::EndsWith(strFile, "$") && aDir.type == SMBC_FILE_SHARE )
continue;
-@@ -120,7 +121,6 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
+@@ -122,7 +123,6 @@ bool CSMBDirectory::GetDirectory(const CURL& url,
CFileItemList &items)
// set this here to if the stat should fail
bIsDir = (aDir.type == SMBC_DIR);
@@ -4211,7 +4216,7 @@
2.30.0
-From 6ea43be70dfd1c696d2843aeb5ce85002fca5f5e Mon Sep 17 00:00:00 2001
+From 8e72ec1c09e0dcac213d9e822a0055929478a39d Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.ge...@gmail.com>
Date: Wed, 21 Oct 2020 09:17:33 +0300
Subject: [PATCH 08/13] TestDateTime: fix GetAsStringsWithBias and add Tzdata
@@ -4408,7 +4413,7 @@
2.30.0
-From c7dfc08ada1fdf186fe7efd184cde08226597b39 Mon Sep 17 00:00:00 2001
+From 055f1523f9fe7379bd09de98193966da15a423e4 Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.ge...@gmail.com>
Date: Wed, 21 Oct 2020 12:41:17 +0300
Subject: [PATCH 09/13] CDateTime: fix DateTimeSpan arithmetics typo
@@ -4443,7 +4448,7 @@
2.30.0
-From fde52a6af598b5b30c7a29777ae86835b39c7515 Mon Sep 17 00:00:00 2001
+From c416094fe6947c0492486c320790fc0df53ff333 Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.ge...@gmail.com>
Date: Tue, 3 Nov 2020 17:51:26 +0200
Subject: [PATCH 10/13] Remove GetAsUTCDateTime and add GetAsLocalDateTime
@@ -4708,7 +4713,7 @@
2.30.0
-From 03cfab22a03a773d92d97a5ad137e1b937ea5b16 Mon Sep 17 00:00:00 2001
+From 3bd37b2ee91bcf5f48644a5dd0f25cf752cfb6d8 Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.ge...@gmail.com>
Date: Tue, 3 Nov 2020 22:49:09 +0200
Subject: [PATCH 11/13] Compensate the representation change
@@ -4842,7 +4847,7 @@
2.30.0
-From bef2abd848d7a577d7157be723fe658e65f0f34e Mon Sep 17 00:00:00 2001
+From c5eee5f37731e43b5f8ccced30d2eebf81d3d14b Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.ge...@gmail.com>
Date: Wed, 4 Nov 2020 11:13:15 +0200
Subject: [PATCH 12/13] Get rid of {Set,}FromUTCDateTime
@@ -5072,7 +5077,7 @@
2.30.0
-From 07809ba7080d7666712d8bdb38e166055eec704c Mon Sep 17 00:00:00 2001
+From ae97c4b1ceeb649913abe2944fa7ba5875dcf505 Mon Sep 17 00:00:00 2001
From: Vasyl Gello <vasek.ge...@gmail.com>
Date: Wed, 6 Jan 2021 22:26:46 +0000
Subject: [PATCH 13/13] Fix changes introduced in PR#19032
diff -Nru
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/patches/kodi/0021-Detect-and-honor-big-endian-arch.patch
kodi-19.0+dfsg1/debian/patches/kodi/0021-Detect-and-honor-big-endian-arch.patch
---
kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/patches/kodi/0021-Detect-and-honor-big-endian-arch.patch
1970-01-01 00:00:00.000000000 +0000
+++
kodi-19.0+dfsg1/debian/patches/kodi/0021-Detect-and-honor-big-endian-arch.patch
2021-02-19 00:02:45.000000000 +0000
@@ -0,0 +1,26 @@
+Author: Vasyl Gello <vasek.ge...@gmail.com>
+Origin: vendor
+Forwarded: https://github.com/xbmc/xbmc/issues/19109
+
+---
+
+diff --git a/cmake/scripts/linux/ArchSetup.cmake
b/cmake/scripts/linux/ArchSetup.cmake
+index b68efe3b..9050804d 100644
+--- a/cmake/scripts/linux/ArchSetup.cmake
++++ b/cmake/scripts/linux/ArchSetup.cmake
+@@ -130,3 +130,13 @@ endif()
+ if(ENABLE_VDPAU)
+ set(ENABLE_GLX ON CACHE BOOL "Enabling GLX" FORCE)
+ endif()
++
++# Architecture endianness detector
++include(TestBigEndian)
++TEST_BIG_ENDIAN(ARCH_IS_BIGENDIAN)
++if(ARCH_IS_BIGENDIAN)
++ message(STATUS "Host architecture is big-endian")
++ list(APPEND ARCH_DEFINES "-DWORDS_BIGENDIAN=1")
++else()
++ message(STATUS "Host architecture is little-endian")
++endif()
+---
+2.30.0
diff -Nru kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/patches/series
kodi-19.0+dfsg1/debian/patches/series
--- kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/patches/series
2021-01-16 18:00:30.000000000 +0000
+++ kodi-19.0+dfsg1/debian/patches/series 2021-02-19 00:02:45.000000000
+0000
@@ -18,6 +18,7 @@
kodi/0018-The-baseline-of-the-i386-port-does-not-include-SSE.patch
kodi/0019-Disable-GetCPUFrequency-test.patch
kodi/0020-Fix-C++-example-includes.patch
+kodi/0021-Detect-and-honor-big-endian-arch.patch
libdvdnav/0001-xbmc-dvdnav-allow-get-set-vm-state.patch
libdvdnav/0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch
libdvdnav/0003-xbmc-dvdnav-detection-of-dvd-name.patch
diff -Nru kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/rules
kodi-19.0+dfsg1/debian/rules
--- kodi-19.0~rc1+git20210119.8c761c4+dfsg1/debian/rules 2021-01-19
20:02:25.000000000 +0000
+++ kodi-19.0+dfsg1/debian/rules 2021-02-19 00:02:45.000000000 +0000
@@ -171,18 +171,22 @@
# Install kodi-repository-kodi
dh_install -pkodi-repository-kodi \
addons/repository.xbmc.org/*
usr/share/kodi/addons/repository.xbmc.org
-
-override_dh_install-arch:
- dh_install -a -XLICENCE -XLICENSE -XLicence.txt -XLicense.txt
-XLICENSE.txt -XNOTICE.txt
# ship xbmcclient.h only in kodi-eventclients-dev
- rm -f debian/kodi-addons-dev/usr/include/kodi/xbmcclient.h
+ rm -f debian/kodi-addons-dev-common/usr/include/kodi/xbmcclient.h
# check if all needed headers are included
$(CXX) -E -c debian/headers-check.c -DBUILD_KODI_ADDON \
$(shell dpkg-buildflags --get CPPFLAGS) \
$(shell dpkg-buildflags --get CXXFLAGS) \
- -Idebian/kodi-addons-dev/usr/include \
+ -Idebian/kodi-addons-dev-common/usr/include \
-o /dev/null
+override_dh_install-arch:
+ # Prepare arch-checker dummy file
+ # see debian/control for explanation of package purpose
+ touch debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/kodi/arch-checker
+ # Perform arch-specific install
+ dh_install -a -XLICENCE -XLICENSE -XLicence.txt -XLicense.txt
-XLICENSE.txt -XNOTICE.txt
+
# dwz fails to create multifile dwarfs with '-gstrip-dwarf'
override_dh_dwz:
