Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f6e6e6b82e5f1874f3f480b3ab7852134776ca63)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f6e6e6b82e5f1874f3f480b3ab7852134776ca63)
  • Date: Fri, 27 Jan 2017 23:47:55 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

video/kodi/AE-override.patch | 22 ----------------------
video/kodi/DEPENDS | 7 +------
video/kodi/DETAILS | 4 ++--
video/kodi/HISTORY | 5 +++++
video/kodi/PRE_BUILD | 1 -
5 files changed, 8 insertions(+), 31 deletions(-)

New commits:
commit f6e6e6b82e5f1874f3f480b3ab7852134776ca63
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

video/kodi: updated release candidate branch to 17.0rc4 Krypton

diff --git a/video/kodi/AE-override.patch b/video/kodi/AE-override.patch
deleted file mode 100644
index 5008699..0000000
--- a/video/kodi/AE-override.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From db26dd8f619d76cf459b87c2e003e3cd33b96b79 Mon Sep 17 00:00:00 2001
-From: fritsch <Peter.Fruehberger AT gmail.com>
-Date: Sun, 8 Jan 2017 20:09:21 +0100
-Subject: [PATCH 1/2] Autotools: Fake empty AE override
-
----
- xbmc/cores/AudioEngine/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/cores/AudioEngine/Makefile.in
b/xbmc/cores/AudioEngine/Makefile.in
-index 9a4e998..9a3d486 100644
---- a/xbmc/cores/AudioEngine/Makefile.in
-+++ b/xbmc/cores/AudioEngine/Makefile.in
-@@ -83,6 +83,6 @@ SRCS += Utils/AELimiter.cpp
- SRCS += Encoders/AEEncoderFFmpeg.cpp
-
- LIB = audioengine.a
--
-+$(shell touch AEDefines_override.h)
- include @abs_top_srcdir@/Makefile.include
- -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
-
diff --git a/video/kodi/DEPENDS b/video/kodi/DEPENDS
index a43ad5f..6ac7620 100755
--- a/video/kodi/DEPENDS
+++ b/video/kodi/DEPENDS
@@ -52,12 +52,7 @@ depends SSL &&
depends dbus &&
depends fribidi &&
depends gnutls &&
-
-if [[ "${KODI_BRANCH}" == "stable" ]]; then
- depends JAVA
-else
- optional_depends JAVA "" "" "for Java support"
-fi &&
+depends JAVA &&

optional_depends lirc \
"--enable-lirc" \
diff --git a/video/kodi/DETAILS b/video/kodi/DETAILS
index 5b7babe..14776d8 100755
--- a/video/kodi/DETAILS
+++ b/video/kodi/DETAILS
@@ -1,7 +1,7 @@
SPELL=kodi
if [[ $KODI_BRANCH == rc ]]; then
- VERSION=17.0rc3
-
SOURCE_HASH=sha512:d44f267067a09dc60bea4278e56b1003a35df774cc8d1af22622b7af95c2b891cb0692cb681fe255c9aee87708786413bb84ef2af766ff21c68a7a05775dc54b
+ VERSION=17.0rc4
+
SOURCE_HASH=sha512:bc1abcec27b09d3f6b8231b3973f518055f28a8de883186d5341ec3d11f8bb9aae93d7b318b0a74695ba7512b7d44262bd0be101e44a839551831831f044a700
CODENAME=Krypton
else
VERSION=16.1
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 74faf18..c675210 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,8 @@
+2017-01-27 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated release candidate branch to 17.0rc4 Krypton
+ * DEPENDS: JAVA is still required for bootstrapping
+ * PRE_BUILD, AE-override.patch: removed the patch
+
2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 0001-add-missing-include-of-Xutil.h.patch: fix compile
error in
prerelease
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 119dc0c..91f1d09 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -6,7 +6,6 @@ if [[ $KODI_BRANCH != rc ]]; then
# remove this when Kodi 17.0 Krypton is out
patch -Np1 <
"$SPELL_DIRECTORY/0007-lib-cximage-6.0-fix-compilation-with-gcc6.patch"
else
- patch -Np1 < "${SPELL_DIRECTORY}/AE-override.patch" &&
patch -Np1 < "${SPELL_DIRECTORY}/0001-add-missing-include-of-Xutil.h.patch"
fi &&
if [[ "${KODI_BRANCH}" != "stable" ]]; then



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (f6e6e6b82e5f1874f3f480b3ab7852134776ca63), Pavel Vinogradov, 01/27/2017

Archive powered by MHonArc 2.6.24.

Top of Page