1042525 - Latest Gecko does not build without-X

Status: RESOLVED FIXED

(Core :: WebRTC, defect)

Description

[Tatiana Meshkova (:tatiana)]

http://hg.mozilla.org/mozilla-central/rev/82df3654cd80

It used to work before, ~ Jul 14, but not if fail to build

make -C /home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture
make: Entering directory `/home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture'
make export
make[1]: Entering directory `/home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture'
make[1]: Nothing to be done for `export'.
make[1]: Leaving directory `/home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture'
make compile
Unified_cpp_ules_desktop_capture0.o
make[1]: Entering directory `/home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture'
c++ -o Unified_cpp_ules_desktop_capture0.o -c  -I../../../../../../dist/system_wrappers -include /home/tatiana/build/xulrunner-package/mozilla-central/config/gcc_hidden_dso_handle.h -D_FILE_OFFSET_BITS='64' -DCHROMIUM_BUILD -DUSE_LIBJPEG_TURBO='1' -DUSE_NSS='1' -DENABLE_ONE_CLICK_SIGNIN -DGTK_DISABLE_SINGLE_INCLUDES='1' -D_ISOC99_SOURCE='1' -DENABLE_REMOTING='1' -DENABLE_WEBRTC='1' -DENABLE_CONFIGURATION_POLICY -DENABLE_INPUT_SPEECH -DENABLE_NOTIFICATIONS -DENABLE_GPU='1' -DENABLE_EGLIMAGE='1' -DUSE_SKIA='1' -DENABLE_TASK_MANAGER='1' -DENABLE_WEB_INTENTS='1' -DENABLE_EXTENSIONS='1' -DENABLE_PLUGIN_INSTALLATION='1' -DENABLE_PROTECTOR_SERVICE='1' -DENABLE_SESSION_SERVICE='1' -DENABLE_THEMES='1' -DENABLE_BACKGROUND='1' -DENABLE_AUTOMATION='1' -DENABLE_PRINTING='1' -DENABLE_CAPTIVE_PORTAL_DETECTION='1' -DWEBRTC_MOZILLA_BUILD -DWEBRTC_MODULE_UTILITY_VIDEO -DWEBRTC_ARCH_ARM -DWEBRTC_LINUX -DUSE_X11 -D__STDC_FORMAT_MACROS -DDYNAMIC_ANNOTATIONS_ENABLED='1' -DWTF_USE_DYNAMIC_ANNOTATIONS='1' -D_DEBUG -DMOZ_GLUE_IN_PROGRAM -DMOZILLA_INTERNAL_API -DIMPL_LIBXUL  -DSTATIC_EXPORTABLE_JS_API -DNO_NSPR_10_SUPPORT -I. -I/home/tatiana/build/xulrunner-package/mozilla-central/media/webrtc/trunk/webrtc/modules/../.. -I/home/tatiana/build/xulrunner-package/mozilla-central/media/webrtc/trunk/webrtc/modules/../.. -I/home/tatiana/build/xulrunner-package/mozilla-central/media/webrtc/trunk/webrtc/modules/../system_wrappers/interface -I/home/tatiana/build/xulrunner-package/mozilla-central/ipc/chromium/src -I/home/tatiana/build/xulrunner-package/mozilla-central/ipc/glue -I../../../../../../ipc/ipdl/_ipdlheaders  -I../../../../../../dist/include  -fPIC   -DMOZILLA_CLIENT -include ../../../../../../mozilla-config.h -MD -MP -MF .deps/Unified_cpp_ules_desktop_capture0.o.pp  -Wall -Wpointer-arith -Woverloaded-virtual -Werror=return-type -Werror=int-to-pointer-cast -Wtype-limits -Wempty-body -Wsign-compare -Wno-invalid-offsetof -O3 -DUSE_ANDROID_OMTC_HACKS=1 -fno-exceptions -fno-strict-aliasing -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -std=gnu++0x -pthread -pipe  -DDEBUG -DTRACING -gdwarf-4      /home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture/Unified_cpp_ules_desktop_capture0.cpp
In file included from /home/tatiana/build/xulrunner-package/mozilla-central/media/webrtc/trunk/webrtc/modules/../../webrtc/modules/desktop_capture/x11/shared_x_display.h:18:0,
                 from /home/tatiana/build/xulrunner-package/mozilla-central/media/webrtc/trunk/webrtc/modules/../../webrtc/modules/desktop_capture/desktop_capture_options.h:17,
                 from /home/tatiana/build/xulrunner-package/mozilla-central/media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer.cc:12,
                 from /home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture/Unified_cpp_ules_desktop_capture0.cpp:2:
../../../../../../dist/system_wrappers/X11/Xlib.h:3:27: fatal error: X11/Xlib.h: No such file or directory
compilation terminated.
make[1]: *** [Unified_cpp_ules_desktop_capture0.o] Error 1
make[1]: Leaving directory `/home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture'
make: *** [default] Error 2
make: Leaving directory `/home/tatiana/build/xulrunner-package/objdir-mer-dbg/media/webrtc/trunk/webrtc/modules/modules_desktop_capture'

Comment 1

[Tatiana Meshkova (:tatiana)]

Mozconfig for this build
https://github.com/tmeshkova/gecko-dev/blob/embedlite/embedding/embedlite/config/mozconfig.merqtxulrunner

Comment 2

[Randall Barker [:rbarker]]

Attachment: part-1-without-x.patch

Patch to propogate MOZ_X11 to the WebRTC gyp based build system.

Comment 3

[Randall Barker [:rbarker]]

Attachment: part-2-missing-files.patch

Adds missing files need to build WebRTC when MOZ_X11 is not defined.

Comment 4

[Randall Barker [:rbarker]]

Attachment: part-2-missing-files.patch

Adding corrented file. Original patch was part 1 uploaded a second time.

Comment 5

[Gian-Carlo Pascutto [:gcp]]

I'm blocked on doing anything on this by bug 966814, so I'll see if I can salvage that one.

Comment 6

[Gian-Carlo Pascutto [:gcp]]

And another blocker:

The first bad revision is:
changeset:   195644:a0988e587a90
user:        Mike Hommey <[e-mail]>
date:        Wed Jul 23 13:31:02 2014 +0900
summary:     Bug 1036894 part 9 - Replace all EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS with EXTRA_LIBS, OS_LIBS or OS_LDFLAGS, appropriately. r=gps

Comment 7

[Tatiana Meshkova (:tatiana)]

Comment on attachment 8461147 [details] [diff] [review]
part-1-without-x.patch

Tested these patches recently and it seems to work fine.

Comment 8

[Gian-Carlo Pascutto [:gcp]]

Comment on attachment 8461147 [details] [diff] [review]
part-1-without-x.patch

Needs a build peer. My remark: can't you set use_x11 directly instead of involving moz_use_x11?

Comment 9

[Gian-Carlo Pascutto [:gcp]]

Comment on attachment 8461155 [details] [diff] [review]
part-2-missing-files.patch

Review of attachment 8461155 [details] [diff] [review]:
-----------------------------------------------------------------

::: media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_device_info_null.cc
@@ +3,5 @@
> + * You can obtain one at http://mozilla.org/MPL/2.0/. */
> +
> +#include "webrtc/modules/desktop_capture/desktop_device_info.h"
> +
> +namespace webrtc{

nit: spacing

@@ +30,5 @@
> +}
> +
> +int32_t
> +DesktopDeviceInfoNull::Init() {
> +

Remove the spurious whitespace here.

Comment 10

[Randall Barker [:rbarker]]

(In reply to Gian-Carlo Pascutto [:gcp] from comment #8)
> Comment on attachment 8461147 [details] [diff] [review]
> part-1-without-x.patch
> 
> Needs a build peer. My remark: can't you set use_x11 directly instead of
> involving moz_use_x11?

Are you saying to set use_x11 in build/gyp.mozbuild instead of media/webrtc/trunk/build/common.gypi? I suppose, I just figured since it had not been done that way originally that it would be better to add on to what had already be done.

Comment 11

[Randell Jesup [:jesup] (needinfo me)]

Comment on attachment 8461147 [details] [diff] [review]
part-1-without-x.patch

Review of attachment 8461147 [details] [diff] [review]:
-----------------------------------------------------------------

::: build/gyp.mozbuild
@@ +32,5 @@
>  
>      # saves 4MB when webrtc_trace is off
>      'enable_lazy_trace_alloc': 0,
>  
> +    'moz_use_x11': 0,

Let's go with setting use_x11 (and use_glib) here to override the common.gypi values.  (For that matter, we should set them for gonk as well, and remove the customization in common.gypi for this, now that we have gyp.mozbuild)

Comment 12

[Randall Barker [:rbarker]]

Attachment: part 1 - Propogate MOZ_X11 to WebRTC build.

Comment 13

[Randall Barker [:rbarker]]

Attachment: part 2 - Add missing null implementation.

Fixed formatting per review.

Comment 14

[Randall Barker [:rbarker]]

Comment on attachment 8466370 [details] [diff] [review]
part 1 - Propogate MOZ_X11 to WebRTC build.

Adding ted back as reviewer.

Comment 15

[Randall Barker [:rbarker]]

try results: https://tbpl.mozilla.org/?tree=Try&rev=bbdbc7fe33c1

Comment 16

[Mike Hommey [:glandium]]

Comment on attachment 8466370 [details] [diff] [review]
part 1 - Propogate MOZ_X11 to WebRTC build.

Review of attachment 8466370 [details] [diff] [review]:
-----------------------------------------------------------------

::: build/gyp.mozbuild
@@ +60,5 @@
>  os = CONFIG['OS_TARGET']
>  
> +if CONFIG['MOZ_X11'] == '1':
> +    gyp_vars['use_x11'] = 1
> +    gyp_vars['use_glib'] = 1

glib should be conditioned on something else, like GLIB_LIBS.

::: media/webrtc/trunk/build/common.gypi
@@ -433,5 @@
> -          'use_x11%': 0,
> -        }, {
> -          'use_glib%': 1,
> -          'use_x11%': 1,
> -        }],

You shouldn't need to remove this. Well, I guess the moz_widget_toolkit_gonk part doesn't come from upstream, so you should restore whatever is upstream.

Comment 17

[Gian-Carlo Pascutto [:gcp]]

>You shouldn't need to remove this. Well, I guess the moz_widget_toolkit_gonk part doesn't come from 
>upstream, so you should restore whatever is upstream.

Upstream is Chrome(!) not WebRTC, but we're so far away from it that the last webrtc uplift didn't sync this file. (Although I have an updated copy, in a patch queue, somewhere...)

Comment 18

[Gian-Carlo Pascutto [:gcp]]

Attachment: Propogate MOZ_X11 to WebRTC build system. r=

Comment 19

[Gian-Carlo Pascutto [:gcp]]

https://tbpl.mozilla.org/?tree=Try&rev=0f2cbc37df79

Comment 20

[Gian-Carlo Pascutto [:gcp]]

Comment on attachment 8467778 [details] [diff] [review]
Propogate MOZ_X11 to WebRTC build system. r=

Like this? As for reverting common.gypi to the original, see my comment above. I'd elected to just keep this patch minimal.

Comment 21

[Gian-Carlo Pascutto [:gcp]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/4efe71ac322e
https://hg.mozilla.org/integration/mozilla-inbound/rev/761e5154c14c

Comment 22

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/4efe71ac322e
https://hg.mozilla.org/mozilla-central/rev/761e5154c14c