Skip to Content.
Sympa Menu

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

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 (6616022401dd026e9c7556b22e030bc1aab7372d)
  • Date: Tue, 29 Jan 2019 05:45:58 +0000

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

video/kodi/0001-add-missing-include-of-Xutil.h.patch | 24 --
video/kodi/DEPENDS | 176
+++----------------
video/kodi/DETAILS | 12 -
video/kodi/HISTORY | 6
video/kodi/PRE_BUILD | 15 -
video/kodi/crossguid-ac.patch | 20 --
video/kodi/kodi-15.1-texturepacker.patch | 25 --
video/kodi/kodi-cmake-no-java.patch | 56 ------
8 files changed, 47 insertions(+), 287 deletions(-)

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

video/kodi: updated both branches to 18.0 Leia

diff --git a/video/kodi/0001-add-missing-include-of-Xutil.h.patch
b/video/kodi/0001-add-missing-include-of-Xutil.h.patch
deleted file mode 100644
index 95aeb78..0000000
--- a/video/kodi/0001-add-missing-include-of-Xutil.h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0da7ecca9917449e28510ffefc721e1dc6f13be4 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sun, 15 Jan 2017 00:02:07 +0100
-Subject: [PATCH] add missing include of Xutil.h
-
----
- xbmc/windowing/X11/GLContextEGL.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/windowing/X11/GLContextEGL.h
b/xbmc/windowing/X11/GLContextEGL.h
-index 87b5755..9a8c35d 100644
---- a/xbmc/windowing/X11/GLContextEGL.h
-+++ b/xbmc/windowing/X11/GLContextEGL.h
-@@ -23,6 +23,7 @@
- #if defined(HAVE_X11)
- #include "GLContext.h"
- #include "EGL/egl.h"
-+#include "X11/Xutil.h"
-
- class CGLContextEGL : public CGLContext
- {
---
-2.11.0
-
diff --git a/video/kodi/DEPENDS b/video/kodi/DEPENDS
index a65138b..1bbb182 100755
--- a/video/kodi/DEPENDS
+++ b/video/kodi/DEPENDS
@@ -1,3 +1,4 @@
+source "${GRIMOIRE}/CMAKE_DEPENDS" &&
depends -sub CXX gcc &&
depends automake &&
depends autoconf &&
@@ -50,146 +51,37 @@ depends SSL &&
depends libmodplug &&
depends gettext &&
depends libtool &&
+depends glew &&
+depends libx11 "-DENABLE_X11=ON" &&
+depends crossguid "-DENABLE_INTERNAL_CROSSGUID=OFF" &&
+depends flatbuffers &&
+depends fmt &&
+depends fstrcmp &&
+depends rapidjson &&

-# Drop the stable case on next stable release
-if [[ "${KODI_BRANCH}" == "stable" ]]; then
- depends cmake &&
- depends libx11 "--enable-x11" &&
- depends glew "--enable-gl" &&
- optional_depends libvdpau \
- "--enable-vdpau" \
- "--disable-vdpau" \
- "for VDPAU decoding" &&
- optional_depends libva \
- "--enable-vaapi" \
- "--disable-vaapi" \
- "for VAAPI support" &&
- optional_depends alsa-lib \
- "--enable-alsa" \
- "--disable-alsa" \
- "for ALSA support" &&
- optional_depends lirc \
- "--enable-lirc" \
- "--disable-lirc" \
- "support for IR remote control" &&
- optional_depends MYSQL \
- "--enable-mysql" \
- "--disable-mysql" \
- "for mysql support" &&
- optional_depends hal \
- "--enable-hal" \
- "--disable-hal" \
- "for HAL support" &&
- optional_depends pulseaudio \
- "--enable-pulse" \
- "--disable-pulse" \
- "for PulseAudio support" &&
- optional_depends avahi \
- "--enable-avahi" \
- "--disable-avahi" \
- "for Avahi support" &&
- optional_depends libxrandr \
- "--enable-xrandr" \
- "--disable-xrandr" \
- "for XRandR support" &&
- optional_depends LIBAVCODEC \
- "--with-ffmpeg=shared" \
- "--with-ffmpeg=force" \
- "use system ffmpeg" &&
- optional_depends goom \
- "--enable-goom" \
- "--disable-goom" \
- "for GOOM visualization" &&
- optional_depends faac \
- "--enable-faac" \
- "--disable-faac" \
- "for faac support" &&
- optional_depends libbluray \
- "--enable-libbluray" \
- "--disable-libbluray" \
- "for libbluray support" &&
- optional_depends a52dec \
- "--enable-external-liba52" \
- "--disable-external-liba52" \
- "use system liba52" &&
- optional_depends libdca \
- "--enable-external-libdts" \
- "--disable-external-libdts" \
- "use system libdts" &&
- optional_depends DEVICE-MANAGER \
- "--enable-udev" \
- "--disable-udev" \
- "for udev support" &&
- optional_depends cwiid \
- "" \
- "" \
- "for wiimote support" &&
- optional_depends BLUEZ \
- "--enable-libbluetooth" \
- "--disable-libbluetooth" \
- "for bluetooth support" &&
- optional_depends samba \
- "--enable-samba" \
- "--disable-samba" \
- "for samba support" &&
- optional_depends libmicrohttpd \
- "--enable-webserver" \
- "--disable-webserver" \
- "for webserver support" &&
- optional_depends libssh \
- "--enable-ssh" \
- "-disable-ssh" \
- "for SFTP support" &&
- optional_depends libusb \
- "--enable-libusb" \
- "--disable-libusb" \
- "for libusb support" &&
- optional_depends libcec \
- "--enable-libcec" \
- "--disable-libcec" \
- "for TV remote control support via HDMI" &&
- optional_depends lcms2 \
- "--enable-lcms2" \
- "--disable-lcms2" \
- "for color managment support"
- optional_depends libcap \
- "--enable-libcap" \
- "--disable-libcap" \
- "for libcap support" &&
- depends crossguid
-else
- source "${GRIMOIRE}/CMAKE_DEPENDS" &&
- depends glew &&
- depends libx11 "-DENABLE_X11=ON" &&
- depends crossguid "-DENABLE_INTERNAL_CROSSGUID=OFF" &&
- depends flatbuffers &&
- depends fmt &&
- depends fstrcmp &&
- depends rapidjson &&
- optional_depends alsa-lib "" "" "for ALSA support" &&
- optional_depends libvdpau "-DENABLE_VDPAU=ON" "-DENABLE_VDPAU=OFF" \
- "for VDPAU decoding" &&
- optional_depends libva "-DENABLE_VAAPI=ON" "-DENABLE_VAAPI=OFF" \
- "for VAAPI support" &&
- optional_depends lirc "-DENABLE_LIRC=ON" "-DENABLE_LIRC=OFF" \
- "support for IR remote control" &&
- optional_depends MYSQL "" "" "for mysql support" &&
- optional_depends pulseaudio "" "" "for PulseAudio support" &&
- optional_depends avahi "" "" "for Avahi support" &&
- optional_depends libxrandr "" "" "for XRandR support" &&
- optional_depends LIBAVCODEC "-DENABLE_INTERNAL_FFMPEG=OFF" \
- "-DENABLE_INTERNAL_FFMPEG=ON" \
- "use system ffmpeg" &&
- optional_depends libbluray "" "" "for libbluray support" &&
- optional_depends libdvdcss "-DENABLE_DVDCSS=ON" "-DENABLE_DVDCSS=OFF" \
- "for libdvdcss support" &&
- optional_depends DEVICE-MANAGER "" "" "for udev support" &&
- optional_depends BLUEZ "" "" "for bluetooth support" &&
- optional_depends samba "" "" "for samba support" &&
- optional_depends libmicrohttpd "" "" "for webserver support" &&
- optional_depends libssh "" "" "for SFTP support" &&
- optional_depends libusb "" "" "for libusb support" &&
- optional_depends libcec "" "" "for TV remote control support via HDMI" &&
- optional_depends lcms2 "" "" "for color managment support"
- optional_depends libcap "" "" "for libcap support"
-fi
+optional_depends alsa-lib "" "" "for ALSA support" &&
+optional_depends libvdpau "-DENABLE_VDPAU=ON" "-DENABLE_VDPAU=OFF" \
+ "for VDPAU decoding" &&
+optional_depends libva "-DENABLE_VAAPI=ON" "-DENABLE_VAAPI=OFF" \
+ "for VAAPI support" &&
+optional_depends lirc "-DENABLE_LIRC=ON" "-DENABLE_LIRC=OFF" \
+ "support for IR remote control" &&
+optional_depends MYSQL "" "" "for mysql support" &&
+optional_depends pulseaudio "" "" "for PulseAudio support" &&
+optional_depends avahi "" "" "for Avahi support" &&
+optional_depends libxrandr "" "" "for XRandR support" &&
+optional_depends LIBAVCODEC "-DENABLE_INTERNAL_FFMPEG=OFF" \
+ "-DENABLE_INTERNAL_FFMPEG=ON" \
+ "use system ffmpeg" &&
+optional_depends libbluray "" "" "for libbluray support" &&
+optional_depends libdvdcss "-DENABLE_DVDCSS=ON" "-DENABLE_DVDCSS=OFF" \
+ "for libdvdcss support" &&
+optional_depends DEVICE-MANAGER "" "" "for udev support" &&
+optional_depends BLUEZ "" "" "for bluetooth support" &&
+optional_depends samba "" "" "for samba support" &&
+optional_depends libmicrohttpd "" "" "for webserver support" &&
+optional_depends libssh "" "" "for SFTP support" &&
+optional_depends libusb "" "" "for libusb support" &&
+optional_depends libcec "" "" "for TV remote control support via HDMI" &&
+optional_depends lcms2 "" "" "for color managment support"
+optional_depends libcap "" "" "for libcap support"
diff --git a/video/kodi/DETAILS b/video/kodi/DETAILS
index 809431b..2ad80f6 100755
--- a/video/kodi/DETAILS
+++ b/video/kodi/DETAILS
@@ -1,13 +1,13 @@
+source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=kodi
if [[ $KODI_BRANCH == rc ]]; then
-source "${GRIMOIRE}/CMAKE_FUNCTIONS"
- VERSION=18.0rc5.2
-
SOURCE_HASH=sha512:bee9f72bb37f0932d62a30c845902d31687f817fca587fc5a8bcf0eb302a2595a0ddf9b1114c89d8f76cb2b194746ad701fdb218ad6f6dcc4526ec02fbac7ff4
+ VERSION=18.0
+
SOURCE_HASH=sha512:d5a91ef10d4e5671a559b48e866ee534cf4d6ec270ed25b5d54ad66cbdaf29bd04acf533d90bd86e80c232be5f3d52bd8d1b697d60100371cff9329e514b9d92
CODENAME=Leia
else
- VERSION=17.6
-
SOURCE_HASH=sha512:1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111
- CODENAME=Krypton
+ VERSION=18.0
+
SOURCE_HASH=sha512:d5a91ef10d4e5671a559b48e866ee534cf4d6ec270ed25b5d54ad66cbdaf29bd04acf533d90bd86e80c232be5f3d52bd8d1b697d60100371cff9329e514b9d92
+ CODENAME=Leia
fi
SECURITY_PATCH=1
SOURCE="${SPELL}-${VERSION}.tar.gz"
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 302b548..a8e05e0 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,9 @@
+2019-01-29 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, DEPENDS, PRE_BUILD: updated both branches to 18.0 Leia
+ * kodi-15.1-texturepacker.patch, kodi-cmake-no-java.patch,
+ crossguid-ac.patch, 0001-add-missing-include-of-Xutil.h.patch:
+ dropped obsolete patches
+
2019-01-15 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: updated release candidate branch to 18.0rc5.2 Leia,
cmakeified rc branch
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 11b60b8..2abad81 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -2,17 +2,4 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

patch -Np1 < "${SPELL_DIRECTORY}/crossguid.patch" &&
-patch -Np1 < "${SPELL_DIRECTORY}/0001-std-isnan-isnan.patch" &&
-
-if [[ "${KODI_BRANCH}" == "stable" ]]; then
- patch -Np0 < "$SPELL_DIRECTORY/kodi-15.1-texturepacker.patch" &&
- patch -Np1 <
"${SPELL_DIRECTORY}/0001-add-missing-include-of-Xutil.h.patch" &&
-
- patch -Np1 < "${SPELL_DIRECTORY}/crossguid-ac.patch" &&
-
- if ! is_depends_enabled JAVA; then
- patch -p1 < "$SPELL_DIRECTORY/kodi-cmake-no-java.patch"
- fi &&
-
- ./bootstrap
-fi
+patch -Np1 < "${SPELL_DIRECTORY}/0001-std-isnan-isnan.patch"
diff --git a/video/kodi/crossguid-ac.patch b/video/kodi/crossguid-ac.patch
deleted file mode 100644
index e60643c..0000000
--- a/video/kodi/crossguid-ac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nuar xbmc-17.4-Krypton.orig/configure.ac xbmc-17.4-Krypton/configure.ac
---- xbmc-17.4-Krypton.orig/configure.ac 2017-08-24 12:59:10.390335315
-0400
-+++ xbmc-17.4-Krypton/configure.ac 2017-08-24 13:02:57.363693138 -0400
-@@ -1063,12 +1063,12 @@
- AC_MSG_CHECKING("for libcrossguid")
- AC_LANG_PUSH([C++])
- SAVED_LIBS="$LIBS"
--LIBS="$LIBS -lcrossguid $UUID_LIBS"
-+LIBS="$LIBS -lxg $UUID_LIBS"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
-- [#include <guid.h>],
-- [Guid dummy])],
-- [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid
$UUID_LIBS"],
-+ [#include <Guid.hpp>],
-+ [xg::Guid dummy])],
-+ [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lxg $UUID_LIBS"],
- [AC_MSG_ERROR(crossguid not found)])
- LIBS="$SAVED_LIBS"
- AC_LANG_POP([C++])
diff --git a/video/kodi/kodi-15.1-texturepacker.patch
b/video/kodi/kodi-15.1-texturepacker.patch
deleted file mode 100644
index 19309c5..0000000
--- a/video/kodi/kodi-15.1-texturepacker.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- tools/depends/native/TexturePacker/Makefile
-+++ tools/depends/native/TexturePacker/Makefile
-@@ -9,14 +9,10 @@
-
- ifeq ($(NATIVEPLATFORM),)
- PLATFORM = native
-- EXTRA_CONFIGURE = --enable-static
- else
- PLATFORM = $(NATIVEPLATFORM)
- endif
-
--ifeq ($(NATIVE_OS), linux)
-- EXTRA_CONFIGURE = --enable-static
--endif
- ifeq ($(NATIVE_OS), android)
- EXTRA_CONFIGURE = --enable-static
- endif
-@@ -35,7 +35,6 @@ all: .installed-$(PLATFORM)
- $(PLATFORM): ../libsquish-native/.installed-$(PLATFORM)
- -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- cd $(PLATFORM); cp -a $(SOURCE)/* .
-- cd $(PLATFORM); ./autogen.sh
- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE)
EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-
-
diff --git a/video/kodi/kodi-cmake-no-java.patch
b/video/kodi/kodi-cmake-no-java.patch
deleted file mode 100644
index 2d965ab..0000000
--- a/video/kodi/kodi-cmake-no-java.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/xbmc/interfaces/swig/CMakeLists.txt
b/xbmc/interfaces/swig/CMakeLists.txt
-index 6e676159eb..d45a2ecbab 100644
---- a/xbmc/interfaces/swig/CMakeLists.txt
-+++ b/xbmc/interfaces/swig/CMakeLists.txt
-@@ -1,43 +1,21 @@
- function(generate_file file)
-- set(classpath ${GROOVY_DIR}/groovy-all-${GROOVY_VER}.jar
-- ${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar
-- ${CORE_SOURCE_DIR}/tools/codegenerator
-- ${CMAKE_CURRENT_SOURCE_DIR}/../python)
-- if(NOT CORE_SYSTEM_NAME STREQUAL windows)
-- set(devnull "/dev/null")
-- string(REPLACE ";" ":" classpath "${classpath}")
-- else()
-- set(devnull "nul")
-- endif()
--
-- set(CPP_FILE ${file}.cpp)
-- add_custom_command(OUTPUT ${CPP_FILE}
-- COMMAND ${SWIG_EXECUTABLE}
-- ARGS -w401 -c++ -o ${file}.xml -xml
-I${CORE_SOURCE_DIR}/xbmc -xmllang python
${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
-- COMMAND ${Java_JAVA_EXECUTABLE}
-- ARGS -cp "${classpath}" groovy.ui.GroovyMain
${CORE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml
${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp >
${devnull}
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file})
-+ set(CPP_FILE
${CORE_SOURCE_DIR}/xbmc/interfaces/python/generated/${file}.cpp)
- set(SOURCES ${SOURCES} "${CPP_FILE}" PARENT_SCOPE)
- endfunction()
-
--find_package(Java COMPONENTS Runtime REQUIRED)
- find_package(SWIG REQUIRED)
-
- # The generated bindings
--set(INPUTS AddonModuleXbmcaddon.i
-- AddonModuleXbmcgui.i
-- AddonModuleXbmc.i
-- AddonModuleXbmcplugin.i
-- AddonModuleXbmcvfs.i
-- AddonModuleXbmcwsgi.i)
--
--set(GROOVY_DIR ${CORE_SOURCE_DIR}/tools/codegenerator/groovy)
--set(GROOVY_VER 2.4.4)
--set(COMMONS_VER 2.6)
-+set(INPUTS AddonModuleXbmcaddon
-+ AddonModuleXbmcgui
-+ AddonModuleXbmc
-+ AddonModuleXbmcplugin
-+ AddonModuleXbmcvfs
-+ AddonModuleXbmcwsgi)
-
- foreach(INPUT IN LISTS INPUTS)
- generate_file(${INPUT})
-- list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.cpp)
-+ list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.i.cpp)
- endforeach()
-
- add_library(python_binding STATIC ${SOURCES})



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6616022401dd026e9c7556b22e030bc1aab7372d), Pavel Vinogradov, 01/29/2019

Archive powered by MHonArc 2.6.24.

Top of Page