Source Mage code commit list

[Jeremy Blosser <scm AT sourcemage.org>]

GIT changes to master grimoire by Jeremy Blosser <jblosser AT sourcemage.org>:

 libs/tinyxml/CONFIGURE |    1 +
 libs/tinyxml/HISTORY   |    3 +++
 libs/tinyxml/PRE_BUILD |    9 ++++++---
 video/xbmc/DEPENDS     |   40 +++++++++++++++++++++++++++++++++-------
 video/xbmc/DETAILS     |    4 ++--
 video/xbmc/HISTORY     |    3 +++
 6 files changed, 48 insertions(+), 12 deletions(-)

New commits:
commit 7008ccf90a93e63dbbd1743637c7d9dc3193adbe
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

    xbmc: 12.2

commit 137f40d83a70921405a3de48791a7d961581731c
Author: Jeremy Blosser <jblosser AT sourcemage.org>
Commit: Jeremy Blosser <jblosser AT sourcemage.org>

    tinyxml: allow building with STL support

diff --git a/libs/tinyxml/CONFIGURE b/libs/tinyxml/CONFIGURE
new file mode 100755
index 0000000..6da3712
--- /dev/null
+++ b/libs/tinyxml/CONFIGURE
@@ -0,0 +1 @@
+config_query TINYXML_STL "Build with STL support?" "n"
diff --git a/libs/tinyxml/HISTORY b/libs/tinyxml/HISTORY
index be4a10c..fb90923 100644
--- a/libs/tinyxml/HISTORY
+++ b/libs/tinyxml/HISTORY
@@ -1,3 +1,6 @@
+2013-10-26 Jeremy Blosser <jblosser AT sourcemage.org>
+       * CONFIGURE, PRE_BUILD: allow building with STL support
+
 2011-08-20 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 2_6_2 (Fixed SOURCE_URL[0])
 
diff --git a/libs/tinyxml/PRE_BUILD b/libs/tinyxml/PRE_BUILD
index addce42..81426d6 100755
--- a/libs/tinyxml/PRE_BUILD
+++ b/libs/tinyxml/PRE_BUILD
@@ -1,3 +1,6 @@
-default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
-cp ${SCRIPT_DIRECTORY}/CMakeLists.txt .
+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/video/xbmc/DEPENDS b/video/xbmc/DEPENDS
index 6f9d777..1f218c9 100755
--- a/video/xbmc/DEPENDS
+++ b/video/xbmc/DEPENDS
@@ -1,10 +1,13 @@
-depends subversion &&
 depends -sub CXX gcc &&
 depends automake &&
 depends autoconf &&
 depends unzip &&
 depends boost &&
 depends cmake &&
+depends swig &&
+depends yajl &&
+depends tinyxml &&
+depends taglib &&
 optional_depends glew \
                  "--enable-gl" \
                  "--disable-gl" \
@@ -22,7 +25,10 @@ depends freetype2 &&
 depends fontconfig &&
 depends bzip2 &&
 depends sqlite &&
-depends alsa-lib &&
+optional_depends alsa-lib \
+                 "--enable-alsa" \
+                 "--disable-alsa" \
+                 "for ALSA support" &&
 depends libpng &&
 depends pcre &&
 depends lzo &&
@@ -39,7 +45,10 @@ depends libxinerama &&
 depends curl &&
 depends dbus &&
 depends fribidi &&
-depends MYSQL &&
+optional_depends MYSQL \
+                 "--enable-mysql" \
+                 "--disable-mysql" \
+                 "for mysql support" &&
 optional_depends hal \
                  "--enable-hal" \
                  "--disable-hal" \
@@ -76,6 +85,10 @@ optional_depends libdvdcss \
                  "--enable-dvdcss" \
                  "--disable-dvdcss" \
                  "for DVDCSS support" &&
+optional_depends libbluray \
+                 "--enable-libbluray" \
+                 "" \
+                 "for libbluray support" &&
 optional_depends a52dec \
                  "--enable-external-liba52" \
                  "--disable-external-liba52" \
@@ -92,11 +105,20 @@ depends wavpack &&
 depends gawk &&
 depends gperf &&
 depends nasm &&
-depends cwiid &&
-depends BLUEZ &&
+optional_depends cwiid \
+                 "" \
+                 "" \
+                 "for wiimote support" &&
+optional_depends BLUEZ \
+                 "" \
+                 "" \
+                 "for bluetooth support" &&
 depends zlib &&
 depends libmms &&
-depends samba &&
+optional_depends samba \
+                 "--enable-samba" \
+                 "--disable-samba" \
+                 "for samba support" &&
 depends tiff &&
 depends openssl &&
 optional_depends libmicrohttpd \
@@ -107,4 +129,8 @@ depends libmodplug &&
 depends libssh &&
 depends gettext &&
 depends cvs &&
-depends libtool
+depends libtool &&
+optional_depends libusb \
+                 "--enable-libusb" \
+                 "--disable-libusb" \
+                 "for libusb support"
diff --git a/video/xbmc/DETAILS b/video/xbmc/DETAILS
index 179e711..5e8b900 100755
--- a/video/xbmc/DETAILS
+++ b/video/xbmc/DETAILS
@@ -1,8 +1,8 @@
            SPELL=xbmc
-         VERSION=10.0
+         VERSION=12.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://mirrors.${SPELL}.org/releases/source/${SOURCE}
-     
SOURCE_HASH=sha512:b08b13088fe72546589ca1b3f1fdc0b7f0551782b85f1c74f117d683ca516588254b57cd3bf168b4770445b954655eee0bd757ed698f2c7e9bbd81804627ca97
+     
SOURCE_HASH=sha512:d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://xbmc.org";
       LICENSE[0]=GPL
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
index b72d465..0a3c108 100644
--- a/video/xbmc/HISTORY
+++ b/video/xbmc/HISTORY
@@ -1,3 +1,6 @@
+2013-10-26 Jeremy Blosser <jblosser AT sourcemage.org>
+       * DETAILS, DEPENDS: version 12.2
+
 2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
        * DEPENDS: changed optional_depends libdts to libdca