From 9ed8b0c26438b90f187ef7c165d5a76cf8f340eb Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 17 Feb 2007 16:01:41 +0100 Subject: [PATCH 1/8] Add new "serverabi" rule to generate drivers dependency on the server. --- debian/xsfbs/xsfbs.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 7b8206e..dbb2872 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,6 +354,21 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir debian/shlibs.local: cat debian/*.shlibs >$@ +SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI)) +ifeq ($(PACKAGE),) +PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) +endif + +.PHONY: serverabi +serverabi: +ifeq ($(SERVERABI),) + @echo error: xserver-xorg-dev needs to be installed + @exit 1 +else + echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars +endif + include debian/xsfbs/xsfbs-autoreconf.mk # vim:set noet ai sts=8 sw=8 tw=0: From dacefd5a6bb9f786c78f35358273e3214c7492e9 Mon Sep 17 00:00:00 2001 From: David Nusinow Date: Wed, 21 Feb 2007 21:37:52 -0500 Subject: [PATCH 2/8] Update serverabi generation to also account for driver Provides * Have the drivers use the file serverminver instead of serverabiver in order to generate the versioned dependency on the server. This is clearer naming. * Use serverabiver to actually store the server's video ABI version. This is used to generate the Provides: line for drivers so the server can depend on them properly. This goes in to the substvar xviddriver:Provides. --- debian/xsfbs/xsfbs.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index dbb2872..ae767b1 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,8 +354,10 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir debian/shlibs.local: cat debian/*.shlibs >$@ +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null) SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERABI)) +SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) +DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI) ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif @@ -367,6 +369,7 @@ ifeq ($(SERVERABI),) @exit 1 else echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars endif include debian/xsfbs/xsfbs-autoreconf.mk From 00fc799ec3107c0c29286b75e780bef82c1fa137 Mon Sep 17 00:00:00 2001 From: David Nusinow Date: Wed, 21 Feb 2007 22:47:30 -0500 Subject: [PATCH 3/8] Fix name of serverminver --- debian/xsfbs/xsfbs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index ae767b1..d54ffd3 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -354,7 +354,7 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir debian/shlibs.local: cat debian/*.shlibs >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminvers 2>/dev/null) +SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null) SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI) From a0c9602f38e9d47d7a76b7b345e7e8bbb29b752f Mon Sep 17 00:00:00 2001 From: David Nusinow Date: Tue, 27 Feb 2007 21:50:20 -0500 Subject: [PATCH 4/8] Add support for X server input ABI versioning --- debian/xsfbs/xsfbs.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index d54ffd3..5e8cf41 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -355,9 +355,11 @@ debian/shlibs.local: cat debian/*.shlibs >$@ SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -SERVERABI = $(shell cat /usr/share/xserver-xorg/serverabiver 2>/dev/null) +VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/driverabiver 2>/dev/null) SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -DRIVER_PROVIDES = xserver-xorg-video-$(SERVERABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) +INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI) ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif @@ -369,7 +371,8 @@ ifeq ($(SERVERABI),) @exit 1 else echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars - echo "xviddriver:Provides=$(DRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars endif include debian/xsfbs/xsfbs-autoreconf.mk From 1344bb9deda5ba54215d0ec5b164706999236b0b Mon Sep 17 00:00:00 2001 From: David Nusinow Date: Wed, 28 Feb 2007 23:08:17 -0500 Subject: [PATCH 5/8] Fix typo that prevented the input abi versioning from working. Good catch Julien --- debian/xsfbs/xsfbs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e8cf41..cfc5496 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -356,7 +356,7 @@ debian/shlibs.local: 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/driverabiver 2>/dev/null) +INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI) From 4a943db2564c4f573ce2f5f676a841267e961f16 Mon Sep 17 00:00:00 2001 From: David Nusinow Date: Thu, 1 Mar 2007 22:06:04 -0500 Subject: [PATCH 6/8] Fix one missed bit from the serverabiver -> serverminver rename --- debian/xsfbs/xsfbs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index cfc5496..0343aec 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -366,7 +366,7 @@ endif .PHONY: serverabi serverabi: -ifeq ($(SERVERABI),) +ifeq ($(SERVERMINVERS),) @echo error: xserver-xorg-dev needs to be installed @exit 1 else From 72811b4cede7275a35d36b44bcb5f431a8aa0133 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 2 Mar 2007 20:28:15 +0100 Subject: [PATCH 7/8] Fix copy/paste typo in the input driver provides. --- debian/xsfbs/xsfbs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 0343aec..d88c6db 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -359,7 +359,7 @@ 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)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI) +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif From 271778bd6338575afa3e4ae7f614f38cdff8e2fb Mon Sep 17 00:00:00 2001 From: Branden Robinson Date: Thu, 12 Apr 2007 23:18:32 -0400 Subject: [PATCH 8/8] Test for existence of debian/patches directory before creating a symlink to it. This prevents packages that apply no patches from ending up with a broken symlink in them. Remove SVN keyword. Update copyright notice. --- debian/xsfbs/xsfbs.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index d88c6db..63dde45 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -1,11 +1,10 @@ #!/usr/bin/make -f -# $Id$ -# Debian rules file for xorg-x11 source package +# Debian X Strike Force Build System (XSFBS): Make portion # Copyright 1996 Stephen Early # Copyright 1997 Mark Eichin -# Copyright 1998-2005 Branden Robinson +# Copyright 1998-2005, 2007 Branden Robinson # Copyright 2005 David Nusinow # # Licensed under the GNU General Public License, version 2. See the file @@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir if [ ! -e $(STAMP_DIR)/log ]; then \ mkdir $(STAMP_DIR)/log; \ fi; \ - if [ ! -e patches ]; then \ + if [ -e debian/patches ] && [ ! -e patches ]; then \ ln -s debian/patches patches; \ fi; \ >$@