Source Mage code commit list

[Quentin Rameau <scm AT sourcemage.org>]

GIT changes to master grimoire by Quentin Rameau <quinq AT sourcemage.org>:

 video/mkvtoolnix/BUILD   |    9 +++++++
 video/mkvtoolnix/DEPENDS |   54 
++++++++++++++++++++++++-----------------------
 video/mkvtoolnix/DETAILS |    6 +----
 video/mkvtoolnix/HISTORY |    7 ++++++
 4 files changed, 46 insertions(+), 30 deletions(-)

New commits:
commit 5bdc9c87090a2f4c9ed903fcb6418db1bbe2ad4b
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>

    video/mkvtoolnix: updated to version 2.9.8, updated dependencies

diff --git a/video/mkvtoolnix/BUILD b/video/mkvtoolnix/BUILD
new file mode 100755
index 0000000..25630f0
--- /dev/null
+++ b/video/mkvtoolnix/BUILD
@@ -0,0 +1,9 @@
+if [[ $(get_spell_provider $SPELL QT) == "qt4" ]]
+then
+# help configure to find needed QT4 binaries
+# if not exported, configure doesn't find them
+  export MOC="${INSTALL_ROOT}/usr/bin/qt4/moc"
+  export RCC="${INSTALL_ROOT}/usr/bin/qt4/rcc"
+  export UIC="${INSTALL_ROOT}/usr/bin/qt4/uic"
+fi &&
+default_build
diff --git a/video/mkvtoolnix/DEPENDS b/video/mkvtoolnix/DEPENDS
index 5a54c08..d2e2424 100755
--- a/video/mkvtoolnix/DEPENDS
+++ b/video/mkvtoolnix/DEPENDS
@@ -1,30 +1,32 @@
-depends  expat             &&
-depends  libvorbis         &&
-depends  libmatroska       &&
-# unless someone has a better suggestion this seems to be needed on 
-# x86_64 else it'll look for it in /usr/lib64 and fail but I'm giving
-# this check just to see if that dir exists in case someone goes
-# multilib or something similar
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] &&
-        [[ ! -d ${INSTALL_ROOT}/usr/lib64 ]] ; then
-depends  -sub REGEX boost "--with-boost-libdir=${INSTALL_ROOT}/usr/lib"
-else
-depends  -sub REGEX boost
-fi &&
-depends  -sub CPP pcre     &&
-optional_depends  bzip2            \
-                  '--enable-bz2'   \
-                  '--disable-bz2'  \
-                  'for BZ2 compression'  &&
+depends  libebml         &&
+depends  libmatroska     &&
+depends  expat           &&
+depends  libogg          &&
+depends  libvorbis       &&
+depends  zlib            &&
+depends  -sub REGEX boost "--with-boost-libdir=${INSTALL_ROOT}/usr/lib" &&
+
+optional_depends  WXWIDGET                           \
+                  '--enable-gui --enable-wxwidgets'  \
+                  '--disable-wxwidgets'              \
+                  "for wxWidgets mkvinfo and mmg gui"  &&
+optional_depends  QT                          \
+                  '--enable-gui --enable-qt'  \
+                  '--disable-qt'              \
+                  "for Qt mkvinfo and mmg gui"  &&
+optional_depends  flac  \
+                  ""    \
+                  ""    \
+                  "for FLAC support"  &&
 optional_depends  lzo              \
                   '--enable-lzo'   \
                   '--disable-lzo'  \
                   'for LZO compression'  &&
-optional_depends  wxgtk            \
-                  '--enable-gui'   \
-                  '--disable-gui'  \
-                  "for mkvinfo and mmg gui"  &&
-optional_depends  "flac"  \
-                  ""      \
-                  ""      \
-                  "for FLAC support"
+optional_depends  bzip2            \
+                  '--enable-bz2'   \
+                  '--disable-bz2'  \
+                  'for BZ2 compression'  &&
+optional_depends  file  \
+                  ""    \
+                  ""    \
+                  'for automatic content type detection'
diff --git a/video/mkvtoolnix/DETAILS b/video/mkvtoolnix/DETAILS
index 89a57fd..3a083f8 100755
--- a/video/mkvtoolnix/DETAILS
+++ b/video/mkvtoolnix/DETAILS
@@ -1,14 +1,12 @@
            SPELL=mkvtoolnix
-         VERSION=2.8.0
+         VERSION=2.9.8
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.bunkus.org/videotools/mkvtoolnix/sources/$SOURCE
         WEB_SITE=http://www.bunkus.org/videotools/mkvtoolnix/
-     
SOURCE_HASH=sha512:54790e2dfbaa37e9162d871bedb75e176b186b3a198e7f7d19cb374ca5a9b422a4ac41fe86a422b94536d5e11f6d5186257b1fa7ddc82854d101f026b1b1c8f9
-#      SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+     
SOURCE_HASH=sha512:0768f04205f82aed92ae9b3452df224e35ce95cee8912575f0c998b4e694d11f221b731e49f35c17283a09b5836e05e7d513030dd7af8da31d277d9e09595e12
       LICENSE[0]=GPL
          ENTERED=20030520
-         UPDATED=20041120
         KEYWORDS="video"
            SHORT="MKVtoolnix will evolve into a set of tools to create, 
alter and inspect Matroska files under Linux and other Unices"
 cat << EOF
diff --git a/video/mkvtoolnix/HISTORY b/video/mkvtoolnix/HISTORY
index 2206627..e5b8476 100644
--- a/video/mkvtoolnix/HISTORY
+++ b/video/mkvtoolnix/HISTORY
@@ -1,3 +1,10 @@
+2009-08-30 Quentin Rameau <quinq AT sourcemage.org>
+       * DETAILS: updated to version 2.9.8
+       * DEPENDS: added dependencies on libebml, libogg, zlib,
+         added optional dependencies on QT, file,
+         removed dependency on pcre
+         removed workaround for /usr/lib64
+
 2009-08-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * TRIGGERS: on_cast boost cast_self