diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-06 18:03:01 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-07-08 14:34:35 +0200 |
| commit | 5af917437056bd9cd6e9e89d41857fbd4d3f86bf (patch) | |
| tree | 770481020b2345ab074ace4cd27e37ea3a67fcd3 /rules/xorg-server.make | |
| parent | 5b3a24d74271b9cea6b18c87be11ca2e8fb96a0b (diff) | |
| download | ptxdist-5af917437056bd9cd6e9e89d41857fbd4d3f86bf.tar.gz ptxdist-5af917437056bd9cd6e9e89d41857fbd4d3f86bf.tar.xz | |
[xorg-server] version bump 1.7.5 -> 1.8.2
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-server.make')
| -rw-r--r-- | rules/xorg-server.make | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/rules/xorg-server.make b/rules/xorg-server.make index fe57ddac2..5f4e33fb6 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server # # Paths and names # -XORG_SERVER_VERSION := 1.7.5 +XORG_SERVER_VERSION := 1.8.2 XORG_SERVER := xorg-server-$(XORG_SERVER_VERSION) XORG_SERVER_SUFFIX := tar.bz2 XORG_SERVER_URL := $(PTXCONF_SETUP_XORGMIRROR)/individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX) @@ -57,7 +57,7 @@ XORG_SERVER_AUTOCONF = \ --disable-maintainer-mode \ --enable-dependency-tracking \ --enable-largefile \ - --disable-werror \ + --disable-strict-compilation \ --disable-debug \ --disable-unit-tests \ --disable-builddocs \ @@ -66,8 +66,11 @@ XORG_SERVER_AUTOCONF = \ --disable-xfree86-utils \ --disable-xquartz \ --disable-standalone-xpbproxy \ + --disable-local-transport \ + --without-doxygen \ --localstatedir=/var \ - --with-xkb-output=/tmp + --with-xkb-output=/tmp \ + --with-fontrootdir=$(XORG_FONTDIR) # FIXME # - what is XORG_OPTIONS_TRANS? @@ -83,12 +86,6 @@ else XORG_SERVER_AUTOCONF += --disable-config-udev endif -ifdef PTXCONF_XORG_SERVER_OPT_NULL_ROOT_CURSOR -XORG_SERVER_AUTOCONF += --enable-null-root-cursor -else -XORG_SERVER_AUTOCONF += --disable-null-root-cursor -endif - ifdef PTXCONF_XORG_SERVER_OPT_AIGLX XORG_SERVER_AUTOCONF += --enable-aiglx else @@ -293,12 +290,6 @@ else XORG_SERVER_AUTOCONF += --disable-xephyr endif -ifdef PTXCONF_XORG_SERVER_XSDL -XORG_SERVER_AUTOCONF += --enable-xsdl -else -XORG_SERVER_AUTOCONF += --disable-xsdl -endif - ifdef PTXCONF_XORG_SERVER_XFAKE XORG_SERVER_AUTOCONF += --enable-xfake else @@ -317,6 +308,24 @@ else XORG_SERVER_AUTOCONF += --disable-install-setuid endif +ifdef PTXCONF_XORG_SERVER_OPT_UNIX_TRANSPORT +XORG_SERVER_AUTOCONF += --enable-unix-transport +else +XORG_SERVER_AUTOCONF += --disable-unix-transport +endif + +ifdef PTXCONF_XORG_SERVER_OPT_TCP_TRANSPORT +XORG_SERVER_AUTOCONF += --enable-tcp-transport +else +XORG_SERVER_AUTOCONF += --disable-tcp-transport +endif + +ifdef PTXCONF_XORG_SERVER_OPT_IPV6 +XORG_SERVER_AUTOCONF += --enable-ipv6 +else +XORG_SERVER_AUTOCONF += --disable-ipv6 +endif + ifdef PTXCONF_XORG_SERVER_OPT_SECURE_RPC XORG_SERVER_AUTOCONF += --enable-secure-rpc else |