isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

2007-06-16 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-actor.c:
        Fix typo in x rotation transform (Thanks to Johan Billen #138)

        * configure.ac:
        * doc/manual/Makefile.am:
        Fix manual build and required program check.

        * tests/Makefile.am:
        Another typo fix.
This commit is contained in:
Matthew Allum 2007-06-15 23:15:34 +00:00
parent 0c5546007c
commit 53301e1bba
5 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-06-16 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-actor.c:
Fix typo in x rotation transform (Thanks to Johan Billen #138)
* configure.ac:
* doc/manual/Makefile.am:
Fix manual build and required program check.
* tests/Makefile.am:
Another typo fix.
2007-06-15 Tomas Frydrych <tf@openedhand.com> 2007-06-15 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-actor.c: * clutter/clutter-actor.c:

2
clutter/clutter-actor.c
View File

@ -595,7 +595,7 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self)
if (priv->rxang) if (priv->rxang)
{ {
cogl_translate (0, priv->rxy, priv->z + priv->rxz); cogl_translate (0, priv->rxy, priv->z + priv->rxz);
cogl_rotatex (priv->rxang, CFX_ONE, 0, CFX_ONE); cogl_rotatex (priv->rxang, CFX_ONE, 0, 0);
cogl_translate (0, -priv->rxy, -(priv->z - priv->rxz)); cogl_translate (0, -priv->rxy, -(priv->z - priv->rxz));
} }

13
configure.ac
View File

@ -263,10 +263,15 @@ AC_ARG_ENABLE(manual,
enable_manual=$enableval, enable_manual=no) enable_manual=$enableval, enable_manual=no)
if "x$enable_manual" = "xyes"; then if "x$enable_manual" = "xyes"; then
AC_PATH_PROG(JW, jw) AC_PATH_PROG(HAVE_JW, jw, no)
AC_PATH_PROG(XMLTO, xmlto) if test "x$HAVE_JW" = "xno"; then
AC_SUBST(JW) AC_MSG_ERROR(['jw' program not found in path - required for building manual.])
AC_SUBST(XMLTO) fi
AC_PATH_PROG(HAVE_XMLTO, xmlto, no)
if test "x$HAVE_XMLTO" = "xno"; then
AC_MSG_ERROR(['xmlto' program not found in path - required for building manual.])
fi
fi fi
AM_CONDITIONAL(ENABLE_MANUAL, test x$enable_manual != xno) AM_CONDITIONAL(ENABLE_MANUAL, test x$enable_manual != xno)

6
doc/manual/Makefile.am
View File

@ -5,19 +5,19 @@ EXTRA_DIST = clutter-manual.xml.in manual.xsl style.css $(srcdir)/$(IMAGE_FILES
CLEANFILES = pdf-build.stamp txt-build.stamp htmldoc-build.stamp clutter-manual.xml CLEANFILES = pdf-build.stamp txt-build.stamp htmldoc-build.stamp clutter-manual.xml
pdf-build.stamp: clutter-manual.xml pdf-build.stamp: clutter-manual.xml
SP_ENCODING=XML SP_CHARSET_FIXED=YES $(JW) \ SP_ENCODING=XML SP_CHARSET_FIXED=YES jw \
-b pdf $(srcdir)/clutter-manual.xml && \ -b pdf $(srcdir)/clutter-manual.xml && \
mv $(srcdir)/clutter-manual.pdf clutter-manual-@CLUTTER_MAJORMINOR@.pdf && \ mv $(srcdir)/clutter-manual.pdf clutter-manual-@CLUTTER_MAJORMINOR@.pdf && \
touch pdf-build.stamp touch pdf-build.stamp
txt-build.stamp: clutter-manual.xml txt-build.stamp: clutter-manual.xml
$(XMLTO) txt $(srcdir)/clutter-manual.xml && \ xmlto txt $(srcdir)/clutter-manual.xml && \
mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_MAJORMINOR@.txt && \ mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_MAJORMINOR@.txt && \
touch txt-build.stamp touch txt-build.stamp
htmldoc-build.stamp: clutter-manual.xml htmldoc-build.stamp: clutter-manual.xml
$(mkinstalldirs) html && \ $(mkinstalldirs) html && \
$(XMLTO) -m manual.xsl -o html/ xhtml $(srcdir)/clutter-manual.xml && \ xmlto -m manual.xsl -o html/ xhtml $(srcdir)/clutter-manual.xml && \
cp $(srcdir)/style.css html/ && \ cp $(srcdir)/style.css html/ && \
touch htmldoc-build.stamp touch htmldoc-build.stamp

2
tests/Makefile.am
View File

@ -11,7 +11,7 @@ test_textures_SOURCES = test-textures.c
test_events_SOURCES = test-events.c test_events_SOURCES = test-events.c
test_offscreen_SOURCES = test-offscreen.c test_offscreen_SOURCES = test-offscreen.c
test_scale_SOURCES = test-scale.c test_scale_SOURCES = test-scale.c
test_actor_SOURCES = test-actors.c test_actors_SOURCES = test-actors.c
test_behave_SOURCES = test-behave.c test_behave_SOURCES = test-behave.c
test_text_SOURCES = test-text.c test_text_SOURCES = test-text.c
test_entry_SOURCES = test-entry.c test_entry_SOURCES = test-entry.c