Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (772c0e70648b1cc22ccdebfd087d416340f375fa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (772c0e70648b1cc22ccdebfd087d416340f375fa)
  • Date: Sun, 15 Jan 2017 11:25:18 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

audio-players/mpd/DETAILS | 4
audio-players/mpd/HISTORY | 3
chat-irc/weechat/DETAILS | 8 -
chat-irc/weechat/HISTORY | 3
editors/vim/DETAILS | 4
editors/vim/HISTORY | 3
graphics/imagemagick/DETAILS | 4
graphics/imagemagick/HISTORY | 3
video/kodi/0001-add-missing-include-of-Xutil.h.patch | 24 +++++
video/kodi/DEPENDS | 91
+++++++++++++++----
video/kodi/HISTORY | 8 +
video/kodi/PRE_BUILD | 8 +
video/kodi/kodi-cmake-no-java.patch | 56 +++++++++++
13 files changed, 189 insertions(+), 30 deletions(-)

New commits:
commit 772c0e70648b1cc22ccdebfd087d416340f375fa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/kodi: adapt dependencies for kodi 17

commit a8c6c162a209ca651e6e1f0292adc6b783ae54cb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/kodi: fix compile error in prerelease

commit 57a9371e213816fe1135d62c81decf3c13ce01ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-irc/weechat: versions 1.7 and 1.8-dev

commit b86b28f9aeebba03351b1052c38b6039780e6dbc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

editors/vim: version 8.0.0182

commit dcc9b1080db58bce65a33d46d47d2a40d1d23d76
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-players/mpd: version 0.20.2

commit 58615c691b68e04dfc667f49ce9aa949e5383b4c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/imagemagick: version 7.0.4-4

commit cf0724a63e24051d9a8103c7934317da29192d14
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

video/kodi: make JAVA dependency optional

diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 94ed001..0f6e0e7 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.20.1
+ VERSION=0.20.2
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://www.musicpd.org/download/${SPELL}/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:7784318f74b963b2ac0f756452484c0f8d20533a5e1635304904249adb5fe5485f7ab4a429d60ce78f4e48804eba854e11e91a1f31077c929d441e750868fc27
+
SOURCE_HASH=sha512:d02b916f342c4b9547f32b1c7611a61983f2e11534f0667778e38077066058319a3f2a5aa7ff28e281af1ec01d00d8f2195bb91ca2f5556d3533b387ce857826
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index de5df56..61ce33a 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.20.2
+
2017-01-10 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 0.20.1, VERSION is sliced now in SOURCE_URL[0]
* DEPENDS: removed glib2
diff --git a/chat-irc/weechat/DETAILS b/chat-irc/weechat/DETAILS
index 49044b0..5409805 100755
--- a/chat-irc/weechat/DETAILS
+++ b/chat-irc/weechat/DETAILS
@@ -9,14 +9,14 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/weechat-$WEECHAT_BRANCH
SOURCE_URL[0]=git_http://github.com/${SPELL}/${SPELL}.git:$SPELL
else
if [ "$WEECHAT_BRANCH" == "devel" ]; then
- VERSION=1.6-dev
+ VERSION=1.8-dev
SOURCE=$SPELL-devel.tar.bz2
-
SOURCE_HASH=sha512:6e9dd8afe0633aa4cc0451d9373c9e681857ab0e4230afce30549b3b5c1175d6b572b1779bca19f96ab56735287963a01c5f18856ad045c41818ff2d668eaea8
+
SOURCE_HASH=sha512:82f39d9f769b423b30fbe7fa5c5e3c964a0e47161dc3696d55b7a06a43cc591ad975f4f8923e0c3ee0bc2af55f9f0ef4fe17be871b819cff7da23c0e302891e8
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-devel
else
- VERSION=1.6
+ VERSION=1.7
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:ff0666904eae180f7091f475fade089128999ab1736e0e4a64ff79139eecb14f091d830be3110b75ec50ce85472bbf49343606ec827959d7711a19a33bfd4059
+
SOURCE_HASH=sha512:f591834ce669d42ac35e02e029f5991e0aa366eb7abc6d557cf969ebd35c6d39f2a1d03c65885ae4061fd9b1b9628c6c6572f26196a7f5aee64e1002b58a1ece
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
fi
SOURCE_URL[0]=http://www.weechat.org/files/src/$SOURCE
diff --git a/chat-irc/weechat/HISTORY b/chat-irc/weechat/HISTORY
index 2d2393c..6182fcb 100644
--- a/chat-irc/weechat/HISTORY
+++ b/chat-irc/weechat/HISTORY
@@ -1,3 +1,6 @@
+2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: versions 1.7 and 1.8-dev
+
2016-10-18 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated WEECHAT_BRANCH=stable to 1.6
updated WEECHAT_BRANCH=devel to 1.6-dev
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index f7b9756..d699c17 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -8,12 +8,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=hg_http://vim.googlecode.com/hg:${SPELL}-hg
SOURCE_IGNORE=volatile
else
- VERSION=8.0.0172
+ VERSION=8.0.0182
SECURITY_PATCH=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL[0]=https://github.com/vim/vim/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:06754e8dafeb2547380534b54ae248a3fbbe56cb91a6be458ca667cb8a51883bd354e04836f8f54a11991345af2dcf7bc89c200783239005802b062dd03ecb20
+
SOURCE_HASH=sha512:a3a6cb41b93d8d1f7b78ed78de761cbf1f7a33ea369766af3d4f47f1fb61f01419ced13ff6a937a00945899bd63c12d9f8ed54231835a21e4f2ff55e2a36d4f6
fi
WEB_SITE=http://www.vim.org
LICENSE[0]=http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index f338c52..e56a391 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 8.0.0182
+
2017-01-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.0.0172

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 77e5fa3..5bd3eb5 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,11 +1,11 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=7.0.4-3
+ VERSION=7.0.4-4
SECURITY_PATCH=5
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=http://www.imagemagick.org/download/releases/$SOURCE
-
SOURCE_HASH=sha256:bc09ea103a82d1c2c093889eda7e36dd0aa7aa98a06c55de4b73932838459fc4:UPSTREAM_HASH
+
SOURCE_HASH=sha512:3dd561c3a816aebf51904bffd680d00cbfb4c36e6f37f078906c404f872c15447c2f14dabff517005a4a6ed260b090b685b7e224cb401565d4c832eb6147e6fe
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index cea4bf8..c7942fa 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 7.0.4-4
+
2017-01-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.0.4-3

diff --git a/video/kodi/0001-add-missing-include-of-Xutil.h.patch
b/video/kodi/0001-add-missing-include-of-Xutil.h.patch
new file mode 100644
index 0000000..95aeb78
--- /dev/null
+++ b/video/kodi/0001-add-missing-include-of-Xutil.h.patch
@@ -0,0 +1,24 @@
+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 2a017ce..a43ad5f 100755
--- a/video/kodi/DEPENDS
+++ b/video/kodi/DEPENDS
@@ -8,13 +8,18 @@ depends swig &&
depends yajl &&
depends -sub STL tinyxml &&
depends taglib &&
-depends glew "--enable-gl" &&
+depends mesalib &&
+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" &&
depends libmad &&
-depends JAVA &&
depends JPEG &&
depends libsamplerate &&
depends libogg &&
@@ -43,10 +48,17 @@ depends libxtst &&
depends libxmu &&
depends libxinerama &&
depends curl &&
+depends SSL &&
depends dbus &&
depends fribidi &&
depends gnutls &&

+if [[ "${KODI_BRANCH}" == "stable" ]]; then
+ depends JAVA
+else
+ optional_depends JAVA "" "" "for Java support"
+fi &&
+
optional_depends lirc \
"--enable-lirc" \
"--disable-lirc" \
@@ -79,21 +91,27 @@ optional_depends goom \
"--enable-goom" \
"--disable-goom" \
"for GOOM visualization" &&
-optional_depends rtmpdump \
- "--enable-rtmp" \
- "--disable-rtmp" \
- "RTMP support via librtmp" &&
+if [[ "${KODI_BRANCH}" == "stable" ]]; then
+ optional_depends rtmpdump \
+ "--enable-rtmp" \
+ "--disable-rtmp" \
+ "RTMP support via librtmp"
+else
+ depends rtmpdump
+fi &&
optional_depends faac \
"--enable-faac" \
"--disable-faac" \
"for faac support" &&
-optional_depends libdvdcss \
- "--enable-dvdcss" \
- "--disable-dvdcss" \
- "for DVDCSS support" &&
+if [[ "${KODI_BRANCH}" == "stable" ]]; then
+ optional_depends libdvdcss \
+ "--enable-dvdcss" \
+ "--disable-dvdcss" \
+ "for DVDCSS support"
+fi &&
optional_depends libbluray \
"--enable-libbluray" \
- "" \
+ "--disable-libbluray" \
"for libbluray support" &&
optional_depends a52dec \
"--enable-external-liba52" \
@@ -103,6 +121,16 @@ optional_depends libdca \
"--enable-external-libdts" \
"--disable-external-libdts" \
"use system libdts" &&
+if [[ "${KODI_BRANCH}" != "stable" ]]; then
+ optional_depends libxslt \
+ "--enable-libxslt" \
+ "--disable-libxslt" \
+ "for XSLT scrapers"
+fi &&
+optional_depends DEVICE-MANAGER \
+ "--enable-udev" \
+ "--disable-udev" \
+ "for udev support" &&
depends faad2 &&
depends libmpeg2 &&
depends libass &&
@@ -115,10 +143,17 @@ optional_depends cwiid \
"" \
"" \
"for wiimote support" &&
-optional_depends BLUEZ \
- "" \
- "" \
- "for bluetooth support" &&
+if [[ "${KODI_BRANCH}" == "stable" ]]; then
+ optional_depends BLUEZ \
+ "" \
+ "" \
+ "for bluetooth support"
+else
+ optional_depends BLUEZ \
+ "--enable-libbluetooth" \
+ "--disable-libbluetooth" \
+ "for bluetooth support"
+fi
depends zlib &&
depends libmms &&
optional_depends samba \
@@ -132,7 +167,10 @@ optional_depends libmicrohttpd \
"--disable-webserver" \
"for webserver support" &&
depends libmodplug &&
-depends libssh &&
+optional_depends libssh \
+ "--enable-ssh" \
+ "-disable-ssh" \
+ "for SFTP support" &&
depends gettext &&
depends cvs &&
depends libtool &&
@@ -140,7 +178,22 @@ optional_depends libusb \
"--enable-libusb" \
"--disable-libusb" \
"for libusb support" &&
-
-optional_depends GIFLIB "--enable-gif" "--disable-gif" "gif support via
libgif" &&
-depends dcadec &&
+optional_depends libcec \
+ "--enable-libcec" \
+ "--disable-libcec" \
+ "for TV remote control support via HDMI" &&
+if [[ "${KODI_BRANCH}" != "stable" ]]; then
+ optional_depends lcms2 \
+ "--enable-lcms2" \
+ "--disable-lcms2" \
+ "for color managment support"
+fi &&
+optional_depends libcap \
+ "--enable-libcap" \
+ "--disable-libcap" \
+ "for libcap support" &&
+if [[ "${KODI_BRANCH}" == "stable" ]]; then
+ optional_depends GIFLIB "--enable-gif" "--disable-gif" "gif support via
libgif" &&
+ depends dcadec
+fi &&
depends crossguid
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 14259d9..74faf18 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,11 @@
+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
+
+2017-01-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, DEPENDS, kodi-cmake-no-java.patch: add patch from gentoo
to make
+ JAVA dependency optional
+
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
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 1758ab6..119dc0c 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -6,6 +6,12 @@ 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}/AE-override.patch" &&
+ patch -Np1 < "${SPELL_DIRECTORY}/0001-add-missing-include-of-Xutil.h.patch"
+fi &&
+if [[ "${KODI_BRANCH}" != "stable" ]]; then
+ if ! is_depends_enabled JAVA; then
+ patch -p1 < "$SPELL_DIRECTORY/kodi-cmake-no-java.patch"
+ fi
fi &&
./bootstrap
diff --git a/video/kodi/kodi-cmake-no-java.patch
b/video/kodi/kodi-cmake-no-java.patch
new file mode 100644
index 0000000..2d965ab
--- /dev/null
+++ b/video/kodi/kodi-cmake-no-java.patch
@@ -0,0 +1,56 @@
+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 Florian Franzmann (772c0e70648b1cc22ccdebfd087d416340f375fa), Florian Franzmann, 01/15/2017

Archive powered by MHonArc 2.6.24.

Top of Page