[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1205-g43e7d50

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  43e7d505fb7ffbddc0dd42d20c4862780aff752b (commit)
       via  489a3787f3fc16d930454ea9bb94b7ade37d5b63 (commit)
      from  aa803ed2a25bf1bbcdeea3beb7d5ee35e52dca57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=43e7d505fb7ffbddc0dd42d20c4862780aff752b


commit 43e7d505fb7ffbddc0dd42d20c4862780aff752b
Author: Rob Savoye <address@hidden>
Date:   Fri Oct 7 12:48:10 2011 -0600

    for distcheck, set cxxflags to -O0 to speed up builds. Only use SUBDIRS, as 
automake groks the correct optional directories. Otherwise directories appear 
twice, causing distcheck to fail.

diff --git a/Makefile.am b/Makefile.am
index 06a844a..5c53561 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,13 +36,15 @@ noinst_SCRIPT = autogen.sh
 ## --prefix is given, but that's another story --strk)
 ##
 ## We also want to build everything possible, since we're
-## testing builds.
+## testing builds. We also don't use optimization, is makes
+## the build go faster.
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-plugins-install=prefix \
        --enable-extensions=all \
        --enable-gui=all \
        --enable-python \
-       --enable-cygnal
+       --enable-cygnal \
+       CXXFLAGS="-O0"
 
 # Only build all devices on Linux, as Input Events are
 # primarily a Linux only thing.
@@ -58,7 +60,15 @@ if BUILD_DEVICES
 DEVICES_DIR = libdevice
 endif
 
-STD_DIRS = \
+if TESTSUITE
+TEST_DIR = testsuite
+endif
+
+if BUILD_EXTENSIONS
+EXT_DIR = extensions
+endif
+
+SUBDIRS = \
        desktop \
        libbase \
        libmedia \
@@ -70,23 +80,12 @@ STD_DIRS = \
        plugin \
        $(CYGNAL_DIR) \
        utilities \
+       $(EXT_DIR) \
        doc \
        po \
+       $(TEST_DIR) \
        $(NULL)
 
-SUBDIRS = $(STD_DIRS)
-# all optional build directories must be in DIST_SUBDIRS to be
-# included in the source tarball.
-DIST_SUBDIRS = $(STD_DIRS) cygnal libdevice extensions testsuite
-
-if TESTSUITE
-SUBDIRS += testsuite
-endif
-
-if BUILD_EXTENSIONS
-SUBDIRS += extensions
-endif
-
 # man_MANS = doc/gnash.1 doc/gprocessor.1 doc/dumpshm.1 soldumper.1
 
 EXTRA_DIST =  \

http://git.savannah.gnu.org/cgit//commit/?id=489a3787f3fc16d930454ea9bb94b7ade37d5b63


commit 489a3787f3fc16d930454ea9bb94b7ade37d5b63
Author: Rob Savoye <address@hidden>
Date:   Fri Oct 7 12:28:16 2011 -0600

    minor reformatting

diff --git a/libcore/asobj/Video_as.cpp b/libcore/asobj/Video_as.cpp
index 054f7f1..66b1bfa 100644
--- a/libcore/asobj/Video_as.cpp
+++ b/libcore/asobj/Video_as.cpp
@@ -47,7 +47,9 @@ createVideoObject(Global_as& gl)
 {
     as_object* obj = getObjectWithPrototype(gl, NSV::CLASS_VIDEO);
     as_object* proto = obj->get_prototype();
-    if (proto) attachPrototypeProperties(*proto);
+    if (proto) {
+        attachPrototypeProperties(*proto);
+    }
     return obj;
 }
 
@@ -60,8 +62,8 @@ video_class_init(as_object& global, const ObjectURI& uri)
     as_object* cl = gl.createClass(emptyFunction, proto);
     attachVideoInterface(*proto);
 
-       // Register _global.Video
-       global.init_member(uri, cl, as_object::DefaultFlags);
+    // Register _global.Video
+    global.init_member(uri, cl, as_object::DefaultFlags);
 }
 
 void
