Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
[vuplus_openembedded] / packages / mjpegtools / files / mjpegtools-v4l-doesnt-mean-x11.patch
1 Index: mjpegtools-1.9.0rc3/lavtools/Makefile.am
2 ===================================================================
3 --- mjpegtools-1.9.0rc3.orig/lavtools/Makefile.am       2008-04-09 00:49:47.000000000 +0200
4 +++ mjpegtools-1.9.0rc3/lavtools/Makefile.am    2008-04-09 00:52:21.000000000 +0200
5 @@ -59,9 +59,9 @@
6  liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
7  liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
8  liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la
9 -if HAVE_V4L
10 -   liblavplay_la_LIBADD += ${X_LIBS} -lX11
11 -endif
12 +#if !X_DISPLAY_MISSING
13 +#   liblavplay_la_LIBADD += ${X_LIBS} -lX11
14 +#endif
15  liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
16  
17  # *********************************************************************