Skip to Content.
Sympa Menu

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

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 (5fb15bf8959d53bb591e06acc25970cc92f95b0c)
  • Date: Wed, 23 Aug 2017 21:31:10 +0000

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

ChangeLog | 3 +++
libs/tinyxml1/BUILD | 1 +
libs/tinyxml1/CMakeLists.txt | 25 +++++++++++++++++++++++++
libs/tinyxml1/CONFIGURE | 1 +
libs/tinyxml1/DEPENDS | 2 ++
libs/tinyxml1/DETAILS | 16 ++++++++++++++++
libs/tinyxml1/HISTORY | 3 +++
libs/tinyxml1/PRE_BUILD | 6 ++++++
libs/tinyxml1/PRE_SUB_DEPENDS | 5 +++++
libs/tinyxml1/SUB_DEPENDS | 5 +++++
video/kodi/DEPENDS | 2 +-
video/kodi/HISTORY | 3 +++
12 files changed, 71 insertions(+), 1 deletion(-)

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

video/kodi: switched to tinyxml1 dependency

commit 773c33a80a27c8f55fa1a89abfa1bf1839d0f68e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/tinyxml1: added old version of tinyxml

diff --git a/ChangeLog b/ChangeLog
index ccf5618..c255456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-08-23 Pavel Vinogradov <public AT sourcemage.org>
+ * libs/tinyxml1: added old version of tinyxml
+
2017-08-23 Vlad Glagolev <stealth AT sourcemage.org>
* fonts-x11/interface: new spell, the Interface font family

diff --git a/libs/tinyxml1/BUILD b/libs/tinyxml1/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/libs/tinyxml1/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/libs/tinyxml1/CMakeLists.txt b/libs/tinyxml1/CMakeLists.txt
new file mode 100644
index 0000000..000f50c
--- /dev/null
+++ b/libs/tinyxml1/CMakeLists.txt
@@ -0,0 +1,25 @@
+project(tinyxml)
+
+set(tinyxmlSources
+ tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
+ )
+
+set(tinyxmlHeaders
+ tinystr.h tinyxml.h
+ )
+
+add_definitions(-DTIXML_USE_STL)
+
+add_library(tinyxml SHARED ${tinyxmlSources} )
+add_library(tinyxml_static STATIC ${tinyxmlSources} )
+
+install(TARGETS tinyxml
+ DESTINATION lib)
+
+install(TARGETS tinyxml_static
+ DESTINATION lib)
+
+install(FILES ${tinyxmlHeaders}
+ DESTINATION include)
+
+
diff --git a/libs/tinyxml1/CONFIGURE b/libs/tinyxml1/CONFIGURE
new file mode 100755
index 0000000..6da3712
--- /dev/null
+++ b/libs/tinyxml1/CONFIGURE
@@ -0,0 +1 @@
+config_query TINYXML_STL "Build with STL support?" "n"
diff --git a/libs/tinyxml1/DEPENDS b/libs/tinyxml1/DEPENDS
new file mode 100755
index 0000000..98b886e
--- /dev/null
+++ b/libs/tinyxml1/DEPENDS
@@ -0,0 +1,2 @@
+depends cmake &&
+depends -sub CXX gcc
diff --git a/libs/tinyxml1/DETAILS b/libs/tinyxml1/DETAILS
new file mode 100755
index 0000000..b724b79
--- /dev/null
+++ b/libs/tinyxml1/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=tinyxml1
+ VERSION=2.6.2
+ SOURCE="tinyxml_${VERSION//./_}.tar.gz"
+
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/tinyxml/tinyxml/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/tinyxml"
+ WEB_SITE="http://sourceforge.net/projects/tinyxml/";
+ LICENSE[0]=ZLIB
+ ENTERED=20170823
+ SHORT="a simple, small, minimal, C++ XML parser"
+cat << EOF
+TinyXML is a simple, small, minimal, C++ XML parser that can be easily
+integrating into other programs. It reads XML and creates C++ objects
+representing the XML document. The objects can be manipulated, changed,
+and saved again as XML.
+EOF
diff --git a/libs/tinyxml1/HISTORY b/libs/tinyxml1/HISTORY
new file mode 100644
index 0000000..67733a2
--- /dev/null
+++ b/libs/tinyxml1/HISTORY
@@ -0,0 +1,3 @@
+2017-08-23 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CMakeLists.txt, CONFIGURE, DEPENDS, DETAILS, PRE_BUILD,
+ PRE_SUB_DEPENDS, SUB_DEPENDS: recreated spell from old tinyxml 2.6.2
diff --git a/libs/tinyxml1/PRE_BUILD b/libs/tinyxml1/PRE_BUILD
new file mode 100755
index 0000000..81426d6
--- /dev/null
+++ b/libs/tinyxml1/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+cp ${SCRIPT_DIRECTORY}/CMakeLists.txt . &&
+if [[ "${TINYXML_STL}" == "y" ]]; then
+ sed -i '1i#define TIXML_USE_STL=YES' tinyxml.h
+fi
diff --git a/libs/tinyxml1/PRE_SUB_DEPENDS b/libs/tinyxml1/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..e84eb96
--- /dev/null
+++ b/libs/tinyxml1/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ STL) [[ TINYXML_STL == "y" ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/libs/tinyxml1/SUB_DEPENDS b/libs/tinyxml1/SUB_DEPENDS
new file mode 100755
index 0000000..3348069
--- /dev/null
+++ b/libs/tinyxml1/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ STL) config_query TINYXML_STL "Build with STL support?" "y" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/video/kodi/DEPENDS b/video/kodi/DEPENDS
index 3b6765f..59598a8 100755
--- a/video/kodi/DEPENDS
+++ b/video/kodi/DEPENDS
@@ -7,7 +7,7 @@ depends boost &&
depends cmake &&
depends swig &&
depends yajl &&
-depends -sub STL tinyxml &&
+depends -sub STL tinyxml1 &&
depends taglib &&
depends mesalib &&
depends libx11 "--enable-x11" &&
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 6c02ec0..11375c9 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,6 @@
+2017-08-23 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: tinyxml -> tinyxml1
+
2017-08-22 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 17.4




  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (5fb15bf8959d53bb591e06acc25970cc92f95b0c), Pavel Vinogradov, 08/23/2017

Archive powered by MHonArc 2.6.24.

Top of Page