@@ -81,8 +83,8 @@ void
 attachVideoInterface(as_object& o)
 {
     VM& vm = getVM(o);
-       o.init_member("attachVideo", vm.getNative(667, 1));
-       o.init_member("clear", vm.getNative(667, 2));
+    o.init_member("attachVideo", vm.getNative(667, 1));
+    o.init_member("clear", vm.getNative(667, 2));
 }
 
 void
@@ -105,35 +107,33 @@ attachPrototypeProperties(as_object& proto)
 as_value
 video_attach(const fn_call& fn)
 {
-       Video* video = ensure<IsDisplayObject<Video> >(fn);
-
-       if (fn.nargs < 1)
-       {
-               IF_VERBOSE_ASCODING_ERRORS(
-               log_aserror(_("attachVideo needs 1 arg"));
-               );
-               return as_value();
-       }
-
+    Video* video = ensure<IsDisplayObject<Video> >(fn);
+    
+    if (fn.nargs < 1) {
+        IF_VERBOSE_ASCODING_ERRORS(
+            log_aserror(_("attachVideo needs 1 arg"));
+            );
+        return as_value();
+    }
+    
     as_object* obj = toObject(fn.arg(0), getVM(fn));
-       NetStream_as* ns;
-
+    NetStream_as* ns;
+    
     if (isNativeType(obj, ns)) {
                video->setStream(ns);
-       }
-       else {
-               IF_VERBOSE_ASCODING_ERRORS(
-               log_aserror(_("attachVideo(%s) first arg is not a NetStream 
instance"),
+    } else {
+        IF_VERBOSE_ASCODING_ERRORS(
+            log_aserror(_("attachVideo(%s) first arg is not a NetStream 
instance"),
                        fn.arg(0));
-               );
-       }
-       return as_value();
+            );
+    }
+    return as_value();
 }
 
 as_value
 video_deblocking(const fn_call& fn)
 {
-       Video* video = ensure<IsDisplayObject<Video> >(fn);
+    Video* video = ensure<IsDisplayObject<Video> >(fn);
     UNUSED(video);
 
     log_unimpl("Video.deblocking");
@@ -143,9 +143,11 @@ video_deblocking(const fn_call& fn)
 as_value
 video_smoothing(const fn_call& fn)
 {
-       Video* video = ensure<IsDisplayObject<Video> >(fn);
+    Video* video = ensure<IsDisplayObject<Video> >(fn);
 
-    if (!fn.nargs) return as_value(video->smoothing());
+    if (!fn.nargs) {
+        return as_value(video->smoothing());
+    }
 
     const bool smooth = toBool(fn.arg(0), getVM(fn));
     video->setSmoothing(smooth);
@@ -156,24 +158,30 @@ video_smoothing(const fn_call& fn)
 as_value
 video_width(const fn_call& fn)
 {
-       Video* video = ensure<IsDisplayObject<Video> >(fn);
+    Video* video = ensure<IsDisplayObject<Video> >(fn);
     return as_value(video->width());
 }
 
 as_value
 video_height(const fn_call& fn)
 {
-       Video* video = ensure<IsDisplayObject<Video> >(fn);
+    Video* video = ensure<IsDisplayObject<Video> >(fn);
     return as_value(video->height());
 }
 
 as_value
 video_clear(const fn_call& fn)
 {
-       Video* video = ensure<IsDisplayObject<Video> >(fn);
+    Video* video = ensure<IsDisplayObject<Video> >(fn);
     video->clear();
     return as_value();
 }
 
 } // anonymous namespace
 } // namespace gnash
+
+// local Variables:
+// mode: C++
+// indent-tabs-mode: nil
+// End:
+

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                |   31 +++++++++----------
 libcore/asobj/Video_as.cpp |   68 ++++++++++++++++++++++++-------------------
 2 files changed, 53 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
Gnash