Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Dear Release Team, Current kodi version in Stretch is 2:17.0+dfsg1-3 but upstream already released Kodi 17.1 which is available from experimental as 2:17.1+dfsg1-1. Among many other bugfixes it fixes #847701 which made kodi unusable on many slower i386 machines. I believe 17.1 would be a better fit for Stretch, while the diff between 17.0 and 17.1 contains quite a lot bug fixes: https://github.com/xbmc/xbmc/compare/a10c5048f2487bd9b2dc1f35d2fee48a2594...fc1619b118f6d503f920a49cf4ac4afcd0dd6b41 At the moment 2:17.1+dfsg1-1 is uploaded to experimental only and I would like to upload 2:17.0+dfsg1-2 with no new changes to unstable if it would be allowed to migrate to testing. Otherwise I will just triage and add the fix for #847701 to 2:17.0+dfsg1-3 and upload that minimal change to unstable as 2:17.0+dfsg1-4, but would prefer going th 17.1 way. Please share your opinion about the options. The attached patch contains the packaging changes only because the full debdiff is ~400k. Cheers, Balint unblock kodi/2:17.1+dfsg1-2
diff --git a/debian/changelog b/debian/changelog index cd613f2..5bda691 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +kodi (2:17.1+dfsg1-1) experimental; urgency=medium + + * Depend on fonts-noto-mono package which contains NotoMono-Regular.ttf + (Closes: #856668) + * Fix FTBFS on alpha by not using Intel assempler code (Closes: #856815) + * Imported Upstream version 17.1+dfsg1 + See: https://kodi.tv/kodi-v17-1-krypton + * Update my Uploader email address to my Ubuntu one + * Fix extract-components target in d/rules + + -- Balint Reczey <rbal...@ubuntu.com> Sun, 02 Apr 2017 11:01:21 +0200 + +kodi (2:17.1~rc1+dfsg1-1) experimental; urgency=medium + + * Imported Upstream version 17.1~rc1+dfsg1 + * Refresh patches + + -- Balint Reczey <bal...@balintreczey.hu> Tue, 28 Feb 2017 02:21:54 +0100 + kodi (2:17.0+dfsg1-3) unstable; urgency=medium * Ship disabled systemd service file (Closes: #854985, #801886) diff --git a/debian/control b/debian/control index f15679b..bb44790 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: kodi Section: video Priority: optional Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintain...@lists.alioth.debian.org> -Uploaders: Balint Reczey <bal...@balintreczey.hu> +Uploaders: Balint Reczey <rbal...@ubuntu.com> Build-Depends: autoconf, automake, autopoint, @@ -140,6 +140,7 @@ Multi-Arch: foreign Depends: mesa-utils, x11-utils, fonts-noto-hinted, + fonts-noto-mono, fonts-roboto-hinted, libjs-jquery, libjs-iscroll, diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch index 2f2952e..01953b0 100644 --- a/debian/patches/06-use-external-libraries.patch +++ b/debian/patches/06-use-external-libraries.patch @@ -15,7 +15,7 @@ Forwarded: not-needed all: $(BOOTSTRAP_TARGETS) --- a/configure.ac +++ b/configure.ac -@@ -2391,18 +2391,11 @@ +@@ -2392,18 +2392,11 @@ ], [0]) XB_CONFIG_MODULE([lib/gtest], [ diff --git a/debian/patches/10-dont-use-omitted-files.patch b/debian/patches/10-dont-use-omitted-files.patch index 4b018ac..ca1d57d 100644 --- a/debian/patches/10-dont-use-omitted-files.patch +++ b/debian/patches/10-dont-use-omitted-files.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2203,7 +2203,6 @@ +@@ -2204,7 +2204,6 @@ tools/Linux/kodi-standalone.sh \ tools/Linux/kodi-xsession.desktop \ tools/EventClients/Makefile \ diff --git a/debian/patches/12-build-cpluff-pic-only.patch b/debian/patches/12-build-cpluff-pic-only.patch index 2668b4f..5b483f1 100644 --- a/debian/patches/12-build-cpluff-pic-only.patch +++ b/debian/patches/12-build-cpluff-pic-only.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2385,7 +2385,7 @@ +@@ -2386,7 +2386,7 @@ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ diff --git a/debian/patches/14-ignore-test-results.patch b/debian/patches/14-ignore-test-results.patch index d180146..5dbbc20 100644 --- a/debian/patches/14-ignore-test-results.patch +++ b/debian/patches/14-ignore-test-results.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -611,7 +611,7 @@ +@@ -615,7 +615,7 @@ ifeq (1,@GTEST_CONFIGURED@) check: testsuite diff --git a/debian/patches/16-fix-alpha-build.patch b/debian/patches/16-fix-alpha-build.patch new file mode 100644 index 0000000..0acfb99 --- /dev/null +++ b/debian/patches/16-fix-alpha-build.patch @@ -0,0 +1,84 @@ +Description: Fix alpha build +Forwarded: not-needed +Author: Michael Cree <mc...@orcon.net.nz> +Bug: https://bugs.debian.org/856815 + +Index: kodi-17.0+dfsg1/xbmc/cores/DllLoader/DllLoader.h +=================================================================== +--- kodi-17.0+dfsg1.orig/xbmc/cores/DllLoader/DllLoader.h ++++ kodi-17.0+dfsg1/xbmc/cores/DllLoader/DllLoader.h +@@ -23,7 +23,7 @@ + #include "coffldr.h" + #include "LibraryLoader.h" + +-#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) ++#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__) + #define USE_LDT_KEEPER + #include "ldt_keeper.h" + #endif +Index: kodi-17.0+dfsg1/xbmc/cores/DllLoader/ldt_keeper.c +=================================================================== +--- kodi-17.0+dfsg1.orig/xbmc/cores/DllLoader/ldt_keeper.c ++++ kodi-17.0+dfsg1/xbmc/cores/DllLoader/ldt_keeper.c +@@ -19,7 +19,7 @@ + */ + + //#ifndef __powerpc__ +-#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) ++#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__) + + #include "ldt_keeper.h" + +Index: kodi-17.0+dfsg1/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h +=================================================================== +--- kodi-17.0+dfsg1.orig/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h ++++ kodi-17.0+dfsg1/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h +@@ -293,7 +293,7 @@ protected: + + + inline int NP2( unsigned x ) { +-#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) ++#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__mips__) && !defined(__s390x__) && !defined(__alpha__) + // If there are any issues compiling this, just append a ' && 0' + // to the above to make it '#if defined(TARGET_POSIX) && 0' + +Index: kodi-17.0+dfsg1/xbmc/threads/Atomics.cpp +=================================================================== +--- kodi-17.0+dfsg1.orig/xbmc/threads/Atomics.cpp ++++ kodi-17.0+dfsg1/xbmc/threads/Atomics.cpp +@@ -106,7 +106,7 @@ long cas(volatile long *pAddr, long expe + /////////////////////////////////////////////////////////////////////////// + long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal) + { +-#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) || defined(__s390x__) // PowerPC and ARM ++#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) || defined(__s390x__) || defined(__alpha__)// PowerPC and ARM + // Not available/required + // Hack to allow compilation + throw "cas2 is not implemented"; +Index: kodi-17.0+dfsg1/xbmc/threads/Atomics.h +=================================================================== +--- kodi-17.0+dfsg1.orig/xbmc/threads/Atomics.h ++++ kodi-17.0+dfsg1/xbmc/threads/Atomics.h +@@ -22,7 +22,7 @@ + + //! @todo Inline these methods + long cas(volatile long *pAddr, long expectedVal, long swapVal); +-#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__s390x__) ++#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__s390x__) && !defined(__alpha__) + long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal); + #endif + long AtomicIncrement(volatile long* pAddr); +Index: kodi-17.0+dfsg1/xbmc/utils/MathUtils.h +=================================================================== +--- kodi-17.0+dfsg1.orig/xbmc/utils/MathUtils.h ++++ kodi-17.0+dfsg1/xbmc/utils/MathUtils.h +@@ -37,7 +37,8 @@ + defined(__mips__) || \ + defined(__arm__) || \ + defined(__s390x__) || \ +- defined(__aarch64__) ++ defined(__aarch64__) || \ ++ defined(__alpha__) + #define DISABLE_MATHUTILS_ASM_ROUND_INT + #endif + diff --git a/debian/patches/series b/debian/patches/series index 2c93c98..23da68d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,6 +14,7 @@ 13-fix-tests.patch 14-ignore-test-results.patch 15-dont-use-openssl.patch +16-fix-alpha-build.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 --git a/debian/rules b/debian/rules index a217c45..425066f 100755 --- a/debian/rules +++ b/debian/rules @@ -197,7 +197,7 @@ override_dh_gencontrol-indep: # extract customized additional tarballs extract-components: tar -xf $(CURDIR)/../kodi_"$(UPSTREAM_VERSION)".orig-$(DVDNAV_COMPONENT).tar.bz2 && \ - mv libdvdnav-* $(CURDIR)/$(DVDNAV_COMPONENT) + test -d $(CURDIR)/$(DVDNAV_COMPONENT) || mv libdvdnav-* $(CURDIR)/$(DVDNAV_COMPONENT) tar -xf $(CURDIR)/../kodi_"$(UPSTREAM_VERSION)".orig-$(DVDREAD_COMPONENT).tar.bz2 && \ - mv libdvdread-* $(CURDIR)/$(DVDREAD_COMPONENT) + test -d $(CURDIR)/$(DVDREAD_COMPONENT) || mv libdvdread-* $(CURDIR)/$(DVDREAD_COMPONENT) tar -xf $(CURDIR)/../kodi_"$(UPSTREAM_VERSION)".orig-webinterface-default.tar.xz diff --git a/debian/watch b/debian/watch index 6973f9b..7fbcb76 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts=repacksuffix=+dfsg1,uversionmangle=s/\([\.0-9a-zA-Z]\)-.*$/\1/,dversionmangle=s/[-.+~]?(git|snapshot|repack|dfsg)(.*)$//i,pasv \ +opts=repacksuffix=+dfsg1,uversionmangle=s/\([\.0-9a-zA-Z]\)-.*$/\1/;s/rc/~rc/;s/a/~alpha/;s/b/~beta/,dversionmangle=s/[-.+~]?(git|snapshot|repack|dfsg)(.*)$//i,pasv \ https://github.com/xbmc/xbmc/tags .*archive/?(\d\S*)-[A-Z].*\.tar\.gz
