[Lunar-commits] <moonbase> gpac: A little adjustment to the DEPENDS and BUILD. Removing the

[Dennis `stumbles` Veatch]

commit b9502d27d177cc4690e090c125149b5a5afaad48
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Feb 8 08:48:00 2011 -0500

    gpac: A little adjustment to the DEPENDS and BUILD. Removing the
    
    BUILD.x86_64 and using some logic in BUILD for detection.
---
 video/gpac/BUILD        |   12 +++++++++++-
 video/gpac/BUILD.x86_64 |   13 -------------
 video/gpac/DEPENDS      |   22 ++++++++++++++++++++--
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/video/gpac/BUILD b/video/gpac/BUILD
index b1e4326..15bbf16 100644
--- a/video/gpac/BUILD
+++ b/video/gpac/BUILD
@@ -1,8 +1,18 @@
 (
 
+  if [ `arch` == "x86_64" ] ; then
+      CFLAGS="-fPIC" &&
+      OPTS+=" --extra-cflags=-fPIC"
+  fi &&
+
+  if module_installed xulrunner ; then
+    XUL_VER=`lvu version xulrunner` &&
+    OPTS+=" --xulsdk-path=/usr/lib/xulrunner-devel-$XUL_VER/"
+  fi &&
+
   chmod +x configure  &&
 
-  OPTS+=" --mozdir=/opt/lunar/plugins --cpu=$CPU"
+  OPTS+=" --mozdir=/opt/lunar/plugins --cpu=$CPU --strip"
 
   default_build       &&
 
diff --git a/video/gpac/BUILD.x86_64 b/video/gpac/BUILD.x86_64
deleted file mode 100644
index 5b9493c..0000000
--- a/video/gpac/BUILD.x86_64
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
-  chmod +x configure  &&
-
-  CFLAGS="-fPIC"
-
-  OPTS="$OPTS --mozdir=/opt/lunar/plugins --cpu=$CPU --extra-cflags=-fPIC"
-
-  default_build       &&
-
-  make install-lib
-
-) > $C_FIFO 2>&1
diff --git a/video/gpac/DEPENDS b/video/gpac/DEPENDS
index 3ff092a..85fd920 100644
--- a/video/gpac/DEPENDS
+++ b/video/gpac/DEPENDS
@@ -6,13 +6,31 @@ optional_depends faad      ""                   ""                     \
                            "for AAC audio decoder support"
 optional_depends freetype2 ""                   ""                     \
                            "for freetype font support"
-optional_depends spidermonkey ""                ""                     \
+
+optional_depends spidermonkey ""                   \
+                              " --use-js=local"     \
                            "for JavaScript support"
+
 optional_depends wxGTK     ""                   "--disable-wx"         \
                            "for wxWindows support"
-optional_depends openjpeg  ""                   ""                     \
+
+optional_depends openjpeg  "--use-openjpeg=system" \
+                           "--use-openjpeg=local"  \
                            "for jpeg2000 formats"
+
 optional_depends %JPEG     ""                   ""                     \
                            "for jpeg support"
 optional_depends libpng    ""                   ""                     \
                            "for png support"
+
+optional_depends libtheora " --use-theora=system"  \
+                           " --use-theora=local"   \
+                           "for theora audio support"
+optional_depends libogg    "--use-ogg=system"   \
+                           "--use-ogg=local"    \
+                           "for ogg audio support"
+
+optional_depends openssl   "--enable-ssl"  \
+                           "--disable-ssl" \
+                           "for openssl support"
+