autogen.sh | 4 +++- configure.ac | 3 +-- src/Makefile.am | 10 ++++++++-- src/alp_driver.c | 2 ++ src/cir.h | 2 ++ src/lg_driver.c | 2 ++ 6 files changed, 18 insertions(+), 5 deletions(-)
New commits: commit 3a2e2d9ef8512c265e3fc3311a69120d03a888b3 Author: Julien Cristau <[email protected]> Date: Wed May 6 22:46:51 2015 +0200 cirrus 1.5.3 Signed-off-by: Julien Cristau <[email protected]> diff --git a/configure.ac b/configure.ac index 9b3dcac..02285c1 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-cirrus], - [1.5.2], + [1.5.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-cirrus]) AC_CONFIG_SRCDIR([Makefile.am]) commit df389885adf71ed3b045c2fde9fd3ba4329e1a58 Author: Dave Airlie <[email protected]> Date: Sat Sep 20 18:51:17 2014 +1000 cirrus: don't use pciTag Signed-off-by: Dave Airlie <[email protected]> diff --git a/src/alp_driver.c b/src/alp_driver.c index 36f2039..bd5e52f 100644 --- a/src/alp_driver.c +++ b/src/alp_driver.c @@ -519,9 +519,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) pCir->Chipset = pCir->pEnt->chipset; /* Find the PCI info for this screen */ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo)); +#endif #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 if (!xf86IsPc98()) diff --git a/src/cir.h b/src/cir.h index 0a5d403..84f64b5 100644 --- a/src/cir.h +++ b/src/cir.h @@ -23,7 +23,9 @@ typedef struct { ScrnInfoPtr pScrn; CARD32 properties; pciVideoPtr PciInfo; +#ifndef XSERVER_LIBPCIACCESS PCITAG PciTag; +#endif unsigned long PIOReg; union { struct lgRec *lg; diff --git a/src/lg_driver.c b/src/lg_driver.c index c20bbd0..589d14e 100644 --- a/src/lg_driver.c +++ b/src/lg_driver.c @@ -382,9 +382,11 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) /* Find the PCI info for this screen */ pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index); +#ifndef XSERVER_LIBPCIACCESS pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo), PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo)); +#endif if (xf86LoadSubModule(pScrn, "int10")) { xf86Int10InfoPtr int10InfoPtr; commit f0d278b48a659d4811f5494bf7de4a84e9c5880f Author: Alan Coopersmith <[email protected]> Date: Sun Nov 17 10:19:41 2013 -0800 Skip building xaa files when XAA is not supported No point building & linking empty *.o files into the drivers. Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Adam Jackson <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index c649b3d..36b8d8b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,9 +44,12 @@ cirrus_alpine_la_SOURCES = \ alp_driver.c \ alp.h \ alp_hwcurs.c \ - alp_i2c.c \ + alp_i2c.c +if XAA +cirrus_alpine_la_SOURCES += \ alp_xaa.c \ alp_xaam.c +endif cirrus_laguna_la_LTLIBRARIES = cirrus_laguna.la cirrus_laguna_la_LDFLAGS = -module -avoid-version @@ -55,6 +58,9 @@ cirrus_laguna_la_SOURCES = \ lg_driver.c \ lg.h \ lg_hwcurs.c \ - lg_i2c.c \ + lg_i2c.c +if XAA +cirrus_laguna_la_SOURCES += \ lg_xaa.c \ lg_xaa.h +endif commit 6504929481eab616f064b5d661a057de74b8b488 Author: Colin Walters <[email protected]> Date: Wed Jan 4 17:37:06 2012 -0500 autogen.sh: Implement GNOME Build API http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson <[email protected]> diff --git a/autogen.sh b/autogen.sh index 904cd67..fc34bd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -9,4 +9,6 @@ cd $srcdir autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode "$@" +if test -z "$NOCONFIGURE"; then + $srcdir/configure "$@" +fi commit 0313bab7f16633a6a1b26e195255196fa69ac209 Author: Adam Jackson <[email protected]> Date: Wed Jan 16 13:18:23 2013 -0500 configure: Drop AM_MAINTAINER_MODE Signed-off-by: Adam Jackson <[email protected]> diff --git a/configure.ac b/configure.ac index 0e00305..9b3dcac 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
