Skip to Content.
Sympa Menu

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

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 (887142772ada0a72816322e8f041cbd8e6d32bdb)
  • Date: Sat, 14 Jan 2017 21:09:04 +0000

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

video/kodi/AE-override.patch | 22 ++++++++++++++++++++++
video/kodi/HISTORY | 2 ++
video/kodi/PRE_BUILD | 4 +++-
3 files changed, 27 insertions(+), 1 deletion(-)

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

video/kodi: fixed a missing header error in rc branch

diff --git a/video/kodi/AE-override.patch b/video/kodi/AE-override.patch
new file mode 100644
index 0000000..5008699
--- /dev/null
+++ b/video/kodi/AE-override.patch
@@ -0,0 +1,22 @@
+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/HISTORY b/video/kodi/HISTORY
index 0aed0f7..14259d9 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,5 +1,7 @@
2017-01-14 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated release candidate branch to 17.0rc3 Krypton
+ * PRE_BUILD, AE-override.patch: added patch to fix a missing header
+ error in rc branch and also missing && in PRE_BUILD

2016-12-30 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated release candidate branch to 17.0rc2 Krypton
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 6b1abf4..1758ab6 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -2,8 +2,10 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
patch -Np0 < "$SPELL_DIRECTORY/kodi-15.1-texturepacker.patch" &&
if [[ $KODI_BRANCH != rc ]]; then
- patch -Np1 <
"$SPELL_DIRECTORY/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch"
+ patch -Np1 <
"$SPELL_DIRECTORY/0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch"
&&
# 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"
fi &&
./bootstrap



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

Archive powered by MHonArc 2.6.24.

Top of Page