Nux

Merge lp://staging/~thumper/nux/nux.armel-fixes into lp://staging/nux

  1. nux.armel-fixes
  2. Merge into trunk
Proposed by Tim Penhey
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 714
Merged at revision: 713
Proposed branch: lp://staging/~thumper/nux/nux.armel-fixes
Merge into: lp://staging/nux
Diff against target: 3586 lines (+805/-622)
53 files modified
INSTALL (+7/-2)
Nux/Area.cpp (+29/-16)
Nux/Area.h (+3/-2)
Nux/BaseWindow.cpp (+29/-6)
Nux/BaseWindow.h (+4/-6)
Nux/FloatingWindow.cpp (+3/-4)
Nux/GesturesSubscription.cpp (+4/-0)
Nux/InputArea.cpp (+30/-17)
Nux/InputMethodIBus.cpp (+0/-4)
Nux/MainLoopGLib.cpp (+26/-17)
Nux/Makefile.am (+100/-84)
Nux/MenuPage.h (+0/-1)
Nux/Nux.cpp (+1/-0)
Nux/Nux.h (+4/-1)
Nux/TextEntry.cpp (+18/-15)
Nux/TextEntry.h (+2/-2)
Nux/WindowCompositor.cpp (+34/-16)
Nux/WindowCompositor.h (+7/-0)
Nux/WindowThread.cpp (+16/-7)
Nux/WindowThread.h (+18/-6)
NuxCore/Logger.cpp (+6/-1)
NuxCore/System.h (+27/-4)
NuxGraphics/CairoGraphics.h (+4/-0)
NuxGraphics/Events.cpp (+6/-7)
NuxGraphics/Events.h (+4/-4)
NuxGraphics/FontRenderer.cpp (+6/-0)
NuxGraphics/FontRenderer.h (+2/-3)
NuxGraphics/GLDeviceObjects.h (+2/-0)
NuxGraphics/GLRenderStates.cpp (+8/-17)
NuxGraphics/GLRenderStates.h (+27/-157)
NuxGraphics/GLResource.h (+7/-5)
NuxGraphics/GLSh_ColorPicker.cpp (+12/-1)
NuxGraphics/GLSh_ColorPicker.h (+2/-0)
NuxGraphics/GLSh_DrawFunction.cpp (+2/-0)
NuxGraphics/GLSh_DrawFunction.h (+2/-0)
NuxGraphics/GLWindowManager.cpp (+5/-5)
NuxGraphics/GLWindowManager.h (+6/-4)
NuxGraphics/GpuDevice.cpp (+36/-7)
NuxGraphics/GpuDevice.h (+12/-1)
NuxGraphics/GpuDeviceShader.cpp (+2/-0)
NuxGraphics/GraphicsDisplay.h (+1/-1)
NuxGraphics/GraphicsDisplayX11.cpp (+4/-1)
NuxGraphics/GraphicsEngine.cpp (+13/-11)
NuxGraphics/GraphicsEngine.h (+2/-1)
NuxGraphics/IOpenGLSurface.cpp (+5/-4)
NuxGraphics/Makefile.am (+26/-8)
NuxGraphics/RenderingPipeGLSL.cpp (+133/-137)
NuxGraphics/VirtualKeyCodes.h (+5/-0)
configure.ac (+37/-7)
gputests/framebufferobject.cpp (+19/-9)
gputests/quad_2texmod.cpp (+1/-0)
gputests/texture_blur.cpp (+42/-19)
gputests/texture_copy_blur.cpp (+4/-2)
To merge this branch: bzr merge lp://staging/~thumper/nux/nux.armel-fixes
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Jay Taoko (community) Approve
Nicolas d'Offay (community) Needs Fixing
Review via email: mp+130448@code.staging.launchpad.net

Commit message

- Introducing improvements for ARM build.
- Resolved build failures
- Added --enable-x-support option
- Added --enable-minimal-build option

[Tests] Covered by existing tests.

Description of the change

Primary purpose of this branch is to introduce ARM improvements and to enable configuration for X-less builds, and minimal builds.

To post a comment you must log in.
Revision history for this message
Nicolas d'Offay (nicolas-doffay) wrote :

As is commented I feel that line 2555 should be GLES specific. The functionality contained within is version specific.

review: Needs Fixing
Revision history for this message
Jay Taoko (jaytaoko) wrote :

* We are using USE_X11 in TextEntry.cpp to turn off iBus. In this case, we should have to option to support iBus in the text entry. And iBus is not related to having X11.

* It is preferable if the code around diff line 2555 remains as it is. I need to rework that section of code. Still the code can be merged as is.

Appart for the use of USE_X11 in TextEntry.cpp, +1 for merging. We could also provide the proper macro at a later time.

Revision history for this message
Tim Penhey (thumper) wrote :

Well, ibus at this stage is somewhat tied to X11.

Revision history for this message
Jay Taoko (jaytaoko) wrote :

+1
None of the point mentionned above is a show stopper.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armel/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armhf/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/33/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armel/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armhf/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/38/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/44/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armel/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armhf/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/44/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Look good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/45/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armel/45/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=armhf/45/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/45/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Still looks good....

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches