>-----Original Message----- >From: Eoff, Ullysses A >Sent: Friday, December 11, 2015 1:15 AM >To: Zhao, Yakui; Xiang, Haihao; [email protected] >Cc: [email protected] >Subject: RE: [Libva] [PATCH] Skip the check related with wayland if wayland is >not used or found > >I don't use any configure options. I don't have wayland installed. And >specifying `--enable-wayland=0` or `--disable-wayland` does not fix the >problem. If I revert the patch, libva compiles fine. > >Clearly, with wayland disabled this patch changes configure.ac to no longer >generate the debian.upstream/libva-wayland1.install. However, that file is >"unconditionally" needed by debian.upstream/Makefile.am. Therefore, this >patch forgot to fix the appropriate Makefile.am for this.
This patch tried to fix the error caused by 'make distclean' with wayland disabled besides bug #79478. I will file a patch to revert a part of this patch and another patch to fix 'make distclean' in another way. > >Thomas et. al., can you submit an additional patch to fix this? I don't have >time to fix this myself, atm. > >U. Artie > >> -----Original Message----- >> From: Zhao, Yakui >> Sent: Wednesday, December 09, 2015 3:53 PM >> To: Eoff, Ullysses A; Xiang, Haihao; [email protected] >> Cc: [email protected] >> Subject: RE: [Libva] [PATCH] Skip the check related with wayland if >> wayland is not used or found >> >> Hi, Artie >> >> Which option is used to build libva on your system? >> >> If the wayland is disabled, you should use the configuration option >> like >the following: >> >./configure --enable-wayland=0 ;make >> Does it work for you? >> >> If the wayland is enabled, you can just use the following: >> >./configure ; make >> >> Thanks >> Yakui >> >> -----Original Message----- >> From: Eoff, Ullysses A >> Sent: Thursday, December 10, 2015 12:07 AM >> To: Xiang, Haihao <[email protected]>; Zhao, Yakui >> <[email protected]>; [email protected] >> Cc: [email protected] >> Subject: RE: [Libva] [PATCH] Skip the check related with wayland if >> wayland is not used or found >> >> This patch breaks compilation for me: >> >> Making all in debian.upstream >> make[2]: Entering directory >'/home/uaeoff/Work/workspace/media/build/libva/debian.upstream' >> make[2]: *** No rule to make target 'libva-wayland1.install', needed by 'all- >am'. Stop. >> make[2]: Leaving directory >'/home/uaeoff/Work/workspace/media/build/libva/debian.upstream' >> Makefile:453: recipe for target 'all-recursive' failed >> make[1]: *** [all-recursive] Error 1 >> make[1]: Leaving directory >'/home/uaeoff/Work/workspace/media/build/libva' >> Makefile:384: recipe for target 'all' failed >> make: *** [all] Error 2 >> >> ---- >> U. Artie >> >> > -----Original Message----- >> > From: Libva [mailto:[email protected]] On Behalf >> > Of Xiang, Haihao >> > Sent: Thursday, December 03, 2015 5:53 PM >> > To: Zhao, Yakui; [email protected] >> > Cc: [email protected] >> > Subject: Re: [Libva] [PATCH] Skip the check related with wayland if >> > wayland is not used or found >> > >> > >> > Applied. >> > >> > Thanks >> > Haihao >> > >> > > https://bugs.freedesktop.org/show_bug.cgi?id=79478 >> > > >> > > Signed-off-by: Thomas Orgis <[email protected]> >> > > Signed-off-by: Zhao Yakui <[email protected]> >> > > --- >> > > configure.ac | 22 ++++++++++++++-------- >> > > 1 file changed, 14 insertions(+), 8 deletions(-) >> > > >> > > diff --git a/configure.ac b/configure.ac index 88a7ef3..e79f6c8 >> > > 100644 >> > > --- a/configure.ac >> > > +++ b/configure.ac >> > > @@ -273,15 +273,16 @@ if test "$enable_wayland" = "yes"; then >> > > PKG_CHECK_MODULES([WAYLAND], [wayland-client >= >> > > wayland_api_version], >> > > [USE_WAYLAND="yes"], [:]) >> > > if test "$USE_WAYLAND" = "yes"; then >> > > + m4_ifdef([WAYLAND_SCANNER_RULES], >> > > + >> > > +[WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/prot >> > > ocol'])], >> > > + [wayland_scanner_rules=""; >> > > AC_SUBST(wayland_scanner_rules)]) >> > > + >> > > AC_DEFINE([HAVE_VA_WAYLAND], [1], >> > > [Defined to 1 if VA/Wayland API is built]) >> > > fi >> > > fi >> > > -AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") >> > > >> > > -m4_ifdef([WAYLAND_SCANNER_RULES], >> > > - >> > > [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])] >> > > , >> > > - [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)]) >> > > +AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") >> > > >> > > pkgconfigdir=${libdir}/pkgconfig >> > > AC_SUBST(pkgconfigdir) >> > > @@ -309,8 +310,6 @@ debian.upstream/libva-drm.install.in >> > > debian.upstream/libva-egl.install.in >> > > debian.upstream/libva-glx$LIBVA_MAJOR_VERSION.install:\ >> > > debian.upstream/libva-glx.install.in >> > > - debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\ >> > > -debian.upstream/libva-wayland.install.in >> > > debian.upstream/libva-x11-$LIBVA_MAJOR_VERSION.install:\ >> > > debian.upstream/libva-x11.install.in >> > > doc/Makefile >> > > @@ -320,7 +319,6 @@ debian.upstream/libva-x11.install.in >> > > pkgconfig/libva-egl.pc >> > > pkgconfig/libva-glx.pc >> > > pkgconfig/libva-tpi.pc >> > > - pkgconfig/libva-wayland.pc >> > > pkgconfig/libva-x11.pc >> > > pkgconfig/libva.pc >> > > test/Makefile >> > > @@ -335,10 +333,18 @@ debian.upstream/libva-x11.install.in >> > > va/egl/Makefile >> > > va/glx/Makefile >> > > va/va_version.h >> > > + va/x11/Makefile >> > > +]) >> > > + >> > > +if test "$USE_WAYLAND" = "yes"; then AC_OUTPUT([ >> > > + debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\ >> > > +debian.upstream/libva-wayland.install.in >> > > + pkgconfig/libva-wayland.pc >> > > va/wayland/Makefile >> > > va/wayland/protocol/Makefile >> > > - va/x11/Makefile >> > > ]) >> > > +fi >> > > >> > > # Print a small summary >> > > BACKENDS="" >> > _______________________________________________ >> > Libva mailing list >> > [email protected] >> > http://lists.freedesktop.org/mailman/listinfo/libva _______________________________________________ Libva mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libva
