On Mon, Feb 21, 2011 at 11:35:06PM +0100, Lucas Nussbaum wrote: > During a rebuild of all packages in sid, your package failed to build on > amd64.
Attached patch makes it build successfully. Please consider it. G.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index b871b3b..672b168 100644 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -276,10 +276,10 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir debian/shlibs.local: cat debian/*.shlibs >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +VIDEOABI = $(shell pkg-config --variable=abi_videodrv xorg-server|cut -f1 -d.) +INPUTABI = $(shell pkg-config --variable=abi_xinput xorg-server|cut -f1 -d.) +SERVER_DEPENDS = $(shell cat /usr/share/xserver-xorg/videodrvdep | \ + sed -n 's/.*\(xserver-xorg-core (>= .*)\).*/\1/p') VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) ifeq ($(PACKAGE),) @@ -288,7 +288,7 @@ endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) +ifeq ($(SERVER_DEPENDS),) @echo error: xserver-xorg-dev needs to be installed @exit 1 else diff --git a/src/Makefile.am b/src/Makefile.am index 59e88a9..b402e1d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -pedantic -Wall -Werror -std=gnu99 +AM_CFLAGS = @XORG_CFLAGS@ -isystem /usr/include/xorg @DRI_CFLAGS@ -pedantic -Wall -Werror -Wno-deprecated-declarations -std=gnu99 glamo_drv_la_LTLIBRARIES = glamo_drv.la glamo_drv_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@ glamo_drv_ladir = @moduledir@/drivers
