configure.ac | 11 +++++++++++
debian/rules | 21 +++++++++++++++------
debian/xserver-xorg-video-fbdev-udeb.install | 1 -
src/fbdev.c | 2 ++
4 files changed, 28 insertions(+), 7 deletions(-)
New commits:
commit fd9e690f45c4416ecdc9c4caf35576add54c7793
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 14 05:17:28 2010 +0000
Build an XV-free flavour for the udeb.
diff --git a/debian/rules b/debian/rules
index 3ce10d1..5e7b84e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,11 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
+common_confflags = \
+ --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(confflags) \
+ CFLAGS="$(CFLAGS)"
+
configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
@@ -41,11 +46,11 @@ build-stamp: configure
dh_testdir
test -d build || mkdir build
- cd build && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(confflags) \
- CFLAGS="$(CFLAGS)"
+ test -d build-udeb || mkdir build-udeb
+ cd build && ../configure --enable-xv $(common_confflags)
+ cd build-udeb && ../configure --disable-xv $(common_confflags)
cd build && $(MAKE)
+ cd build-udeb && $(MAKE)
>$@
clean: xsfclean
@@ -57,7 +62,8 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf build
+ rm -rf build build-udeb
+ rm -rf debian/tmp debian/tmp-udeb
rm -f aclocal.m4 config.guess config.sub config.h.in configure
rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
rm -f $$(find -name Makefile.in)
@@ -68,9 +74,11 @@ install: build
dh_testdir
dh_testroot
dh_clean -k
+ rm -rf debian/tmp-udeb
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp-udeb install
# Build architecture-dependent files here.
binary-arch: build install serverabi
@@ -79,7 +87,8 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install -p$(PACKAGE) --sourcedir=debian/tmp --list-missing
+ dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb --list-missing
dh_link
dh_strip
dh_compress
commit d94d5db52643e1ffcf764c150fcc1b10e3d65d05
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 14 04:56:13 2010 +0000
Disable XV-related calls when told to.
diff --git a/src/fbdev.c b/src/fbdev.c
index 149bb24..a42f282 100644
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -936,6 +936,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
char **argv)
fPtr->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = FBDevCloseScreen;
+#if USE_XV
{
XF86VideoAdaptorPtr *ptr;
@@ -944,6 +945,7 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
char **argv)
xf86XVScreenInit(pScreen,ptr,n);
}
}
+#endif
TRACE_EXIT("FBDevScreenInit");
commit d86db60724d509ed0e28a67fd77516bf17dcd48e
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 14 04:46:12 2010 +0000
Add --enable-xv support to configure.ac
diff --git a/configure.ac b/configure.ac
index f76cca0..8fa2204 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,10 @@ AC_ARG_ENABLE(pciaccess,
AS_HELP_STRING([--enable-pciaccess],
[Enable use of libpciaccess (default: disabled)]),
[PCIACCESS=$enableval], [PCIACCESS=no])
+AC_ARG_ENABLE(xv, AS_HELP_STRING([--enable-xv],
+ [Enable use of xv (default: enabled)]),
+ [USE_XV=$enableval], [USE_XV=yes])
+
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -74,6 +78,13 @@ if test "x$PCIACCESS" = xyes; then
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
fi
+AM_CONDITIONAL(USE_XV, [test "xUSE_XV" = xyes])
+if test "x$USE_XV" = xyes; then
+ AC_DEFINE(USE_XV, 1, [Use XV])
+else
+ AC_DEFINE(USE_XV, 0, [Do not use XV])
+fi
+
# Checks for libraries.
# Checks for header files.
commit 97fa1a42aaba119e14681ebee07266acaa186fc7
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Feb 14 04:28:15 2010 +0000
No longer ship manpages in the udeb.
diff --git a/debian/xserver-xorg-video-fbdev-udeb.install
b/debian/xserver-xorg-video-fbdev-udeb.install
index 614cfb4..daf7bfe 100644
--- a/debian/xserver-xorg-video-fbdev-udeb.install
+++ b/debian/xserver-xorg-video-fbdev-udeb.install
@@ -1,2 +1 @@
usr/lib/xorg/modules/drivers/*.so
-usr/share/man/man4/*
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ngx7a-00085x...@alioth.debian.org
