[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./Makefile.am doc/omf.make doc/xmldocs.ma...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./Makefile.am doc/omf.make doc/xmldocs.ma... |
Date: |
Fri, 07 Apr 2006 00:59:43 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/04/07 00:59:43
Modified files:
. : Makefile.am
doc : omf.make xmldocs.make
doc/C : Makefile.am gnash-C.omf gnash.xml internals.xml
plugin.xml
macros : ghelp.m4
testsuite/actionscript.all: Makefile.am
Log message:
Update manuakl now that the plugin works correctly. Reenable Ghelp.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/omf.make.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/xmldocs.make.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/gnash-C.omf.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/gnash.xml.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/internals.xml.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/plugin.xml.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ghelp.m4.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/actionscript.all/Makefile.am.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
Patches:
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.18 gnash/Makefile.am:1.19
--- gnash/Makefile.am:1.18 Mon Apr 3 04:26:06 2006
+++ gnash/Makefile.am Fri Apr 7 00:59:42 2006
@@ -70,6 +70,13 @@
cp -fr $(srcdir)/packaging/debian gnash-${VERSION}/
(cd gnash-${VERSION}; dpkg-buildpackage)
+snapshot: distdir
+ now=`date -u "+%Y%m%d"`; \
+ mv gnash-${VERSION} gnash-$${now}; \
+ tardir=gnash-$${now} && $(am__tar) | bzip2 -9 -c >
gnash-$${now}.tar.bz2; \
+ $(RM) -fr gnash-$${now}
+
mudflap:
@echo "Rebuilding with GCC Mudflap support"
$(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
+
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.18 gnash/doc/C/Makefile.am:1.19
--- gnash/doc/C/Makefile.am:1.18 Mon Apr 3 04:26:06 2006
+++ gnash/doc/C/Makefile.am Fri Apr 7 00:59:43 2006
@@ -18,9 +18,7 @@
#
# Building a PDF using Apache FOP only works with fop-0.20.5 for now.
-# if GHELP
-# include $(top_srcdir)/doc/xmldocs.make
-# endif
+include $(top_srcdir)/doc/xmldocs.make
STYLESDIR = @docbook_styles@
Index: gnash/doc/C/gnash-C.omf
diff -u gnash/doc/C/gnash-C.omf:1.1 gnash/doc/C/gnash-C.omf:1.2
--- gnash/doc/C/gnash-C.omf:1.1 Thu Feb 9 02:33:53 2006
+++ gnash/doc/C/gnash-C.omf Fri Apr 7 00:59:43 2006
@@ -14,7 +14,7 @@
2006-02-06
</date>
<version identifier="0.1.1" date="2006-02-06" description="First
release."/>
- <subject category="GNOME|Applications|Sound and Video"/>
+ <subject category="GNOME|Applications|Multimedia"/>
<description>
This is the manual for Gnash, a Free flash movie player.
</description>
Index: gnash/doc/C/gnash.xml
diff -u gnash/doc/C/gnash.xml:1.18 gnash/doc/C/gnash.xml:1.19
--- gnash/doc/C/gnash.xml:1.18 Sun Apr 2 22:55:29 2006
+++ gnash/doc/C/gnash.xml Fri Apr 7 00:59:43 2006
@@ -435,6 +435,24 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>-j</term>
+ <listitem>
+ <para>
+ Specify the width of the window. This is mostly used
+ only by the plugin.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-k</term>
+ <listitem>
+ <para>
+ Specify the height of the window. This is mostly used
+ only by the plugin.
+ </para>
+ </listitem>
+ </varlistentry>
<!--
<varlistentry>
<term>-e</term>
Index: gnash/doc/C/internals.xml
diff -u gnash/doc/C/internals.xml:1.15 gnash/doc/C/internals.xml:1.16
--- gnash/doc/C/internals.xml:1.15 Sun Apr 2 21:45:55 2006
+++ gnash/doc/C/internals.xml Fri Apr 7 00:59:43 2006
@@ -161,7 +161,7 @@
One future thought for the plugin is to use the new Firefox
1.5 or greater version of Firefox. This version has added a
drawable canvas window that supports hardware acceleration, and
- is desgined to support things like rendering directly into the
+ is designed to support things like rendering directly into the
canvas without needing OpenGL.
</para>
@@ -179,8 +179,7 @@
There are a few limitations in the current implementation,
but it works well enough to be used for web surfing. The
main limitations are the SDL version has no event handling,
- and the GTK version creates a new popup window to render the
- movie in.
+ and sound doesn't work yet.
</para>
</sect4>
@@ -235,17 +234,6 @@
way the existing keyboard commands do.
</para>
- <para>
- The current implementation has a problem with using
- gtk_plug(), which is supposed to embed one GtkWidget into
- another. A blank window is all that appears to be rendered,
- although the movie is happily being played in the
- background. To get around this problem, the GTK version
- creates a new window to render the movie in. The SDK version
- correctly gets embedded into the browser window, so no new
- window needs to be created. The assumption is this is a
- problem with X11 default visuals.
- </para>
</sect4>
<sect4 id="mozplugger">
Index: gnash/doc/C/plugin.xml
diff -u gnash/doc/C/plugin.xml:1.3 gnash/doc/C/plugin.xml:1.4
--- gnash/doc/C/plugin.xml:1.3 Sun Apr 2 21:45:55 2006
+++ gnash/doc/C/plugin.xml Fri Apr 7 00:59:43 2006
@@ -2,8 +2,8 @@
<title>Mozilla/Firefox Plugin</title>
<para>
- The Mozilla SDK has two layers. The older layer is documented in
- the <ulink type="http"
+ The Mozilla SDK has two API layers for plugins. The older layer is
+ documented in the <ulink type="http"
url="http://www.gnu.org/software/gnash/manual/plugin.pdf">
Geeko Plugin API Reference</ulink>, and the newer layer doesn't
appear to be documented. The new API is simpler, and is portable
Index: gnash/doc/omf.make
diff -u gnash/doc/omf.make:1.7 gnash/doc/omf.make:1.8
--- gnash/doc/omf.make:1.7 Sun Feb 26 15:49:29 2006
+++ gnash/doc/omf.make Fri Apr 7 00:59:42 2006
@@ -32,31 +32,21 @@
omf: omf_timestamp
omf_timestamp: $(omffile)
- @for file in $(omffile); do \
+ for file in $(omffile); do \
$(SCROLLINSTALL) $(docdir)/$(docname).xml $(srcdir)/$$file
$$file.out; \
done
touch omf_timestamp
install-data-hook-omf:
-if GHELP
$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
for file in $(omffile); do \
$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
done
- if test x"$(USER)" = x"root" ; then \
- $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir);\
- else \
- echo "ERROR: you must be root to install scrollkeeper files!";\
- fi
-endif
+ $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
uninstall-local-omf:
- address@hidden file in $(omffile); do \
+ -for file in $(omffile); do \
$(RM) $(DESTDIR)$(omf_dest_dir)/$$file; \
done
-rmdir $(DESTDIR)$(omf_dest_dir)
- if test x"$(USER)" = x"root" ; then \
- $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir);\
- else \
- echo "ERROR: you must be root to uninstall scrollkeeper files!";\
- fi
+ $(SCROLLUPDATE) -v -p $(DESTDIR)$(scrollkeeper_localstate_dir)
Index: gnash/doc/xmldocs.make
diff -u gnash/doc/xmldocs.make:1.4 gnash/doc/xmldocs.make:1.5
--- gnash/doc/xmldocs.make:1.4 Wed Feb 15 23:35:53 2006
+++ gnash/doc/xmldocs.make Fri Apr 7 00:59:43 2006
@@ -39,11 +39,11 @@
docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
# ************** You should not have to edit below this line
*******************
-omf_dir=$(top_srcdir)/omf-install
+#omf_dir=$(top_srcdir)/omf-install
include $(top_srcdir)/doc/omf.make
-all-local: omf
+#all-local: omf
# this interferes with make establishing the proper depandancies, since
# we use SUFFIX rules to build the docs.
@@ -52,9 +52,10 @@
# cd $(srcdir); \
# cp $(entities) $$ourdir
-dist-hook: app-dist-hook
+#dist-hook: app-dist-hook
-app-dist-hook:
+#app-dist-hook:
+dist-hook:
if test "$(figdir)"; then \
$(mkinstalldirs) $(distdir)/$(figdir); \
for file in $(srcdir)/$(figdir)/*.png; do \
@@ -63,7 +64,7 @@
done \
fi
-install-data-local: omf
+install-data-local:
$(mkinstalldirs) $(DESTDIR)$(docdir)
for file in $(xml_files); do \
cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
@@ -76,10 +77,11 @@
done \
fi
-install-data-hook: install-data-hook-omf
-uninstall-local: uninstall-local-doc uninstall-local-omf
+# install-data-hook: install-data-hook-omf
+# uninstall-local: uninstall-local-doc uninstall-local-omf
-uninstall-local-doc:
+#uninstall-local-doc:
+uninstall-local:
-if test "$(figdir)"; then \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
@@ -92,3 +94,8 @@
done
-rmdir $(DESTDIR)$(docdir)
+if GHELP
+all-local: omf
+install-data-hook: omf install-data-hook-omf
+uninstall-hook: uninstall-hook-omf
+endif
Index: gnash/macros/ghelp.m4
diff -u gnash/macros/ghelp.m4:1.7 gnash/macros/ghelp.m4:1.8
--- gnash/macros/ghelp.m4:1.7 Wed Mar 29 05:42:41 2006
+++ gnash/macros/ghelp.m4 Fri Apr 7 00:59:43 2006
@@ -52,17 +52,9 @@
[$PATH:/usr/bin/X11:/usr/local/bin/X11:/opt/X11])
AC_PATH_PROG(SCROLLINSTALL, scrollkeeper-preinstall, [],
[$PATH:/usr/bin/X11:/usr/local/bin/X11:/opt/X11])
- if test x"${SCROLLKEEPER}" != x"" ; then
- AC_MSG_CHECKING([the path to install under scrollkeeper])
- ghelp_install=`$SCROLLKEEPER --prefix`
- AC_MSG_RESULT(${ghelp_install})
- if test x"${ghelp_install}" = x"/usr"; then
- AC_MSG_WARN([You will need to be root to install under scrollkeeper])
- fi
+ if test x"$SCROLLKEEPER" = x -o x"$SCROLLUPDATE" = x -o x"$SCROLLINSTALL"
= x ; then
+ ghelp=no
+ AC_MSG_WARN([You need to install scrollkeeper for gnome help])
fi
fi
- if test x"$SCROLLKEEPER" = x -o x"$SCROLLUPDATE" = x -o x"$SCROLLINSTALL" =
x ; then
- ghelp=no
- AC_MSG_WARN([You need to install scrollkeeper for gnome help])
- fi
])
Index: gnash/testsuite/actionscript.all/Makefile.am
diff -u gnash/testsuite/actionscript.all/Makefile.am:1.19
gnash/testsuite/actionscript.all/Makefile.am:1.20
--- gnash/testsuite/actionscript.all/Makefile.am:1.19 Tue Apr 4 20:42:56 2006
+++ gnash/testsuite/actionscript.all/Makefile.am Fri Apr 7 00:59:43 2006
@@ -78,10 +78,11 @@
XML.swf \
Function.swf
-EXTRA_DIST = $(GENERATED:.swf=.as) $(GENERATED)
+EXTRA_DIST = $(GENERATED:.swf=.as)
if ENABLE_MING
TARGET = $(GENERATED)
+EXTRA_DIST += $(GENERATED)
else
TARGET =
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./Makefile.am doc/omf.make doc/xmldocs.ma...,
Rob Savoye <=