1088588 - Build failure without GLX in X11TextureSourceOGL.cpp

Status: RESOLVED FIXED

(Core :: Graphics: Layers, defect)

Description

[Dirk Mueller]

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.36 Safari/537.36

Steps to reproduce:

build with  --with-gl-provider=EGL


Actual results:

[17117s] BasicImageLayer.o
[17118s] /home/abuild/rpmbuild/BUILD/mozilla/gfx/layers/opengl/X11TextureSourceOGL.cpp:107:1: error: expected declaration before '}' token
[17118s]  }
[17118s]  ^
[17118s] /home/abuild/rpmbuild/BUILD/mozilla/config/rules.mk:991: recipe for target 'X11TextureSourceOGL.o' failed
[17118s] make[5]: *** [X11TextureSourceOGL.o] Error 1


Expected results:

build should continue. patch is:

--- a/mozilla/gfx/layers/opengl/X11TextureSourceOGL.cpp	2014-10-11 11:01:27.111256303 +0200
+++ b/mozilla/gfx/layers/opengl/X11TextureSourceOGL.cpp	2014-10-24 11:33:34.602641752 +0200
@@ -102,7 +102,8 @@
   }
 }
 
-#endif
-
 }
 }
+
+#endif
+

Comment 1

[josua.m]

Issue reproduced on openSUSE: ARM
same patch applies (the namespace brackets open inside #ifdef GL_PROVIDER_GLX, but close after #endif

So when its not defined, tehre are 2 closing brackets but none opening.

Comment 2

[:Gijs (he/him)]

Attachment: fix ifdef in X11TextureSourceOGL.cpp,

Comment 3

[:Gijs (he/him)]

Dirk, thanks for the patch. I've attached it and requested review (the patch has you as the cset author), so I'm going to mark this assigned to you as well; let me know if all that's OK.

Comment 4

[:Gijs (he/him)]

Landed under my name with "Patch by Dirk Mueller" given the lack of response:

remote:   https://hg.mozilla.org/integration/fx-team/rev/bd910b32e904

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/bd910b32e904