[PATCH v6 xserver] config: declare xserver private dependencies in xorg-server.pc
dbn.lists at gmail.com
Wed Jun 16 12:17:31 PDT 2010
On Wed, Jun 16, 2010 at 10:48 AM, Gaetan Nadon <memsize at videotron.ca> wrote:
> Any module (drivers) depending on xserver also depends on some of the
> server private dependencies. Any driver including xf86.h depends on
> xext, kbproto, inputproto and randr.
> These dependencies are in separate packages, so anything can happen,
> removal, wrong version, etc... and the driver fails during compilation.
> Having the private dependencies declared will ensure all packages the
> server depends on are present and at the correct version.
> Currently each module attempts to check for server dependencies with
> various degrees of accuracy. With this patch, the driver will only need
> to check for its own explicit dependencies.
> Now that xproto is included in Requires.private it is removed from Requires.
> All the cflags from both Requires and Requires.private are returned
> to caller to pkg-config.
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> configure.ac | 9 ++++++++-
> xorg-server.pc.in | 3 ++-
> 2 files changed, 10 insertions(+), 2 deletions(-)
> diff --git a/configure.ac b/configure.ac
> index d41191f..eb4df19 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -793,9 +793,13 @@ WINDOWSWMPROTO="windowswmproto"
> APPLEWMPROTO="applewmproto >= 1.4"
> dnl Core modules for most extensions, et al.
> -REQUIRED_MODULES="[randrproto >= 188.8.131.52] [renderproto >= 0.11] [fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xextproto >= 184.108.40.206] [xproto >= 7.0.17] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] fontsproto [inputproto >= 220.127.116.112] [kbproto >= 1.0.3]"
> +SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 18.104.22.168] [renderproto >= 0.11] [xextproto >= 22.214.171.124] [inputproto >= 126.96.36.1992] [kbproto >= 1.0.3]"
> +REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] fontsproto $SDK_REQUIRED_MODULES"
> REQUIRED_LIBS="xfont xau"
Looks like this hunk doesn't have fontsproto in SDK_REQUIRED_MODULES.
It'll get there eventually. :) With that change,
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
More information about the xorg-devel