[PATCH 2/3] xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires

[Gaetan Nadon]

On Wed, 2011-09-14 at 20:17 -0500, Jeremy Huddleston wrote:

> Every module building against xorg-server does not *Require* pixman nor
> libpciaccess.  If such modules need pixman or pciaccess, they should be
> depending on them directly rather than inheriting a dependency from
> xorg-server.
> 
> This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
> to satisfy include dependencies but avoid linking needlessly.
> 

Can you add in the commit text your recommendations for drivers which:
    - are already released and need pciaccess; would they no longer
build (or no longer work)?
    - are actively maintained and need pciaccess:
        - should they bump up xserver version in PKG_CHECK_MODULES as
they now would no longer build on previous versions of xserver?

I don't have an opinion on what should or should not happen, just that
it is helpful when it is written down.
A bonus would be a list of drivers that do use pciaccess (maybe not in
the commit text!). A complete list of drivers can be found in build.sh.

> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> ---
>  configure.ac      |   11 ++++++-----
>  xorg-server.pc.in |    1 -
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 415ead8..a97da47 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -785,11 +785,6 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
>  WINDOWSWMPROTO="windowswmproto"
>  APPLEWMPROTO="applewmproto >= 1.4"
>  
> -dnl Core modules for most extensions, et al.
> -SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
> -# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
> -AC_SUBST(SDK_REQUIRED_MODULES)
> -
>  dnl List of libraries that require a specific version
>  LIBAPPLEWM="applewm >= 1.4"
>  LIBDMX="dmx >= 1.0.99.1"
> @@ -811,6 +806,11 @@ dnl specific modules against it
>  PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
>  REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
>  
> +dnl Core modules for most extensions, et al.
> +SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto $LIBPIXMAN"
> +# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
> +AC_SUBST(SDK_REQUIRED_MODULES)
> +
>  REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
>  
>  if test "x$CONFIG_UDEV" = xyes &&
> @@ -1561,6 +1561,7 @@ if test "x$XORG" = xyes; then
>  	if test "x$PCI" = xyes; then
>  
>  	PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
> +	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
>  	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS"
>  	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
>  
> diff --git a/xorg-server.pc.in b/xorg-server.pc.in
> index fb238b5..a98eca8 100644
> --- a/xorg-server.pc.in
> +++ b/xorg-server.pc.in
> @@ -15,7 +15,6 @@ abi_extension=@abi_extension@
>  Name: xorg-server
>  Description: Modular X.Org X Server
>  Version: @PACKAGE_VERSION@
> -Requires: pixman-1 pciaccess
>  Requires.private: @SDK_REQUIRED_MODULES@
>  Cflags: -I${sdkdir} @symbol_visibility@
>  Libs: -L${libdir}


Reviewed-by: Gaetan Nadon <memsize at videotron.ca>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110915/d96b339f/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110915/d96b339f/attachment.pgp>