gephex--main--0.4--patch-1869

Archive: [email protected]
New revision: gephex--main--0.4--patch-1869

--
Revision: gephex--main--0.4--patch-1869
Archive: [email protected]
Creator: The Gephex Source Archive <[email protected]>
Date: Thu Mar 31 20:46:08 CEST 2005
Standard-date: 2005-03-31 18:46:08 GMT
Modified-files: AUTHORS configure.ac doc/Makefile.am
    doc/documentation.xml
New-patches: [email protected]/gephex--macport--0.4--patch-33
    [email protected]/gephex--macport--0.4--patch-34
    [email protected]/gephex--macport--0.4--patch-35
    [email protected]/gephex--main--0.4--patch-1869
Summary: [MERGE-REQUEST] Makefile rules for pdf documentation using fop, updated AUTHORS, added configure message if nasm is missing
Keywords: 

Patches applied:

 * [email protected]/gephex--macport--0.4--patch-33
   Added makefile rules for creating pdf docu with fop

 * [email protected]/gephex--macport--0.4--patch-34
   Added note when nasm is missing

 * [email protected]/gephex--macport--0.4--patch-35
   Updated AUTHORS file

* added files

    {arch}/gephex/gephex--macport/gephex--macport--0.4/[email protected]/patch-log/patch-33
    {arch}/gephex/gephex--macport/gephex--macport--0.4/[email protected]/patch-log/patch-34
    {arch}/gephex/gephex--macport/gephex--macport--0.4/[email protected]/patch-log/patch-35
    {arch}/gephex/gephex--main/gephex--main--0.4/[email protected]/patch-log/patch-1869

* modified files

--- orig/AUTHORS
+++ mod/AUTHORS
@@ -1,27 +1,27 @@
+Core Developers:
+
 Georg Seidel <[email protected]>
 Martin Bayer <[email protected]>
 Phillip Promesberger <[email protected]>
 
-Some files inside effectvmodules are from the EffecTV project
-(all paths relative to 'effectvmodules/src/'):
+Module developers:
+
+Michael Mandl <[email protected]>
+Sven Schnelle <[email protected]>
+
+
+Some files inside effectvmodules are taken from the EffecTV project
+(path relative to 'effectvmodules/src/'):
+
+effectXmodule/X.c
 
-effectvagingmodule/aging.c
-effectvburnmodule/burn.c
-effectvcyclemodule/cycle.c
-effectvdotmodule/dot.c
-effectvdotmodule/heart.inc
-effectvedgemodule/edge.c
-effectvfiremodule/fire.c
-effectvlensmodule/lens.c
-effectvlifemodule/life.c
-effectvpuzzlemodule/puzzle.c
-effectvquarkmodule/quark.c
-effectvsparkmodule/spark.c
+where X is the name of the effecTV effect.
 
 libeffectv/libeffectv.c (contains some wrapper code)
 
 The files are taken from the 0.3.8 and 0.3.9 release.
-All files except libeffectv.c are unmodified.
+Most files except libeffectv.c are unmodified, some contain
+small changes (event handling commented out, ...)
 
 Please look at these files and http://effectv.sourceforge.net
 for the copyright.


--- orig/configure.ac
+++ mod/configure.ac
@@ -327,7 +327,10 @@
 if test "x$enable_mmx" = "xyes"; then
 	AC_PATH_PROG(NASM, nasm)
 	if test "x$NASM" = "x"; then
-        	AC_MSG_ERROR([*** 'nasm' missing, please install or fix your \$PATH ***])
+        	AC_MSG_ERROR([*** 'nasm' missing, please install or fix your 
+\$PATH ***
+Note: you can disable mmx by using the "--disable-mmx" parameter. In this
+case nasm will not be required.])
 	fi
 
         NASM_FLAGS="-f elf -O1"


--- orig/doc/Makefile.am
+++ mod/doc/Makefile.am
@@ -34,3 +34,9 @@
 
 documentation.html: $(srcdir)/documentation.xml  $(srcdir)/module-api*.xml  $(srcdir)/type-api*.xml $(srcdir)/images/*.png
 	if test "x${DBXSLDIR}" = "x"; then touch documentation.html; else xsltproc --xinclude --param shade.verbatim 1 -o documentation.html ${DBXSLDIR}/html/docbook.xsl $(srcdir)/documentation.xml; fi
+
+documentation.fo: $(srcdir)/documentation.xml  $(srcdir)/module-api*.xml  $(srcdir)/type-api*.xml $(srcdir)/images/*.png
+	if test "x${DBXSLDIR}" = "x"; then touch documentation.fo; else xsltproc --stringparam draft.mode no --stringparam fop.extensions 1 --xinclude --param shade.verbatim 1 -o documentation.fo ${DBXSLDIR}/fo/docbook.xsl $(srcdir)/documentation.xml; fi
+
+documentation.pdf: $(srcdir)/documentation.fo 
+	if test "x${DBXSLDIR}" = "x"; then touch documentation.pdf; else fop -d documentation.fo documentation.pdf; fi


--- orig/doc/documentation.xml
+++ mod/doc/documentation.xml
@@ -1837,8 +1837,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="module-api-setOutput.xml" />
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="module-api-update.xml" />
 
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="module-api-update.xml" />
-
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="module-api-getInputAttributes.xml" />
 
 </sect3>