| Message ID | 1343036959-7639-1-git-send-email-jacmet@sunsite.dk |
|---|---|
| State | Accepted |
| Headers | show |
Le Mon, 23 Jul 2012 11:49:19 +0200, Peter Korsgaard <jacmet@sunsite.dk> a écrit : > -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) > +# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support > +# is only used for SDL output) > +ifeq ($(BR2_PACKAGE_SDL_X11),y) > MEDIASTREAMER_CONF_OPT += --enable-x11 > -MEDIASTREAMER_DEPENDENCIES += xlib_libX11 > else > MEDIASTREAMER_CONF_OPT += --disable-x11 > endif So this means that it is not possible to use mediastreamer on X11 without SDL? I understand that when SDL support is enabled, it wants SDL to support X11. But when X11 is enabled, does it requires SDL ? Thanks! Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Le Mon, 23 Jul 2012 11:49:19 +0200, Thomas> Peter Korsgaard <jacmet@sunsite.dk> a écrit : >> -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) >> +# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support >> +# is only used for SDL output) >> +ifeq ($(BR2_PACKAGE_SDL_X11),y) >> MEDIASTREAMER_CONF_OPT += --enable-x11 >> -MEDIASTREAMER_DEPENDENCIES += xlib_libX11 >> else >> MEDIASTREAMER_CONF_OPT += --disable-x11 >> endif Thomas> So this means that it is not possible to use mediastreamer on X11 Thomas> without SDL? Indeed. The Xlib support is only used for the SDL videoouput: grep -rls HAVE_X11_XLIB_H mediastreamer-2.8.2 mediastreamer-2.8.2/configure mediastreamer-2.8.2/mediastreamer-config.h.in mediastreamer-2.8.2/src/videoout.c mediastreamer-2.8.2/mediastreamer-config.h mediastreamer-2.8.2/tests/test_x11window.c Where videoout.c is: grep -B1 -A1 videoout mediastreamer-2.8.2/src/Makefile.am if BUILD_SDL libmediastreamer_la_SOURCES+=videoout.c endif Thomas> I understand that when SDL support is enabled, it wants SDL to support Thomas> X11. But when X11 is enabled, does it requires SDL ? It does (and ffmpeg). The option should probably have been called --enable-sdl-x11 instead.
Le Mon, 23 Jul 2012 11:49:19 +0200, Peter Korsgaard <jacmet@sunsite.dk> a écrit : > Fixes http://autobuild.buildroot.net/results/a8f2db4a40c0f53c0d25b2632fe87c2ce136f770 > > Mediastreamer assumes SDL has X11 support if SDL and libX11 are found, > which is not necessarily true in BR. > > Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Applied, thanks! Thomas
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 9e67ed4..1f4e1d4 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -48,9 +48,10 @@ else MEDIASTREAMER_CONF_OPT += --disable-sdl endif -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support +# is only used for SDL output) +ifeq ($(BR2_PACKAGE_SDL_X11),y) MEDIASTREAMER_CONF_OPT += --enable-x11 -MEDIASTREAMER_DEPENDENCIES += xlib_libX11 else MEDIASTREAMER_CONF_OPT += --disable-x11 endif
Fixes http://autobuild.buildroot.net/results/a8f2db4a40c0f53c0d25b2632fe87c2ce136f770 Mediastreamer assumes SDL has X11 support if SDL and libX11 are found, which is not necessarily true in BR. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> --- package/mediastreamer/mediastreamer.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)