Merge lp:~darkxst/ubuntu/saucy/clutter-1.0/lp963925 into lp:ubuntu/saucy/clutter-1.0
- Saucy (13.10)
- lp963925
- Merge into saucy
Proposed by
Tim Lunn
Status: | Merged |
---|---|
Merge reported by: | Iain Lane |
Merged at revision: | not available |
Proposed branch: | lp:~darkxst/ubuntu/saucy/clutter-1.0/lp963925 |
Merge into: | lp:ubuntu/saucy/clutter-1.0 |
Diff against target: |
21044 lines (+4799/-4044) 336 files modified
ChangeLog (+175/-0) Makefile.in (+78/-88) NEWS (+52/-0) README (+9/-1) README.in (+8/-0) aclocal.m4 (+38/-78) build/Makefile.in (+58/-66) build/autotools/Makefile.in (+15/-15) build/compile (+7/-2) build/config.guess (+23/-18) build/config.sub (+42/-34) build/depcomp (+268/-185) build/mingw/Makefile.in (+15/-15) build/missing (+150/-265) build/test-driver (+127/-0) build/win32/Makefile.in (+56/-64) build/win32/vs10/Makefile.in (+15/-15) build/win32/vs9/Makefile.in (+15/-15) clutter/Makefile.in (+393/-139) clutter/clutter-gesture-action-private.h (+1/-1) clutter/clutter-gesture-action.c (+80/-41) clutter/clutter-script-parser.c (+2/-2) clutter/clutter-stage.c (+52/-3) clutter/clutter-stage.h (+9/-0) clutter/clutter-tap-action.c (+1/-1) clutter/clutter-version.h (+3/-3) clutter/clutter-zoom-action.c (+23/-21) clutter/clutter.symbols (+1/-0) clutter/config.h.win32 (+2/-2) clutter/wayland/clutter-stage-wayland.c (+17/-0) clutter/x11/clutter-backend-x11.c (+3/-3) configure (+58/-19) configure.ac (+1/-1) debian/changelog (+12/-0) debian/control (+3/-3) debian/control.in (+2/-1) debian/libclutter-1.0-0.symbols (+1/-0) debian/patches/git_cally_weak_pointer.patch (+53/-0) debian/patches/series (+1/-0) doc/Makefile.in (+56/-64) doc/common/Makefile.in (+15/-15) doc/cookbook/Makefile.in (+65/-73) doc/cookbook/examples/Makefile.in (+48/-44) doc/cookbook/html/actors-allocation-notify.html (+3/-3) doc/cookbook/html/actors-composite.html (+1/-1) doc/cookbook/html/actors-non-rectangular.html (+6/-6) doc/cookbook/html/actors-opacity.html (+7/-7) doc/cookbook/html/actors-paint-wrappers.html (+3/-3) doc/cookbook/html/actors.html (+1/-1) doc/cookbook/html/animations-complex.html (+4/-4) doc/cookbook/html/animations-fading.html (+3/-3) doc/cookbook/html/animations-inversion.html (+3/-3) doc/cookbook/html/animations-looping.html (+5/-5) doc/cookbook/html/animations-moving.html (+9/-9) doc/cookbook/html/animations-path.html (+4/-4) doc/cookbook/html/animations-reuse.html (+1/-1) doc/cookbook/html/animations-rotating.html (+11/-11) doc/cookbook/html/animations-scaling.html (+6/-6) doc/cookbook/html/animations.html (+3/-3) doc/cookbook/html/ch01s02.html (+2/-2) doc/cookbook/html/ch01s03.html (+3/-3) doc/cookbook/html/ch01s04.html (+1/-1) doc/cookbook/html/clutter-cookbook.devhelp (+161/-161) doc/cookbook/html/contributing.html (+1/-1) doc/cookbook/html/effects-basic.html (+5/-5) doc/cookbook/html/effects-custom-deform.html (+5/-5) doc/cookbook/html/effects.html (+4/-4) doc/cookbook/html/events-buttons.html (+6/-6) doc/cookbook/html/events-handling-key-events.html (+5/-5) doc/cookbook/html/events-mouse-scroll.html (+5/-5) doc/cookbook/html/events-pointer-motion.html (+6/-6) doc/cookbook/html/events.html (+1/-1) doc/cookbook/html/index.html (+4/-4) doc/cookbook/html/introduction.html (+2/-2) doc/cookbook/html/layouts-bind-constraint.html (+5/-5) doc/cookbook/html/layouts-box.html (+7/-7) doc/cookbook/html/layouts-stacking.html (+7/-7) doc/cookbook/html/layouts.html (+5/-5) doc/cookbook/html/script-signals.html (+5/-5) doc/cookbook/html/script-state.html (+4/-4) doc/cookbook/html/script-ui.html (+4/-4) doc/cookbook/html/script.html (+5/-5) doc/cookbook/html/text-shadow.html (+4/-4) doc/cookbook/html/text.html (+1/-1) doc/cookbook/html/textures-aspect-ratio.html (+4/-4) doc/cookbook/html/textures-crossfade.html (+7/-7) doc/cookbook/html/textures-drawing-with-cairo.html (+3/-3) doc/cookbook/html/textures-image-loading.html (+5/-5) doc/cookbook/html/textures-reflection.html (+4/-4) doc/cookbook/html/textures-sub-textures.html (+5/-5) doc/cookbook/html/textures.html (+2/-2) doc/reference/Makefile.in (+56/-64) doc/reference/cally/Makefile.in (+17/-18) doc/reference/cally/cally-docs.xml (+1/-1) doc/reference/cally/html/CallyActor.html (+1/-1) doc/reference/cally/html/CallyClone.html (+1/-1) doc/reference/cally/html/CallyGroup.html (+1/-1) doc/reference/cally/html/CallyRectangle.html (+1/-1) doc/reference/cally/html/CallyRoot.html (+1/-1) doc/reference/cally/html/CallyStage.html (+1/-1) doc/reference/cally/html/CallyText.html (+1/-1) doc/reference/cally/html/CallyTexture.html (+1/-1) doc/reference/cally/html/CallyUtil.html (+1/-1) doc/reference/cally/html/cally-General-API.html (+1/-1) doc/reference/cally/html/callyannotationglossary.html (+6/-8) doc/reference/cally/html/callybase.html (+2/-2) doc/reference/cally/html/callyobjecthierarchy.html (+1/-1) doc/reference/cally/html/callyobjectindex.html (+1/-1) doc/reference/cally/html/callyobjects.html (+2/-2) doc/reference/cally/html/ch01.html (+2/-2) doc/reference/cally/html/ch02.html (+2/-2) doc/reference/cally/html/clutter-overview.html (+1/-1) doc/reference/cally/html/index.html (+3/-3) doc/reference/cally/html/ix01.html (+1/-1) doc/reference/cally/html/ix02.html (+1/-1) doc/reference/cally/html/ix03.html (+1/-1) doc/reference/cally/html/ix04.html (+1/-1) doc/reference/cally/html/license.html (+1/-1) doc/reference/clutter/Makefile.in (+17/-18) doc/reference/clutter/clutter-docs.xml (+1/-1) doc/reference/clutter/html/ClutterAction.html (+1/-1) doc/reference/clutter/html/ClutterActor.html (+1/-1) doc/reference/clutter/html/ClutterActorMeta.html (+1/-1) doc/reference/clutter/html/ClutterAlignConstraint.html (+1/-1) doc/reference/clutter/html/ClutterAlpha.html (+1/-1) doc/reference/clutter/html/ClutterAnimatable.html (+1/-1) doc/reference/clutter/html/ClutterAnimator.html (+1/-1) doc/reference/clutter/html/ClutterBackend.html (+1/-1) doc/reference/clutter/html/ClutterBehaviour.html (+1/-1) doc/reference/clutter/html/ClutterBehaviourDepth.html (+1/-1) doc/reference/clutter/html/ClutterBehaviourEllipse.html (+1/-1) doc/reference/clutter/html/ClutterBehaviourOpacity.html (+1/-1) doc/reference/clutter/html/ClutterBehaviourPath.html (+1/-1) doc/reference/clutter/html/ClutterBehaviourRotate.html (+1/-1) doc/reference/clutter/html/ClutterBehaviourScale.html (+1/-1) doc/reference/clutter/html/ClutterBinLayout.html (+1/-1) doc/reference/clutter/html/ClutterBindConstraint.html (+1/-1) doc/reference/clutter/html/ClutterBlurEffect.html (+1/-1) doc/reference/clutter/html/ClutterBox.html (+1/-1) doc/reference/clutter/html/ClutterBoxLayout.html (+1/-1) doc/reference/clutter/html/ClutterBrightnessContrastEffect.html (+1/-1) doc/reference/clutter/html/ClutterCairoTexture.html (+1/-1) doc/reference/clutter/html/ClutterCanvas.html (+1/-1) doc/reference/clutter/html/ClutterChildMeta.html (+1/-1) doc/reference/clutter/html/ClutterClickAction.html (+1/-1) doc/reference/clutter/html/ClutterClone.html (+1/-1) doc/reference/clutter/html/ClutterColorizeEffect.html (+1/-1) doc/reference/clutter/html/ClutterConstraint.html (+1/-1) doc/reference/clutter/html/ClutterContainer.html (+1/-1) doc/reference/clutter/html/ClutterContent.html (+1/-1) doc/reference/clutter/html/ClutterDeformEffect.html (+1/-1) doc/reference/clutter/html/ClutterDesaturateEffect.html (+1/-1) doc/reference/clutter/html/ClutterDeviceManager.html (+1/-1) doc/reference/clutter/html/ClutterDragAction.html (+1/-1) doc/reference/clutter/html/ClutterDropAction.html (+1/-1) doc/reference/clutter/html/ClutterEffect.html (+1/-1) doc/reference/clutter/html/ClutterFixedLayout.html (+1/-1) doc/reference/clutter/html/ClutterFlowLayout.html (+1/-1) doc/reference/clutter/html/ClutterGestureAction.html (+1/-1) doc/reference/clutter/html/ClutterGridLayout.html (+1/-1) doc/reference/clutter/html/ClutterGroup.html (+1/-1) doc/reference/clutter/html/ClutterImage.html (+1/-1) doc/reference/clutter/html/ClutterInputDevice.html (+1/-1) doc/reference/clutter/html/ClutterKeyframeTransition.html (+1/-1) doc/reference/clutter/html/ClutterLayoutManager.html (+1/-1) doc/reference/clutter/html/ClutterLayoutMeta.html (+1/-1) doc/reference/clutter/html/ClutterListModel.html (+1/-1) doc/reference/clutter/html/ClutterMedia.html (+1/-1) doc/reference/clutter/html/ClutterModel.html (+1/-1) doc/reference/clutter/html/ClutterModelIter.html (+1/-1) doc/reference/clutter/html/ClutterOffscreenEffect.html (+1/-1) doc/reference/clutter/html/ClutterPageTurnEffect.html (+1/-1) doc/reference/clutter/html/ClutterPaintNode.html (+1/-1) doc/reference/clutter/html/ClutterPanAction.html (+1/-1) doc/reference/clutter/html/ClutterPath.html (+1/-1) doc/reference/clutter/html/ClutterPathConstraint.html (+1/-1) doc/reference/clutter/html/ClutterPropertyTransition.html (+1/-1) doc/reference/clutter/html/ClutterRectangle.html (+1/-1) doc/reference/clutter/html/ClutterRotateAction.html (+1/-1) doc/reference/clutter/html/ClutterScore.html (+1/-1) doc/reference/clutter/html/ClutterScript.html (+1/-1) doc/reference/clutter/html/ClutterScriptable.html (+1/-1) doc/reference/clutter/html/ClutterScrollActor.html (+1/-1) doc/reference/clutter/html/ClutterSettings.html (+1/-1) doc/reference/clutter/html/ClutterShaderEffect.html (+1/-1) doc/reference/clutter/html/ClutterSnapConstraint.html (+1/-1) doc/reference/clutter/html/ClutterStage.html (+1/-1) doc/reference/clutter/html/ClutterState.html (+1/-1) doc/reference/clutter/html/ClutterSwipeAction.html (+1/-1) doc/reference/clutter/html/ClutterTableLayout.html (+1/-1) doc/reference/clutter/html/ClutterTapAction.html (+2/-2) doc/reference/clutter/html/ClutterText.html (+1/-1) doc/reference/clutter/html/ClutterTextBuffer.html (+1/-1) doc/reference/clutter/html/ClutterTexture.html (+1/-1) doc/reference/clutter/html/ClutterTimeline.html (+1/-1) doc/reference/clutter/html/ClutterTransition.html (+1/-1) doc/reference/clutter/html/ClutterTransitionGroup.html (+1/-1) doc/reference/clutter/html/ClutterZoomAction.html (+1/-1) doc/reference/clutter/html/annotation-glossary.html (+33/-47) doc/reference/clutter/html/building-clutter.html (+1/-1) doc/reference/clutter/html/ch01.html (+2/-2) doc/reference/clutter/html/ch02.html (+2/-2) doc/reference/clutter/html/ch03.html (+2/-2) doc/reference/clutter/html/ch04.html (+2/-2) doc/reference/clutter/html/ch05.html (+2/-2) doc/reference/clutter/html/ch06.html (+2/-2) doc/reference/clutter/html/ch07.html (+2/-2) doc/reference/clutter/html/ch08.html (+2/-2) doc/reference/clutter/html/ch09.html (+2/-2) doc/reference/clutter/html/ch10.html (+2/-2) doc/reference/clutter/html/ch11.html (+2/-2) doc/reference/clutter/html/ch12.html (+2/-2) doc/reference/clutter/html/clutter-Base-geometric-types.html (+1/-1) doc/reference/clutter/html/clutter-ClutterGLXTexturePixmap.html (+1/-1) doc/reference/clutter/html/clutter-ClutterWaylandSurface.html (+1/-1) doc/reference/clutter/html/clutter-ClutterX11TexturePixmap.html (+1/-1) doc/reference/clutter/html/clutter-Colors.html (+1/-1) doc/reference/clutter/html/clutter-EGL-Specific-Support.html (+1/-1) doc/reference/clutter/html/clutter-Events.html (+1/-1) doc/reference/clutter/html/clutter-Features.html (+1/-1) doc/reference/clutter/html/clutter-GDK-Specific-Support.html (+1/-1) doc/reference/clutter/html/clutter-General.html (+1/-1) doc/reference/clutter/html/clutter-Implicit-Animations.html (+1/-1) doc/reference/clutter/html/clutter-Intel-CE3100-CE4100-Specific-Support.html (+1/-1) doc/reference/clutter/html/clutter-Key-Bindings.html (+1/-1) doc/reference/clutter/html/clutter-Paint-Nodes.html (+1/-1) doc/reference/clutter/html/clutter-Shaders.html (+1/-1) doc/reference/clutter/html/clutter-Stage-Manager.html (+1/-1) doc/reference/clutter/html/clutter-Unit-conversion.html (+1/-1) doc/reference/clutter/html/clutter-Utilities.html (+1/-1) doc/reference/clutter/html/clutter-Value-intervals.html (+1/-1) doc/reference/clutter/html/clutter-Versioning-Macros.html (+4/-4) doc/reference/clutter/html/clutter-Wayland-compositor-specific-support.html (+1/-1) doc/reference/clutter/html/clutter-Win32-Specific-Support.html (+1/-1) doc/reference/clutter/html/clutter-X11-Specific-Support.html (+1/-1) doc/reference/clutter/html/clutter-overview.html (+1/-1) doc/reference/clutter/html/clutteranimation.html (+2/-2) doc/reference/clutter/html/clutterbackends.html (+2/-2) doc/reference/clutter/html/clutterbase.html (+2/-2) doc/reference/clutter/html/clutterglossary.html (+2/-2) doc/reference/clutter/html/clutterobjecthierarchy.html (+1/-1) doc/reference/clutter/html/clutterobjectindex.html (+1/-1) doc/reference/clutter/html/clutterobjects.html (+2/-2) doc/reference/clutter/html/cluttertools.html (+2/-2) doc/reference/clutter/html/deprecated.html (+2/-2) doc/reference/clutter/html/go01.html (+37/-25) doc/reference/clutter/html/index.html (+3/-3) doc/reference/clutter/html/iterating-paths.html (+1/-1) doc/reference/clutter/html/ix01.html (+1/-1) doc/reference/clutter/html/ix02.html (+1/-1) doc/reference/clutter/html/ix03.html (+1/-1) doc/reference/clutter/html/ix04.html (+1/-1) doc/reference/clutter/html/ix05.html (+1/-1) doc/reference/clutter/html/ix06.html (+1/-1) doc/reference/clutter/html/ix07.html (+1/-1) doc/reference/clutter/html/ix08.html (+1/-1) doc/reference/clutter/html/ix09.html (+1/-1) doc/reference/clutter/html/ix10.html (+1/-1) doc/reference/clutter/html/ix11.html (+1/-1) doc/reference/clutter/html/ix12.html (+1/-1) doc/reference/clutter/html/ix13.html (+1/-1) doc/reference/clutter/html/ix14.html (+1/-1) doc/reference/clutter/html/license.html (+1/-1) doc/reference/clutter/html/migrating-ClutterAnimation.html (+2/-2) doc/reference/clutter/html/migrating-ClutterBehaviour.html (+1/-1) doc/reference/clutter/html/migrating-ClutterEffect.html (+2/-2) doc/reference/clutter/html/migrating-ClutterPath.html (+2/-2) doc/reference/clutter/html/migration.html (+2/-2) doc/reference/clutter/html/pt09.html (+1/-1) doc/reference/clutter/html/running-clutter.html (+1/-1) doc/reference/clutter/html/using-cairo.html (+1/-1) examples/Makefile.in (+48/-44) po/ar.po (+29/-29) po/as.po (+29/-29) po/ast.po (+29/-29) po/az_IR.po (+29/-29) po/be.po (+29/-29) po/bg.po (+29/-29) po/ca.po (+29/-29) po/ca@valencia.po (+29/-29) po/clutter-1.0.pot (+30/-30) po/cs.po (+29/-29) po/da.po (+29/-29) po/de.po (+29/-29) po/el.po (+29/-29) po/en_GB.po (+29/-29) po/eo.po (+29/-29) po/es.po (+29/-29) po/fa.po (+29/-29) po/fi.po (+29/-29) po/fr.po (+29/-29) po/gl.po (+29/-29) po/he.po (+29/-29) po/hi.po (+29/-29) po/id.po (+29/-29) po/it.po (+29/-29) po/ja.po (+29/-29) po/km.po (+29/-29) po/kn.po (+29/-29) po/lt.po (+29/-29) po/lv.po (+29/-29) po/mk.po (+29/-29) po/ml.po (+29/-29) po/nb.po (+29/-29) po/nl.po (+29/-29) po/or.po (+29/-29) po/pa.po (+29/-29) po/pl.po (+29/-29) po/ps.po (+29/-29) po/pt.po (+29/-29) po/pt_BR.po (+29/-29) po/ro.po (+29/-29) po/ru.po (+29/-29) po/sk.po (+29/-29) po/sl.po (+29/-29) po/sr.po (+29/-29) po/sr@latin.po (+29/-29) po/sv.po (+29/-29) po/ta.po (+29/-29) po/te.po (+29/-29) po/tg.po (+29/-29) po/tr.po (+29/-29) po/ug.po (+29/-29) po/uk.po (+29/-29) po/ur.po (+29/-29) po/yi.po (+29/-29) po/zh_CN.po (+29/-29) po/zh_HK.po (+29/-29) po/zh_TW.po (+29/-29) tests/Makefile.in (+63/-70) tests/accessibility/Makefile.in (+47/-43) tests/conform/Makefile.in (+46/-44) tests/data/Makefile.in (+15/-15) tests/interactive/Makefile.in (+46/-44) tests/micro-bench/Makefile.in (+47/-43) tests/performance/Makefile.in (+47/-43) |
To merge this branch: | bzr merge lp:~darkxst/ubuntu/saucy/clutter-1.0/lp963925 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Disapprove | ||
Ubuntu branches | Pending | ||
Review via email: mp+164829@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2013-03-26 01:28:45 +0000 |
3 | +++ ChangeLog 2013-05-21 02:54:27 +0000 |
4 | @@ -1,5 +1,180 @@ |
5 | # Generated by configure. Do not edit. |
6 | |
7 | +commit 5f96faf259db61a4424f96ce944ae01493f6a4fd |
8 | +Author: Emmanuele Bassi <ebassi@gnome.org> |
9 | +Date: Wed May 15 05:57:36 2013 +0100 |
10 | + |
11 | + Release Clutter 1.14.4 |
12 | + |
13 | + NEWS | 31 +++++++++++++++++++++++++++++++ |
14 | + README.in | 8 ++++++++ |
15 | + configure.ac | 2 +- |
16 | + 3 files changed, 40 insertions(+), 1 deletion(-) |
17 | + |
18 | +commit 584ec5c31d876b20cc6d0f695325785f1467f339 |
19 | +Author: Emmanuele Bassi <ebassi@gnome.org> |
20 | +Date: Wed Apr 24 15:35:28 2013 -0400 |
21 | + |
22 | + stage: Add a paint callback |
23 | + |
24 | + The ClutterActor::paint signal is deprecated, and connecting to it even |
25 | + to get notifications will disable clipped redraws because of violations |
26 | + of the paint volume. |
27 | + |
28 | + The only actual valid use case for notifications of a successful frame |
29 | + is on the ClutterStage, so we should add new (experimental) API for it, |
30 | + so that users can actually subscribe to it — at least if you're writing |
31 | + a compositor. |
32 | + |
33 | + Shoving a signal in a performance critical path is not an option, and |
34 | + I'm not sure I want to commit to an API like this yet. I reserve the |
35 | + right to revisit this decision in the future. |
36 | + |
37 | + This is a backport of the same commit from the clutter-1.16 branch, and |
38 | + it introduces new API in a stable series. |
39 | + |
40 | + https://bugzilla.gnome.org/show_bug.cgi?id=698783 |
41 | + |
42 | + (cherry picked from commit d061a47573fbfec69ed6f2fd02f233e218830a6d) |
43 | + |
44 | + Signed-off-by: Emmanuele Bassi <ebassi@gnome.org> |
45 | + |
46 | + clutter/clutter-stage.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++--- |
47 | + clutter/clutter-stage.h | 9 ++++++++ |
48 | + clutter/clutter.symbols | 1 + |
49 | + configure.ac | 2 +- |
50 | + 4 files changed, 63 insertions(+), 4 deletions(-) |
51 | + |
52 | +commit ae9bf742b7f19683280f90d8cad897febc10c190 |
53 | +Author: Lionel Landwerlin <llandwerlin@gmail.com> |
54 | +Date: Tue Apr 23 17:52:22 2013 -0700 |
55 | + |
56 | + zoom-action: improve zooming behavior |
57 | + |
58 | + https://bugzilla.gnome.org/show_bug.cgi?id=698674 |
59 | + |
60 | + clutter/clutter-zoom-action.c | 44 ++++++++++++++++++++++--------------------- |
61 | + 1 file changed, 23 insertions(+), 21 deletions(-) |
62 | + |
63 | +commit e0c2967b98ef6ebbc454918b1e8c40b72898fa71 |
64 | +Author: Lionel Landwerlin <llandwerlin@gmail.com> |
65 | +Date: Mon Apr 22 16:20:49 2013 -0700 |
66 | + |
67 | + gesture-action: refactor event handling function |
68 | + |
69 | + https://bugzilla.gnome.org/show_bug.cgi?id=698671 |
70 | + |
71 | + clutter/clutter-gesture-action.c | 118 ++++++++++++++++++++++++++------------- |
72 | + 1 file changed, 78 insertions(+), 40 deletions(-) |
73 | + |
74 | +commit 1ddef9576d87c98fafbcefe3108f04866630c2cd |
75 | +Author: Lionel Landwerlin <llandwerlin@gmail.com> |
76 | +Date: Mon Apr 22 14:57:47 2013 -0700 |
77 | + |
78 | + gesture-action: fix trigger edge after behavior with more than 1 point |
79 | + |
80 | + https://bugzilla.gnome.org/show_bug.cgi?id=698669 |
81 | + |
82 | + clutter/clutter-gesture-action.c | 3 ++- |
83 | + 1 file changed, 2 insertions(+), 1 deletion(-) |
84 | + |
85 | +commit 484672600b98ce1deb1c18592cb201567152ae79 |
86 | +Author: Lionel Landwerlin <llandwerlin@gmail.com> |
87 | +Date: Sun Apr 7 16:12:32 2013 +0100 |
88 | + |
89 | + gesture-action: avoid shadowing time() syscall function |
90 | + |
91 | + https://bugzilla.gnome.org/show_bug.cgi?id=698668 |
92 | + |
93 | + clutter/clutter-gesture-action.c | 12 ++++++------ |
94 | + 1 file changed, 6 insertions(+), 6 deletions(-) |
95 | + |
96 | +commit 968bc56e864dd1f1f189b6042ac62e3d4c37bb26 |
97 | +Author: Lionel Landwerlin <llandwerlin@gmail.com> |
98 | +Date: Sun Apr 7 15:47:26 2013 +0100 |
99 | + |
100 | + gesture-action: fix typo |
101 | + |
102 | + https://bugzilla.gnome.org/show_bug.cgi?id=698668 |
103 | + |
104 | + clutter/clutter-gesture-action-private.h | 2 +- |
105 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
106 | + |
107 | +commit 6b738b7f563d671ffa4ca00a9f012293889925d1 |
108 | +Author: Emmanuele Bassi <ebassi@gnome.org> |
109 | +Date: Wed Apr 17 15:32:24 2013 +0100 |
110 | + |
111 | + Post-release version bump to 1.14.3 |
112 | + |
113 | + configure.ac | 4 ++-- |
114 | + 1 file changed, 2 insertions(+), 2 deletions(-) |
115 | + |
116 | +commit 8316d057d4cd8692f6e2d574610d7497996c6733 |
117 | +Author: Emmanuele Bassi <ebassi@gnome.org> |
118 | +Date: Wed Apr 17 15:22:52 2013 +0100 |
119 | + |
120 | + Release Clutter 1.14.2 (stable) |
121 | + |
122 | + NEWS | 21 +++++++++++++++++++++ |
123 | + configure.ac | 4 ++-- |
124 | + 2 files changed, 23 insertions(+), 2 deletions(-) |
125 | + |
126 | +commit 48fd228e263dead1ea665299c8190912de35c0f7 |
127 | +Author: Emanuele Aina <emanuele.aina@collabora.com> |
128 | +Date: Mon Apr 1 19:10:36 2013 +0200 |
129 | + |
130 | + tap-action: Fix the docs, it does not require actors with children |
131 | + |
132 | + clutter/clutter-tap-action.c | 2 +- |
133 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
134 | + |
135 | +commit 3e6f32f6d07584f6271f73ad13ca1afffd9006b4 |
136 | +Author: Neil Roberts <neil@linux.intel.com> |
137 | +Date: Thu Mar 28 15:30:50 2013 +0000 |
138 | + |
139 | + wayland: Queue a redraw after showing the stage |
140 | + |
141 | + On the other backends we will get some sort of expose event after |
142 | + showing the stage's window which will queue a redraw. These expose |
143 | + events don't exist on Wayland so nothing will cause Clutter to queue a |
144 | + redraw. Weston doesn't bother displaying anything for the stage's |
145 | + surface until the first buffer is sent, which of course it will never |
146 | + receive if Clutter doesn't paint anything. This patch just makes it |
147 | + explicitly queue a redraw after the stage is shown so that we will |
148 | + always pass at least one frame to the compositor. |
149 | + |
150 | + The bug can be seen by running test-stage-sizing. That example doesn't |
151 | + have any animations so it won't try to queue any redraws until |
152 | + something interacts with it. On the other hand something like |
153 | + test-actors works fine without the patch because it constantly queues |
154 | + redraws anyway in order to display the animation. |
155 | + |
156 | + https://bugzilla.gnome.org/show_bug.cgi?id=696791 |
157 | + |
158 | + (cherry picked from commit d5896d284ee39243f84bab903d1429d3cab35bf7) |
159 | + |
160 | + clutter/wayland/clutter-stage-wayland.c | 17 +++++++++++++++++ |
161 | + 1 file changed, 17 insertions(+) |
162 | + |
163 | +commit 6295b1571720f9e8f1b8d935f59c9ec8e538752d |
164 | +Author: Emmanuele Bassi <ebassi@gnome.org> |
165 | +Date: Tue Mar 26 22:25:37 2013 +0000 |
166 | + |
167 | + Fix build with debug paths enabled |
168 | + |
169 | + clutter/clutter-script-parser.c | 4 ++-- |
170 | + clutter/x11/clutter-backend-x11.c | 6 +++--- |
171 | + 2 files changed, 5 insertions(+), 5 deletions(-) |
172 | + |
173 | +commit f8d27b7ecb09dd742ecf3dd8135131f329737c5b |
174 | +Author: Emmanuele Bassi <ebassi@gnome.org> |
175 | +Date: Mon Mar 25 18:22:10 2013 +0000 |
176 | + |
177 | + Post-release version bump to 1.14.1 |
178 | + |
179 | + configure.ac | 4 ++-- |
180 | + 1 file changed, 2 insertions(+), 2 deletions(-) |
181 | + |
182 | commit b968f81b743f8e3c91737a21528626108b3578fc |
183 | Author: Emmanuele Bassi <ebassi@gnome.org> |
184 | Date: Mon Mar 25 18:13:52 2013 +0000 |
185 | |
186 | === modified file 'Makefile.in' |
187 | --- Makefile.in 2013-03-26 01:28:45 +0000 |
188 | +++ Makefile.in 2013-05-21 02:54:27 +0000 |
189 | @@ -1,4 +1,4 @@ |
190 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
191 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
192 | # @configure_input@ |
193 | |
194 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
195 | @@ -58,18 +58,18 @@ |
196 | POST_UNINSTALL = : |
197 | build_triplet = @build@ |
198 | host_triplet = @host@ |
199 | -DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ |
200 | - $(srcdir)/Makefile.in $(srcdir)/README.in \ |
201 | +DIST_COMMON = $(top_srcdir)/build/autotools/Makefile.am.silent \ |
202 | $(top_srcdir)/build/autotools/Makefile.am.changelog \ |
203 | $(top_srcdir)/build/autotools/Makefile.am.release \ |
204 | - $(top_srcdir)/build/autotools/Makefile.am.silent \ |
205 | - $(top_srcdir)/build/compile $(top_srcdir)/build/config.guess \ |
206 | + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
207 | + $(top_srcdir)/configure $(am__configure_deps) \ |
208 | + $(srcdir)/README.in $(top_srcdir)/clutter/cally/cally.pc.in \ |
209 | + $(top_srcdir)/clutter/cex100/clutter-cex100.h.in ABOUT-NLS \ |
210 | + COPYING NEWS $(top_srcdir)/build/compile \ |
211 | + $(top_srcdir)/build/config.guess \ |
212 | $(top_srcdir)/build/config.rpath \ |
213 | $(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \ |
214 | - $(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing \ |
215 | - $(top_srcdir)/clutter/cally/cally.pc.in \ |
216 | - $(top_srcdir)/clutter/cex100/clutter-cex100.h.in \ |
217 | - $(top_srcdir)/configure ABOUT-NLS COPYING NEWS |
218 | + $(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing |
219 | @BUILD_TESTS_TRUE@am__append_1 = tests |
220 | @BUILD_EXAMPLES_TRUE@am__append_2 = examples |
221 | subdir = . |
222 | @@ -116,13 +116,14 @@ |
223 | am__v_at_1 = |
224 | SOURCES = |
225 | DIST_SOURCES = |
226 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
227 | - html-recursive info-recursive install-data-recursive \ |
228 | - install-dvi-recursive install-exec-recursive \ |
229 | - install-html-recursive install-info-recursive \ |
230 | - install-pdf-recursive install-ps-recursive install-recursive \ |
231 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
232 | - ps-recursive uninstall-recursive |
233 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
234 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
235 | + install-data-recursive install-dvi-recursive \ |
236 | + install-exec-recursive install-html-recursive \ |
237 | + install-info-recursive install-pdf-recursive \ |
238 | + install-ps-recursive install-recursive installcheck-recursive \ |
239 | + installdirs-recursive pdf-recursive ps-recursive \ |
240 | + tags-recursive uninstall-recursive |
241 | am__can_run_installinfo = \ |
242 | case $$AM_UPDATE_INFO_DIR in \ |
243 | n|no|NO) false;; \ |
244 | @@ -130,9 +131,29 @@ |
245 | esac |
246 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
247 | distclean-recursive maintainer-clean-recursive |
248 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
249 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
250 | +am__recursive_targets = \ |
251 | + $(RECURSIVE_TARGETS) \ |
252 | + $(RECURSIVE_CLEAN_TARGETS) \ |
253 | + $(am__extra_recursive_targets) |
254 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
255 | cscope distdir dist dist-all distcheck |
256 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
257 | +# Read a list of newline-separated strings from the standard input, |
258 | +# and print each of them once, without duplicates. Input order is |
259 | +# *not* preserved. |
260 | +am__uniquify_input = $(AWK) '\ |
261 | + BEGIN { nonempty = 0; } \ |
262 | + { items[$$0] = 1; nonempty = 1; } \ |
263 | + END { if (nonempty) { for (i in items) print i; }; } \ |
264 | +' |
265 | +# Make sure the list of sources is unique. This is necessary because, |
266 | +# e.g., the same source file might be shared among _SOURCES variables |
267 | +# for different programs/libraries. |
268 | +am__define_uniq_tagged_files = \ |
269 | + list='$(am__tagged_files)'; \ |
270 | + unique=`for i in $$list; do \ |
271 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
272 | + done | $(am__uniquify_input)` |
273 | ETAGS = etags |
274 | CTAGS = ctags |
275 | CSCOPE = cscope |
276 | @@ -521,7 +542,7 @@ |
277 | # (1) if the variable is set in 'config.status', edit 'config.status' |
278 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
279 | # (2) otherwise, pass the desired values on the 'make' command line. |
280 | -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
281 | +$(am__recursive_targets): |
282 | @fail= failcom='exit 1'; \ |
283 | for f in x $$MAKEFLAGS; do \ |
284 | case $$f in \ |
285 | @@ -549,31 +570,13 @@ |
286 | if test "$$dot_seen" = "no"; then \ |
287 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
288 | fi; test -z "$$fail" |
289 | -tags-recursive: |
290 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
291 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
292 | - done |
293 | -ctags-recursive: |
294 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
295 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
296 | - done |
297 | -cscopelist-recursive: |
298 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
299 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
300 | - done |
301 | - |
302 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
303 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
304 | - unique=`for i in $$list; do \ |
305 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
306 | - done | \ |
307 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
308 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
309 | - mkid -fID $$unique |
310 | -tags: TAGS |
311 | - |
312 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
313 | - $(TAGS_FILES) $(LISP) |
314 | + |
315 | +ID: $(am__tagged_files) |
316 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
317 | +tags: tags-recursive |
318 | +TAGS: tags |
319 | + |
320 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
321 | set x; \ |
322 | here=`pwd`; \ |
323 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
324 | @@ -589,12 +592,7 @@ |
325 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
326 | fi; \ |
327 | done; \ |
328 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
329 | - unique=`for i in $$list; do \ |
330 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
331 | - done | \ |
332 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
333 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
334 | + $(am__define_uniq_tagged_files); \ |
335 | shift; \ |
336 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
337 | test -n "$$unique" || unique=$$empty_fix; \ |
338 | @@ -606,15 +604,11 @@ |
339 | $$unique; \ |
340 | fi; \ |
341 | fi |
342 | -ctags: CTAGS |
343 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
344 | - $(TAGS_FILES) $(LISP) |
345 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
346 | - unique=`for i in $$list; do \ |
347 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
348 | - done | \ |
349 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
350 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
351 | +ctags: ctags-recursive |
352 | + |
353 | +CTAGS: ctags |
354 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
355 | + $(am__define_uniq_tagged_files); \ |
356 | test -z "$(CTAGS_ARGS)$$unique" \ |
357 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
358 | $$unique |
359 | @@ -623,18 +617,16 @@ |
360 | here=`$(am__cd) $(top_builddir) && pwd` \ |
361 | && $(am__cd) $(top_srcdir) \ |
362 | && gtags -i $(GTAGS_ARGS) "$$here" |
363 | - |
364 | cscope: cscope.files |
365 | test ! -s cscope.files \ |
366 | || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
367 | - |
368 | clean-cscope: |
369 | -rm -f cscope.files |
370 | - |
371 | -cscope.files: clean-cscope cscopelist-recursive cscopelist |
372 | - |
373 | -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
374 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
375 | +cscope.files: clean-cscope cscopelist |
376 | +cscopelist: cscopelist-recursive |
377 | + |
378 | +cscopelist-am: $(am__tagged_files) |
379 | + list='$(am__tagged_files)'; \ |
380 | case "$(srcdir)" in \ |
381 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
382 | *) sdir=$(subdir)/$(srcdir) ;; \ |
383 | @@ -770,9 +762,9 @@ |
384 | *.zip*) \ |
385 | unzip $(distdir).zip ;;\ |
386 | esac |
387 | - chmod -R a-w $(distdir); chmod u+w $(distdir) |
388 | - mkdir $(distdir)/_build |
389 | - mkdir $(distdir)/_inst |
390 | + chmod -R a-w $(distdir) |
391 | + chmod u+w $(distdir) |
392 | + mkdir $(distdir)/_build $(distdir)/_inst |
393 | chmod a-w $(distdir) |
394 | test -d $(distdir)/_build || exit 0; \ |
395 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
396 | @@ -941,26 +933,24 @@ |
397 | |
398 | uninstall-am: |
399 | |
400 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ |
401 | - cscopelist-recursive ctags-recursive install-am install-strip \ |
402 | - tags-recursive |
403 | +.MAKE: $(am__recursive_targets) install-am install-strip |
404 | |
405 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
406 | - all all-am am--refresh check check-am clean clean-cscope \ |
407 | - clean-generic clean-libtool cscope cscopelist \ |
408 | - cscopelist-recursive ctags ctags-recursive dist dist-all \ |
409 | - dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ |
410 | - dist-xz dist-zip distcheck distclean distclean-generic \ |
411 | - distclean-libtool distclean-tags distcleancheck distdir \ |
412 | - distuninstallcheck dvi dvi-am html html-am info info-am \ |
413 | - install install-am install-data install-data-am install-dvi \ |
414 | - install-dvi-am install-exec install-exec-am install-html \ |
415 | - install-html-am install-info install-info-am install-man \ |
416 | - install-pdf install-pdf-am install-ps install-ps-am \ |
417 | - install-strip installcheck installcheck-am installdirs \ |
418 | - installdirs-am maintainer-clean maintainer-clean-generic \ |
419 | - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
420 | - ps ps-am tags tags-recursive uninstall uninstall-am |
421 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
422 | + am--refresh check check-am clean clean-cscope clean-generic \ |
423 | + clean-libtool cscope cscopelist-am ctags ctags-am dist \ |
424 | + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ |
425 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
426 | + distclean-generic distclean-libtool distclean-tags \ |
427 | + distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
428 | + html-am info info-am install install-am install-data \ |
429 | + install-data-am install-dvi install-dvi-am install-exec \ |
430 | + install-exec-am install-html install-html-am install-info \ |
431 | + install-info-am install-man install-pdf install-pdf-am \ |
432 | + install-ps install-ps-am install-strip installcheck \ |
433 | + installcheck-am installdirs installdirs-am maintainer-clean \ |
434 | + maintainer-clean-generic mostlyclean mostlyclean-generic \ |
435 | + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ |
436 | + uninstall-am |
437 | |
438 | |
439 | changelogs: |
440 | |
441 | === modified file 'NEWS' |
442 | --- NEWS 2013-03-26 01:28:45 +0000 |
443 | +++ NEWS 2013-05-21 02:54:27 +0000 |
444 | @@ -1,3 +1,55 @@ |
445 | +Clutter 1.14.4 2013-05-15 |
446 | +=============================================================================== |
447 | + |
448 | + • List of changes since Clutter 1.14.2 |
449 | + |
450 | + - Fix GestureAction handling of multi-touch gestures |
451 | + |
452 | + - Add a paint callback for Stage updates |
453 | + This experimental API allows installing a notification function on |
454 | + ClutterStage that is called when the stage has finished drawing, but |
455 | + before the frame buffer is flushed. This function replaces the ::paint |
456 | + signal on the ClutterStage in a way that does not disable paint volume |
457 | + culling and optimizations. |
458 | + |
459 | + - Improve scaling behaviour in ZoomAction |
460 | + Instead of recomputing the scaling center, the action should use the |
461 | + pivot-point of the ClutterActor. |
462 | + |
463 | + - Documentation fixes |
464 | + |
465 | + • List of bugs fixed since Clutter 1.14.2 |
466 | + |
467 | + #698668 - A few improvements to ClutterGestureAction |
468 | + #698671 - Refactor event handling code in ClutterGestureAction |
469 | + #698674 - Improve ClutterZoomAction behavior |
470 | + #698783 - Add a paint callback for ClutterStage |
471 | + |
472 | +Many thanks to: |
473 | + |
474 | + Lionel Landwerlin |
475 | + |
476 | +Clutter 1.14.2 2013-04-17 |
477 | +=============================================================================== |
478 | + |
479 | + • List of changes since Clutter 1.14.0 |
480 | + |
481 | + - Ensure a redraw when making the stage visible under Wayland |
482 | + This makes it possible to update the contents of the stage when toggling |
483 | + its visibility. |
484 | + |
485 | + - Fix build with debug messages enabled. |
486 | + |
487 | + - Documentation fixes. |
488 | + |
489 | + • List of bugs fixed since Clutter 1.14.0 |
490 | + |
491 | + #696791 - wayland: Queue a redraw after showing the stage |
492 | + |
493 | +Many thanks to: |
494 | + |
495 | + Emanuele Aina, Neil Roberts. |
496 | + |
497 | Clutter 1.14.0 2013-03-25 |
498 | =============================================================================== |
499 | |
500 | |
501 | === modified file 'README' |
502 | --- README 2013-03-26 01:28:45 +0000 |
503 | +++ README 2013-05-21 02:54:27 +0000 |
504 | @@ -1,4 +1,4 @@ |
505 | -README for Clutter 1.14.0 |
506 | +README for Clutter 1.14.4 |
507 | =============================================================================== |
508 | |
509 | Clutter is an open source software library for creating fast, compelling, |
510 | @@ -318,6 +318,14 @@ |
511 | at all: gunichar is a typedef to guint32 already. The change will impact |
512 | introspection consumers. |
513 | |
514 | +• ClutterScrollActor now uses the :child-transform property to implement |
515 | + scrolling its children. Any external update to the :child-transform |
516 | + property has to take into account that the property will be modified |
517 | + every time the scroll point is updated. |
518 | + |
519 | +• ClutterZoomAction now sets the :pivot-point property on the actor to |
520 | + which it is applied. |
521 | + |
522 | Release Notes for Clutter 1.12 |
523 | ------------------------------------------------------------------------------- |
524 | |
525 | |
526 | === modified file 'README.in' |
527 | --- README.in 2013-03-26 01:28:45 +0000 |
528 | +++ README.in 2013-05-21 02:54:27 +0000 |
529 | @@ -318,6 +318,14 @@ |
530 | at all: gunichar is a typedef to guint32 already. The change will impact |
531 | introspection consumers. |
532 | |
533 | +• ClutterScrollActor now uses the :child-transform property to implement |
534 | + scrolling its children. Any external update to the :child-transform |
535 | + property has to take into account that the property will be modified |
536 | + every time the scroll point is updated. |
537 | + |
538 | +• ClutterZoomAction now sets the :pivot-point property on the actor to |
539 | + which it is applied. |
540 | + |
541 | Release Notes for Clutter 1.12 |
542 | ------------------------------------------------------------------------------- |
543 | |
544 | |
545 | === modified file 'aclocal.m4' |
546 | --- aclocal.m4 2013-03-26 01:28:45 +0000 |
547 | +++ aclocal.m4 2013-05-21 02:54:27 +0000 |
548 | @@ -1,4 +1,4 @@ |
549 | -# generated automatically by aclocal 1.12.2 -*- Autoconf -*- |
550 | +# generated automatically by aclocal 1.13.1 -*- Autoconf -*- |
551 | |
552 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. |
553 | |
554 | @@ -11,6 +11,7 @@ |
555 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
556 | # PARTICULAR PURPOSE. |
557 | |
558 | +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
559 | m4_ifndef([AC_AUTOCONF_VERSION], |
560 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
561 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
562 | @@ -19,24 +20,22 @@ |
563 | If you have problems, you may need to regenerate the build system entirely. |
564 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
565 | |
566 | -# Copyright (C) 2002-2012 Free Software Foundation, Inc. |
567 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
568 | # |
569 | # This file is free software; the Free Software Foundation |
570 | # gives unlimited permission to copy and/or distribute it, |
571 | # with or without modifications, as long as this notice is preserved. |
572 | |
573 | -# serial 8 |
574 | - |
575 | # AM_AUTOMAKE_VERSION(VERSION) |
576 | # ---------------------------- |
577 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
578 | # generated from the m4 files accompanying Automake X.Y. |
579 | # (This private macro should not be called outside this file.) |
580 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
581 | -[am__api_version='1.12' |
582 | +[am__api_version='1.13' |
583 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
584 | dnl require some minimum version. Point them to the right macro. |
585 | -m4_if([$1], [1.12.2], [], |
586 | +m4_if([$1], [1.13.1], [], |
587 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
588 | ]) |
589 | |
590 | @@ -52,21 +51,19 @@ |
591 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
592 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
593 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
594 | -[AM_AUTOMAKE_VERSION([1.12.2])dnl |
595 | +[AM_AUTOMAKE_VERSION([1.13.1])dnl |
596 | m4_ifndef([AC_AUTOCONF_VERSION], |
597 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
598 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
599 | |
600 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
601 | |
602 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
603 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
604 | # |
605 | # This file is free software; the Free Software Foundation |
606 | # gives unlimited permission to copy and/or distribute it, |
607 | # with or without modifications, as long as this notice is preserved. |
608 | |
609 | -# serial 2 |
610 | - |
611 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
612 | # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
613 | # '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
614 | @@ -114,14 +111,12 @@ |
615 | |
616 | # AM_CONDITIONAL -*- Autoconf -*- |
617 | |
618 | -# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
619 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
620 | # |
621 | # This file is free software; the Free Software Foundation |
622 | # gives unlimited permission to copy and/or distribute it, |
623 | # with or without modifications, as long as this notice is preserved. |
624 | |
625 | -# serial 10 |
626 | - |
627 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
628 | # ------------------------------------- |
629 | # Define a conditional. |
630 | @@ -147,13 +142,12 @@ |
631 | Usually this means the macro was only invoked conditionally.]]) |
632 | fi])]) |
633 | |
634 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
635 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
636 | # |
637 | # This file is free software; the Free Software Foundation |
638 | # gives unlimited permission to copy and/or distribute it, |
639 | # with or without modifications, as long as this notice is preserved. |
640 | |
641 | -# serial 17 |
642 | |
643 | # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
644 | # written in clear, in which case automake, when reading aclocal.m4, |
645 | @@ -339,19 +333,18 @@ |
646 | |
647 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
648 | |
649 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
650 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
651 | # |
652 | # This file is free software; the Free Software Foundation |
653 | # gives unlimited permission to copy and/or distribute it, |
654 | # with or without modifications, as long as this notice is preserved. |
655 | |
656 | -# serial 6 |
657 | |
658 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
659 | # ------------------------------ |
660 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
661 | [{ |
662 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
663 | + # Older Autoconf quotes --file arguments for eval, but not when files |
664 | # are listed without --file. Let's play safe and only enable the eval |
665 | # if we detect the quoting. |
666 | case $CONFIG_FILES in |
667 | @@ -416,14 +409,12 @@ |
668 | |
669 | # Do all the work for Automake. -*- Autoconf -*- |
670 | |
671 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
672 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
673 | # |
674 | # This file is free software; the Free Software Foundation |
675 | # gives unlimited permission to copy and/or distribute it, |
676 | # with or without modifications, as long as this notice is preserved. |
677 | |
678 | -# serial 19 |
679 | - |
680 | # This macro actually does too much. Some checks are only needed if |
681 | # your package does certain things. But this isn't really a big deal. |
682 | |
683 | @@ -439,7 +430,7 @@ |
684 | # arguments mandatory, and then we can depend on a new Autoconf |
685 | # release and drop the old call support. |
686 | AC_DEFUN([AM_INIT_AUTOMAKE], |
687 | -[AC_PREREQ([2.62])dnl |
688 | +[AC_PREREQ([2.65])dnl |
689 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
690 | dnl the ones we care about. |
691 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
692 | @@ -469,8 +460,7 @@ |
693 | dnl Distinguish between old-style and new-style calls. |
694 | m4_ifval([$2], |
695 | [AC_DIAGNOSE([obsolete], |
696 | -[$0: two- and three-arguments forms are deprecated. For more info, see: |
697 | -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) |
698 | + [$0: two- and three-arguments forms are deprecated.]) |
699 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
700 | AC_SUBST([PACKAGE], [$1])dnl |
701 | AC_SUBST([VERSION], [$2])], |
702 | @@ -524,18 +514,15 @@ |
703 | [_AM_DEPENDENCIES([OBJC])], |
704 | [m4_define([AC_PROG_OBJC], |
705 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
706 | -dnl Support for Objective C++ was only introduced in Autoconf 2.65, |
707 | -dnl but we still cater to Autoconf 2.62. |
708 | -m4_ifdef([AC_PROG_OBJCXX], |
709 | -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
710 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
711 | [_AM_DEPENDENCIES([OBJCXX])], |
712 | [m4_define([AC_PROG_OBJCXX], |
713 | - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl |
714 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
715 | ]) |
716 | -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
717 | -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |
718 | -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
719 | -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
720 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
721 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
722 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
723 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
724 | AC_CONFIG_COMMANDS_PRE(dnl |
725 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
726 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
727 | @@ -569,14 +556,12 @@ |
728 | done |
729 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
730 | |
731 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
732 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
733 | # |
734 | # This file is free software; the Free Software Foundation |
735 | # gives unlimited permission to copy and/or distribute it, |
736 | # with or without modifications, as long as this notice is preserved. |
737 | |
738 | -# serial 8 |
739 | - |
740 | # AM_PROG_INSTALL_SH |
741 | # ------------------ |
742 | # Define $install_sh. |
743 | @@ -592,14 +577,12 @@ |
744 | fi |
745 | AC_SUBST([install_sh])]) |
746 | |
747 | -# Copyright (C) 2003-2012 Free Software Foundation, Inc. |
748 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
749 | # |
750 | # This file is free software; the Free Software Foundation |
751 | # gives unlimited permission to copy and/or distribute it, |
752 | # with or without modifications, as long as this notice is preserved. |
753 | |
754 | -# serial 2 |
755 | - |
756 | # Check whether the underlying file-system supports filenames |
757 | # with a leading dot. For instance MS-DOS doesn't. |
758 | AC_DEFUN([AM_SET_LEADING_DOT], |
759 | @@ -615,14 +598,12 @@ |
760 | |
761 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
762 | |
763 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
764 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
765 | # |
766 | # This file is free software; the Free Software Foundation |
767 | # gives unlimited permission to copy and/or distribute it, |
768 | # with or without modifications, as long as this notice is preserved. |
769 | |
770 | -# serial 5 |
771 | - |
772 | # AM_MAKE_INCLUDE() |
773 | # ----------------- |
774 | # Check to see how make treats includes. |
775 | @@ -665,14 +646,12 @@ |
776 | rm -f confinc confmf |
777 | ]) |
778 | |
779 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
780 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
781 | # |
782 | # This file is free software; the Free Software Foundation |
783 | # gives unlimited permission to copy and/or distribute it, |
784 | # with or without modifications, as long as this notice is preserved. |
785 | |
786 | -# serial 6 |
787 | - |
788 | # AM_PROG_CC_C_O |
789 | # -------------- |
790 | # Like AC_PROG_CC_C_O, but changed for automake. |
791 | @@ -701,14 +680,12 @@ |
792 | |
793 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
794 | |
795 | -# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
796 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
797 | # |
798 | # This file is free software; the Free Software Foundation |
799 | # gives unlimited permission to copy and/or distribute it, |
800 | # with or without modifications, as long as this notice is preserved. |
801 | |
802 | -# serial 7 |
803 | - |
804 | # AM_MISSING_PROG(NAME, PROGRAM) |
805 | # ------------------------------ |
806 | AC_DEFUN([AM_MISSING_PROG], |
807 | @@ -716,11 +693,10 @@ |
808 | $1=${$1-"${am_missing_run}$2"} |
809 | AC_SUBST($1)]) |
810 | |
811 | - |
812 | # AM_MISSING_HAS_RUN |
813 | # ------------------ |
814 | -# Define MISSING if not defined so far and test if it supports --run. |
815 | -# If it does, set am_missing_run to use it, otherwise, to nothing. |
816 | +# Define MISSING if not defined so far and test if it is modern enough. |
817 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
818 | AC_DEFUN([AM_MISSING_HAS_RUN], |
819 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
820 | AC_REQUIRE_AUX_FILE([missing])dnl |
821 | @@ -733,29 +709,27 @@ |
822 | esac |
823 | fi |
824 | # Use eval to expand $SHELL |
825 | -if eval "$MISSING --run true"; then |
826 | - am_missing_run="$MISSING --run " |
827 | +if eval "$MISSING --is-lightweight"; then |
828 | + am_missing_run="$MISSING " |
829 | else |
830 | am_missing_run= |
831 | AC_MSG_WARN(['missing' script is too old or missing]) |
832 | fi |
833 | ]) |
834 | |
835 | -# Copyright (C) 2003-2012 Free Software Foundation, Inc. |
836 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
837 | # |
838 | # This file is free software; the Free Software Foundation |
839 | # gives unlimited permission to copy and/or distribute it, |
840 | # with or without modifications, as long as this notice is preserved. |
841 | |
842 | -# serial 3 |
843 | - |
844 | # AM_PROG_MKDIR_P |
845 | # --------------- |
846 | # Check for 'mkdir -p'. |
847 | AC_DEFUN([AM_PROG_MKDIR_P], |
848 | [AC_PREREQ([2.60])dnl |
849 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
850 | -dnl FIXME to be removed in Automake 1.13. |
851 | +dnl FIXME to be removed in Automake 1.14. |
852 | AC_DIAGNOSE([obsolete], |
853 | [$0: this macro is deprecated, and will soon be removed. |
854 | You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, |
855 | @@ -776,14 +750,12 @@ |
856 | |
857 | # Helper functions for option handling. -*- Autoconf -*- |
858 | |
859 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
860 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
861 | # |
862 | # This file is free software; the Free Software Foundation |
863 | # gives unlimited permission to copy and/or distribute it, |
864 | # with or without modifications, as long as this notice is preserved. |
865 | |
866 | -# serial 6 |
867 | - |
868 | # _AM_MANGLE_OPTION(NAME) |
869 | # ----------------------- |
870 | AC_DEFUN([_AM_MANGLE_OPTION], |
871 | @@ -807,14 +779,12 @@ |
872 | AC_DEFUN([_AM_IF_OPTION], |
873 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
874 | |
875 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
876 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
877 | # |
878 | # This file is free software; the Free Software Foundation |
879 | # gives unlimited permission to copy and/or distribute it, |
880 | # with or without modifications, as long as this notice is preserved. |
881 | |
882 | -# serial 1 |
883 | - |
884 | # AM_RUN_LOG(COMMAND) |
885 | # ------------------- |
886 | # Run COMMAND, save the exit status in ac_status, and log it. |
887 | @@ -828,14 +798,12 @@ |
888 | |
889 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
890 | |
891 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
892 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
893 | # |
894 | # This file is free software; the Free Software Foundation |
895 | # gives unlimited permission to copy and/or distribute it, |
896 | # with or without modifications, as long as this notice is preserved. |
897 | |
898 | -# serial 9 |
899 | - |
900 | # AM_SANITY_CHECK |
901 | # --------------- |
902 | AC_DEFUN([AM_SANITY_CHECK], |
903 | @@ -911,14 +879,12 @@ |
904 | rm -f conftest.file |
905 | ]) |
906 | |
907 | -# Copyright (C) 2009-2012 Free Software Foundation, Inc. |
908 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
909 | # |
910 | # This file is free software; the Free Software Foundation |
911 | # gives unlimited permission to copy and/or distribute it, |
912 | # with or without modifications, as long as this notice is preserved. |
913 | |
914 | -# serial 3 |
915 | - |
916 | # AM_SILENT_RULES([DEFAULT]) |
917 | # -------------------------- |
918 | # Enable less verbose build rules; with the default set to DEFAULT |
919 | @@ -973,14 +939,12 @@ |
920 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
921 | ]) |
922 | |
923 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
924 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
925 | # |
926 | # This file is free software; the Free Software Foundation |
927 | # gives unlimited permission to copy and/or distribute it, |
928 | # with or without modifications, as long as this notice is preserved. |
929 | |
930 | -# serial 2 |
931 | - |
932 | # AM_PROG_INSTALL_STRIP |
933 | # --------------------- |
934 | # One issue with vendor 'install' (even GNU) is that you can't |
935 | @@ -1003,14 +967,12 @@ |
936 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
937 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
938 | |
939 | -# Copyright (C) 2006-2012 Free Software Foundation, Inc. |
940 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
941 | # |
942 | # This file is free software; the Free Software Foundation |
943 | # gives unlimited permission to copy and/or distribute it, |
944 | # with or without modifications, as long as this notice is preserved. |
945 | |
946 | -# serial 3 |
947 | - |
948 | # _AM_SUBST_NOTMAKE(VARIABLE) |
949 | # --------------------------- |
950 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
951 | @@ -1024,14 +986,12 @@ |
952 | |
953 | # Check how to create a tarball. -*- Autoconf -*- |
954 | |
955 | -# Copyright (C) 2004-2012 Free Software Foundation, Inc. |
956 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
957 | # |
958 | # This file is free software; the Free Software Foundation |
959 | # gives unlimited permission to copy and/or distribute it, |
960 | # with or without modifications, as long as this notice is preserved. |
961 | |
962 | -# serial 3 |
963 | - |
964 | # _AM_PROG_TAR(FORMAT) |
965 | # -------------------- |
966 | # Check how to create a tarball in format FORMAT. |
967 | |
968 | === modified file 'build/Makefile.in' |
969 | --- build/Makefile.in 2013-03-26 01:28:45 +0000 |
970 | +++ build/Makefile.in 2013-05-21 02:54:27 +0000 |
971 | @@ -1,4 +1,4 @@ |
972 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
973 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
974 | # @configure_input@ |
975 | |
976 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
977 | @@ -50,9 +50,9 @@ |
978 | build_triplet = @build@ |
979 | host_triplet = @host@ |
980 | subdir = build |
981 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in compile \ |
982 | - config.guess config.rpath config.sub install-sh ltmain.sh \ |
983 | - missing |
984 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am compile \ |
985 | + config.guess config.rpath config.sub install-sh missing \ |
986 | + ltmain.sh |
987 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
988 | am__aclocal_m4_deps = \ |
989 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
990 | @@ -94,13 +94,14 @@ |
991 | am__v_at_1 = |
992 | SOURCES = |
993 | DIST_SOURCES = |
994 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
995 | - html-recursive info-recursive install-data-recursive \ |
996 | - install-dvi-recursive install-exec-recursive \ |
997 | - install-html-recursive install-info-recursive \ |
998 | - install-pdf-recursive install-ps-recursive install-recursive \ |
999 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
1000 | - ps-recursive uninstall-recursive |
1001 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
1002 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
1003 | + install-data-recursive install-dvi-recursive \ |
1004 | + install-exec-recursive install-html-recursive \ |
1005 | + install-info-recursive install-pdf-recursive \ |
1006 | + install-ps-recursive install-recursive installcheck-recursive \ |
1007 | + installdirs-recursive pdf-recursive ps-recursive \ |
1008 | + tags-recursive uninstall-recursive |
1009 | am__can_run_installinfo = \ |
1010 | case $$AM_UPDATE_INFO_DIR in \ |
1011 | n|no|NO) false;; \ |
1012 | @@ -108,9 +109,29 @@ |
1013 | esac |
1014 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
1015 | distclean-recursive maintainer-clean-recursive |
1016 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
1017 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
1018 | +am__recursive_targets = \ |
1019 | + $(RECURSIVE_TARGETS) \ |
1020 | + $(RECURSIVE_CLEAN_TARGETS) \ |
1021 | + $(am__extra_recursive_targets) |
1022 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
1023 | distdir |
1024 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
1025 | +# Read a list of newline-separated strings from the standard input, |
1026 | +# and print each of them once, without duplicates. Input order is |
1027 | +# *not* preserved. |
1028 | +am__uniquify_input = $(AWK) '\ |
1029 | + BEGIN { nonempty = 0; } \ |
1030 | + { items[$$0] = 1; nonempty = 1; } \ |
1031 | + END { if (nonempty) { for (i in items) print i; }; } \ |
1032 | +' |
1033 | +# Make sure the list of sources is unique. This is necessary because, |
1034 | +# e.g., the same source file might be shared among _SOURCES variables |
1035 | +# for different programs/libraries. |
1036 | +am__define_uniq_tagged_files = \ |
1037 | + list='$(am__tagged_files)'; \ |
1038 | + unique=`for i in $$list; do \ |
1039 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1040 | + done | $(am__uniquify_input)` |
1041 | ETAGS = etags |
1042 | CTAGS = ctags |
1043 | DIST_SUBDIRS = $(SUBDIRS) |
1044 | @@ -413,7 +434,7 @@ |
1045 | # (1) if the variable is set in 'config.status', edit 'config.status' |
1046 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
1047 | # (2) otherwise, pass the desired values on the 'make' command line. |
1048 | -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
1049 | +$(am__recursive_targets): |
1050 | @fail= failcom='exit 1'; \ |
1051 | for f in x $$MAKEFLAGS; do \ |
1052 | case $$f in \ |
1053 | @@ -441,31 +462,13 @@ |
1054 | if test "$$dot_seen" = "no"; then \ |
1055 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
1056 | fi; test -z "$$fail" |
1057 | -tags-recursive: |
1058 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1059 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
1060 | - done |
1061 | -ctags-recursive: |
1062 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1063 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
1064 | - done |
1065 | -cscopelist-recursive: |
1066 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
1067 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
1068 | - done |
1069 | - |
1070 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
1071 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
1072 | - unique=`for i in $$list; do \ |
1073 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1074 | - done | \ |
1075 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1076 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1077 | - mkid -fID $$unique |
1078 | -tags: TAGS |
1079 | - |
1080 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
1081 | - $(TAGS_FILES) $(LISP) |
1082 | + |
1083 | +ID: $(am__tagged_files) |
1084 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
1085 | +tags: tags-recursive |
1086 | +TAGS: tags |
1087 | + |
1088 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1089 | set x; \ |
1090 | here=`pwd`; \ |
1091 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
1092 | @@ -481,12 +484,7 @@ |
1093 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
1094 | fi; \ |
1095 | done; \ |
1096 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
1097 | - unique=`for i in $$list; do \ |
1098 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1099 | - done | \ |
1100 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1101 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1102 | + $(am__define_uniq_tagged_files); \ |
1103 | shift; \ |
1104 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
1105 | test -n "$$unique" || unique=$$empty_fix; \ |
1106 | @@ -498,15 +496,11 @@ |
1107 | $$unique; \ |
1108 | fi; \ |
1109 | fi |
1110 | -ctags: CTAGS |
1111 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
1112 | - $(TAGS_FILES) $(LISP) |
1113 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
1114 | - unique=`for i in $$list; do \ |
1115 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
1116 | - done | \ |
1117 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
1118 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
1119 | +ctags: ctags-recursive |
1120 | + |
1121 | +CTAGS: ctags |
1122 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
1123 | + $(am__define_uniq_tagged_files); \ |
1124 | test -z "$(CTAGS_ARGS)$$unique" \ |
1125 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
1126 | $$unique |
1127 | @@ -515,9 +509,10 @@ |
1128 | here=`$(am__cd) $(top_builddir) && pwd` \ |
1129 | && $(am__cd) $(top_srcdir) \ |
1130 | && gtags -i $(GTAGS_ARGS) "$$here" |
1131 | +cscopelist: cscopelist-recursive |
1132 | |
1133 | -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
1134 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
1135 | +cscopelist-am: $(am__tagged_files) |
1136 | + list='$(am__tagged_files)'; \ |
1137 | case "$(srcdir)" in \ |
1138 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
1139 | *) sdir=$(subdir)/$(srcdir) ;; \ |
1140 | @@ -689,23 +684,20 @@ |
1141 | |
1142 | uninstall-am: |
1143 | |
1144 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ |
1145 | - cscopelist-recursive ctags-recursive install-am install-strip \ |
1146 | - tags-recursive |
1147 | +.MAKE: $(am__recursive_targets) install-am install-strip |
1148 | |
1149 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
1150 | - all all-am check check-am clean clean-generic clean-libtool \ |
1151 | - cscopelist cscopelist-recursive ctags ctags-recursive \ |
1152 | - distclean distclean-generic distclean-libtool distclean-tags \ |
1153 | - distdir dvi dvi-am html html-am info info-am install \ |
1154 | - install-am install-data install-data-am install-dvi \ |
1155 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ |
1156 | + check-am clean clean-generic clean-libtool cscopelist-am ctags \ |
1157 | + ctags-am distclean distclean-generic distclean-libtool \ |
1158 | + distclean-tags distdir dvi dvi-am html html-am info info-am \ |
1159 | + install install-am install-data install-data-am install-dvi \ |
1160 | install-dvi-am install-exec install-exec-am install-html \ |
1161 | install-html-am install-info install-info-am install-man \ |
1162 | install-pdf install-pdf-am install-ps install-ps-am \ |
1163 | install-strip installcheck installcheck-am installdirs \ |
1164 | installdirs-am maintainer-clean maintainer-clean-generic \ |
1165 | mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
1166 | - ps ps-am tags tags-recursive uninstall uninstall-am |
1167 | + ps ps-am tags tags-am uninstall uninstall-am |
1168 | |
1169 | |
1170 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1171 | |
1172 | === modified file 'build/autotools/Makefile.in' |
1173 | --- build/autotools/Makefile.in 2013-03-26 01:28:45 +0000 |
1174 | +++ build/autotools/Makefile.in 2013-05-21 02:54:27 +0000 |
1175 | @@ -1,4 +1,4 @@ |
1176 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
1177 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
1178 | # @configure_input@ |
1179 | |
1180 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
1181 | @@ -50,7 +50,7 @@ |
1182 | build_triplet = @build@ |
1183 | host_triplet = @host@ |
1184 | subdir = build/autotools |
1185 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
1186 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
1187 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1188 | am__aclocal_m4_deps = \ |
1189 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
1190 | @@ -97,6 +97,7 @@ |
1191 | n|no|NO) false;; \ |
1192 | *) (install-info --version) >/dev/null 2>&1;; \ |
1193 | esac |
1194 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
1195 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1196 | ACLOCAL = @ACLOCAL@ |
1197 | ALL_LINGUAS = @ALL_LINGUAS@ |
1198 | @@ -377,11 +378,9 @@ |
1199 | |
1200 | clean-libtool: |
1201 | -rm -rf .libs _libs |
1202 | -tags: TAGS |
1203 | -TAGS: |
1204 | +tags TAGS: |
1205 | |
1206 | -ctags: CTAGS |
1207 | -CTAGS: |
1208 | +ctags CTAGS: |
1209 | |
1210 | cscope cscopelist: |
1211 | |
1212 | @@ -519,15 +518,16 @@ |
1213 | .MAKE: install-am install-strip |
1214 | |
1215 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
1216 | - distclean distclean-generic distclean-libtool distdir dvi \ |
1217 | - dvi-am html html-am info info-am install install-am \ |
1218 | - install-data install-data-am install-dvi install-dvi-am \ |
1219 | - install-exec install-exec-am install-html install-html-am \ |
1220 | - install-info install-info-am install-man install-pdf \ |
1221 | - install-pdf-am install-ps install-ps-am install-strip \ |
1222 | - installcheck installcheck-am installdirs maintainer-clean \ |
1223 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
1224 | - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am |
1225 | + cscopelist-am ctags-am distclean distclean-generic \ |
1226 | + distclean-libtool distdir dvi dvi-am html html-am info info-am \ |
1227 | + install install-am install-data install-data-am install-dvi \ |
1228 | + install-dvi-am install-exec install-exec-am install-html \ |
1229 | + install-html-am install-info install-info-am install-man \ |
1230 | + install-pdf install-pdf-am install-ps install-ps-am \ |
1231 | + install-strip installcheck installcheck-am installdirs \ |
1232 | + maintainer-clean maintainer-clean-generic mostlyclean \ |
1233 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
1234 | + tags-am uninstall uninstall-am |
1235 | |
1236 | |
1237 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
1238 | |
1239 | === modified file 'build/compile' |
1240 | --- build/compile 2013-03-26 01:28:45 +0000 |
1241 | +++ build/compile 2013-05-21 02:54:27 +0000 |
1242 | @@ -1,9 +1,9 @@ |
1243 | #! /bin/sh |
1244 | # Wrapper for compilers which do not understand '-c -o'. |
1245 | |
1246 | -scriptversion=2012-03-05.13; # UTC |
1247 | +scriptversion=2012-10-14.11; # UTC |
1248 | |
1249 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
1250 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1251 | # Written by Tom Tromey <tromey@cygnus.com>. |
1252 | # |
1253 | # This program is free software; you can redistribute it and/or modify |
1254 | @@ -112,6 +112,11 @@ |
1255 | lib=$dir/$lib.lib |
1256 | break |
1257 | fi |
1258 | + if test -f "$dir/lib$lib.a"; then |
1259 | + found=yes |
1260 | + lib=$dir/lib$lib.a |
1261 | + break |
1262 | + fi |
1263 | done |
1264 | IFS=$save_IFS |
1265 | |
1266 | |
1267 | === modified file 'build/config.guess' |
1268 | --- build/config.guess 2013-03-26 01:28:45 +0000 |
1269 | +++ build/config.guess 2013-05-21 02:54:27 +0000 |
1270 | @@ -2,13 +2,13 @@ |
1271 | # Attempt to guess a canonical system name. |
1272 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1273 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1274 | -# 2011, 2012 Free Software Foundation, Inc. |
1275 | +# 2011, 2012, 2013 Free Software Foundation, Inc. |
1276 | |
1277 | -timestamp='2012-06-10' |
1278 | +timestamp='2012-12-29' |
1279 | |
1280 | # This file is free software; you can redistribute it and/or modify it |
1281 | # under the terms of the GNU General Public License as published by |
1282 | -# the Free Software Foundation; either version 2 of the License, or |
1283 | +# the Free Software Foundation; either version 3 of the License, or |
1284 | # (at your option) any later version. |
1285 | # |
1286 | # This program is distributed in the hope that it will be useful, but |
1287 | @@ -22,19 +22,17 @@ |
1288 | # As a special exception to the GNU General Public License, if you |
1289 | # distribute this file as part of a program that contains a |
1290 | # configuration script generated by Autoconf, you may include it under |
1291 | -# the same distribution terms that you use for the rest of that program. |
1292 | - |
1293 | - |
1294 | -# Originally written by Per Bothner. Please send patches (context |
1295 | -# diff format) to <config-patches@gnu.org> and include a ChangeLog |
1296 | -# entry. |
1297 | +# the same distribution terms that you use for the rest of that |
1298 | +# program. This Exception is an additional permission under section 7 |
1299 | +# of the GNU General Public License, version 3 ("GPLv3"). |
1300 | # |
1301 | -# This script attempts to guess a canonical system name similar to |
1302 | -# config.sub. If it succeeds, it prints the system name on stdout, and |
1303 | -# exits with 0. Otherwise, it exits with 1. |
1304 | +# Originally written by Per Bothner. |
1305 | # |
1306 | # You can get the latest version of this script from: |
1307 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
1308 | +# |
1309 | +# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
1310 | + |
1311 | |
1312 | me=`echo "$0" | sed -e 's,.*/,,'` |
1313 | |
1314 | @@ -55,8 +53,8 @@ |
1315 | |
1316 | Originally written by Per Bothner. |
1317 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1318 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1319 | -Free Software Foundation, Inc. |
1320 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
1321 | +2012, 2013 Free Software Foundation, Inc. |
1322 | |
1323 | This is free software; see the source for copying conditions. There is NO |
1324 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1325 | @@ -200,6 +198,10 @@ |
1326 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
1327 | echo "${machine}-${os}${release}" |
1328 | exit ;; |
1329 | + *:Bitrig:*:*) |
1330 | + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
1331 | + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} |
1332 | + exit ;; |
1333 | *:OpenBSD:*:*) |
1334 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
1335 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
1336 | @@ -302,7 +304,7 @@ |
1337 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
1338 | echo arm-acorn-riscix${UNAME_RELEASE} |
1339 | exit ;; |
1340 | - arm:riscos:*:*|arm:RISCOS:*:*) |
1341 | + arm*:riscos:*:*|arm*:RISCOS:*:*) |
1342 | echo arm-unknown-riscos |
1343 | exit ;; |
1344 | SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
1345 | @@ -801,6 +803,9 @@ |
1346 | i*:CYGWIN*:*) |
1347 | echo ${UNAME_MACHINE}-pc-cygwin |
1348 | exit ;; |
1349 | + *:MINGW64*:*) |
1350 | + echo ${UNAME_MACHINE}-pc-mingw64 |
1351 | + exit ;; |
1352 | *:MINGW*:*) |
1353 | echo ${UNAME_MACHINE}-pc-mingw32 |
1354 | exit ;; |
1355 | @@ -1201,6 +1206,9 @@ |
1356 | BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
1357 | echo i586-pc-haiku |
1358 | exit ;; |
1359 | + x86_64:Haiku:*:*) |
1360 | + echo x86_64-unknown-haiku |
1361 | + exit ;; |
1362 | SX-4:SUPER-UX:*:*) |
1363 | echo sx4-nec-superux${UNAME_RELEASE} |
1364 | exit ;; |
1365 | @@ -1330,9 +1338,6 @@ |
1366 | exit ;; |
1367 | esac |
1368 | |
1369 | -#echo '(No uname command or uname output not recognized.)' 1>&2 |
1370 | -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 |
1371 | - |
1372 | eval $set_cc_for_build |
1373 | cat >$dummy.c <<EOF |
1374 | #ifdef _SEQUENT_ |
1375 | |
1376 | === modified file 'build/config.sub' |
1377 | --- build/config.sub 2013-03-26 01:28:45 +0000 |
1378 | +++ build/config.sub 2013-05-21 02:54:27 +0000 |
1379 | @@ -2,23 +2,19 @@ |
1380 | # Configuration validation subroutine script. |
1381 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1382 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1383 | -# 2011, 2012 Free Software Foundation, Inc. |
1384 | - |
1385 | -timestamp='2012-04-18' |
1386 | - |
1387 | -# This file is (in principle) common to ALL GNU software. |
1388 | -# The presence of a machine in this file suggests that SOME GNU software |
1389 | -# can handle that machine. It does not imply ALL GNU software can. |
1390 | -# |
1391 | -# This file is free software; you can redistribute it and/or modify |
1392 | -# it under the terms of the GNU General Public License as published by |
1393 | -# the Free Software Foundation; either version 2 of the License, or |
1394 | +# 2011, 2012, 2013 Free Software Foundation, Inc. |
1395 | + |
1396 | +timestamp='2012-12-29' |
1397 | + |
1398 | +# This file is free software; you can redistribute it and/or modify it |
1399 | +# under the terms of the GNU General Public License as published by |
1400 | +# the Free Software Foundation; either version 3 of the License, or |
1401 | # (at your option) any later version. |
1402 | # |
1403 | -# This program is distributed in the hope that it will be useful, |
1404 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1405 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1406 | -# GNU General Public License for more details. |
1407 | +# This program is distributed in the hope that it will be useful, but |
1408 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
1409 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
1410 | +# General Public License for more details. |
1411 | # |
1412 | # You should have received a copy of the GNU General Public License |
1413 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
1414 | @@ -26,11 +22,12 @@ |
1415 | # As a special exception to the GNU General Public License, if you |
1416 | # distribute this file as part of a program that contains a |
1417 | # configuration script generated by Autoconf, you may include it under |
1418 | -# the same distribution terms that you use for the rest of that program. |
1419 | - |
1420 | - |
1421 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
1422 | -# diff and a properly formatted GNU ChangeLog entry. |
1423 | +# the same distribution terms that you use for the rest of that |
1424 | +# program. This Exception is an additional permission under section 7 |
1425 | +# of the GNU General Public License, version 3 ("GPLv3"). |
1426 | + |
1427 | + |
1428 | +# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
1429 | # |
1430 | # Configuration subroutine to validate and canonicalize a configuration type. |
1431 | # Supply the specified configuration type as an argument. |
1432 | @@ -74,8 +71,8 @@ |
1433 | GNU config.sub ($timestamp) |
1434 | |
1435 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1436 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1437 | -Free Software Foundation, Inc. |
1438 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, |
1439 | +2012, 2013 Free Software Foundation, Inc. |
1440 | |
1441 | This is free software; see the source for copying conditions. There is NO |
1442 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1443 | @@ -123,7 +120,7 @@ |
1444 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1445 | case $maybe_os in |
1446 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1447 | - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1448 | + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1449 | knetbsd*-gnu* | netbsd*-gnu* | \ |
1450 | kopensolaris*-gnu* | \ |
1451 | storm-chaos* | os2-emx* | rtmk-nova*) |
1452 | @@ -156,7 +153,7 @@ |
1453 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
1454 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
1455 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
1456 | - -apple | -axis | -knuth | -cray | -microblaze) |
1457 | + -apple | -axis | -knuth | -cray | -microblaze*) |
1458 | os= |
1459 | basic_machine=$1 |
1460 | ;; |
1461 | @@ -259,8 +256,10 @@ |
1462 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1463 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1464 | | am33_2.0 \ |
1465 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1466 | - | be32 | be64 \ |
1467 | + | arc \ |
1468 | + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
1469 | + | avr | avr32 \ |
1470 | + | be32 | be64 \ |
1471 | | bfin \ |
1472 | | c4x | clipper \ |
1473 | | d10v | d30v | dlx | dsp16xx \ |
1474 | @@ -273,7 +272,7 @@ |
1475 | | le32 | le64 \ |
1476 | | lm32 \ |
1477 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1478 | - | maxq | mb | microblaze | mcore | mep | metag \ |
1479 | + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ |
1480 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
1481 | | mips16 \ |
1482 | | mips64 | mips64el \ |
1483 | @@ -389,7 +388,8 @@ |
1484 | | lm32-* \ |
1485 | | m32c-* | m32r-* | m32rle-* \ |
1486 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
1487 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
1488 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
1489 | + | microblaze-* | microblazeel-* \ |
1490 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
1491 | | mips16-* \ |
1492 | | mips64-* | mips64el-* \ |
1493 | @@ -788,9 +788,13 @@ |
1494 | basic_machine=ns32k-utek |
1495 | os=-sysv |
1496 | ;; |
1497 | - microblaze) |
1498 | + microblaze*) |
1499 | basic_machine=microblaze-xilinx |
1500 | ;; |
1501 | + mingw64) |
1502 | + basic_machine=x86_64-pc |
1503 | + os=-mingw64 |
1504 | + ;; |
1505 | mingw32) |
1506 | basic_machine=i386-pc |
1507 | os=-mingw32 |
1508 | @@ -1004,7 +1008,7 @@ |
1509 | ;; |
1510 | ppc64) basic_machine=powerpc64-unknown |
1511 | ;; |
1512 | - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
1513 | + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
1514 | ;; |
1515 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
1516 | basic_machine=powerpc64le-unknown |
1517 | @@ -1019,7 +1023,11 @@ |
1518 | basic_machine=i586-unknown |
1519 | os=-pw32 |
1520 | ;; |
1521 | - rdos) |
1522 | + rdos | rdos64) |
1523 | + basic_machine=x86_64-pc |
1524 | + os=-rdos |
1525 | + ;; |
1526 | + rdos32) |
1527 | basic_machine=i386-pc |
1528 | os=-rdos |
1529 | ;; |
1530 | @@ -1352,15 +1360,15 @@ |
1531 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1532 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
1533 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
1534 | - | -openbsd* | -solidbsd* \ |
1535 | + | -bitrig* | -openbsd* | -solidbsd* \ |
1536 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
1537 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
1538 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
1539 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1540 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1541 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1542 | - | -mingw32* | -linux-gnu* | -linux-android* \ |
1543 | - | -linux-newlib* | -linux-uclibc* \ |
1544 | + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
1545 | + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
1546 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1547 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1548 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1549 | |
1550 | === modified file 'build/depcomp' |
1551 | --- build/depcomp 2013-03-26 01:28:45 +0000 |
1552 | +++ build/depcomp 2013-05-21 02:54:27 +0000 |
1553 | @@ -1,9 +1,9 @@ |
1554 | #! /bin/sh |
1555 | # depcomp - compile a program generating dependencies as side-effects |
1556 | |
1557 | -scriptversion=2012-03-27.16; # UTC |
1558 | +scriptversion=2012-10-18.11; # UTC |
1559 | |
1560 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
1561 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1562 | |
1563 | # This program is free software; you can redistribute it and/or modify |
1564 | # it under the terms of the GNU General Public License as published by |
1565 | @@ -27,9 +27,9 @@ |
1566 | |
1567 | case $1 in |
1568 | '') |
1569 | - echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1570 | - exit 1; |
1571 | - ;; |
1572 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1573 | + exit 1; |
1574 | + ;; |
1575 | -h | --h*) |
1576 | cat <<\EOF |
1577 | Usage: depcomp [--help] [--version] PROGRAM [ARGS] |
1578 | @@ -56,11 +56,65 @@ |
1579 | ;; |
1580 | esac |
1581 | |
1582 | +# Get the directory component of the given path, and save it in the |
1583 | +# global variables '$dir'. Note that this directory component will |
1584 | +# be either empty or ending with a '/' character. This is deliberate. |
1585 | +set_dir_from () |
1586 | +{ |
1587 | + case $1 in |
1588 | + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; |
1589 | + *) dir=;; |
1590 | + esac |
1591 | +} |
1592 | + |
1593 | +# Get the suffix-stripped basename of the given path, and save it the |
1594 | +# global variable '$base'. |
1595 | +set_base_from () |
1596 | +{ |
1597 | + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` |
1598 | +} |
1599 | + |
1600 | +# If no dependency file was actually created by the compiler invocation, |
1601 | +# we still have to create a dummy depfile, to avoid errors with the |
1602 | +# Makefile "include basename.Plo" scheme. |
1603 | +make_dummy_depfile () |
1604 | +{ |
1605 | + echo "#dummy" > "$depfile" |
1606 | +} |
1607 | + |
1608 | +# Factor out some common post-processing of the generated depfile. |
1609 | +# Requires the auxiliary global variable '$tmpdepfile' to be set. |
1610 | +aix_post_process_depfile () |
1611 | +{ |
1612 | + # If the compiler actually managed to produce a dependency file, |
1613 | + # post-process it. |
1614 | + if test -f "$tmpdepfile"; then |
1615 | + # Each line is of the form 'foo.o: dependency.h'. |
1616 | + # Do two passes, one to just change these to |
1617 | + # $object: dependency.h |
1618 | + # and one to simply output |
1619 | + # dependency.h: |
1620 | + # which is needed to avoid the deleted-header problem. |
1621 | + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" |
1622 | + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" |
1623 | + } > "$depfile" |
1624 | + rm -f "$tmpdepfile" |
1625 | + else |
1626 | + make_dummy_depfile |
1627 | + fi |
1628 | +} |
1629 | + |
1630 | # A tabulation character. |
1631 | tab=' ' |
1632 | # A newline character. |
1633 | nl=' |
1634 | ' |
1635 | +# Character ranges might be problematic outside the C locale. |
1636 | +# These definitions help. |
1637 | +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ |
1638 | +lower=abcdefghijklmnopqrstuvwxyz |
1639 | +digits=0123456789 |
1640 | +alpha=${upper}${lower} |
1641 | |
1642 | if test -z "$depmode" || test -z "$source" || test -z "$object"; then |
1643 | echo "depcomp: Variables source, object and depmode must be set" 1>&2 |
1644 | @@ -74,6 +128,9 @@ |
1645 | |
1646 | rm -f "$tmpdepfile" |
1647 | |
1648 | +# Avoid interferences from the environment. |
1649 | +gccflag= dashmflag= |
1650 | + |
1651 | # Some modes work just like other modes, but use different flags. We |
1652 | # parameterize here, but still list the modes in the big case below, |
1653 | # to make depend.m4 easier to write. Note that we *cannot* use a case |
1654 | @@ -85,32 +142,32 @@ |
1655 | fi |
1656 | |
1657 | if test "$depmode" = dashXmstdout; then |
1658 | - # This is just like dashmstdout with a different argument. |
1659 | - dashmflag=-xM |
1660 | - depmode=dashmstdout |
1661 | + # This is just like dashmstdout with a different argument. |
1662 | + dashmflag=-xM |
1663 | + depmode=dashmstdout |
1664 | fi |
1665 | |
1666 | cygpath_u="cygpath -u -f -" |
1667 | if test "$depmode" = msvcmsys; then |
1668 | - # This is just like msvisualcpp but w/o cygpath translation. |
1669 | - # Just convert the backslash-escaped backslashes to single forward |
1670 | - # slashes to satisfy depend.m4 |
1671 | - cygpath_u='sed s,\\\\,/,g' |
1672 | - depmode=msvisualcpp |
1673 | + # This is just like msvisualcpp but w/o cygpath translation. |
1674 | + # Just convert the backslash-escaped backslashes to single forward |
1675 | + # slashes to satisfy depend.m4 |
1676 | + cygpath_u='sed s,\\\\,/,g' |
1677 | + depmode=msvisualcpp |
1678 | fi |
1679 | |
1680 | if test "$depmode" = msvc7msys; then |
1681 | - # This is just like msvc7 but w/o cygpath translation. |
1682 | - # Just convert the backslash-escaped backslashes to single forward |
1683 | - # slashes to satisfy depend.m4 |
1684 | - cygpath_u='sed s,\\\\,/,g' |
1685 | - depmode=msvc7 |
1686 | + # This is just like msvc7 but w/o cygpath translation. |
1687 | + # Just convert the backslash-escaped backslashes to single forward |
1688 | + # slashes to satisfy depend.m4 |
1689 | + cygpath_u='sed s,\\\\,/,g' |
1690 | + depmode=msvc7 |
1691 | fi |
1692 | |
1693 | if test "$depmode" = xlc; then |
1694 | - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. |
1695 | - gccflag=-qmakedep=gcc,-MF |
1696 | - depmode=gcc |
1697 | + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. |
1698 | + gccflag=-qmakedep=gcc,-MF |
1699 | + depmode=gcc |
1700 | fi |
1701 | |
1702 | case "$depmode" in |
1703 | @@ -133,8 +190,7 @@ |
1704 | done |
1705 | "$@" |
1706 | stat=$? |
1707 | - if test $stat -eq 0; then : |
1708 | - else |
1709 | + if test $stat -ne 0; then |
1710 | rm -f "$tmpdepfile" |
1711 | exit $stat |
1712 | fi |
1713 | @@ -142,13 +198,17 @@ |
1714 | ;; |
1715 | |
1716 | gcc) |
1717 | +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. |
1718 | +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. |
1719 | +## (see the conditional assignment to $gccflag above). |
1720 | ## There are various ways to get dependency output from gcc. Here's |
1721 | ## why we pick this rather obscure method: |
1722 | ## - Don't want to use -MD because we'd like the dependencies to end |
1723 | ## up in a subdir. Having to rename by hand is ugly. |
1724 | ## (We might end up doing this anyway to support other compilers.) |
1725 | ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like |
1726 | -## -MM, not -M (despite what the docs say). |
1727 | +## -MM, not -M (despite what the docs say). Also, it might not be |
1728 | +## supported by the other compilers which use the 'gcc' depmode. |
1729 | ## - Using -M directly means running the compiler twice (even worse |
1730 | ## than renaming). |
1731 | if test -z "$gccflag"; then |
1732 | @@ -156,15 +216,14 @@ |
1733 | fi |
1734 | "$@" -Wp,"$gccflag$tmpdepfile" |
1735 | stat=$? |
1736 | - if test $stat -eq 0; then : |
1737 | - else |
1738 | + if test $stat -ne 0; then |
1739 | rm -f "$tmpdepfile" |
1740 | exit $stat |
1741 | fi |
1742 | rm -f "$depfile" |
1743 | echo "$object : \\" > "$depfile" |
1744 | - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz |
1745 | -## The second -e expression handles DOS-style file names with drive letters. |
1746 | + # The second -e expression handles DOS-style file names with drive |
1747 | + # letters. |
1748 | sed -e 's/^[^:]*: / /' \ |
1749 | -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" |
1750 | ## This next piece of magic avoids the "deleted header file" problem. |
1751 | @@ -173,15 +232,15 @@ |
1752 | ## typically no way to rebuild the header). We avoid this by adding |
1753 | ## dummy dependencies for each header file. Too bad gcc doesn't do |
1754 | ## this for us directly. |
1755 | - tr ' ' "$nl" < "$tmpdepfile" | |
1756 | ## Some versions of gcc put a space before the ':'. On the theory |
1757 | ## that the space means something, we add a space to the output as |
1758 | ## well. hp depmode also adds that space, but also prefixes the VPATH |
1759 | ## to the object. Take care to not repeat it in the output. |
1760 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
1761 | ## correctly. Breaking it into two sed invocations is a workaround. |
1762 | - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
1763 | - | sed -e 's/$/ :/' >> "$depfile" |
1764 | + tr ' ' "$nl" < "$tmpdepfile" \ |
1765 | + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
1766 | + | sed -e 's/$/ :/' >> "$depfile" |
1767 | rm -f "$tmpdepfile" |
1768 | ;; |
1769 | |
1770 | @@ -199,8 +258,7 @@ |
1771 | "$@" -MDupdate "$tmpdepfile" |
1772 | fi |
1773 | stat=$? |
1774 | - if test $stat -eq 0; then : |
1775 | - else |
1776 | + if test $stat -ne 0; then |
1777 | rm -f "$tmpdepfile" |
1778 | exit $stat |
1779 | fi |
1780 | @@ -208,7 +266,6 @@ |
1781 | |
1782 | if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files |
1783 | echo "$object : \\" > "$depfile" |
1784 | - |
1785 | # Clip off the initial element (the dependent). Don't try to be |
1786 | # clever and replace this with sed code, as IRIX sed won't handle |
1787 | # lines with more than a fixed number of characters (4096 in |
1788 | @@ -216,19 +273,15 @@ |
1789 | # the IRIX cc adds comments like '#:fec' to the end of the |
1790 | # dependency line. |
1791 | tr ' ' "$nl" < "$tmpdepfile" \ |
1792 | - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ |
1793 | - tr "$nl" ' ' >> "$depfile" |
1794 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ |
1795 | + | tr "$nl" ' ' >> "$depfile" |
1796 | echo >> "$depfile" |
1797 | - |
1798 | # The second pass generates a dummy entry for each header file. |
1799 | tr ' ' "$nl" < "$tmpdepfile" \ |
1800 | - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
1801 | - >> "$depfile" |
1802 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
1803 | + >> "$depfile" |
1804 | else |
1805 | - # The sourcefile does not contain any dependencies, so just |
1806 | - # store a dummy comment line, to avoid errors with the Makefile |
1807 | - # "include basename.Plo" scheme. |
1808 | - echo "#dummy" > "$depfile" |
1809 | + make_dummy_depfile |
1810 | fi |
1811 | rm -f "$tmpdepfile" |
1812 | ;; |
1813 | @@ -246,9 +299,8 @@ |
1814 | # current directory. Also, the AIX compiler puts '$object:' at the |
1815 | # start of each line; $object doesn't have directory information. |
1816 | # Version 6 uses the directory in both cases. |
1817 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
1818 | - test "x$dir" = "x$object" && dir= |
1819 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
1820 | + set_dir_from "$object" |
1821 | + set_base_from "$object" |
1822 | if test "$libtool" = yes; then |
1823 | tmpdepfile1=$dir$base.u |
1824 | tmpdepfile2=$base.u |
1825 | @@ -261,9 +313,7 @@ |
1826 | "$@" -M |
1827 | fi |
1828 | stat=$? |
1829 | - |
1830 | - if test $stat -eq 0; then : |
1831 | - else |
1832 | + if test $stat -ne 0; then |
1833 | rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
1834 | exit $stat |
1835 | fi |
1836 | @@ -272,65 +322,113 @@ |
1837 | do |
1838 | test -f "$tmpdepfile" && break |
1839 | done |
1840 | - if test -f "$tmpdepfile"; then |
1841 | - # Each line is of the form 'foo.o: dependent.h'. |
1842 | - # Do two passes, one to just change these to |
1843 | - # '$object: dependent.h' and one to simply 'dependent.h:'. |
1844 | - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
1845 | - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
1846 | - else |
1847 | - # The sourcefile does not contain any dependencies, so just |
1848 | - # store a dummy comment line, to avoid errors with the Makefile |
1849 | - # "include basename.Plo" scheme. |
1850 | - echo "#dummy" > "$depfile" |
1851 | + aix_post_process_depfile |
1852 | + ;; |
1853 | + |
1854 | +tcc) |
1855 | + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 |
1856 | + # FIXME: That version still under development at the moment of writing. |
1857 | + # Make that this statement remains true also for stable, released |
1858 | + # versions. |
1859 | + # It will wrap lines (doesn't matter whether long or short) with a |
1860 | + # trailing '\', as in: |
1861 | + # |
1862 | + # foo.o : \ |
1863 | + # foo.c \ |
1864 | + # foo.h \ |
1865 | + # |
1866 | + # It will put a trailing '\' even on the last line, and will use leading |
1867 | + # spaces rather than leading tabs (at least since its commit 0394caf7 |
1868 | + # "Emit spaces for -MD"). |
1869 | + "$@" -MD -MF "$tmpdepfile" |
1870 | + stat=$? |
1871 | + if test $stat -ne 0; then |
1872 | + rm -f "$tmpdepfile" |
1873 | + exit $stat |
1874 | fi |
1875 | + rm -f "$depfile" |
1876 | + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. |
1877 | + # We have to change lines of the first kind to '$object: \'. |
1878 | + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" |
1879 | + # And for each line of the second kind, we have to emit a 'dep.h:' |
1880 | + # dummy dependency, to avoid the deleted-header problem. |
1881 | + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" |
1882 | rm -f "$tmpdepfile" |
1883 | ;; |
1884 | |
1885 | -icc) |
1886 | - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. |
1887 | - # However on |
1888 | - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
1889 | - # ICC 7.0 will fill foo.d with something like |
1890 | - # foo.o: sub/foo.c |
1891 | - # foo.o: sub/foo.h |
1892 | - # which is wrong. We want |
1893 | - # sub/foo.o: sub/foo.c |
1894 | - # sub/foo.o: sub/foo.h |
1895 | - # sub/foo.c: |
1896 | - # sub/foo.h: |
1897 | - # ICC 7.1 will output |
1898 | +## The order of this option in the case statement is important, since the |
1899 | +## shell code in configure will try each of these formats in the order |
1900 | +## listed in this file. A plain '-MD' option would be understood by many |
1901 | +## compilers, so we must ensure this comes after the gcc and icc options. |
1902 | +pgcc) |
1903 | + # Portland's C compiler understands '-MD'. |
1904 | + # Will always output deps to 'file.d' where file is the root name of the |
1905 | + # source file under compilation, even if file resides in a subdirectory. |
1906 | + # The object file name does not affect the name of the '.d' file. |
1907 | + # pgcc 10.2 will output |
1908 | # foo.o: sub/foo.c sub/foo.h |
1909 | - # and will wrap long lines using '\': |
1910 | + # and will wrap long lines using '\' : |
1911 | # foo.o: sub/foo.c ... \ |
1912 | # sub/foo.h ... \ |
1913 | # ... |
1914 | - # tcc 0.9.26 (FIXME still under development at the moment of writing) |
1915 | - # will emit a similar output, but also prepend the continuation lines |
1916 | - # with horizontal tabulation characters. |
1917 | - "$@" -MD -MF "$tmpdepfile" |
1918 | - stat=$? |
1919 | - if test $stat -eq 0; then : |
1920 | - else |
1921 | + set_dir_from "$object" |
1922 | + # Use the source, not the object, to determine the base name, since |
1923 | + # that's sadly what pgcc will do too. |
1924 | + set_base_from "$source" |
1925 | + tmpdepfile=$base.d |
1926 | + |
1927 | + # For projects that build the same source file twice into different object |
1928 | + # files, the pgcc approach of using the *source* file root name can cause |
1929 | + # problems in parallel builds. Use a locking strategy to avoid stomping on |
1930 | + # the same $tmpdepfile. |
1931 | + lockdir=$base.d-lock |
1932 | + trap " |
1933 | + echo '$0: caught signal, cleaning up...' >&2 |
1934 | + rmdir '$lockdir' |
1935 | + exit 1 |
1936 | + " 1 2 13 15 |
1937 | + numtries=100 |
1938 | + i=$numtries |
1939 | + while test $i -gt 0; do |
1940 | + # mkdir is a portable test-and-set. |
1941 | + if mkdir "$lockdir" 2>/dev/null; then |
1942 | + # This process acquired the lock. |
1943 | + "$@" -MD |
1944 | + stat=$? |
1945 | + # Release the lock. |
1946 | + rmdir "$lockdir" |
1947 | + break |
1948 | + else |
1949 | + # If the lock is being held by a different process, wait |
1950 | + # until the winning process is done or we timeout. |
1951 | + while test -d "$lockdir" && test $i -gt 0; do |
1952 | + sleep 1 |
1953 | + i=`expr $i - 1` |
1954 | + done |
1955 | + fi |
1956 | + i=`expr $i - 1` |
1957 | + done |
1958 | + trap - 1 2 13 15 |
1959 | + if test $i -le 0; then |
1960 | + echo "$0: failed to acquire lock after $numtries attempts" >&2 |
1961 | + echo "$0: check lockdir '$lockdir'" >&2 |
1962 | + exit 1 |
1963 | + fi |
1964 | + |
1965 | + if test $stat -ne 0; then |
1966 | rm -f "$tmpdepfile" |
1967 | exit $stat |
1968 | fi |
1969 | rm -f "$depfile" |
1970 | - # Each line is of the form 'foo.o: dependent.h', |
1971 | - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. |
1972 | + # Each line is of the form `foo.o: dependent.h', |
1973 | + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. |
1974 | # Do two passes, one to just change these to |
1975 | - # '$object: dependent.h' and one to simply 'dependent.h:'. |
1976 | - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ |
1977 | - < "$tmpdepfile" > "$depfile" |
1978 | - sed ' |
1979 | - s/[ '"$tab"'][ '"$tab"']*/ /g |
1980 | - s/^ *// |
1981 | - s/ *\\*$// |
1982 | - s/^[^:]*: *// |
1983 | - /^$/d |
1984 | - /:$/d |
1985 | - s/$/ :/ |
1986 | - ' < "$tmpdepfile" >> "$depfile" |
1987 | + # `$object: dependent.h' and one to simply `dependent.h:'. |
1988 | + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" |
1989 | + # Some versions of the HPUX 10.20 sed can't process this invocation |
1990 | + # correctly. Breaking it into two sed invocations is a workaround. |
1991 | + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ |
1992 | + | sed -e 's/$/ :/' >> "$depfile" |
1993 | rm -f "$tmpdepfile" |
1994 | ;; |
1995 | |
1996 | @@ -341,9 +439,8 @@ |
1997 | # 'foo.d', which lands next to the object file, wherever that |
1998 | # happens to be. |
1999 | # Much of this is similar to the tru64 case; see comments there. |
2000 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
2001 | - test "x$dir" = "x$object" && dir= |
2002 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
2003 | + set_dir_from "$object" |
2004 | + set_base_from "$object" |
2005 | if test "$libtool" = yes; then |
2006 | tmpdepfile1=$dir$base.d |
2007 | tmpdepfile2=$dir.libs/$base.d |
2008 | @@ -354,8 +451,7 @@ |
2009 | "$@" +Maked |
2010 | fi |
2011 | stat=$? |
2012 | - if test $stat -eq 0; then : |
2013 | - else |
2014 | + if test $stat -ne 0; then |
2015 | rm -f "$tmpdepfile1" "$tmpdepfile2" |
2016 | exit $stat |
2017 | fi |
2018 | @@ -365,76 +461,61 @@ |
2019 | test -f "$tmpdepfile" && break |
2020 | done |
2021 | if test -f "$tmpdepfile"; then |
2022 | - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" |
2023 | + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" |
2024 | # Add 'dependent.h:' lines. |
2025 | sed -ne '2,${ |
2026 | - s/^ *// |
2027 | - s/ \\*$// |
2028 | - s/$/:/ |
2029 | - p |
2030 | - }' "$tmpdepfile" >> "$depfile" |
2031 | + s/^ *// |
2032 | + s/ \\*$// |
2033 | + s/$/:/ |
2034 | + p |
2035 | + }' "$tmpdepfile" >> "$depfile" |
2036 | else |
2037 | - echo "#dummy" > "$depfile" |
2038 | + make_dummy_depfile |
2039 | fi |
2040 | rm -f "$tmpdepfile" "$tmpdepfile2" |
2041 | ;; |
2042 | |
2043 | tru64) |
2044 | - # The Tru64 compiler uses -MD to generate dependencies as a side |
2045 | - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
2046 | - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
2047 | - # dependencies in 'foo.d' instead, so we check for that too. |
2048 | - # Subdirectories are respected. |
2049 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
2050 | - test "x$dir" = "x$object" && dir= |
2051 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
2052 | - |
2053 | - if test "$libtool" = yes; then |
2054 | - # With Tru64 cc, shared objects can also be used to make a |
2055 | - # static library. This mechanism is used in libtool 1.4 series to |
2056 | - # handle both shared and static libraries in a single compilation. |
2057 | - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. |
2058 | - # |
2059 | - # With libtool 1.5 this exception was removed, and libtool now |
2060 | - # generates 2 separate objects for the 2 libraries. These two |
2061 | - # compilations output dependencies in $dir.libs/$base.o.d and |
2062 | - # in $dir$base.o.d. We have to check for both files, because |
2063 | - # one of the two compilations can be disabled. We should prefer |
2064 | - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is |
2065 | - # automatically cleaned when .libs/ is deleted, while ignoring |
2066 | - # the former would cause a distcleancheck panic. |
2067 | - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 |
2068 | - tmpdepfile2=$dir$base.o.d # libtool 1.5 |
2069 | - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 |
2070 | - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 |
2071 | - "$@" -Wc,-MD |
2072 | - else |
2073 | - tmpdepfile1=$dir$base.o.d |
2074 | - tmpdepfile2=$dir$base.d |
2075 | - tmpdepfile3=$dir$base.d |
2076 | - tmpdepfile4=$dir$base.d |
2077 | - "$@" -MD |
2078 | - fi |
2079 | - |
2080 | - stat=$? |
2081 | - if test $stat -eq 0; then : |
2082 | - else |
2083 | - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
2084 | - exit $stat |
2085 | - fi |
2086 | - |
2087 | - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
2088 | - do |
2089 | - test -f "$tmpdepfile" && break |
2090 | - done |
2091 | - if test -f "$tmpdepfile"; then |
2092 | - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
2093 | - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
2094 | - else |
2095 | - echo "#dummy" > "$depfile" |
2096 | - fi |
2097 | - rm -f "$tmpdepfile" |
2098 | - ;; |
2099 | + # The Tru64 compiler uses -MD to generate dependencies as a side |
2100 | + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
2101 | + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
2102 | + # dependencies in 'foo.d' instead, so we check for that too. |
2103 | + # Subdirectories are respected. |
2104 | + set_dir_from "$object" |
2105 | + set_base_from "$object" |
2106 | + |
2107 | + if test "$libtool" = yes; then |
2108 | + # Libtool generates 2 separate objects for the 2 libraries. These |
2109 | + # two compilations output dependencies in $dir.libs/$base.o.d and |
2110 | + # in $dir$base.o.d. We have to check for both files, because |
2111 | + # one of the two compilations can be disabled. We should prefer |
2112 | + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is |
2113 | + # automatically cleaned when .libs/ is deleted, while ignoring |
2114 | + # the former would cause a distcleancheck panic. |
2115 | + tmpdepfile1=$dir$base.o.d # libtool 1.5 |
2116 | + tmpdepfile2=$dir.libs/$base.o.d # Likewise. |
2117 | + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 |
2118 | + "$@" -Wc,-MD |
2119 | + else |
2120 | + tmpdepfile1=$dir$base.d |
2121 | + tmpdepfile2=$dir$base.d |
2122 | + tmpdepfile3=$dir$base.d |
2123 | + "$@" -MD |
2124 | + fi |
2125 | + |
2126 | + stat=$? |
2127 | + if test $stat -ne 0; then |
2128 | + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
2129 | + exit $stat |
2130 | + fi |
2131 | + |
2132 | + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
2133 | + do |
2134 | + test -f "$tmpdepfile" && break |
2135 | + done |
2136 | + # Same post-processing that is required for AIX mode. |
2137 | + aix_post_process_depfile |
2138 | + ;; |
2139 | |
2140 | msvc7) |
2141 | if test "$libtool" = yes; then |
2142 | @@ -445,8 +526,7 @@ |
2143 | "$@" $showIncludes > "$tmpdepfile" |
2144 | stat=$? |
2145 | grep -v '^Note: including file: ' "$tmpdepfile" |
2146 | - if test "$stat" = 0; then : |
2147 | - else |
2148 | + if test $stat -ne 0; then |
2149 | rm -f "$tmpdepfile" |
2150 | exit $stat |
2151 | fi |
2152 | @@ -523,13 +603,14 @@ |
2153 | # in the target name. This is to cope with DOS-style filenames: |
2154 | # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. |
2155 | "$@" $dashmflag | |
2156 | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" |
2157 | + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" |
2158 | rm -f "$depfile" |
2159 | cat < "$tmpdepfile" > "$depfile" |
2160 | - tr ' ' "$nl" < "$tmpdepfile" | \ |
2161 | -## Some versions of the HPUX 10.20 sed can't process this invocation |
2162 | -## correctly. Breaking it into two sed invocations is a workaround. |
2163 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
2164 | + # Some versions of the HPUX 10.20 sed can't process this sed invocation |
2165 | + # correctly. Breaking it into two sed invocations is a workaround. |
2166 | + tr ' ' "$nl" < "$tmpdepfile" \ |
2167 | + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ |
2168 | + | sed -e 's/$/ :/' >> "$depfile" |
2169 | rm -f "$tmpdepfile" |
2170 | ;; |
2171 | |
2172 | @@ -582,10 +663,12 @@ |
2173 | # makedepend may prepend the VPATH from the source file name to the object. |
2174 | # No need to regex-escape $object, excess matching of '.' is harmless. |
2175 | sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
2176 | - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ |
2177 | -## Some versions of the HPUX 10.20 sed can't process this invocation |
2178 | -## correctly. Breaking it into two sed invocations is a workaround. |
2179 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
2180 | + # Some versions of the HPUX 10.20 sed can't process the last invocation |
2181 | + # correctly. Breaking it into two sed invocations is a workaround. |
2182 | + sed '1,2d' "$tmpdepfile" \ |
2183 | + | tr ' ' "$nl" \ |
2184 | + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ |
2185 | + | sed -e 's/$/ :/' >> "$depfile" |
2186 | rm -f "$tmpdepfile" "$tmpdepfile".bak |
2187 | ;; |
2188 | |
2189 | @@ -621,10 +704,10 @@ |
2190 | esac |
2191 | done |
2192 | |
2193 | - "$@" -E | |
2194 | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
2195 | - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | |
2196 | - sed '$ s: \\$::' > "$tmpdepfile" |
2197 | + "$@" -E \ |
2198 | + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
2199 | + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
2200 | + | sed '$ s: \\$::' > "$tmpdepfile" |
2201 | rm -f "$depfile" |
2202 | echo "$object : \\" > "$depfile" |
2203 | cat < "$tmpdepfile" >> "$depfile" |
2204 | @@ -656,15 +739,15 @@ |
2205 | shift |
2206 | ;; |
2207 | "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") |
2208 | - set fnord "$@" |
2209 | - shift |
2210 | - shift |
2211 | - ;; |
2212 | + set fnord "$@" |
2213 | + shift |
2214 | + shift |
2215 | + ;; |
2216 | *) |
2217 | - set fnord "$@" "$arg" |
2218 | - shift |
2219 | - shift |
2220 | - ;; |
2221 | + set fnord "$@" "$arg" |
2222 | + shift |
2223 | + shift |
2224 | + ;; |
2225 | esac |
2226 | done |
2227 | "$@" -E 2>/dev/null | |
2228 | |
2229 | === modified file 'build/mingw/Makefile.in' |
2230 | --- build/mingw/Makefile.in 2013-03-26 01:28:45 +0000 |
2231 | +++ build/mingw/Makefile.in 2013-05-21 02:54:27 +0000 |
2232 | @@ -1,4 +1,4 @@ |
2233 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
2234 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
2235 | # @configure_input@ |
2236 | |
2237 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2238 | @@ -50,7 +50,7 @@ |
2239 | build_triplet = @build@ |
2240 | host_triplet = @host@ |
2241 | subdir = build/mingw |
2242 | -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
2243 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README |
2244 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2245 | am__aclocal_m4_deps = \ |
2246 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
2247 | @@ -97,6 +97,7 @@ |
2248 | n|no|NO) false;; \ |
2249 | *) (install-info --version) >/dev/null 2>&1;; \ |
2250 | esac |
2251 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
2252 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2253 | ACLOCAL = @ACLOCAL@ |
2254 | ALL_LINGUAS = @ALL_LINGUAS@ |
2255 | @@ -364,11 +365,9 @@ |
2256 | |
2257 | clean-libtool: |
2258 | -rm -rf .libs _libs |
2259 | -tags: TAGS |
2260 | -TAGS: |
2261 | +tags TAGS: |
2262 | |
2263 | -ctags: CTAGS |
2264 | -CTAGS: |
2265 | +ctags CTAGS: |
2266 | |
2267 | cscope cscopelist: |
2268 | |
2269 | @@ -506,15 +505,16 @@ |
2270 | .MAKE: install-am install-strip |
2271 | |
2272 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
2273 | - distclean distclean-generic distclean-libtool distdir dvi \ |
2274 | - dvi-am html html-am info info-am install install-am \ |
2275 | - install-data install-data-am install-dvi install-dvi-am \ |
2276 | - install-exec install-exec-am install-html install-html-am \ |
2277 | - install-info install-info-am install-man install-pdf \ |
2278 | - install-pdf-am install-ps install-ps-am install-strip \ |
2279 | - installcheck installcheck-am installdirs maintainer-clean \ |
2280 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
2281 | - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am |
2282 | + cscopelist-am ctags-am distclean distclean-generic \ |
2283 | + distclean-libtool distdir dvi dvi-am html html-am info info-am \ |
2284 | + install install-am install-data install-data-am install-dvi \ |
2285 | + install-dvi-am install-exec install-exec-am install-html \ |
2286 | + install-html-am install-info install-info-am install-man \ |
2287 | + install-pdf install-pdf-am install-ps install-ps-am \ |
2288 | + install-strip installcheck installcheck-am installdirs \ |
2289 | + maintainer-clean maintainer-clean-generic mostlyclean \ |
2290 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2291 | + tags-am uninstall uninstall-am |
2292 | |
2293 | |
2294 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
2295 | |
2296 | === modified file 'build/missing' |
2297 | --- build/missing 2013-03-20 12:41:57 +0000 |
2298 | +++ build/missing 2013-05-21 02:54:27 +0000 |
2299 | @@ -1,10 +1,10 @@ |
2300 | #! /bin/sh |
2301 | -# Common stub for a few missing GNU programs while installing. |
2302 | - |
2303 | -scriptversion=2012-01-06.18; # UTC |
2304 | - |
2305 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
2306 | -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2307 | +# Common wrapper for a few potentially missing GNU programs. |
2308 | + |
2309 | +scriptversion=2012-06-26.16; # UTC |
2310 | + |
2311 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2312 | +# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2313 | |
2314 | # This program is free software; you can redistribute it and/or modify |
2315 | # it under the terms of the GNU General Public License as published by |
2316 | @@ -29,61 +29,33 @@ |
2317 | exit 1 |
2318 | fi |
2319 | |
2320 | -run=: |
2321 | -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' |
2322 | -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' |
2323 | - |
2324 | -# In the cases where this matters, 'missing' is being run in the |
2325 | -# srcdir already. |
2326 | -if test -f configure.ac; then |
2327 | - configure_ac=configure.ac |
2328 | -else |
2329 | - configure_ac=configure.in |
2330 | -fi |
2331 | - |
2332 | -msg="missing on your system" |
2333 | - |
2334 | case $1 in |
2335 | ---run) |
2336 | - # Try to run requested program, and just exit if it succeeds. |
2337 | - run= |
2338 | - shift |
2339 | - "$@" && exit 0 |
2340 | - # Exit code 63 means version mismatch. This often happens |
2341 | - # when the user try to use an ancient version of a tool on |
2342 | - # a file that requires a minimum version. In this case we |
2343 | - # we should proceed has if the program had been absent, or |
2344 | - # if --run hadn't been passed. |
2345 | - if test $? = 63; then |
2346 | - run=: |
2347 | - msg="probably too old" |
2348 | - fi |
2349 | - ;; |
2350 | + |
2351 | + --is-lightweight) |
2352 | + # Used by our autoconf macros to check whether the available missing |
2353 | + # script is modern enough. |
2354 | + exit 0 |
2355 | + ;; |
2356 | + |
2357 | + --run) |
2358 | + # Back-compat with the calling convention used by older automake. |
2359 | + shift |
2360 | + ;; |
2361 | |
2362 | -h|--h|--he|--hel|--help) |
2363 | echo "\ |
2364 | $0 [OPTION]... PROGRAM [ARGUMENT]... |
2365 | |
2366 | -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an |
2367 | -error status if there is no known handling for PROGRAM. |
2368 | +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due |
2369 | +to PROGRAM being missing or too old. |
2370 | |
2371 | Options: |
2372 | -h, --help display this help and exit |
2373 | -v, --version output version information and exit |
2374 | - --run try to run the given command, and emulate it if it fails |
2375 | |
2376 | Supported PROGRAM values: |
2377 | - aclocal touch file 'aclocal.m4' |
2378 | - autoconf touch file 'configure' |
2379 | - autoheader touch file 'config.h.in' |
2380 | - autom4te touch the output file, or create a stub one |
2381 | - automake touch all 'Makefile.in' files |
2382 | - bison create 'y.tab.[ch]', if possible, from existing .[ch] |
2383 | - flex create 'lex.yy.c', if possible, from existing .c |
2384 | - help2man touch the output file |
2385 | - lex create 'lex.yy.c', if possible, from existing .c |
2386 | - makeinfo touch the output file |
2387 | - yacc create 'y.tab.[ch]', if possible, from existing .[ch] |
2388 | + aclocal autoconf autoheader autom4te automake makeinfo |
2389 | + bison yacc flex lex help2man |
2390 | |
2391 | Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and |
2392 | 'g' are ignored when checking the name. |
2393 | @@ -98,228 +70,141 @@ |
2394 | ;; |
2395 | |
2396 | -*) |
2397 | - echo 1>&2 "$0: Unknown '$1' option" |
2398 | + echo 1>&2 "$0: unknown '$1' option" |
2399 | echo 1>&2 "Try '$0 --help' for more information" |
2400 | exit 1 |
2401 | ;; |
2402 | |
2403 | esac |
2404 | |
2405 | -# normalize program name to check for. |
2406 | -program=`echo "$1" | sed ' |
2407 | - s/^gnu-//; t |
2408 | - s/^gnu//; t |
2409 | - s/^g//; t'` |
2410 | - |
2411 | -# Now exit if we have it, but it failed. Also exit now if we |
2412 | -# don't have it and --version was passed (most likely to detect |
2413 | -# the program). This is about non-GNU programs, so use $1 not |
2414 | -# $program. |
2415 | -case $1 in |
2416 | - lex*|yacc*) |
2417 | - # Not GNU programs, they don't have --version. |
2418 | - ;; |
2419 | - |
2420 | - *) |
2421 | - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
2422 | - # We have it, but it failed. |
2423 | - exit 1 |
2424 | - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then |
2425 | - # Could not run --version or --help. This is probably someone |
2426 | - # running '$TOOL --version' or '$TOOL --help' to check whether |
2427 | - # $TOOL exists and not knowing $TOOL uses missing. |
2428 | - exit 1 |
2429 | - fi |
2430 | - ;; |
2431 | -esac |
2432 | - |
2433 | -# If it does not exist, or fails to run (possibly an outdated version), |
2434 | -# try to emulate it. |
2435 | -case $program in |
2436 | - aclocal*) |
2437 | - echo 1>&2 "\ |
2438 | -WARNING: '$1' is $msg. You should only need it if |
2439 | - you modified 'acinclude.m4' or '${configure_ac}'. You might want |
2440 | - to install the Automake and Perl packages. Grab them from |
2441 | - any GNU archive site." |
2442 | - touch aclocal.m4 |
2443 | - ;; |
2444 | - |
2445 | - autoconf*) |
2446 | - echo 1>&2 "\ |
2447 | -WARNING: '$1' is $msg. You should only need it if |
2448 | - you modified '${configure_ac}'. You might want to install the |
2449 | - Autoconf and GNU m4 packages. Grab them from any GNU |
2450 | - archive site." |
2451 | - touch configure |
2452 | - ;; |
2453 | - |
2454 | - autoheader*) |
2455 | - echo 1>&2 "\ |
2456 | -WARNING: '$1' is $msg. You should only need it if |
2457 | - you modified 'acconfig.h' or '${configure_ac}'. You might want |
2458 | - to install the Autoconf and GNU m4 packages. Grab them |
2459 | - from any GNU archive site." |
2460 | - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` |
2461 | - test -z "$files" && files="config.h" |
2462 | - touch_files= |
2463 | - for f in $files; do |
2464 | - case $f in |
2465 | - *:*) touch_files="$touch_files "`echo "$f" | |
2466 | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; |
2467 | - *) touch_files="$touch_files $f.in";; |
2468 | - esac |
2469 | - done |
2470 | - touch $touch_files |
2471 | - ;; |
2472 | - |
2473 | - automake*) |
2474 | - echo 1>&2 "\ |
2475 | -WARNING: '$1' is $msg. You should only need it if |
2476 | - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. |
2477 | - You might want to install the Automake and Perl packages. |
2478 | - Grab them from any GNU archive site." |
2479 | - find . -type f -name Makefile.am -print | |
2480 | - sed 's/\.am$/.in/' | |
2481 | - while read f; do touch "$f"; done |
2482 | - ;; |
2483 | - |
2484 | - autom4te*) |
2485 | - echo 1>&2 "\ |
2486 | -WARNING: '$1' is needed, but is $msg. |
2487 | - You might have modified some files without having the |
2488 | - proper tools for further handling them. |
2489 | - You can get '$1' as part of Autoconf from any GNU |
2490 | - archive site." |
2491 | - |
2492 | - file=`echo "$*" | sed -n "$sed_output"` |
2493 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
2494 | - if test -f "$file"; then |
2495 | - touch $file |
2496 | - else |
2497 | - test -z "$file" || exec >$file |
2498 | - echo "#! /bin/sh" |
2499 | - echo "# Created by GNU Automake missing as a replacement of" |
2500 | - echo "# $ $@" |
2501 | - echo "exit 0" |
2502 | - chmod +x $file |
2503 | - exit 1 |
2504 | - fi |
2505 | - ;; |
2506 | - |
2507 | - bison*|yacc*) |
2508 | - echo 1>&2 "\ |
2509 | -WARNING: '$1' $msg. You should only need it if |
2510 | - you modified a '.y' file. You may need the Bison package |
2511 | - in order for those modifications to take effect. You can get |
2512 | - Bison from any GNU archive site." |
2513 | - rm -f y.tab.c y.tab.h |
2514 | - if test $# -ne 1; then |
2515 | - eval LASTARG=\${$#} |
2516 | - case $LASTARG in |
2517 | - *.y) |
2518 | - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
2519 | - if test -f "$SRCFILE"; then |
2520 | - cp "$SRCFILE" y.tab.c |
2521 | - fi |
2522 | - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` |
2523 | - if test -f "$SRCFILE"; then |
2524 | - cp "$SRCFILE" y.tab.h |
2525 | - fi |
2526 | - ;; |
2527 | - esac |
2528 | - fi |
2529 | - if test ! -f y.tab.h; then |
2530 | - echo >y.tab.h |
2531 | - fi |
2532 | - if test ! -f y.tab.c; then |
2533 | - echo 'main() { return 0; }' >y.tab.c |
2534 | - fi |
2535 | - ;; |
2536 | - |
2537 | - lex*|flex*) |
2538 | - echo 1>&2 "\ |
2539 | -WARNING: '$1' is $msg. You should only need it if |
2540 | - you modified a '.l' file. You may need the Flex package |
2541 | - in order for those modifications to take effect. You can get |
2542 | - Flex from any GNU archive site." |
2543 | - rm -f lex.yy.c |
2544 | - if test $# -ne 1; then |
2545 | - eval LASTARG=\${$#} |
2546 | - case $LASTARG in |
2547 | - *.l) |
2548 | - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
2549 | - if test -f "$SRCFILE"; then |
2550 | - cp "$SRCFILE" lex.yy.c |
2551 | - fi |
2552 | - ;; |
2553 | - esac |
2554 | - fi |
2555 | - if test ! -f lex.yy.c; then |
2556 | - echo 'main() { return 0; }' >lex.yy.c |
2557 | - fi |
2558 | - ;; |
2559 | - |
2560 | - help2man*) |
2561 | - echo 1>&2 "\ |
2562 | -WARNING: '$1' is $msg. You should only need it if |
2563 | - you modified a dependency of a manual page. You may need the |
2564 | - Help2man package in order for those modifications to take |
2565 | - effect. You can get Help2man from any GNU archive site." |
2566 | - |
2567 | - file=`echo "$*" | sed -n "$sed_output"` |
2568 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
2569 | - if test -f "$file"; then |
2570 | - touch $file |
2571 | - else |
2572 | - test -z "$file" || exec >$file |
2573 | - echo ".ab help2man is required to generate this page" |
2574 | - exit $? |
2575 | - fi |
2576 | - ;; |
2577 | - |
2578 | - makeinfo*) |
2579 | - echo 1>&2 "\ |
2580 | -WARNING: '$1' is $msg. You should only need it if |
2581 | - you modified a '.texi' or '.texinfo' file, or any other file |
2582 | - indirectly affecting the aspect of the manual. The spurious |
2583 | - call might also be the consequence of using a buggy 'make' (AIX, |
2584 | - DU, IRIX). You might want to install the Texinfo package or |
2585 | - the GNU make package. Grab either from any GNU archive site." |
2586 | - # The file to touch is that specified with -o ... |
2587 | - file=`echo "$*" | sed -n "$sed_output"` |
2588 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
2589 | - if test -z "$file"; then |
2590 | - # ... or it is the one specified with @setfilename ... |
2591 | - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` |
2592 | - file=`sed -n ' |
2593 | - /^@setfilename/{ |
2594 | - s/.* \([^ ]*\) *$/\1/ |
2595 | - p |
2596 | - q |
2597 | - }' $infile` |
2598 | - # ... or it is derived from the source name (dir/f.texi becomes f.info) |
2599 | - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info |
2600 | - fi |
2601 | - # If the file does not exist, the user really needs makeinfo; |
2602 | - # let's fail without touching anything. |
2603 | - test -f $file || exit 1 |
2604 | - touch $file |
2605 | - ;; |
2606 | - |
2607 | - *) |
2608 | - echo 1>&2 "\ |
2609 | -WARNING: '$1' is needed, and is $msg. |
2610 | - You might have modified some files without having the |
2611 | - proper tools for further handling them. Check the 'README' file, |
2612 | - it often tells you about the needed prerequisites for installing |
2613 | - this package. You may also peek at any GNU archive site, in case |
2614 | - some other package would contain this missing '$1' program." |
2615 | - exit 1 |
2616 | - ;; |
2617 | -esac |
2618 | - |
2619 | -exit 0 |
2620 | +# Run the given program, remember its exit status. |
2621 | +"$@"; st=$? |
2622 | + |
2623 | +# If it succeeded, we are done. |
2624 | +test $st -eq 0 && exit 0 |
2625 | + |
2626 | +# Also exit now if we it failed (or wasn't found), and '--version' was |
2627 | +# passed; such an option is passed most likely to detect whether the |
2628 | +# program is present and works. |
2629 | +case $2 in --version|--help) exit $st;; esac |
2630 | + |
2631 | +# Exit code 63 means version mismatch. This often happens when the user |
2632 | +# tries to use an ancient version of a tool on a file that requires a |
2633 | +# minimum version. |
2634 | +if test $st -eq 63; then |
2635 | + msg="probably too old" |
2636 | +elif test $st -eq 127; then |
2637 | + # Program was missing. |
2638 | + msg="missing on your system" |
2639 | +else |
2640 | + # Program was found and executed, but failed. Give up. |
2641 | + exit $st |
2642 | +fi |
2643 | + |
2644 | +perl_URL=http://www.perl.org/ |
2645 | +flex_URL=http://flex.sourceforge.net/ |
2646 | +gnu_software_URL=http://www.gnu.org/software |
2647 | + |
2648 | +program_details () |
2649 | +{ |
2650 | + case $1 in |
2651 | + aclocal|automake) |
2652 | + echo "The '$1' program is part of the GNU Automake package:" |
2653 | + echo "<$gnu_software_URL/automake>" |
2654 | + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" |
2655 | + echo "<$gnu_software_URL/autoconf>" |
2656 | + echo "<$gnu_software_URL/m4/>" |
2657 | + echo "<$perl_URL>" |
2658 | + ;; |
2659 | + autoconf|autom4te|autoheader) |
2660 | + echo "The '$1' program is part of the GNU Autoconf package:" |
2661 | + echo "<$gnu_software_URL/autoconf/>" |
2662 | + echo "It also requires GNU m4 and Perl in order to run:" |
2663 | + echo "<$gnu_software_URL/m4/>" |
2664 | + echo "<$perl_URL>" |
2665 | + ;; |
2666 | + esac |
2667 | +} |
2668 | + |
2669 | +give_advice () |
2670 | +{ |
2671 | + # Normalize program name to check for. |
2672 | + normalized_program=`echo "$1" | sed ' |
2673 | + s/^gnu-//; t |
2674 | + s/^gnu//; t |
2675 | + s/^g//; t'` |
2676 | + |
2677 | + printf '%s\n' "'$1' is $msg." |
2678 | + |
2679 | + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" |
2680 | + case $normalized_program in |
2681 | + autoconf*) |
2682 | + echo "You should only need it if you modified 'configure.ac'," |
2683 | + echo "or m4 files included by it." |
2684 | + program_details 'autoconf' |
2685 | + ;; |
2686 | + autoheader*) |
2687 | + echo "You should only need it if you modified 'acconfig.h' or" |
2688 | + echo "$configure_deps." |
2689 | + program_details 'autoheader' |
2690 | + ;; |
2691 | + automake*) |
2692 | + echo "You should only need it if you modified 'Makefile.am' or" |
2693 | + echo "$configure_deps." |
2694 | + program_details 'automake' |
2695 | + ;; |
2696 | + aclocal*) |
2697 | + echo "You should only need it if you modified 'acinclude.m4' or" |
2698 | + echo "$configure_deps." |
2699 | + program_details 'aclocal' |
2700 | + ;; |
2701 | + autom4te*) |
2702 | + echo "You might have modified some maintainer files that require" |
2703 | + echo "the 'automa4te' program to be rebuilt." |
2704 | + program_details 'autom4te' |
2705 | + ;; |
2706 | + bison*|yacc*) |
2707 | + echo "You should only need it if you modified a '.y' file." |
2708 | + echo "You may want to install the GNU Bison package:" |
2709 | + echo "<$gnu_software_URL/bison/>" |
2710 | + ;; |
2711 | + lex*|flex*) |
2712 | + echo "You should only need it if you modified a '.l' file." |
2713 | + echo "You may want to install the Fast Lexical Analyzer package:" |
2714 | + echo "<$flex_URL>" |
2715 | + ;; |
2716 | + help2man*) |
2717 | + echo "You should only need it if you modified a dependency" \ |
2718 | + "of a man page." |
2719 | + echo "You may want to install the GNU Help2man package:" |
2720 | + echo "<$gnu_software_URL/help2man/>" |
2721 | + ;; |
2722 | + makeinfo*) |
2723 | + echo "You should only need it if you modified a '.texi' file, or" |
2724 | + echo "any other file indirectly affecting the aspect of the manual." |
2725 | + echo "You might want to install the Texinfo package:" |
2726 | + echo "<$gnu_software_URL/texinfo/>" |
2727 | + echo "The spurious makeinfo call might also be the consequence of" |
2728 | + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" |
2729 | + echo "want to install GNU make:" |
2730 | + echo "<$gnu_software_URL/make/>" |
2731 | + ;; |
2732 | + *) |
2733 | + echo "You might have modified some files without having the proper" |
2734 | + echo "tools for further handling them. Check the 'README' file, it" |
2735 | + echo "often tells you about the needed prerequisites for installing" |
2736 | + echo "this package. You may also peek at any GNU archive site, in" |
2737 | + echo "case some other package contains this missing '$1' program." |
2738 | + ;; |
2739 | + esac |
2740 | +} |
2741 | + |
2742 | +give_advice "$1" | sed -e '1s/^/WARNING: /' \ |
2743 | + -e '2,$s/^/ /' >&2 |
2744 | + |
2745 | +# Propagate the correct exit status (expected to be 127 for a program |
2746 | +# not found, 63 for a program that failed due to version mismatch). |
2747 | +exit $st |
2748 | |
2749 | # Local variables: |
2750 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
2751 | |
2752 | === added file 'build/test-driver' |
2753 | --- build/test-driver 1970-01-01 00:00:00 +0000 |
2754 | +++ build/test-driver 2013-05-21 02:54:27 +0000 |
2755 | @@ -0,0 +1,127 @@ |
2756 | +#! /bin/sh |
2757 | +# test-driver - basic testsuite driver script. |
2758 | + |
2759 | +scriptversion=2012-06-27.10; # UTC |
2760 | + |
2761 | +# Copyright (C) 2011-2013 Free Software Foundation, Inc. |
2762 | +# |
2763 | +# This program is free software; you can redistribute it and/or modify |
2764 | +# it under the terms of the GNU General Public License as published by |
2765 | +# the Free Software Foundation; either version 2, or (at your option) |
2766 | +# any later version. |
2767 | +# |
2768 | +# This program is distributed in the hope that it will be useful, |
2769 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
2770 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2771 | +# GNU General Public License for more details. |
2772 | +# |
2773 | +# You should have received a copy of the GNU General Public License |
2774 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
2775 | + |
2776 | +# As a special exception to the GNU General Public License, if you |
2777 | +# distribute this file as part of a program that contains a |
2778 | +# configuration script generated by Autoconf, you may include it under |
2779 | +# the same distribution terms that you use for the rest of that program. |
2780 | + |
2781 | +# This file is maintained in Automake, please report |
2782 | +# bugs to <bug-automake@gnu.org> or send patches to |
2783 | +# <automake-patches@gnu.org>. |
2784 | + |
2785 | +# Make unconditional expansion of undefined variables an error. This |
2786 | +# helps a lot in preventing typo-related bugs. |
2787 | +set -u |
2788 | + |
2789 | +usage_error () |
2790 | +{ |
2791 | + echo "$0: $*" >&2 |
2792 | + print_usage >&2 |
2793 | + exit 2 |
2794 | +} |
2795 | + |
2796 | +print_usage () |
2797 | +{ |
2798 | + cat <<END |
2799 | +Usage: |
2800 | + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH |
2801 | + [--expect-failure={yes|no}] [--color-tests={yes|no}] |
2802 | + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT |
2803 | +The '--test-name', '--log-file' and '--trs-file' options are mandatory. |
2804 | +END |
2805 | +} |
2806 | + |
2807 | +# TODO: better error handling in option parsing (in particular, ensure |
2808 | +# TODO: $log_file, $trs_file and $test_name are defined). |
2809 | +test_name= # Used for reporting. |
2810 | +log_file= # Where to save the output of the test script. |
2811 | +trs_file= # Where to save the metadata of the test run. |
2812 | +expect_failure=no |
2813 | +color_tests=no |
2814 | +enable_hard_errors=yes |
2815 | +while test $# -gt 0; do |
2816 | + case $1 in |
2817 | + --help) print_usage; exit $?;; |
2818 | + --version) echo "test-driver $scriptversion"; exit $?;; |
2819 | + --test-name) test_name=$2; shift;; |
2820 | + --log-file) log_file=$2; shift;; |
2821 | + --trs-file) trs_file=$2; shift;; |
2822 | + --color-tests) color_tests=$2; shift;; |
2823 | + --expect-failure) expect_failure=$2; shift;; |
2824 | + --enable-hard-errors) enable_hard_errors=$2; shift;; |
2825 | + --) shift; break;; |
2826 | + -*) usage_error "invalid option: '$1'";; |
2827 | + esac |
2828 | + shift |
2829 | +done |
2830 | + |
2831 | +if test $color_tests = yes; then |
2832 | + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. |
2833 | + red='[0;31m' # Red. |
2834 | + grn='[0;32m' # Green. |
2835 | + lgn='[1;32m' # Light green. |
2836 | + blu='[1;34m' # Blue. |
2837 | + mgn='[0;35m' # Magenta. |
2838 | + std='[m' # No color. |
2839 | +else |
2840 | + red= grn= lgn= blu= mgn= std= |
2841 | +fi |
2842 | + |
2843 | +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' |
2844 | +trap "st=129; $do_exit" 1 |
2845 | +trap "st=130; $do_exit" 2 |
2846 | +trap "st=141; $do_exit" 13 |
2847 | +trap "st=143; $do_exit" 15 |
2848 | + |
2849 | +# Test script is run here. |
2850 | +"$@" >$log_file 2>&1 |
2851 | +estatus=$? |
2852 | +if test $enable_hard_errors = no && test $estatus -eq 99; then |
2853 | + estatus=1 |
2854 | +fi |
2855 | + |
2856 | +case $estatus:$expect_failure in |
2857 | + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; |
2858 | + 0:*) col=$grn res=PASS recheck=no gcopy=no;; |
2859 | + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; |
2860 | + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; |
2861 | + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; |
2862 | + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; |
2863 | +esac |
2864 | + |
2865 | +# Report outcome to console. |
2866 | +echo "${col}${res}${std}: $test_name" |
2867 | + |
2868 | +# Register the test result, and other relevant metadata. |
2869 | +echo ":test-result: $res" > $trs_file |
2870 | +echo ":global-test-result: $res" >> $trs_file |
2871 | +echo ":recheck: $recheck" >> $trs_file |
2872 | +echo ":copy-in-global-log: $gcopy" >> $trs_file |
2873 | + |
2874 | +# Local Variables: |
2875 | +# mode: shell-script |
2876 | +# sh-indentation: 2 |
2877 | +# eval: (add-hook 'write-file-hooks 'time-stamp) |
2878 | +# time-stamp-start: "scriptversion=" |
2879 | +# time-stamp-format: "%:y-%02m-%02d.%02H" |
2880 | +# time-stamp-time-zone: "UTC" |
2881 | +# time-stamp-end: "; # UTC" |
2882 | +# End: |
2883 | |
2884 | === modified file 'build/win32/Makefile.in' |
2885 | --- build/win32/Makefile.in 2013-03-26 01:28:45 +0000 |
2886 | +++ build/win32/Makefile.in 2013-05-21 02:54:27 +0000 |
2887 | @@ -1,4 +1,4 @@ |
2888 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
2889 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
2890 | # @configure_input@ |
2891 | |
2892 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2893 | @@ -50,7 +50,7 @@ |
2894 | build_triplet = @build@ |
2895 | host_triplet = @host@ |
2896 | subdir = build/win32 |
2897 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
2898 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
2899 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2900 | am__aclocal_m4_deps = \ |
2901 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
2902 | @@ -92,13 +92,14 @@ |
2903 | am__v_at_1 = |
2904 | SOURCES = |
2905 | DIST_SOURCES = |
2906 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
2907 | - html-recursive info-recursive install-data-recursive \ |
2908 | - install-dvi-recursive install-exec-recursive \ |
2909 | - install-html-recursive install-info-recursive \ |
2910 | - install-pdf-recursive install-ps-recursive install-recursive \ |
2911 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
2912 | - ps-recursive uninstall-recursive |
2913 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
2914 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
2915 | + install-data-recursive install-dvi-recursive \ |
2916 | + install-exec-recursive install-html-recursive \ |
2917 | + install-info-recursive install-pdf-recursive \ |
2918 | + install-ps-recursive install-recursive installcheck-recursive \ |
2919 | + installdirs-recursive pdf-recursive ps-recursive \ |
2920 | + tags-recursive uninstall-recursive |
2921 | am__can_run_installinfo = \ |
2922 | case $$AM_UPDATE_INFO_DIR in \ |
2923 | n|no|NO) false;; \ |
2924 | @@ -106,9 +107,29 @@ |
2925 | esac |
2926 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
2927 | distclean-recursive maintainer-clean-recursive |
2928 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
2929 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
2930 | +am__recursive_targets = \ |
2931 | + $(RECURSIVE_TARGETS) \ |
2932 | + $(RECURSIVE_CLEAN_TARGETS) \ |
2933 | + $(am__extra_recursive_targets) |
2934 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
2935 | distdir |
2936 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
2937 | +# Read a list of newline-separated strings from the standard input, |
2938 | +# and print each of them once, without duplicates. Input order is |
2939 | +# *not* preserved. |
2940 | +am__uniquify_input = $(AWK) '\ |
2941 | + BEGIN { nonempty = 0; } \ |
2942 | + { items[$$0] = 1; nonempty = 1; } \ |
2943 | + END { if (nonempty) { for (i in items) print i; }; } \ |
2944 | +' |
2945 | +# Make sure the list of sources is unique. This is necessary because, |
2946 | +# e.g., the same source file might be shared among _SOURCES variables |
2947 | +# for different programs/libraries. |
2948 | +am__define_uniq_tagged_files = \ |
2949 | + list='$(am__tagged_files)'; \ |
2950 | + unique=`for i in $$list; do \ |
2951 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2952 | + done | $(am__uniquify_input)` |
2953 | ETAGS = etags |
2954 | CTAGS = ctags |
2955 | DIST_SUBDIRS = $(SUBDIRS) |
2956 | @@ -412,7 +433,7 @@ |
2957 | # (1) if the variable is set in 'config.status', edit 'config.status' |
2958 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
2959 | # (2) otherwise, pass the desired values on the 'make' command line. |
2960 | -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
2961 | +$(am__recursive_targets): |
2962 | @fail= failcom='exit 1'; \ |
2963 | for f in x $$MAKEFLAGS; do \ |
2964 | case $$f in \ |
2965 | @@ -440,31 +461,13 @@ |
2966 | if test "$$dot_seen" = "no"; then \ |
2967 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
2968 | fi; test -z "$$fail" |
2969 | -tags-recursive: |
2970 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
2971 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
2972 | - done |
2973 | -ctags-recursive: |
2974 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
2975 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
2976 | - done |
2977 | -cscopelist-recursive: |
2978 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
2979 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
2980 | - done |
2981 | - |
2982 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
2983 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2984 | - unique=`for i in $$list; do \ |
2985 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2986 | - done | \ |
2987 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2988 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2989 | - mkid -fID $$unique |
2990 | -tags: TAGS |
2991 | - |
2992 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
2993 | - $(TAGS_FILES) $(LISP) |
2994 | + |
2995 | +ID: $(am__tagged_files) |
2996 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
2997 | +tags: tags-recursive |
2998 | +TAGS: tags |
2999 | + |
3000 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
3001 | set x; \ |
3002 | here=`pwd`; \ |
3003 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
3004 | @@ -480,12 +483,7 @@ |
3005 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
3006 | fi; \ |
3007 | done; \ |
3008 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3009 | - unique=`for i in $$list; do \ |
3010 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3011 | - done | \ |
3012 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3013 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3014 | + $(am__define_uniq_tagged_files); \ |
3015 | shift; \ |
3016 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
3017 | test -n "$$unique" || unique=$$empty_fix; \ |
3018 | @@ -497,15 +495,11 @@ |
3019 | $$unique; \ |
3020 | fi; \ |
3021 | fi |
3022 | -ctags: CTAGS |
3023 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
3024 | - $(TAGS_FILES) $(LISP) |
3025 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3026 | - unique=`for i in $$list; do \ |
3027 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3028 | - done | \ |
3029 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3030 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3031 | +ctags: ctags-recursive |
3032 | + |
3033 | +CTAGS: ctags |
3034 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
3035 | + $(am__define_uniq_tagged_files); \ |
3036 | test -z "$(CTAGS_ARGS)$$unique" \ |
3037 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
3038 | $$unique |
3039 | @@ -514,9 +508,10 @@ |
3040 | here=`$(am__cd) $(top_builddir) && pwd` \ |
3041 | && $(am__cd) $(top_srcdir) \ |
3042 | && gtags -i $(GTAGS_ARGS) "$$here" |
3043 | +cscopelist: cscopelist-recursive |
3044 | |
3045 | -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
3046 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
3047 | +cscopelist-am: $(am__tagged_files) |
3048 | + list='$(am__tagged_files)'; \ |
3049 | case "$(srcdir)" in \ |
3050 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
3051 | *) sdir=$(subdir)/$(srcdir) ;; \ |
3052 | @@ -688,23 +683,20 @@ |
3053 | |
3054 | uninstall-am: |
3055 | |
3056 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ |
3057 | - cscopelist-recursive ctags-recursive install-am install-strip \ |
3058 | - tags-recursive |
3059 | +.MAKE: $(am__recursive_targets) install-am install-strip |
3060 | |
3061 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
3062 | - all all-am check check-am clean clean-generic clean-libtool \ |
3063 | - cscopelist cscopelist-recursive ctags ctags-recursive \ |
3064 | - distclean distclean-generic distclean-libtool distclean-tags \ |
3065 | - distdir dvi dvi-am html html-am info info-am install \ |
3066 | - install-am install-data install-data-am install-dvi \ |
3067 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ |
3068 | + check-am clean clean-generic clean-libtool cscopelist-am ctags \ |
3069 | + ctags-am distclean distclean-generic distclean-libtool \ |
3070 | + distclean-tags distdir dvi dvi-am html html-am info info-am \ |
3071 | + install install-am install-data install-data-am install-dvi \ |
3072 | install-dvi-am install-exec install-exec-am install-html \ |
3073 | install-html-am install-info install-info-am install-man \ |
3074 | install-pdf install-pdf-am install-ps install-ps-am \ |
3075 | install-strip installcheck installcheck-am installdirs \ |
3076 | installdirs-am maintainer-clean maintainer-clean-generic \ |
3077 | mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
3078 | - ps ps-am tags tags-recursive uninstall uninstall-am |
3079 | + ps ps-am tags tags-am uninstall uninstall-am |
3080 | |
3081 | |
3082 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
3083 | |
3084 | === modified file 'build/win32/vs10/Makefile.in' |
3085 | --- build/win32/vs10/Makefile.in 2013-03-26 01:28:45 +0000 |
3086 | +++ build/win32/vs10/Makefile.in 2013-05-21 02:54:27 +0000 |
3087 | @@ -1,4 +1,4 @@ |
3088 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
3089 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3090 | # @configure_input@ |
3091 | |
3092 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3093 | @@ -50,7 +50,7 @@ |
3094 | build_triplet = @build@ |
3095 | host_triplet = @host@ |
3096 | subdir = build/win32/vs10 |
3097 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
3098 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
3099 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
3100 | am__aclocal_m4_deps = \ |
3101 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
3102 | @@ -97,6 +97,7 @@ |
3103 | n|no|NO) false;; \ |
3104 | *) (install-info --version) >/dev/null 2>&1;; \ |
3105 | esac |
3106 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
3107 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3108 | ACLOCAL = @ACLOCAL@ |
3109 | ALL_LINGUAS = @ALL_LINGUAS@ |
3110 | @@ -415,11 +416,9 @@ |
3111 | |
3112 | clean-libtool: |
3113 | -rm -rf .libs _libs |
3114 | -tags: TAGS |
3115 | -TAGS: |
3116 | +tags TAGS: |
3117 | |
3118 | -ctags: CTAGS |
3119 | -CTAGS: |
3120 | +ctags CTAGS: |
3121 | |
3122 | cscope cscopelist: |
3123 | |
3124 | @@ -557,15 +556,16 @@ |
3125 | .MAKE: install-am install-strip |
3126 | |
3127 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
3128 | - distclean distclean-generic distclean-libtool distdir dvi \ |
3129 | - dvi-am html html-am info info-am install install-am \ |
3130 | - install-data install-data-am install-dvi install-dvi-am \ |
3131 | - install-exec install-exec-am install-html install-html-am \ |
3132 | - install-info install-info-am install-man install-pdf \ |
3133 | - install-pdf-am install-ps install-ps-am install-strip \ |
3134 | - installcheck installcheck-am installdirs maintainer-clean \ |
3135 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
3136 | - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am |
3137 | + cscopelist-am ctags-am distclean distclean-generic \ |
3138 | + distclean-libtool distdir dvi dvi-am html html-am info info-am \ |
3139 | + install install-am install-data install-data-am install-dvi \ |
3140 | + install-dvi-am install-exec install-exec-am install-html \ |
3141 | + install-html-am install-info install-info-am install-man \ |
3142 | + install-pdf install-pdf-am install-ps install-ps-am \ |
3143 | + install-strip installcheck installcheck-am installdirs \ |
3144 | + maintainer-clean maintainer-clean-generic mostlyclean \ |
3145 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
3146 | + tags-am uninstall uninstall-am |
3147 | |
3148 | |
3149 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
3150 | |
3151 | === modified file 'build/win32/vs9/Makefile.in' |
3152 | --- build/win32/vs9/Makefile.in 2013-03-26 01:28:45 +0000 |
3153 | +++ build/win32/vs9/Makefile.in 2013-05-21 02:54:27 +0000 |
3154 | @@ -1,4 +1,4 @@ |
3155 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
3156 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3157 | # @configure_input@ |
3158 | |
3159 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3160 | @@ -50,7 +50,7 @@ |
3161 | build_triplet = @build@ |
3162 | host_triplet = @host@ |
3163 | subdir = build/win32/vs9 |
3164 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
3165 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
3166 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
3167 | am__aclocal_m4_deps = \ |
3168 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
3169 | @@ -97,6 +97,7 @@ |
3170 | n|no|NO) false;; \ |
3171 | *) (install-info --version) >/dev/null 2>&1;; \ |
3172 | esac |
3173 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
3174 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3175 | ACLOCAL = @ACLOCAL@ |
3176 | ALL_LINGUAS = @ALL_LINGUAS@ |
3177 | @@ -392,11 +393,9 @@ |
3178 | |
3179 | clean-libtool: |
3180 | -rm -rf .libs _libs |
3181 | -tags: TAGS |
3182 | -TAGS: |
3183 | +tags TAGS: |
3184 | |
3185 | -ctags: CTAGS |
3186 | -CTAGS: |
3187 | +ctags CTAGS: |
3188 | |
3189 | cscope cscopelist: |
3190 | |
3191 | @@ -534,15 +533,16 @@ |
3192 | .MAKE: install-am install-strip |
3193 | |
3194 | .PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
3195 | - distclean distclean-generic distclean-libtool distdir dvi \ |
3196 | - dvi-am html html-am info info-am install install-am \ |
3197 | - install-data install-data-am install-dvi install-dvi-am \ |
3198 | - install-exec install-exec-am install-html install-html-am \ |
3199 | - install-info install-info-am install-man install-pdf \ |
3200 | - install-pdf-am install-ps install-ps-am install-strip \ |
3201 | - installcheck installcheck-am installdirs maintainer-clean \ |
3202 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
3203 | - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am |
3204 | + cscopelist-am ctags-am distclean distclean-generic \ |
3205 | + distclean-libtool distdir dvi dvi-am html html-am info info-am \ |
3206 | + install install-am install-data install-data-am install-dvi \ |
3207 | + install-dvi-am install-exec install-exec-am install-html \ |
3208 | + install-html-am install-info install-info-am install-man \ |
3209 | + install-pdf install-pdf-am install-ps install-ps-am \ |
3210 | + install-strip installcheck installcheck-am installdirs \ |
3211 | + maintainer-clean maintainer-clean-generic mostlyclean \ |
3212 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
3213 | + tags-am uninstall uninstall-am |
3214 | |
3215 | |
3216 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
3217 | |
3218 | === modified file 'clutter/Makefile.in' |
3219 | --- clutter/Makefile.in 2013-03-26 01:28:45 +0000 |
3220 | +++ clutter/Makefile.in 2013-05-21 02:54:27 +0000 |
3221 | @@ -1,4 +1,4 @@ |
3222 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
3223 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
3224 | # @configure_input@ |
3225 | |
3226 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
3227 | @@ -87,7 +87,16 @@ |
3228 | POST_UNINSTALL = : |
3229 | build_triplet = @build@ |
3230 | host_triplet = @host@ |
3231 | -DIST_COMMON = $(am__cluttercex100_include_HEADERS_DIST) \ |
3232 | +DIST_COMMON = $(top_srcdir)/build/autotools/Makefile.am.silent \ |
3233 | + $(top_srcdir)/build/autotools/Makefile.am.marshal \ |
3234 | + $(top_srcdir)/build/autotools/Makefile.am.enums \ |
3235 | + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
3236 | + $(srcdir)/config.h.in $(srcdir)/config.h.win32.in \ |
3237 | + $(srcdir)/clutter-config.h.in $(srcdir)/clutter-version.h.in \ |
3238 | + $(srcdir)/clutter.pc.in $(top_srcdir)/build/depcomp \ |
3239 | + $(cally_include_HEADERS) $(clutter_deprecated_HEADERS) \ |
3240 | + $(clutter_include_HEADERS) \ |
3241 | + $(am__cluttercex100_include_HEADERS_DIST) \ |
3242 | $(am__clutteregl_include_HEADERS_DIST) \ |
3243 | $(am__clutterevdev_include_HEADERS_DIST) \ |
3244 | $(am__cluttergdk_include_HEADERS_DIST) \ |
3245 | @@ -97,15 +106,7 @@ |
3246 | $(am__clutterwin_include_HEADERS_DIST) \ |
3247 | $(am__clutterx11_include_HEADERS_DIST) \ |
3248 | $(am__wayland_compositor_include_HEADERS_DIST) \ |
3249 | - $(cally_include_HEADERS) $(clutter_deprecated_HEADERS) \ |
3250 | - $(clutter_include_HEADERS) $(srcdir)/Makefile.am \ |
3251 | - $(srcdir)/Makefile.in $(srcdir)/clutter-config.h.in \ |
3252 | - $(srcdir)/clutter-version.h.in $(srcdir)/clutter.pc.in \ |
3253 | - $(srcdir)/config.h.in $(srcdir)/config.h.win32.in \ |
3254 | - $(top_srcdir)/build/autotools/Makefile.am.enums \ |
3255 | - $(top_srcdir)/build/autotools/Makefile.am.marshal \ |
3256 | - $(top_srcdir)/build/autotools/Makefile.am.silent \ |
3257 | - $(top_srcdir)/build/depcomp |
3258 | + $(top_srcdir)/build/test-driver |
3259 | @BUILD_XI2_TRUE@am__append_1 = \ |
3260 | @BUILD_XI2_TRUE@ $(srcdir)/x11/clutter-device-manager-xi2.c \ |
3261 | @BUILD_XI2_TRUE@ $(srcdir)/x11/clutter-input-device-xi2.c \ |
3262 | @@ -790,12 +791,203 @@ |
3263 | $(clutterwin_include_HEADERS) $(clutterx11_include_HEADERS) \ |
3264 | $(nodist_clutter_include_HEADERS) \ |
3265 | $(wayland_compositor_include_HEADERS) |
3266 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
3267 | + $(LISP)config.h.in |
3268 | +# Read a list of newline-separated strings from the standard input, |
3269 | +# and print each of them once, without duplicates. Input order is |
3270 | +# *not* preserved. |
3271 | +am__uniquify_input = $(AWK) '\ |
3272 | + BEGIN { nonempty = 0; } \ |
3273 | + { items[$$0] = 1; nonempty = 1; } \ |
3274 | + END { if (nonempty) { for (i in items) print i; }; } \ |
3275 | +' |
3276 | +# Make sure the list of sources is unique. This is necessary because, |
3277 | +# e.g., the same source file might be shared among _SOURCES variables |
3278 | +# for different programs/libraries. |
3279 | +am__define_uniq_tagged_files = \ |
3280 | + list='$(am__tagged_files)'; \ |
3281 | + unique=`for i in $$list; do \ |
3282 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3283 | + done | $(am__uniquify_input)` |
3284 | ETAGS = etags |
3285 | CTAGS = ctags |
3286 | am__tty_colors_dummy = \ |
3287 | mgn= red= grn= lgn= blu= brg= std=; \ |
3288 | am__color_tests=no |
3289 | -am__tty_colors = $(am__tty_colors_dummy) |
3290 | +am__tty_colors = { \ |
3291 | + $(am__tty_colors_dummy); \ |
3292 | + if test "X$(AM_COLOR_TESTS)" = Xno; then \ |
3293 | + am__color_tests=no; \ |
3294 | + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ |
3295 | + am__color_tests=yes; \ |
3296 | + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ |
3297 | + am__color_tests=yes; \ |
3298 | + fi; \ |
3299 | + if test $$am__color_tests = yes; then \ |
3300 | + red='[0;31m'; \ |
3301 | + grn='[0;32m'; \ |
3302 | + lgn='[1;32m'; \ |
3303 | + blu='[1;34m'; \ |
3304 | + mgn='[0;35m'; \ |
3305 | + brg='[1m'; \ |
3306 | + std='[m'; \ |
3307 | + fi; \ |
3308 | +} |
3309 | +am__recheck_rx = ^[ ]*:recheck:[ ]* |
3310 | +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* |
3311 | +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* |
3312 | +# A command that, given a newline-separated list of test names on the |
3313 | +# standard input, print the name of the tests that are to be re-run |
3314 | +# upon "make recheck". |
3315 | +am__list_recheck_tests = $(AWK) '{ \ |
3316 | + recheck = 1; \ |
3317 | + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ |
3318 | + { \ |
3319 | + if (rc < 0) \ |
3320 | + { \ |
3321 | + if ((getline line2 < ($$0 ".log")) < 0) \ |
3322 | + recheck = 0; \ |
3323 | + break; \ |
3324 | + } \ |
3325 | + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ |
3326 | + { \ |
3327 | + recheck = 0; \ |
3328 | + break; \ |
3329 | + } \ |
3330 | + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ |
3331 | + { \ |
3332 | + break; \ |
3333 | + } \ |
3334 | + }; \ |
3335 | + if (recheck) \ |
3336 | + print $$0; \ |
3337 | + close ($$0 ".trs"); \ |
3338 | + close ($$0 ".log"); \ |
3339 | +}' |
3340 | +# A command that, given a newline-separated list of test names on the |
3341 | +# standard input, create the global log from their .trs and .log files. |
3342 | +am__create_global_log = $(AWK) ' \ |
3343 | +function fatal(msg) \ |
3344 | +{ \ |
3345 | + print "fatal: making $@: " msg | "cat >&2"; \ |
3346 | + exit 1; \ |
3347 | +} \ |
3348 | +function rst_section(header) \ |
3349 | +{ \ |
3350 | + print header; \ |
3351 | + len = length(header); \ |
3352 | + for (i = 1; i <= len; i = i + 1) \ |
3353 | + printf "="; \ |
3354 | + printf "\n\n"; \ |
3355 | +} \ |
3356 | +{ \ |
3357 | + copy_in_global_log = 1; \ |
3358 | + global_test_result = "RUN"; \ |
3359 | + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ |
3360 | + { \ |
3361 | + if (rc < 0) \ |
3362 | + fatal("failed to read from " $$0 ".trs"); \ |
3363 | + if (line ~ /$(am__global_test_result_rx)/) \ |
3364 | + { \ |
3365 | + sub("$(am__global_test_result_rx)", "", line); \ |
3366 | + sub("[ ]*$$", "", line); \ |
3367 | + global_test_result = line; \ |
3368 | + } \ |
3369 | + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ |
3370 | + copy_in_global_log = 0; \ |
3371 | + }; \ |
3372 | + if (copy_in_global_log) \ |
3373 | + { \ |
3374 | + rst_section(global_test_result ": " $$0); \ |
3375 | + while ((rc = (getline line < ($$0 ".log"))) != 0) \ |
3376 | + { \ |
3377 | + if (rc < 0) \ |
3378 | + fatal("failed to read from " $$0 ".log"); \ |
3379 | + print line; \ |
3380 | + }; \ |
3381 | + printf "\n"; \ |
3382 | + }; \ |
3383 | + close ($$0 ".trs"); \ |
3384 | + close ($$0 ".log"); \ |
3385 | +}' |
3386 | +# Restructured Text title. |
3387 | +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } |
3388 | +# Solaris 10 'make', and several other traditional 'make' implementations, |
3389 | +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it |
3390 | +# by disabling -e (using the XSI extension "set +e") if it's set. |
3391 | +am__sh_e_setup = case $$- in *e*) set +e;; esac |
3392 | +# Default flags passed to test drivers. |
3393 | +am__common_driver_flags = \ |
3394 | + --color-tests "$$am__color_tests" \ |
3395 | + --enable-hard-errors "$$am__enable_hard_errors" \ |
3396 | + --expect-failure "$$am__expect_failure" |
3397 | +# To be inserted before the command running the test. Creates the |
3398 | +# directory for the log if needed. Stores in $dir the directory |
3399 | +# containing $f, in $tst the test, in $log the log. Executes the |
3400 | +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and |
3401 | +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that |
3402 | +# will run the test scripts (or their associated LOG_COMPILER, if |
3403 | +# thy have one). |
3404 | +am__check_pre = \ |
3405 | +$(am__sh_e_setup); \ |
3406 | +$(am__vpath_adj_setup) $(am__vpath_adj) \ |
3407 | +$(am__tty_colors); \ |
3408 | +srcdir=$(srcdir); export srcdir; \ |
3409 | +case "$@" in \ |
3410 | + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ |
3411 | + *) am__odir=.;; \ |
3412 | +esac; \ |
3413 | +test "x$$am__odir" = x"." || test -d "$$am__odir" \ |
3414 | + || $(MKDIR_P) "$$am__odir" || exit $$?; \ |
3415 | +if test -f "./$$f"; then dir=./; \ |
3416 | +elif test -f "$$f"; then dir=; \ |
3417 | +else dir="$(srcdir)/"; fi; \ |
3418 | +tst=$$dir$$f; log='$@'; \ |
3419 | +if test -n '$(DISABLE_HARD_ERRORS)'; then \ |
3420 | + am__enable_hard_errors=no; \ |
3421 | +else \ |
3422 | + am__enable_hard_errors=yes; \ |
3423 | +fi; \ |
3424 | +case " $(XFAIL_TESTS) " in \ |
3425 | + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ |
3426 | + am__expect_failure=yes;; \ |
3427 | + *) \ |
3428 | + am__expect_failure=no;; \ |
3429 | +esac; \ |
3430 | +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) |
3431 | +# A shell command to get the names of the tests scripts with any registered |
3432 | +# extension removed (i.e., equivalently, the names of the test logs, with |
3433 | +# the '.log' extension removed). The result is saved in the shell variable |
3434 | +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, |
3435 | +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", |
3436 | +# since that might cause problem with VPATH rewrites for suffix-less tests. |
3437 | +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. |
3438 | +am__set_TESTS_bases = \ |
3439 | + bases='$(TEST_LOGS)'; \ |
3440 | + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ |
3441 | + bases=`echo $$bases` |
3442 | +RECHECK_LOGS = $(TEST_LOGS) |
3443 | +AM_RECURSIVE_TARGETS = check recheck |
3444 | +TEST_SUITE_LOG = test-suite.log |
3445 | +TEST_EXTENSIONS = @EXEEXT@ .test |
3446 | +LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver |
3447 | +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) |
3448 | +am__set_b = \ |
3449 | + case '$@' in \ |
3450 | + */*) \ |
3451 | + case '$*' in \ |
3452 | + */*) b='$*';; \ |
3453 | + *) b=`echo '$@' | sed 's/\.log$$//'`; \ |
3454 | + esac;; \ |
3455 | + *) \ |
3456 | + b='$*';; \ |
3457 | + esac |
3458 | +am__test_logs1 = $(TESTS:=.log) |
3459 | +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) |
3460 | +TEST_LOGS = $(am__test_logs2:.test.log=.log) |
3461 | +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build/test-driver |
3462 | +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ |
3463 | + $(TEST_LOG_FLAGS) |
3464 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3465 | ACLOCAL = @ACLOCAL@ |
3466 | ALL_LINGUAS = @ALL_LINGUAS@ |
3467 | @@ -1792,7 +1984,7 @@ |
3468 | $(MAKE) $(AM_MAKEFLAGS) all-am |
3469 | |
3470 | .SUFFIXES: |
3471 | -.SUFFIXES: .c .lo .o .obj .rc |
3472 | +.SUFFIXES: .c .lo .log .o .obj .rc .test .test$(EXEEXT) .trs |
3473 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/autotools/Makefile.am.silent $(top_srcdir)/build/autotools/Makefile.am.marshal $(top_srcdir)/build/autotools/Makefile.am.enums $(am__configure_deps) |
3474 | @for dep in $?; do \ |
3475 | case '$(am__configure_deps)' in \ |
3476 | @@ -1845,6 +2037,7 @@ |
3477 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
3478 | clutter-version.h: $(top_builddir)/config.status $(srcdir)/clutter-version.h.in |
3479 | cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
3480 | + |
3481 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
3482 | @$(NORMAL_INSTALL) |
3483 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
3484 | @@ -3555,26 +3748,15 @@ |
3485 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3486 | dir='$(DESTDIR)$(wayland_compositor_includedir)'; $(am__uninstall_files_from_dir) |
3487 | |
3488 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
3489 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3490 | - unique=`for i in $$list; do \ |
3491 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3492 | - done | \ |
3493 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3494 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3495 | - mkid -fID $$unique |
3496 | -tags: TAGS |
3497 | +ID: $(am__tagged_files) |
3498 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
3499 | +tags: tags-am |
3500 | +TAGS: tags |
3501 | |
3502 | -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
3503 | - $(TAGS_FILES) $(LISP) |
3504 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
3505 | set x; \ |
3506 | here=`pwd`; \ |
3507 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
3508 | - unique=`for i in $$list; do \ |
3509 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3510 | - done | \ |
3511 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3512 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3513 | + $(am__define_uniq_tagged_files); \ |
3514 | shift; \ |
3515 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
3516 | test -n "$$unique" || unique=$$empty_fix; \ |
3517 | @@ -3586,15 +3768,11 @@ |
3518 | $$unique; \ |
3519 | fi; \ |
3520 | fi |
3521 | -ctags: CTAGS |
3522 | -CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
3523 | - $(TAGS_FILES) $(LISP) |
3524 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
3525 | - unique=`for i in $$list; do \ |
3526 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
3527 | - done | \ |
3528 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
3529 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
3530 | +ctags: ctags-am |
3531 | + |
3532 | +CTAGS: ctags |
3533 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
3534 | + $(am__define_uniq_tagged_files); \ |
3535 | test -z "$(CTAGS_ARGS)$$unique" \ |
3536 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
3537 | $$unique |
3538 | @@ -3603,9 +3781,10 @@ |
3539 | here=`$(am__cd) $(top_builddir) && pwd` \ |
3540 | && $(am__cd) $(top_srcdir) \ |
3541 | && gtags -i $(GTAGS_ARGS) "$$here" |
3542 | +cscopelist: cscopelist-am |
3543 | |
3544 | -cscopelist: $(HEADERS) $(SOURCES) $(LISP) |
3545 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
3546 | +cscopelist-am: $(am__tagged_files) |
3547 | + list='$(am__tagged_files)'; \ |
3548 | case "$(srcdir)" in \ |
3549 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
3550 | *) sdir=$(subdir)/$(srcdir) ;; \ |
3551 | @@ -3621,98 +3800,168 @@ |
3552 | distclean-tags: |
3553 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
3554 | |
3555 | -check-TESTS: $(TESTS) |
3556 | - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ |
3557 | - srcdir=$(srcdir); export srcdir; \ |
3558 | - list=' $(TESTS) '; \ |
3559 | - $(am__tty_colors); \ |
3560 | - if test -n "$$list"; then \ |
3561 | - for tst in $$list; do \ |
3562 | - if test -f ./$$tst; then dir=./; \ |
3563 | - elif test -f $$tst; then dir=; \ |
3564 | - else dir="$(srcdir)/"; fi; \ |
3565 | - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ |
3566 | - all=`expr $$all + 1`; \ |
3567 | - case " $(XFAIL_TESTS) " in \ |
3568 | - *[\ \ ]$$tst[\ \ ]*) \ |
3569 | - xpass=`expr $$xpass + 1`; \ |
3570 | - failed=`expr $$failed + 1`; \ |
3571 | - col=$$red; res=XPASS; \ |
3572 | - ;; \ |
3573 | - *) \ |
3574 | - col=$$grn; res=PASS; \ |
3575 | - ;; \ |
3576 | - esac; \ |
3577 | - elif test $$? -ne 77; then \ |
3578 | - all=`expr $$all + 1`; \ |
3579 | - case " $(XFAIL_TESTS) " in \ |
3580 | - *[\ \ ]$$tst[\ \ ]*) \ |
3581 | - xfail=`expr $$xfail + 1`; \ |
3582 | - col=$$lgn; res=XFAIL; \ |
3583 | - ;; \ |
3584 | - *) \ |
3585 | - failed=`expr $$failed + 1`; \ |
3586 | - col=$$red; res=FAIL; \ |
3587 | - ;; \ |
3588 | - esac; \ |
3589 | - else \ |
3590 | - skip=`expr $$skip + 1`; \ |
3591 | - col=$$blu; res=SKIP; \ |
3592 | - fi; \ |
3593 | - echo "$${col}$$res$${std}: $$tst"; \ |
3594 | +# Recover from deleted '.trs' file; this should ensure that |
3595 | +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create |
3596 | +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells |
3597 | +# to avoid problems with "make -n". |
3598 | +.log.trs: |
3599 | + rm -f $< $@ |
3600 | + $(MAKE) $(AM_MAKEFLAGS) $< |
3601 | + |
3602 | +# Leading 'am--fnord' is there to ensure the list of targets does not |
3603 | +# exand to empty, as could happen e.g. with make check TESTS=''. |
3604 | +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) |
3605 | +am--force-recheck: |
3606 | + @: |
3607 | + |
3608 | +$(TEST_SUITE_LOG): $(TEST_LOGS) |
3609 | + @$(am__set_TESTS_bases); \ |
3610 | + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ |
3611 | + redo_bases=`for i in $$bases; do \ |
3612 | + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ |
3613 | + done`; \ |
3614 | + if test -n "$$redo_bases"; then \ |
3615 | + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ |
3616 | + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ |
3617 | + if $(am__make_dryrun); then :; else \ |
3618 | + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ |
3619 | + fi; \ |
3620 | + fi; \ |
3621 | + if test -n "$$am__remaking_logs"; then \ |
3622 | + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ |
3623 | + "recursion detected" >&2; \ |
3624 | + else \ |
3625 | + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ |
3626 | + fi; \ |
3627 | + if $(am__make_dryrun); then :; else \ |
3628 | + st=0; \ |
3629 | + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ |
3630 | + for i in $$redo_bases; do \ |
3631 | + test -f $$i.trs && test -r $$i.trs \ |
3632 | + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ |
3633 | + test -f $$i.log && test -r $$i.log \ |
3634 | + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ |
3635 | done; \ |
3636 | - if test "$$all" -eq 1; then \ |
3637 | - tests="test"; \ |
3638 | - All=""; \ |
3639 | - else \ |
3640 | - tests="tests"; \ |
3641 | - All="All "; \ |
3642 | - fi; \ |
3643 | - if test "$$failed" -eq 0; then \ |
3644 | - if test "$$xfail" -eq 0; then \ |
3645 | - banner="$$All$$all $$tests passed"; \ |
3646 | - else \ |
3647 | - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ |
3648 | - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ |
3649 | - fi; \ |
3650 | - else \ |
3651 | - if test "$$xpass" -eq 0; then \ |
3652 | - banner="$$failed of $$all $$tests failed"; \ |
3653 | - else \ |
3654 | - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ |
3655 | - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ |
3656 | - fi; \ |
3657 | - fi; \ |
3658 | - dashes="$$banner"; \ |
3659 | - skipped=""; \ |
3660 | - if test "$$skip" -ne 0; then \ |
3661 | - if test "$$skip" -eq 1; then \ |
3662 | - skipped="($$skip test was not run)"; \ |
3663 | - else \ |
3664 | - skipped="($$skip tests were not run)"; \ |
3665 | - fi; \ |
3666 | - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ |
3667 | - dashes="$$skipped"; \ |
3668 | - fi; \ |
3669 | - report=""; \ |
3670 | - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ |
3671 | - report="Please report to $(PACKAGE_BUGREPORT)"; \ |
3672 | - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ |
3673 | - dashes="$$report"; \ |
3674 | - fi; \ |
3675 | - dashes=`echo "$$dashes" | sed s/./=/g`; \ |
3676 | - if test "$$failed" -eq 0; then \ |
3677 | - col="$$grn"; \ |
3678 | - else \ |
3679 | - col="$$red"; \ |
3680 | - fi; \ |
3681 | - echo "$${col}$$dashes$${std}"; \ |
3682 | - echo "$${col}$$banner$${std}"; \ |
3683 | - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ |
3684 | - test -z "$$report" || echo "$${col}$$report$${std}"; \ |
3685 | - echo "$${col}$$dashes$${std}"; \ |
3686 | - test "$$failed" -eq 0; \ |
3687 | - else :; fi |
3688 | + test $$st -eq 0 || exit 1; \ |
3689 | + fi |
3690 | + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ |
3691 | + ws='[ ]'; \ |
3692 | + results=`for b in $$bases; do echo $$b.trs; done`; \ |
3693 | + test -n "$$results" || results=/dev/null; \ |
3694 | + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ |
3695 | + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ |
3696 | + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ |
3697 | + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ |
3698 | + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ |
3699 | + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ |
3700 | + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ |
3701 | + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ |
3702 | + success=true; \ |
3703 | + else \ |
3704 | + success=false; \ |
3705 | + fi; \ |
3706 | + br='==================='; br=$$br$$br$$br$$br; \ |
3707 | + result_count () \ |
3708 | + { \ |
3709 | + if test x"$$1" = x"--maybe-color"; then \ |
3710 | + maybe_colorize=yes; \ |
3711 | + elif test x"$$1" = x"--no-color"; then \ |
3712 | + maybe_colorize=no; \ |
3713 | + else \ |
3714 | + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ |
3715 | + fi; \ |
3716 | + shift; \ |
3717 | + desc=$$1 count=$$2; \ |
3718 | + if test $$maybe_colorize = yes && test $$count -gt 0; then \ |
3719 | + color_start=$$3 color_end=$$std; \ |
3720 | + else \ |
3721 | + color_start= color_end=; \ |
3722 | + fi; \ |
3723 | + echo "$${color_start}# $$desc $$count$${color_end}"; \ |
3724 | + }; \ |
3725 | + create_testsuite_report () \ |
3726 | + { \ |
3727 | + result_count $$1 "TOTAL:" $$all "$$brg"; \ |
3728 | + result_count $$1 "PASS: " $$pass "$$grn"; \ |
3729 | + result_count $$1 "SKIP: " $$skip "$$blu"; \ |
3730 | + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ |
3731 | + result_count $$1 "FAIL: " $$fail "$$red"; \ |
3732 | + result_count $$1 "XPASS:" $$xpass "$$red"; \ |
3733 | + result_count $$1 "ERROR:" $$error "$$mgn"; \ |
3734 | + }; \ |
3735 | + { \ |
3736 | + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ |
3737 | + $(am__rst_title); \ |
3738 | + create_testsuite_report --no-color; \ |
3739 | + echo; \ |
3740 | + echo ".. contents:: :depth: 2"; \ |
3741 | + echo; \ |
3742 | + for b in $$bases; do echo $$b; done \ |
3743 | + | $(am__create_global_log); \ |
3744 | + } >$(TEST_SUITE_LOG).tmp || exit 1; \ |
3745 | + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ |
3746 | + if $$success; then \ |
3747 | + col="$$grn"; \ |
3748 | + else \ |
3749 | + col="$$red"; \ |
3750 | + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ |
3751 | + fi; \ |
3752 | + echo "$${col}$$br$${std}"; \ |
3753 | + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ |
3754 | + echo "$${col}$$br$${std}"; \ |
3755 | + create_testsuite_report --maybe-color; \ |
3756 | + echo "$$col$$br$$std"; \ |
3757 | + if $$success; then :; else \ |
3758 | + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ |
3759 | + if test -n "$(PACKAGE_BUGREPORT)"; then \ |
3760 | + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ |
3761 | + fi; \ |
3762 | + echo "$$col$$br$$std"; \ |
3763 | + fi; \ |
3764 | + $$success || exit 1 |
3765 | + |
3766 | +check-TESTS: |
3767 | + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list |
3768 | + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list |
3769 | + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) |
3770 | + @set +e; $(am__set_TESTS_bases); \ |
3771 | + log_list=`for i in $$bases; do echo $$i.log; done`; \ |
3772 | + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ |
3773 | + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ |
3774 | + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ |
3775 | + exit $$?; |
3776 | +recheck: all |
3777 | + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) |
3778 | + @set +e; $(am__set_TESTS_bases); \ |
3779 | + bases=`for i in $$bases; do echo $$i; done \ |
3780 | + | $(am__list_recheck_tests)` || exit 1; \ |
3781 | + log_list=`for i in $$bases; do echo $$i.log; done`; \ |
3782 | + log_list=`echo $$log_list`; \ |
3783 | + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ |
3784 | + am__force_recheck=am--force-recheck \ |
3785 | + TEST_LOGS="$$log_list"; \ |
3786 | + exit $$? |
3787 | +abicheck.sh.log: abicheck.sh |
3788 | + @p='abicheck.sh'; \ |
3789 | + b='abicheck.sh'; \ |
3790 | + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ |
3791 | + --log-file $$b.log --trs-file $$b.trs \ |
3792 | + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ |
3793 | + "$$tst" $(AM_TESTS_FD_REDIRECT) |
3794 | +.test.log: |
3795 | + @p='$<'; \ |
3796 | + $(am__set_b); \ |
3797 | + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ |
3798 | + --log-file $$b.log --trs-file $$b.trs \ |
3799 | + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ |
3800 | + "$$tst" $(AM_TESTS_FD_REDIRECT) |
3801 | +@am__EXEEXT_TRUE@.test$(EXEEXT).log: |
3802 | +@am__EXEEXT_TRUE@ @p='$<'; \ |
3803 | +@am__EXEEXT_TRUE@ $(am__set_b); \ |
3804 | +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ |
3805 | +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ |
3806 | +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ |
3807 | +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) |
3808 | |
3809 | distdir: $(DISTFILES) |
3810 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
3811 | @@ -3777,6 +4026,9 @@ |
3812 | "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3813 | fi |
3814 | mostlyclean-generic: |
3815 | + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) |
3816 | + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) |
3817 | + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) |
3818 | |
3819 | clean-generic: |
3820 | -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) |
3821 | @@ -3891,12 +4143,13 @@ |
3822 | |
3823 | .MAKE: all check check-am install install-am install-strip |
3824 | |
3825 | -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ |
3826 | - clean-generic clean-libLTLIBRARIES clean-libtool cscopelist \ |
3827 | - ctags dist-hook distclean distclean-compile distclean-generic \ |
3828 | - distclean-hdr distclean-libtool distclean-tags distdir dvi \ |
3829 | - dvi-am html html-am info info-am install install-am \ |
3830 | - install-cally_includeHEADERS install-clutter_deprecatedHEADERS \ |
3831 | +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ |
3832 | + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ |
3833 | + ctags ctags-am dist-hook distclean distclean-compile \ |
3834 | + distclean-generic distclean-hdr distclean-libtool \ |
3835 | + distclean-tags distdir dvi dvi-am html html-am info info-am \ |
3836 | + install install-am install-cally_includeHEADERS \ |
3837 | + install-clutter_deprecatedHEADERS \ |
3838 | install-clutter_includeHEADERS \ |
3839 | install-cluttercex100_includeHEADERS \ |
3840 | install-clutteregl_includeHEADERS \ |
3841 | @@ -3918,7 +4171,8 @@ |
3842 | installcheck-am installdirs maintainer-clean \ |
3843 | maintainer-clean-generic mostlyclean mostlyclean-compile \ |
3844 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
3845 | - tags uninstall uninstall-am uninstall-cally_includeHEADERS \ |
3846 | + recheck tags tags-am uninstall uninstall-am \ |
3847 | + uninstall-cally_includeHEADERS \ |
3848 | uninstall-clutter_deprecatedHEADERS \ |
3849 | uninstall-clutter_includeHEADERS \ |
3850 | uninstall-cluttercex100_includeHEADERS \ |
3851 | |
3852 | === modified file 'clutter/clutter-gesture-action-private.h' |
3853 | --- clutter/clutter-gesture-action-private.h 2013-03-15 23:20:40 +0000 |
3854 | +++ clutter/clutter-gesture-action-private.h 2013-05-21 02:54:27 +0000 |
3855 | @@ -35,7 +35,7 @@ |
3856 | * it needs to wait until the drag threshold has been exceeded before |
3857 | * considering that the gesture has begun; |
3858 | * @CLUTTER_GESTURE_TRIGGER_BEFORE: Tell #ClutterGestureAction that |
3859 | - * the gesture must begin immegiately and that it must be cancelled |
3860 | + * the gesture must begin immediately and that it must be cancelled |
3861 | * once the drag exceed the configured threshold. |
3862 | * |
3863 | * Enum passed to the _clutter_gesture_action_set_threshold_trigger_edge() |
3864 | |
3865 | === modified file 'clutter/clutter-gesture-action.c' |
3866 | --- clutter/clutter-gesture-action.c 2013-03-26 01:28:45 +0000 |
3867 | +++ clutter/clutter-gesture-action.c 2013-05-21 02:54:27 +0000 |
3868 | @@ -213,8 +213,48 @@ |
3869 | g_array_remove_index (priv->points, position); |
3870 | } |
3871 | |
3872 | +static void |
3873 | +gesture_update_motion_point (GesturePoint *point, |
3874 | + ClutterEvent *event) |
3875 | +{ |
3876 | + gfloat motion_x, motion_y; |
3877 | + gint64 _time; |
3878 | + |
3879 | + clutter_event_get_coords (event, &motion_x, &motion_y); |
3880 | + |
3881 | + clutter_event_free (point->last_event); |
3882 | + point->last_event = clutter_event_copy (event); |
3883 | + |
3884 | + point->last_delta_x = motion_x - point->last_motion_x; |
3885 | + point->last_delta_y = motion_y - point->last_motion_y; |
3886 | + point->last_motion_x = motion_x; |
3887 | + point->last_motion_y = motion_y; |
3888 | + |
3889 | + _time = clutter_event_get_time (event); |
3890 | + point->last_delta_time = _time - point->last_motion_time; |
3891 | + point->last_motion_time = _time; |
3892 | +} |
3893 | + |
3894 | +static void |
3895 | +gesture_update_release_point (GesturePoint *point, |
3896 | + ClutterEvent *event) |
3897 | +{ |
3898 | + gint64 _time; |
3899 | + |
3900 | + clutter_event_get_coords (event, &point->release_x, &point->release_y); |
3901 | + |
3902 | + clutter_event_free (point->last_event); |
3903 | + point->last_event = clutter_event_copy (event); |
3904 | + |
3905 | + /* Treat the release event as the continuation of the last motion, |
3906 | + * in case the user keeps the pointer still for a while before |
3907 | + * releasing it. */ |
3908 | + _time = clutter_event_get_time (event); |
3909 | + point->last_delta_time += _time - point->last_motion_time; |
3910 | +} |
3911 | + |
3912 | static gint |
3913 | -gesture_get_threshold (ClutterGestureAction *action) |
3914 | +gesture_get_threshold (void) |
3915 | { |
3916 | gint threshold; |
3917 | ClutterSettings *settings = clutter_settings_get_default (); |
3918 | @@ -222,6 +262,20 @@ |
3919 | return threshold; |
3920 | } |
3921 | |
3922 | +static gboolean |
3923 | +gesture_point_pass_threshold (GesturePoint *point, ClutterEvent *event) |
3924 | +{ |
3925 | + gint drag_threshold = gesture_get_threshold (); |
3926 | + gfloat motion_x, motion_y; |
3927 | + |
3928 | + clutter_event_get_coords (event, &motion_x, &motion_y); |
3929 | + |
3930 | + if ((fabsf (point->press_y - motion_y) < drag_threshold) && |
3931 | + (fabsf (point->press_x - motion_x) < drag_threshold)) |
3932 | + return TRUE; |
3933 | + return FALSE; |
3934 | +} |
3935 | + |
3936 | static void |
3937 | gesture_point_unset (GesturePoint *point) |
3938 | { |
3939 | @@ -290,8 +344,6 @@ |
3940 | gint position, drag_threshold; |
3941 | gboolean return_value; |
3942 | GesturePoint *point; |
3943 | - gfloat motion_x, motion_y; |
3944 | - gint64 time; |
3945 | |
3946 | if ((point = gesture_find_point (action, event, &position)) == NULL) |
3947 | return CLUTTER_EVENT_PROPAGATE; |
3948 | @@ -317,39 +369,31 @@ |
3949 | /* Follow same code path as a touch event update */ |
3950 | |
3951 | case CLUTTER_TOUCH_UPDATE: |
3952 | - clutter_event_get_coords (event, |
3953 | - &motion_x, |
3954 | - &motion_y); |
3955 | - |
3956 | - if (priv->points->len < priv->requested_nb_points) |
3957 | - return CLUTTER_EVENT_PROPAGATE; |
3958 | - |
3959 | - drag_threshold = gesture_get_threshold (action); |
3960 | - |
3961 | if (!priv->in_gesture) |
3962 | { |
3963 | + if (priv->points->len < priv->requested_nb_points) |
3964 | + { |
3965 | + gesture_update_motion_point (point, event); |
3966 | + return CLUTTER_EVENT_PROPAGATE; |
3967 | + } |
3968 | + |
3969 | /* Wait until the drag threshold has been exceeded |
3970 | * before starting _TRIGGER_EDGE_AFTER gestures. */ |
3971 | if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_AFTER && |
3972 | - (fabsf (point->press_y - motion_y) < drag_threshold) && |
3973 | - (fabsf (point->press_x - motion_x) < drag_threshold)) |
3974 | - return CLUTTER_EVENT_PROPAGATE; |
3975 | + gesture_point_pass_threshold (point, event)) |
3976 | + { |
3977 | + gesture_update_motion_point (point, event); |
3978 | + return CLUTTER_EVENT_PROPAGATE; |
3979 | + } |
3980 | |
3981 | if (!begin_gesture(action, actor)) |
3982 | - return CLUTTER_EVENT_PROPAGATE; |
3983 | + { |
3984 | + gesture_update_motion_point (point, event); |
3985 | + return CLUTTER_EVENT_PROPAGATE; |
3986 | + } |
3987 | } |
3988 | |
3989 | - clutter_event_free (point->last_event); |
3990 | - point->last_event = clutter_event_copy (event); |
3991 | - |
3992 | - point->last_delta_x = motion_x - point->last_motion_x; |
3993 | - point->last_delta_y = motion_y - point->last_motion_y; |
3994 | - point->last_motion_x = motion_x; |
3995 | - point->last_motion_y = motion_y; |
3996 | - |
3997 | - time = clutter_event_get_time (event); |
3998 | - point->last_delta_time = time - point->last_motion_time; |
3999 | - point->last_motion_time = time; |
4000 | + gesture_update_motion_point (point, event); |
4001 | |
4002 | g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor, |
4003 | &return_value); |
4004 | @@ -361,9 +405,10 @@ |
4005 | |
4006 | /* Check if a _TRIGGER_EDGE_BEFORE gesture needs to be cancelled because |
4007 | * the drag threshold has been exceeded. */ |
4008 | + drag_threshold = gesture_get_threshold (); |
4009 | if (priv->edge == CLUTTER_GESTURE_TRIGGER_EDGE_BEFORE && |
4010 | - ((fabsf (point->press_y - motion_y) > drag_threshold) || |
4011 | - (fabsf (point->press_x - motion_x) > drag_threshold))) |
4012 | + ((fabsf (point->press_y - point->last_motion_y) > drag_threshold) || |
4013 | + (fabsf (point->press_x - point->last_motion_x) > drag_threshold))) |
4014 | { |
4015 | cancel_gesture (action); |
4016 | return CLUTTER_EVENT_PROPAGATE; |
4017 | @@ -373,20 +418,11 @@ |
4018 | case CLUTTER_BUTTON_RELEASE: |
4019 | case CLUTTER_TOUCH_END: |
4020 | { |
4021 | - clutter_event_get_coords (event, &point->release_x, &point->release_y); |
4022 | - |
4023 | - clutter_event_free (point->last_event); |
4024 | - point->last_event = clutter_event_copy (event); |
4025 | + gesture_update_release_point (point, event); |
4026 | |
4027 | if (priv->in_gesture && |
4028 | ((priv->points->len - 1) < priv->requested_nb_points)) |
4029 | { |
4030 | - /* Treat the release event as the continuation of the last motion, |
4031 | - * in case the user keeps the pointer still for a while before |
4032 | - * releasing it. */ |
4033 | - time = clutter_event_get_time (event); |
4034 | - point->last_delta_time += time - point->last_motion_time; |
4035 | - |
4036 | priv->in_gesture = FALSE; |
4037 | g_signal_emit (action, gesture_signals[GESTURE_END], 0, actor); |
4038 | } |
4039 | @@ -397,6 +433,8 @@ |
4040 | |
4041 | case CLUTTER_TOUCH_CANCEL: |
4042 | { |
4043 | + gesture_update_release_point (point, event); |
4044 | + |
4045 | if (priv->in_gesture) |
4046 | { |
4047 | priv->in_gesture = FALSE; |
4048 | @@ -448,7 +486,8 @@ |
4049 | |
4050 | /* Start the gesture immediately if the gesture has no |
4051 | * _TRIGGER_EDGE_AFTER drag threshold. */ |
4052 | - if (priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER) |
4053 | + if ((priv->points->len < priv->requested_nb_points) && |
4054 | + (priv->edge != CLUTTER_GESTURE_TRIGGER_EDGE_AFTER)) |
4055 | begin_gesture (action, actor); |
4056 | |
4057 | return CLUTTER_EVENT_PROPAGATE; |
4058 | @@ -899,7 +938,7 @@ |
4059 | clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (action)); |
4060 | gint i, drag_threshold; |
4061 | |
4062 | - drag_threshold = gesture_get_threshold (action); |
4063 | + drag_threshold = gesture_get_threshold (); |
4064 | |
4065 | for (i = 0; i < priv->points->len; i++) |
4066 | { |
4067 | |
4068 | === modified file 'clutter/clutter-script-parser.c' |
4069 | --- clutter/clutter-script-parser.c 2013-03-26 01:28:45 +0000 |
4070 | +++ clutter/clutter-script-parser.c 2013-05-21 02:54:27 +0000 |
4071 | @@ -1857,7 +1857,7 @@ |
4072 | CLUTTER_NOTE (SCRIPT, |
4073 | "Setting %s layout property '%s' (type:%s) to " |
4074 | "object '%s' (id:%s)", |
4075 | - set_custom_property ? "custom" : "regular", |
4076 | + iface->set_custom_property != NULL ? "custom" : "regular", |
4077 | name, |
4078 | g_type_name (G_VALUE_TYPE (&value)), |
4079 | g_type_name (oinfo->gtype), |
4080 | @@ -1956,7 +1956,7 @@ |
4081 | CLUTTER_NOTE (SCRIPT, |
4082 | "Setting %s child property '%s' (type:%s) to " |
4083 | "object '%s' (id:%s)", |
4084 | - set_custom_property ? "custom" : "regular", |
4085 | + iface->set_custom_property != NULL ? "custom" : "regular", |
4086 | name, |
4087 | g_type_name (G_VALUE_TYPE (&value)), |
4088 | g_type_name (oinfo->gtype), |
4089 | |
4090 | === modified file 'clutter/clutter-stage.c' |
4091 | --- clutter/clutter-stage.c 2013-03-26 01:28:45 +0000 |
4092 | +++ clutter/clutter-stage.c 2013-05-21 02:54:27 +0000 |
4093 | @@ -159,6 +159,10 @@ |
4094 | |
4095 | ClutterStageState current_state; |
4096 | |
4097 | + ClutterStagePaintFunc paint_callback; |
4098 | + gpointer paint_data; |
4099 | + GDestroyNotify paint_notify; |
4100 | + |
4101 | guint relayout_pending : 1; |
4102 | guint redraw_pending : 1; |
4103 | guint is_fullscreen : 1; |
4104 | @@ -210,8 +214,9 @@ |
4105 | |
4106 | static const ClutterColor default_stage_color = { 255, 255, 255, 255 }; |
4107 | |
4108 | -static void _clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage); |
4109 | +static void clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage); |
4110 | static void free_queue_redraw_entry (ClutterStageQueueRedrawEntry *entry); |
4111 | +static void clutter_stage_invoke_paint_callback (ClutterStage *stage); |
4112 | |
4113 | static void |
4114 | clutter_stage_real_add (ClutterContainer *container, |
4115 | @@ -669,6 +674,8 @@ |
4116 | _clutter_stage_paint_volume_stack_free_all (stage); |
4117 | _clutter_stage_update_active_framebuffer (stage); |
4118 | clutter_actor_paint (CLUTTER_ACTOR (stage)); |
4119 | + |
4120 | + clutter_stage_invoke_paint_callback (stage); |
4121 | } |
4122 | |
4123 | static void |
4124 | @@ -1226,7 +1233,7 @@ |
4125 | if (!priv->redraw_pending) |
4126 | return FALSE; |
4127 | |
4128 | - _clutter_stage_maybe_finish_queue_redraws (stage); |
4129 | + clutter_stage_maybe_finish_queue_redraws (stage); |
4130 | |
4131 | clutter_stage_do_redraw (stage); |
4132 | |
4133 | @@ -1879,6 +1886,9 @@ |
4134 | if (priv->fps_timer != NULL) |
4135 | g_timer_destroy (priv->fps_timer); |
4136 | |
4137 | + if (priv->paint_notify != NULL) |
4138 | + priv->paint_notify (priv->paint_data); |
4139 | + |
4140 | G_OBJECT_CLASS (clutter_stage_parent_class)->finalize (object); |
4141 | } |
4142 | |
4143 | @@ -4137,7 +4147,7 @@ |
4144 | } |
4145 | |
4146 | static void |
4147 | -_clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage) |
4148 | +clutter_stage_maybe_finish_queue_redraws (ClutterStage *stage) |
4149 | { |
4150 | /* Note: we have to repeat until the pending_queue_redraws list is |
4151 | * empty because actors are allowed to queue redraws in response to |
4152 | @@ -4581,3 +4591,42 @@ |
4153 | if (stage_window) |
4154 | _clutter_stage_window_schedule_update (stage_window, -1); |
4155 | } |
4156 | + |
4157 | +/** |
4158 | + * clutter_stage_set_paint_callback: |
4159 | + * @stage: a #ClutterStage |
4160 | + * @callback: (allow-none): a callback |
4161 | + * @data: (allow-none): data to be passed to @callback |
4162 | + * @notify: (allow-none): function to be called when the callback is removed |
4163 | + * |
4164 | + * Sets a callback function to be invoked after the @stage has been |
4165 | + * painted. |
4166 | + * |
4167 | + * Since: 1.14 |
4168 | + */ |
4169 | +void |
4170 | +clutter_stage_set_paint_callback (ClutterStage *stage, |
4171 | + ClutterStagePaintFunc callback, |
4172 | + gpointer data, |
4173 | + GDestroyNotify notify) |
4174 | +{ |
4175 | + ClutterStagePrivate *priv; |
4176 | + |
4177 | + g_return_if_fail (CLUTTER_IS_STAGE (stage)); |
4178 | + |
4179 | + priv = stage->priv; |
4180 | + |
4181 | + if (priv->paint_notify != NULL) |
4182 | + priv->paint_notify (priv->paint_data); |
4183 | + |
4184 | + priv->paint_callback = callback; |
4185 | + priv->paint_data = data; |
4186 | + priv->paint_notify = notify; |
4187 | +} |
4188 | + |
4189 | +static void |
4190 | +clutter_stage_invoke_paint_callback (ClutterStage *stage) |
4191 | +{ |
4192 | + if (stage->priv->paint_callback != NULL) |
4193 | + stage->priv->paint_callback (stage, stage->priv->paint_data); |
4194 | +} |
4195 | |
4196 | === modified file 'clutter/clutter-stage.h' |
4197 | --- clutter/clutter-stage.h 2013-03-26 01:28:45 +0000 |
4198 | +++ clutter/clutter-stage.h 2013-05-21 02:54:27 +0000 |
4199 | @@ -208,6 +208,15 @@ |
4200 | gint sync_delay); |
4201 | CLUTTER_AVAILABLE_IN_1_14 |
4202 | void clutter_stage_skip_sync_delay (ClutterStage *stage); |
4203 | + |
4204 | +typedef void (* ClutterStagePaintFunc) (ClutterStage *stage, |
4205 | + gpointer data); |
4206 | + |
4207 | +CLUTTER_AVAILABLE_IN_1_14 |
4208 | +void clutter_stage_set_paint_callback (ClutterStage *stage, |
4209 | + ClutterStagePaintFunc callback, |
4210 | + gpointer data, |
4211 | + GDestroyNotify notify); |
4212 | #endif |
4213 | |
4214 | G_END_DECLS |
4215 | |
4216 | === modified file 'clutter/clutter-tap-action.c' |
4217 | --- clutter/clutter-tap-action.c 2013-03-15 23:20:40 +0000 |
4218 | +++ clutter/clutter-tap-action.c 2013-05-21 02:54:27 +0000 |
4219 | @@ -40,7 +40,7 @@ |
4220 | * the logic for recognizing mouse clicks and touch tap gestures. |
4221 | * |
4222 | * The simplest usage of #ClutterTapAction consists in adding it to |
4223 | - * a #ClutterActor with a child, setting it as reactive and connecting a |
4224 | + * a #ClutterActor, setting it as reactive and connecting a |
4225 | * callback for the #ClutterTapAction::tap signal, along the lines of the |
4226 | * following code: |
4227 | * |
4228 | |
4229 | === modified file 'clutter/clutter-version.h' |
4230 | --- clutter/clutter-version.h 2013-03-26 01:28:45 +0000 |
4231 | +++ clutter/clutter-version.h 2013-05-21 02:54:27 +0000 |
4232 | @@ -96,14 +96,14 @@ |
4233 | * |
4234 | * The micro version of the Clutter library (3, if %CLUTTER_VERSION is 1.2.3) |
4235 | */ |
4236 | -#define CLUTTER_MICRO_VERSION (0) |
4237 | +#define CLUTTER_MICRO_VERSION (4) |
4238 | |
4239 | /** |
4240 | * CLUTTER_VERSION: |
4241 | * |
4242 | * The full version of the Clutter library, like 1.2.3 |
4243 | */ |
4244 | -#define CLUTTER_VERSION 1.14.0 |
4245 | +#define CLUTTER_VERSION 1.14.4 |
4246 | |
4247 | /** |
4248 | * CLUTTER_VERSION_S: |
4249 | @@ -111,7 +111,7 @@ |
4250 | * The full version of the Clutter library, in string form (suited for |
4251 | * string concatenation) |
4252 | */ |
4253 | -#define CLUTTER_VERSION_S "1.14.0" |
4254 | +#define CLUTTER_VERSION_S "1.14.4" |
4255 | |
4256 | /** |
4257 | * CLUTTER_VERSION_HEX: |
4258 | |
4259 | === modified file 'clutter/clutter-zoom-action.c' |
4260 | --- clutter/clutter-zoom-action.c 2013-03-26 01:28:45 +0000 |
4261 | +++ clutter/clutter-zoom-action.c 2013-05-21 02:54:27 +0000 |
4262 | @@ -81,6 +81,7 @@ |
4263 | |
4264 | ZoomPoint points[2]; |
4265 | |
4266 | + ClutterPoint initial_focal_point; |
4267 | ClutterPoint focal_point; |
4268 | ClutterPoint transformed_focal_point; |
4269 | |
4270 | @@ -176,6 +177,18 @@ |
4271 | &priv->initial_scale_x, |
4272 | &priv->initial_scale_y); |
4273 | |
4274 | + priv->initial_focal_point.x = (priv->points[0].start_x + priv->points[1].start_x) / 2; |
4275 | + priv->initial_focal_point.y = (priv->points[0].start_y + priv->points[1].start_y) / 2; |
4276 | + clutter_actor_transform_stage_point (actor, |
4277 | + priv->initial_focal_point.x, |
4278 | + priv->initial_focal_point.y, |
4279 | + &priv->transformed_focal_point.x, |
4280 | + &priv->transformed_focal_point.y); |
4281 | + |
4282 | + clutter_actor_set_pivot_point (actor, |
4283 | + priv->transformed_focal_point.x / clutter_actor_get_width (actor), |
4284 | + priv->transformed_focal_point.y / clutter_actor_get_height (actor)); |
4285 | + |
4286 | return TRUE; |
4287 | } |
4288 | |
4289 | @@ -200,11 +213,6 @@ |
4290 | |
4291 | priv->focal_point.x = (priv->points[0].update_x + priv->points[1].update_x) / 2; |
4292 | priv->focal_point.y = (priv->points[0].update_y + priv->points[1].update_y) / 2; |
4293 | - priv->transformed_focal_point.x = (priv->points[0].transformed_update_x + |
4294 | - priv->points[1].transformed_update_x) / 2; |
4295 | - priv->transformed_focal_point.y = (priv->points[0].transformed_update_y + |
4296 | - priv->points[1].transformed_update_y) / 2; |
4297 | - |
4298 | |
4299 | new_scale = distance / priv->zoom_initial_distance; |
4300 | |
4301 | @@ -235,11 +243,16 @@ |
4302 | gdouble factor) |
4303 | { |
4304 | ClutterZoomActionPrivate *priv = action->priv; |
4305 | - ClutterActor *parent = clutter_actor_get_parent (actor); |
4306 | gfloat x, y, z; |
4307 | gdouble scale_x, scale_y; |
4308 | ClutterVertex out, in; |
4309 | |
4310 | + in.x = priv->transformed_focal_point.x; |
4311 | + in.y = priv->transformed_focal_point.y; |
4312 | + in.z = 0; |
4313 | + |
4314 | + clutter_actor_apply_transform_to_point (actor, &in, &out); |
4315 | + |
4316 | clutter_actor_get_scale (actor, &scale_x, &scale_y); |
4317 | |
4318 | switch (priv->zoom_axis) |
4319 | @@ -260,21 +273,10 @@ |
4320 | break; |
4321 | } |
4322 | |
4323 | - |
4324 | - in.x = priv->transformed_focal_point.x; |
4325 | - in.y = priv->transformed_focal_point.y; |
4326 | - in.z = 0; |
4327 | - |
4328 | - clutter_actor_apply_relative_transform_to_point (actor, |
4329 | - parent, |
4330 | - &in, &out); |
4331 | - |
4332 | - |
4333 | - clutter_actor_get_translation (actor, &x, &y, &z); |
4334 | - clutter_actor_set_translation (actor, |
4335 | - x + priv->focal_point.x - out.x, |
4336 | - y + priv->focal_point.y - out.y, |
4337 | - z); |
4338 | + x = priv->initial_x + priv->focal_point.x - priv->initial_focal_point.x; |
4339 | + y = priv->initial_y + priv->focal_point.y - priv->initial_focal_point.y; |
4340 | + clutter_actor_get_translation (actor, NULL, NULL, &z); |
4341 | + clutter_actor_set_translation (actor, x, y, z); |
4342 | |
4343 | return TRUE; |
4344 | } |
4345 | |
4346 | === modified file 'clutter/clutter.symbols' |
4347 | --- clutter/clutter.symbols 2013-03-26 01:28:45 +0000 |
4348 | +++ clutter/clutter.symbols 2013-05-21 02:54:27 +0000 |
4349 | @@ -1283,6 +1283,7 @@ |
4350 | clutter_stage_set_minimum_size |
4351 | clutter_stage_set_motion_events_enabled |
4352 | clutter_stage_set_no_clear_hint |
4353 | +clutter_stage_set_paint_callback |
4354 | clutter_stage_set_perspective |
4355 | clutter_stage_set_sync_delay |
4356 | clutter_stage_set_throttle_motion_events |
4357 | |
4358 | === modified file 'clutter/config.h.win32' |
4359 | --- clutter/config.h.win32 2013-03-26 01:28:45 +0000 |
4360 | +++ clutter/config.h.win32 2013-05-21 02:54:27 +0000 |
4361 | @@ -156,7 +156,7 @@ |
4362 | #define PACKAGE_NAME "clutter" |
4363 | |
4364 | /* Define to the full name and version of this package. */ |
4365 | -#define PACKAGE_STRING "clutter 1.14.0" |
4366 | +#define PACKAGE_STRING "clutter 1.14.4" |
4367 | |
4368 | /* Define to the one symbol short name of this package. */ |
4369 | #define PACKAGE_TARNAME "clutter" |
4370 | @@ -165,7 +165,7 @@ |
4371 | #define PACKAGE_URL "http://www.clutter-project.org" |
4372 | |
4373 | /* Define to the version of this package. */ |
4374 | -#define PACKAGE_VERSION "1.14.0" |
4375 | +#define PACKAGE_VERSION "1.14.4" |
4376 | |
4377 | /* Define to 1 if you have the ANSI C header files. */ |
4378 | #define STDC_HEADERS 1 |
4379 | |
4380 | === modified file 'clutter/wayland/clutter-stage-wayland.c' |
4381 | --- clutter/wayland/clutter-stage-wayland.c 2013-03-26 01:28:45 +0000 |
4382 | +++ clutter/wayland/clutter-stage-wayland.c 2013-05-21 02:54:27 +0000 |
4383 | @@ -130,6 +130,22 @@ |
4384 | } |
4385 | |
4386 | static void |
4387 | +clutter_stage_wayland_show (ClutterStageWindow *stage_window, |
4388 | + gboolean do_raise) |
4389 | +{ |
4390 | + ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window); |
4391 | + |
4392 | + clutter_stage_window_parent_iface->show (stage_window, do_raise); |
4393 | + |
4394 | + /* We need to queue a redraw after the stage is shown because all of |
4395 | + * the other queue redraws up to this point will have been ignored |
4396 | + * because the actor was not visible. The other backends do not need |
4397 | + * to do this because they will get expose events at some point, but |
4398 | + * that does not happen for Wayland. */ |
4399 | + clutter_actor_queue_redraw (CLUTTER_ACTOR (stage_cogl->wrapper)); |
4400 | +} |
4401 | + |
4402 | +static void |
4403 | clutter_stage_wayland_set_fullscreen (ClutterStageWindow *stage_window, |
4404 | gboolean fullscreen) |
4405 | { |
4406 | @@ -203,6 +219,7 @@ |
4407 | clutter_stage_window_parent_iface = g_type_interface_peek_parent (iface); |
4408 | |
4409 | iface->realize = clutter_stage_wayland_realize; |
4410 | + iface->show = clutter_stage_wayland_show; |
4411 | iface->set_fullscreen = clutter_stage_wayland_set_fullscreen; |
4412 | iface->resize = clutter_stage_wayland_resize; |
4413 | } |
4414 | |
4415 | === modified file 'clutter/x11/clutter-backend-x11.c' |
4416 | --- clutter/x11/clutter-backend-x11.c 2013-03-26 01:28:45 +0000 |
4417 | +++ clutter/x11/clutter-backend-x11.c 2013-05-21 02:54:27 +0000 |
4418 | @@ -786,9 +786,9 @@ |
4419 | _clutter_backend_add_event_translator (backend, translator); |
4420 | |
4421 | CLUTTER_NOTE (MISC, "X11 stage created (display:%p, screen:%d, root:%u)", |
4422 | - CLUTTER_BACKEND_X11 (backend_x11)->xdpy, |
4423 | - CLUTTER_BACKEND_X11 (backend_x11)->xscreen_num, |
4424 | - (unsigned int) CLUTTER_BACKEND_X11 (backend_x11)->xwin_root); |
4425 | + CLUTTER_BACKEND_X11 (backend)->xdpy, |
4426 | + CLUTTER_BACKEND_X11 (backend)->xscreen_num, |
4427 | + (unsigned int) CLUTTER_BACKEND_X11 (backend)->xwin_root); |
4428 | |
4429 | return stage; |
4430 | } |
4431 | |
4432 | === modified file 'configure' |
4433 | --- configure 2013-03-26 01:28:45 +0000 |
4434 | +++ configure 2013-05-21 02:54:27 +0000 |
4435 | @@ -1,6 +1,6 @@ |
4436 | #! /bin/sh |
4437 | # Guess values for system-dependent variables and create Makefiles. |
4438 | -# Generated by GNU Autoconf 2.69 for clutter 1.14.0. |
4439 | +# Generated by GNU Autoconf 2.69 for clutter 1.14.4. |
4440 | # |
4441 | # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=clutter>. |
4442 | # |
4443 | @@ -591,8 +591,8 @@ |
4444 | # Identity of this package. |
4445 | PACKAGE_NAME='clutter' |
4446 | PACKAGE_TARNAME='clutter' |
4447 | -PACKAGE_VERSION='1.14.0' |
4448 | -PACKAGE_STRING='clutter 1.14.0' |
4449 | +PACKAGE_VERSION='1.14.4' |
4450 | +PACKAGE_STRING='clutter 1.14.4' |
4451 | PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=clutter' |
4452 | PACKAGE_URL='http://www.clutter-project.org' |
4453 | |
4454 | @@ -1543,7 +1543,7 @@ |
4455 | # Omit some internal or obsolete options to make the list less imposing. |
4456 | # This message is too long to be a string in the A/UX 3.1 sh. |
4457 | cat <<_ACEOF |
4458 | -\`configure' configures clutter 1.14.0 to adapt to many kinds of systems. |
4459 | +\`configure' configures clutter 1.14.4 to adapt to many kinds of systems. |
4460 | |
4461 | Usage: $0 [OPTION]... [VAR=VALUE]... |
4462 | |
4463 | @@ -1617,7 +1617,7 @@ |
4464 | |
4465 | if test -n "$ac_init_help"; then |
4466 | case $ac_init_help in |
4467 | - short | recursive ) echo "Configuration of clutter 1.14.0:";; |
4468 | + short | recursive ) echo "Configuration of clutter 1.14.4:";; |
4469 | esac |
4470 | cat <<\_ACEOF |
4471 | |
4472 | @@ -1812,7 +1812,7 @@ |
4473 | test -n "$ac_init_help" && exit $ac_status |
4474 | if $ac_init_version; then |
4475 | cat <<\_ACEOF |
4476 | -clutter configure 1.14.0 |
4477 | +clutter configure 1.14.4 |
4478 | generated by GNU Autoconf 2.69 |
4479 | |
4480 | Copyright (C) 2012 Free Software Foundation, Inc. |
4481 | @@ -2238,7 +2238,7 @@ |
4482 | This file contains any messages produced by compilers while |
4483 | running configure, to aid debugging if configure makes a mistake. |
4484 | |
4485 | -It was created by clutter $as_me 1.14.0, which was |
4486 | +It was created by clutter $as_me 1.14.4, which was |
4487 | generated by GNU Autoconf 2.69. Invocation command line was |
4488 | |
4489 | $ $0 $@ |
4490 | @@ -2622,7 +2622,7 @@ |
4491 | |
4492 | |
4493 | |
4494 | -am__api_version='1.12' |
4495 | +am__api_version='1.13' |
4496 | |
4497 | # Find a good install program. We prefer a C program (faster), |
4498 | # so one script is as good as another. But avoid the broken or |
4499 | @@ -2806,8 +2806,8 @@ |
4500 | esac |
4501 | fi |
4502 | # Use eval to expand $SHELL |
4503 | -if eval "$MISSING --run true"; then |
4504 | - am_missing_run="$MISSING --run " |
4505 | +if eval "$MISSING --is-lightweight"; then |
4506 | + am_missing_run="$MISSING " |
4507 | else |
4508 | am_missing_run= |
4509 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 |
4510 | @@ -3047,6 +3047,45 @@ |
4511 | fi |
4512 | rmdir .tst 2>/dev/null |
4513 | |
4514 | +# Check whether --enable-silent-rules was given. |
4515 | +if test "${enable_silent_rules+set}" = set; then : |
4516 | + enableval=$enable_silent_rules; |
4517 | +fi |
4518 | + |
4519 | +case $enable_silent_rules in # ((( |
4520 | + yes) AM_DEFAULT_VERBOSITY=0;; |
4521 | + no) AM_DEFAULT_VERBOSITY=1;; |
4522 | + *) AM_DEFAULT_VERBOSITY=1;; |
4523 | +esac |
4524 | +am_make=${MAKE-make} |
4525 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
4526 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
4527 | +if ${am_cv_make_support_nested_variables+:} false; then : |
4528 | + $as_echo_n "(cached) " >&6 |
4529 | +else |
4530 | + if $as_echo 'TRUE=$(BAR$(V)) |
4531 | +BAR0=false |
4532 | +BAR1=true |
4533 | +V=1 |
4534 | +am__doit: |
4535 | + @$(TRUE) |
4536 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
4537 | + am_cv_make_support_nested_variables=yes |
4538 | +else |
4539 | + am_cv_make_support_nested_variables=no |
4540 | +fi |
4541 | +fi |
4542 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
4543 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
4544 | +if test $am_cv_make_support_nested_variables = yes; then |
4545 | + AM_V='$(V)' |
4546 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
4547 | +else |
4548 | + AM_V=$AM_DEFAULT_VERBOSITY |
4549 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
4550 | +fi |
4551 | +AM_BACKSLASH='\' |
4552 | + |
4553 | if test "`cd $srcdir && pwd`" != "`pwd`"; then |
4554 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
4555 | # is not polluted with repeated "-I." |
4556 | @@ -3069,7 +3108,7 @@ |
4557 | |
4558 | # Define the identity of the package. |
4559 | PACKAGE='clutter' |
4560 | - VERSION='1.14.0' |
4561 | + VERSION='1.14.4' |
4562 | |
4563 | |
4564 | # Some tools Automake needs. |
4565 | @@ -3231,9 +3270,9 @@ |
4566 | |
4567 | CLUTTER_MINOR_VERSION=14 |
4568 | |
4569 | -CLUTTER_MICRO_VERSION=0 |
4570 | +CLUTTER_MICRO_VERSION=4 |
4571 | |
4572 | -CLUTTER_VERSION=1.14.0 |
4573 | +CLUTTER_VERSION=1.14.4 |
4574 | |
4575 | CLUTTER_API_VERSION=1.0 |
4576 | |
4577 | @@ -3245,12 +3284,12 @@ |
4578 | |
4579 | |
4580 | |
4581 | -CLUTTER_LT_CURRENT=1400 |
4582 | +CLUTTER_LT_CURRENT=1404 |
4583 | CLUTTER_LT_REV=0 |
4584 | -CLUTTER_LT_AGE=1400 |
4585 | +CLUTTER_LT_AGE=1404 |
4586 | CLUTTER_LT_VERSION="$CLUTTER_LT_CURRENT:$CLUTTER_LT_REV:$CLUTTER_LT_AGE" |
4587 | CLUTTER_LT_LDFLAGS="-version-info $CLUTTER_LT_VERSION" |
4588 | -CLUTTER_LT_CURRENT=1400 |
4589 | +CLUTTER_LT_CURRENT=1404 |
4590 | |
4591 | CLUTTER_LT_REVISION=0 |
4592 | |
4593 | @@ -18517,7 +18556,7 @@ |
4594 | # report actual input values of CONFIG_FILES etc. instead of their |
4595 | # values after options handling. |
4596 | ac_log=" |
4597 | -This file was extended by clutter $as_me 1.14.0, which was |
4598 | +This file was extended by clutter $as_me 1.14.4, which was |
4599 | generated by GNU Autoconf 2.69. Invocation command line was |
4600 | |
4601 | CONFIG_FILES = $CONFIG_FILES |
4602 | @@ -18584,7 +18623,7 @@ |
4603 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4604 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4605 | ac_cs_version="\\ |
4606 | -clutter config.status 1.14.0 |
4607 | +clutter config.status 1.14.4 |
4608 | configured by $0, generated by GNU Autoconf 2.69, |
4609 | with options \\"\$ac_cs_config\\" |
4610 | |
4611 | @@ -19633,7 +19672,7 @@ |
4612 | |
4613 | case $ac_file$ac_mode in |
4614 | "depfiles":C) test x"$AMDEP_TRUE" != x"" || { |
4615 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
4616 | + # Older Autoconf quotes --file arguments for eval, but not when files |
4617 | # are listed without --file. Let's play safe and only enable the eval |
4618 | # if we detect the quoting. |
4619 | case $CONFIG_FILES in |
4620 | |
4621 | === modified file 'configure.ac' |
4622 | --- configure.ac 2013-03-26 01:28:45 +0000 |
4623 | +++ configure.ac 2013-05-21 02:54:27 +0000 |
4624 | @@ -10,7 +10,7 @@ |
4625 | # - increase clutter_interface_version to the next odd number |
4626 | m4_define([clutter_major_version], [1]) |
4627 | m4_define([clutter_minor_version], [14]) |
4628 | -m4_define([clutter_micro_version], [0]) |
4629 | +m4_define([clutter_micro_version], [4]) |
4630 | |
4631 | # • for stable releases: increase the interface age by 1 for each release; |
4632 | # if the API changes, set to 0. interface_age and binary_age are used to |
4633 | |
4634 | === modified file 'debian/changelog' |
4635 | --- debian/changelog 2013-03-26 01:28:45 +0000 |
4636 | +++ debian/changelog 2013-05-21 02:54:27 +0000 |
4637 | @@ -1,3 +1,15 @@ |
4638 | +clutter-1.0 (1.14.4-0ubuntu1) saucy; urgency=low |
4639 | + [ Rico Tzschichholz ] |
4640 | + * New upstream release |
4641 | + + debian/libclutter-1.0-0.symbols: |
4642 | + - Updated. |
4643 | + |
4644 | + [ Tim Lunn ] |
4645 | + * debian/patches/git_cally_weak_pointer.patch: |
4646 | + - Upstream git patch to fix crash (LP: #963925) |
4647 | + |
4648 | + -- Tim Lunn <tim@feathertop.org> Tue, 21 May 2013 11:46:25 +1000 |
4649 | + |
4650 | clutter-1.0 (1.14.0-1) experimental; urgency=low |
4651 | |
4652 | [ Emilio Pozuelo Monfort ] |
4653 | |
4654 | === modified file 'debian/control' |
4655 | --- debian/control 2013-03-26 01:28:45 +0000 |
4656 | +++ debian/control 2013-05-21 02:54:27 +0000 |
4657 | @@ -2,12 +2,12 @@ |
4658 | # |
4659 | # Modifications should be made to debian/control.in instead. |
4660 | # This file is regenerated automatically in the clean target. |
4661 | - |
4662 | Source: clutter-1.0 |
4663 | Section: libs |
4664 | Priority: optional |
4665 | -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
4666 | -Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Gustavo Noronha Silva <kov@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Rico Tzschichholz <ricotz@ubuntu.com> |
4667 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
4668 | +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
4669 | +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Gustavo Noronha Silva <kov@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Rico Tzschichholz <ricotz@ubuntu.com> |
4670 | Build-Depends: debhelper (>= 8.1.3~), |
4671 | cdbs (>= 0.4.93~), |
4672 | dh-autoreconf, |
4673 | |
4674 | === modified file 'debian/control.in' |
4675 | --- debian/control.in 2013-03-26 01:28:45 +0000 |
4676 | +++ debian/control.in 2013-05-21 02:54:27 +0000 |
4677 | @@ -1,7 +1,8 @@ |
4678 | Source: clutter-1.0 |
4679 | Section: libs |
4680 | Priority: optional |
4681 | -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
4682 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
4683 | +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
4684 | Uploaders: @GNOME_TEAM@, Rico Tzschichholz <ricotz@ubuntu.com> |
4685 | Build-Depends: debhelper (>= 8.1.3~), |
4686 | cdbs (>= 0.4.93~), |
4687 | |
4688 | === modified file 'debian/libclutter-1.0-0.symbols' |
4689 | --- debian/libclutter-1.0-0.symbols 2013-03-26 01:28:45 +0000 |
4690 | +++ debian/libclutter-1.0-0.symbols 2013-05-21 02:54:27 +0000 |
4691 | @@ -1268,6 +1268,7 @@ |
4692 | clutter_stage_set_minimum_size@Base 1.10.0 |
4693 | clutter_stage_set_motion_events_enabled@Base 1.10.0 |
4694 | clutter_stage_set_no_clear_hint@Base 1.10.0 |
4695 | + clutter_stage_set_paint_callback@Base 1.14.4 |
4696 | clutter_stage_set_perspective@Base 1.10.0 |
4697 | clutter_stage_set_sync_delay@Base 1.13.6 |
4698 | clutter_stage_set_throttle_motion_events@Base 1.10.0 |
4699 | |
4700 | === added file 'debian/patches/git_cally_weak_pointer.patch' |
4701 | --- debian/patches/git_cally_weak_pointer.patch 1970-01-01 00:00:00 +0000 |
4702 | +++ debian/patches/git_cally_weak_pointer.patch 2013-05-21 02:54:27 +0000 |
4703 | @@ -0,0 +1,53 @@ |
4704 | +From a586c23ddcef9a11f6e343b4b6848cde2df54927 Mon Sep 17 00:00:00 2001 |
4705 | +From: Emmanuele Bassi <ebassi@gnome.org> |
4706 | +Date: Mon, 06 May 2013 22:46:25 +0000 |
4707 | +Subject: cally: Use a weak pointer to hold the key focus in CallyStage |
4708 | + |
4709 | +We want to avoid the pointer getting stale, and causing crashes. |
4710 | + |
4711 | +https://bugzilla.gnome.org/show_bug.cgi?id=692706 |
4712 | +(cherry picked from commit 19391a9626b087bd4df452e8699d53caa54c350f) |
4713 | + |
4714 | +Signed-off-by: Emmanuele Bassi <ebassi@gnome.org> |
4715 | +--- |
4716 | +diff --git a/clutter/cally/cally-stage.c b/clutter/cally/cally-stage.c |
4717 | +index 2b1cfd1..c95ccb0 100644 |
4718 | +--- a/clutter/cally/cally-stage.c |
4719 | ++++ b/clutter/cally/cally-stage.c |
4720 | +@@ -139,7 +139,11 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage, |
4721 | + AtkObject *old = NULL; |
4722 | + |
4723 | + if (self->priv->key_focus != NULL) |
4724 | +- old = clutter_actor_get_accessible (self->priv->key_focus); |
4725 | ++ { |
4726 | ++ g_object_remove_weak_pointer (G_OBJECT (self->priv->key_focus), |
4727 | ++ (gpointer *) &self->priv->key_focus); |
4728 | ++ old = clutter_actor_get_accessible (self->priv->key_focus); |
4729 | ++ } |
4730 | + else |
4731 | + old = clutter_actor_get_accessible (CLUTTER_ACTOR (stage)); |
4732 | + |
4733 | +@@ -154,7 +158,19 @@ cally_stage_notify_key_focus_cb (ClutterStage *stage, |
4734 | + self->priv->key_focus = key_focus; |
4735 | + |
4736 | + if (key_focus != NULL) |
4737 | +- new = clutter_actor_get_accessible (key_focus); |
4738 | ++ { |
4739 | ++ /* ensure that if the key focus goes away, the field inside |
4740 | ++ * CallyStage is reset. see bug: |
4741 | ++ * |
4742 | ++ * https://bugzilla.gnome.org/show_bug.cgi?id=692706 |
4743 | ++ * |
4744 | ++ * we remove the weak pointer above. |
4745 | ++ */ |
4746 | ++ g_object_add_weak_pointer (G_OBJECT (self->priv->key_focus), |
4747 | ++ (gpointer *) &self->priv->key_focus); |
4748 | ++ |
4749 | ++ new = clutter_actor_get_accessible (key_focus); |
4750 | ++ } |
4751 | + else |
4752 | + new = clutter_actor_get_accessible (CLUTTER_ACTOR (stage)); |
4753 | + |
4754 | +-- |
4755 | +cgit v0.9.1 |
4756 | + |
4757 | |
4758 | === modified file 'debian/patches/series' |
4759 | --- debian/patches/series 2012-11-08 11:03:05 +0000 |
4760 | +++ debian/patches/series 2013-05-21 02:54:27 +0000 |
4761 | @@ -1,1 +1,2 @@ |
4762 | fix_test_data_path.patch |
4763 | +git_cally_weak_pointer.patch |
4764 | |
4765 | === modified file 'doc/Makefile.in' |
4766 | --- doc/Makefile.in 2013-03-26 01:28:45 +0000 |
4767 | +++ doc/Makefile.in 2013-05-21 02:54:27 +0000 |
4768 | @@ -1,4 +1,4 @@ |
4769 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
4770 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4771 | # @configure_input@ |
4772 | |
4773 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4774 | @@ -52,7 +52,7 @@ |
4775 | @BUILD_GTK_DOC_TRUE@am__append_1 = reference |
4776 | @ENABLE_DOCS_TRUE@am__append_2 = common cookbook |
4777 | subdir = doc |
4778 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
4779 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
4780 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4781 | am__aclocal_m4_deps = \ |
4782 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
4783 | @@ -94,13 +94,14 @@ |
4784 | am__v_at_1 = |
4785 | SOURCES = |
4786 | DIST_SOURCES = |
4787 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
4788 | - html-recursive info-recursive install-data-recursive \ |
4789 | - install-dvi-recursive install-exec-recursive \ |
4790 | - install-html-recursive install-info-recursive \ |
4791 | - install-pdf-recursive install-ps-recursive install-recursive \ |
4792 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
4793 | - ps-recursive uninstall-recursive |
4794 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
4795 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
4796 | + install-data-recursive install-dvi-recursive \ |
4797 | + install-exec-recursive install-html-recursive \ |
4798 | + install-info-recursive install-pdf-recursive \ |
4799 | + install-ps-recursive install-recursive installcheck-recursive \ |
4800 | + installdirs-recursive pdf-recursive ps-recursive \ |
4801 | + tags-recursive uninstall-recursive |
4802 | am__can_run_installinfo = \ |
4803 | case $$AM_UPDATE_INFO_DIR in \ |
4804 | n|no|NO) false;; \ |
4805 | @@ -108,9 +109,29 @@ |
4806 | esac |
4807 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
4808 | distclean-recursive maintainer-clean-recursive |
4809 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
4810 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
4811 | +am__recursive_targets = \ |
4812 | + $(RECURSIVE_TARGETS) \ |
4813 | + $(RECURSIVE_CLEAN_TARGETS) \ |
4814 | + $(am__extra_recursive_targets) |
4815 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
4816 | distdir |
4817 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
4818 | +# Read a list of newline-separated strings from the standard input, |
4819 | +# and print each of them once, without duplicates. Input order is |
4820 | +# *not* preserved. |
4821 | +am__uniquify_input = $(AWK) '\ |
4822 | + BEGIN { nonempty = 0; } \ |
4823 | + { items[$$0] = 1; nonempty = 1; } \ |
4824 | + END { if (nonempty) { for (i in items) print i; }; } \ |
4825 | +' |
4826 | +# Make sure the list of sources is unique. This is necessary because, |
4827 | +# e.g., the same source file might be shared among _SOURCES variables |
4828 | +# for different programs/libraries. |
4829 | +am__define_uniq_tagged_files = \ |
4830 | + list='$(am__tagged_files)'; \ |
4831 | + unique=`for i in $$list; do \ |
4832 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4833 | + done | $(am__uniquify_input)` |
4834 | ETAGS = etags |
4835 | CTAGS = ctags |
4836 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4837 | @@ -418,7 +439,7 @@ |
4838 | # (1) if the variable is set in 'config.status', edit 'config.status' |
4839 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
4840 | # (2) otherwise, pass the desired values on the 'make' command line. |
4841 | -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
4842 | +$(am__recursive_targets): |
4843 | @fail= failcom='exit 1'; \ |
4844 | for f in x $$MAKEFLAGS; do \ |
4845 | case $$f in \ |
4846 | @@ -446,31 +467,13 @@ |
4847 | if test "$$dot_seen" = "no"; then \ |
4848 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
4849 | fi; test -z "$$fail" |
4850 | -tags-recursive: |
4851 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
4852 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
4853 | - done |
4854 | -ctags-recursive: |
4855 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
4856 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
4857 | - done |
4858 | -cscopelist-recursive: |
4859 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
4860 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
4861 | - done |
4862 | - |
4863 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
4864 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4865 | - unique=`for i in $$list; do \ |
4866 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4867 | - done | \ |
4868 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
4869 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
4870 | - mkid -fID $$unique |
4871 | -tags: TAGS |
4872 | - |
4873 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
4874 | - $(TAGS_FILES) $(LISP) |
4875 | + |
4876 | +ID: $(am__tagged_files) |
4877 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
4878 | +tags: tags-recursive |
4879 | +TAGS: tags |
4880 | + |
4881 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
4882 | set x; \ |
4883 | here=`pwd`; \ |
4884 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
4885 | @@ -486,12 +489,7 @@ |
4886 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
4887 | fi; \ |
4888 | done; \ |
4889 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4890 | - unique=`for i in $$list; do \ |
4891 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4892 | - done | \ |
4893 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
4894 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
4895 | + $(am__define_uniq_tagged_files); \ |
4896 | shift; \ |
4897 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
4898 | test -n "$$unique" || unique=$$empty_fix; \ |
4899 | @@ -503,15 +501,11 @@ |
4900 | $$unique; \ |
4901 | fi; \ |
4902 | fi |
4903 | -ctags: CTAGS |
4904 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
4905 | - $(TAGS_FILES) $(LISP) |
4906 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
4907 | - unique=`for i in $$list; do \ |
4908 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
4909 | - done | \ |
4910 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
4911 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
4912 | +ctags: ctags-recursive |
4913 | + |
4914 | +CTAGS: ctags |
4915 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
4916 | + $(am__define_uniq_tagged_files); \ |
4917 | test -z "$(CTAGS_ARGS)$$unique" \ |
4918 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
4919 | $$unique |
4920 | @@ -520,9 +514,10 @@ |
4921 | here=`$(am__cd) $(top_builddir) && pwd` \ |
4922 | && $(am__cd) $(top_srcdir) \ |
4923 | && gtags -i $(GTAGS_ARGS) "$$here" |
4924 | +cscopelist: cscopelist-recursive |
4925 | |
4926 | -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
4927 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
4928 | +cscopelist-am: $(am__tagged_files) |
4929 | + list='$(am__tagged_files)'; \ |
4930 | case "$(srcdir)" in \ |
4931 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
4932 | *) sdir=$(subdir)/$(srcdir) ;; \ |
4933 | @@ -694,23 +689,20 @@ |
4934 | |
4935 | uninstall-am: |
4936 | |
4937 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ |
4938 | - cscopelist-recursive ctags-recursive install-am install-strip \ |
4939 | - tags-recursive |
4940 | +.MAKE: $(am__recursive_targets) install-am install-strip |
4941 | |
4942 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
4943 | - all all-am check check-am clean clean-generic clean-libtool \ |
4944 | - cscopelist cscopelist-recursive ctags ctags-recursive \ |
4945 | - distclean distclean-generic distclean-libtool distclean-tags \ |
4946 | - distdir dvi dvi-am html html-am info info-am install \ |
4947 | - install-am install-data install-data-am install-dvi \ |
4948 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ |
4949 | + check-am clean clean-generic clean-libtool cscopelist-am ctags \ |
4950 | + ctags-am distclean distclean-generic distclean-libtool \ |
4951 | + distclean-tags distdir dvi dvi-am html html-am info info-am \ |
4952 | + install install-am install-data install-data-am install-dvi \ |
4953 | install-dvi-am install-exec install-exec-am install-html \ |
4954 | install-html-am install-info install-info-am install-man \ |
4955 | install-pdf install-pdf-am install-ps install-ps-am \ |
4956 | install-strip installcheck installcheck-am installdirs \ |
4957 | installdirs-am maintainer-clean maintainer-clean-generic \ |
4958 | mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
4959 | - ps ps-am tags tags-recursive uninstall uninstall-am |
4960 | + ps ps-am tags tags-am uninstall uninstall-am |
4961 | |
4962 | |
4963 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
4964 | |
4965 | === modified file 'doc/common/Makefile.in' |
4966 | --- doc/common/Makefile.in 2013-03-26 01:28:45 +0000 |
4967 | +++ doc/common/Makefile.in 2013-05-21 02:54:27 +0000 |
4968 | @@ -1,4 +1,4 @@ |
4969 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
4970 | +# Makefile.in generated by automake 1.13.1 from Makefile.am. |
4971 | # @configure_input@ |
4972 | |
4973 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. |
4974 | @@ -50,7 +50,7 @@ |
4975 | build_triplet = @build@ |
4976 | host_triplet = @host@ |
4977 | subdir = doc/common |
4978 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
4979 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am |
4980 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
4981 | am__aclocal_m4_deps = \ |
4982 | $(top_srcdir)/build/autotools/as-compiler-flag.m4 \ |
4983 | @@ -97,6 +97,7 @@ |
4984 | n|no|NO) false;; \ |
4985 | *) (install-info --version) >/dev/null 2>&1;; \ |
4986 | esac |
4987 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
4988 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
4989 | ACLOCAL = @ACLOCAL@ |
4990 | ALL_LINGUAS = @ALL_LINGUAS@ |
4991 | @@ -373,11 +374,9 @@ |
4992 | |
4993 | clean-libtool: |
4994 | -rm -rf .libs _libs |
4995 | -tags: TAGS |
4996 | -TAGS: |
4997 | +tags TAGS: |
4998 | |
4999 | -ctags: CTAGS |
5000 | -CTAGS: |
The diff has been truncated for viewing.
We'll do this via Debian.