[Lunar-commits] <moonbase> mkvtoolnix: Don't know how this could possibly have worked. They switched to

[Dennis `stumbles` Veatch]

commit 437b97ce43cb250f251a2c9c1bd2b0f3e9a370f8
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Nov 5 08:23:20 2010 -0400

    mkvtoolnix: Don't know how this could possibly have worked. They switched to
    
    a ruby make process so our default_build/default_make will not work. Luckily they
    have included a ruby equivalent; drake. Adjusting the BUILD accordingly and leaving
    the qt4 related stuff in the BUILD with some alterations.
    
    Also disabling the qt4 gui in DEPENDS for the time being. The make will crap out on
    a missing include file from mkvtoolnix.
---
 video/mkvtoolnix/BUILD     |   17 ++++++++++++++---
 video/mkvtoolnix/CONFIGURE |    1 +
 video/mkvtoolnix/DEPENDS   |   36 +++++++++++++++++++++++++++---------
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/video/mkvtoolnix/BUILD b/video/mkvtoolnix/BUILD
index 94c5b46..999fa9d 100644
--- a/video/mkvtoolnix/BUILD
+++ b/video/mkvtoolnix/BUILD
@@ -1,7 +1,18 @@
 (
 
-  . /etc/profile.d/qt4.rc
-  sedit 's:console_show_element(level, text, position):console_show_element(level, text, position, size):' src/info/qt_ui.cpp  &&
-  default_build
+# If you choose the qt4 GUI then ./configure craps out with -j $MAKES but works fine if you
+# say no to qt4 GUI. 
+  if in_depends $MODULE qt4 ; then
+    sedit "s:ui/mainwindow.h:ui/mainwindow.ui:" src/info/qt_ui.h &&
+    . /etc/profile.d/qt4.rc &&
+    default_config &&
+    ./drake 
+   else
+    default_config &&
+  ./drake -j $MAKES 
+  fi &&
+
+  prepare_install &&
+  ./drake install 
 
 ) > $C_FIFO 2>&1
diff --git a/video/mkvtoolnix/CONFIGURE b/video/mkvtoolnix/CONFIGURE
new file mode 100644
index 0000000..40c13f8
--- /dev/null
+++ b/video/mkvtoolnix/CONFIGURE
@@ -0,0 +1 @@
+mquery USE_OPTS "compile with optimization: -O3?" y "--enable-optimization" "--disable-optimization"
diff --git a/video/mkvtoolnix/DEPENDS b/video/mkvtoolnix/DEPENDS
index 523db34..27069c6 100644
--- a/video/mkvtoolnix/DEPENDS
+++ b/video/mkvtoolnix/DEPENDS
@@ -1,15 +1,33 @@
-depends  boost
 depends  libmatroska
-depends  lzo
 depends  libvorbis
 
-optional_depends  "flac"  \
-                  ""      \
-                  ""      \
+
+optional_depends  "bzip2"             \
+                  "--enable-bz2"      \
+                  "--disable-bz2"     \
+                  "for bzip compression support"
+
+optional_depends  "lzo"                \
+                  "--enable-lzo"       \
+                  "--disable-lzo"      \
+                  "for lzo support"
+
+optional_depends  "flac"                \
+                  "--with-flac"         \
+                  "--without-flac"      \
                   "for flac audio codec" 
 
-optional_depends  "qt4"                       \
-                  "--enable-qt --enable-gui"  \
-                  ""                          \
-                  "for Qt based GUI" 
+optional_depends  "boost"             \
+                  "--with-boost"      \
+                  "--without-boost"   \
+                  "for boost support"
+
+#optional_depends  "qt4"                       \
+#                  "--enable-qt --enable-gui"  \
+#                  "--disable-qt"              \
+#                  "for Qt based GUI" 
 
+optional_depends  "wxGTK"                           \
+                  "--enable-wxwidgets --enable-gui" \
+                  "--disable-wxwidgets"             \
+                  "for wxwidget gui support"