Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 dev/null                                    |binary
 video/handbrake/DEPENDS                     |   12 ++++++++++++
 video/handbrake/DETAILS                     |    2 +-
 video/handbrake/HISTORY                     |    8 ++++++++
 video/handbrake/HandBrake-0.9.5.tar.bz2.sig |    0 
 video/handbrake/HandBrake-0.9.6.tar.bz2.sig |binary
 video/handbrake/PRE_BUILD                   |    9 +++++++++
 7 files changed, 30 insertions(+), 1 deletion(-)

New commits:
commit e518c330e50f5c8ce55c82e84f03795c93be8523
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    handbrake: Updated to 0.9.6
    Matches upstream posted MD5
    Requires fribidi for biderectional unicode text
    Requires gcc with CXX (g++)
    Optionally depends on yasm
    Fix compilation if your fribidi is built with glib2
    
    I can now rip my Thor DVD. :)

diff --git a/video/handbrake/DEPENDS b/video/handbrake/DEPENDS
index 3bbc295..d79ee86 100755
--- a/video/handbrake/DEPENDS
+++ b/video/handbrake/DEPENDS
@@ -1,10 +1,22 @@
+depends  -sub "CXX" gcc  &&
 depends  $HANDBRAKE_FETCH  "--fetch=$HANDBRAKE_FETCH" &&
+depends  fribidi  &&
 depends  python &&
 depends  hal    &&
 
+optional_depends  'gstreamer'  \
+                  '--enable-gst'  \
+                  '--disable-gst'  \
+                  'enable live preview (works only in GUI)'  &&
+
 optional_depends  'gtk+2'  \
                   '--enable-gtk'  \
                   '--disable-gtk'  \
                   'for GTK+ GUI' &&
 
+optional_depends  'yasm'  \
+                  '--enable-local-yasm'  \
+                  '--disable-local-yasm'  \
+                  'build and use local yasm'  &&
+
 suggest_depends  'libdvdcss'  '' '' 'for DVD CSS decryption'
diff --git a/video/handbrake/DETAILS b/video/handbrake/DETAILS
index 34fca71..601ca83 100755
--- a/video/handbrake/DETAILS
+++ b/video/handbrake/DETAILS
@@ -1,5 +1,5 @@
            SPELL=handbrake
-         VERSION=0.9.5
+         VERSION=0.9.6
           SOURCE=HandBrake-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/HandBrake-$VERSION
    SOURCE_URL[0]=http://handbrake.fr/rotation.php?file=$SOURCE
diff --git a/video/handbrake/HISTORY b/video/handbrake/HISTORY
index cdf1c58..edf35f8 100644
--- a/video/handbrake/HISTORY
+++ b/video/handbrake/HISTORY
@@ -1,3 +1,11 @@
+2012-05-05 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 0.9.6
+         Matches upstream posted MD5
+       * DEPENDS: Requires fribidi for biderectional unicode text
+         Requires gcc with CXX (g++)
+         Optionally depends on yasm
+       * PRE_BUILD: Fix compilation if your fribidi is built with glib2
+
 2011-03-31 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.5
 
diff --git a/video/handbrake/HandBrake-0.9.5.tar.bz2.sig 
b/video/handbrake/HandBrake-0.9.5.tar.bz2.sig
deleted file mode 100644
index 9966466..0000000
Binary files a/video/handbrake/HandBrake-0.9.5.tar.bz2.sig and /dev/null 
differ
diff --git a/video/handbrake/HandBrake-0.9.6.tar.bz2.sig 
b/video/handbrake/HandBrake-0.9.6.tar.bz2.sig
new file mode 100644
index 0000000..f8b2a96
Binary files /dev/null and b/video/handbrake/HandBrake-0.9.6.tar.bz2.sig 
differ
diff --git a/video/handbrake/PRE_BUILD b/video/handbrake/PRE_BUILD
new file mode 100755
index 0000000..44a0c21
--- /dev/null
+++ b/video/handbrake/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+#
+# Fix compilation if our fribidi is built against glib2
+# as upstream specifically disabled fribidi's glib2 option
+#
+if is_depends_enabled fribidi glib2; then
+  sedit 's:FRIBIDI_USE_GLIB=0:FRIBIDI_USE_GLIB=1:' 
"${SOURCE_DIRECTORY}"/contrib/fribidi/P01-darwin-no-glib.patch &&
+  sedit "s:FRIBIDI_CFLAGS=.*:FRIBIDI_CFLAGS=\"-I\$(call 
fn.ABSOLUTE,\$(CONTRIB.build/))include 
-I${INSTALL_ROOT}/usr/include/glib-2.0/ 
-I${INSTALL_ROOT}/usr/lib/glib-2.0/include/\":" 
"${SOURCE_DIRECTORY}"/contrib/libass/module.defs
+fi