Commit Graph

639 Commits

Author SHA1 Message Date
Eric Anholt
dd098501d8 Move the apple fat binary hacks back to a header file, and make it apple-only. 2009-01-30 16:36:45 -08:00
Peter Hutterer
82fc102568 Disable Xnest by default.
Xneest doesn't build right now and is in the process of being removed. So
let's not build it by default.
2009-01-28 07:53:57 +10:00
Paulo Cesar Pereira de Andrade
f7585d0205 Convert kdrive libraries to libtool convenience libraries.
Also correct a link failure due to unresolved symbols. This
is arguably a libtool/ranlib/ld bug, that "may" be corrected
by linking all convenience libraries in a single one. But in
this case, it was preferred to just add a linker option  to
Xfake_LDFLAGS, to force linkage of all libraries.

  This corrects #19725.
2009-01-27 03:13:28 -02:00
Daniel Stone
40877c6680 XKB: Make XKB mandatory
No more #ifdef XKB, because you can't disable the build, and no more
noXkbExtension either.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-01-22 15:06:25 +11:00
Alan Coopersmith
cdf216aa17 Fix XKB default configure options to use the right variables 2009-01-21 14:40:52 -08:00
Daniel Stone
23862ede59 XKB: Allow build-time configuration of XKB defaults
Instead of hardcoding base/pc105/us, allow users to change the defaults at
./configure time.  Change the default model to be evdev on Linux.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-01-20 15:32:18 +11:00
Dan Nicholson
64f924fbf5 Kill off --with-mesa-source completely
There were a few spots left in the source that were using the
--with-mesa-source defined headers or the now removed $(top_srcdir)/GL
directory. These aren't needed anymore as all the necessary source for
GLX is in $(top_srcdir)/glx.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-01-18 09:49:06 -08:00
Dan Nicholson
e1c8ee2157 Don't reuse PKG_CHECK_MODULES identifiers
Using GL for the PKG_CHECK_MODULES identifier multiple times means only
the first call will actually be used. Later calls will be skipped due to
GL_CFLAGS and GL_LIBS already being set. This changes DRI to using a
different identifier and DMX to just reusing GL_CFLAGS.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-01-18 09:49:06 -08:00
Jeremy Huddleston
1c504dff8a XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation 2009-01-15 21:03:27 -08:00
Julien Cristau
1e47064598 require randrproto 1.2.99.3 2009-01-13 00:12:56 +01:00
Jeremy Huddleston
2d917cfe56 Apple: Don't use DRI2
(cherry picked from commit a1d35cee59)
2009-01-11 01:54:29 -08:00
Paulo Cesar Pereira de Andrade
49b93df8a3 Default to use standard bitmap fonts, with builtins as fallback
The builtin-fonts configure option was removed, as it at best should
have been a runtime option. Instead, now it always register all "font
path element" backends, and adds built-ins fonts at the end of the
default font path.
  This should be a more reasonable solution, to "correct" the most
common Xorg FAQ (could not open default font 'fixed'), and also don't
break by default applications that use only the standard/historical
X Font rendering.
2009-01-07 19:37:03 -02:00
Jeremy Huddleston
4f00423187 XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0)
2009-01-07 10:57:06 -08:00
Jon TURNEY
2ec0ac08ad Cygwin/X: Fix some remaining build issues
Fixes for a few remaining build issues, omitted from commmit 6e85a8304b in error

Provide VENDOR_RELEASE in XORG_VERSION_CURRENT for XWin
Remove -static from linker flags for XWin

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-01-05 16:26:53 +00:00
Dan Nicholson
13ce7b98d4 dmx: Require newer libXi for XQueryInputVersion
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-01-05 11:36:32 +10:00
Jeremy Huddleston
cf85a32b5f XQuartz: pbproxy: We explicitly need libX11 for pbproxy
(cherry picked from commit 32824120da)
2008-12-28 22:17:42 -08:00
Jon TURNEY
6e85a8304b Cygwin/X: build machinery fixes
The Cygwin/X build has been broken for a long time, probably since modular X
This patch fixes up configure/makefile and some general build issues (#18568)

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2008-12-16 16:28:01 +00:00
Jeremy Huddleston
ecaaf0462d XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e9658)
2008-12-10 15:07:26 -08:00
Adam Jackson
58a27d2932 Default to x86emu even on i386 linux
vm86 mode is a bad idea anyway, and using the emulator everywhere
means we get a consistent set of bugs.
2008-12-08 16:28:00 -05:00
Paulo Cesar Pereira de Andrade
c3bf15ba85 Require macros 1.2.0 or newer for XORG_CHANGELOG and XORG_CWARNFLAGS. 2008-12-07 18:52:23 -02:00
Paulo Cesar Pereira de Andrade
b1dac41fb3 Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.

  The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.

  This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
2008-12-07 02:22:19 -02:00
Jeremy Huddleston
9db84fac0c Removed unised option from configure.ac for launchd
(cherry picked from commit 87e4de0a9a)
2008-12-03 21:59:28 -08:00
Jeremy Huddleston
fa4f2527a5 XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dc)
2008-12-03 21:59:23 -08:00
Paulo Cesar Pereira de Andrade
5dbe70dd52 Remove dummylib.
Only cvt required it, and only used XNF{,c}alloc
via xnf{,c}alloc macros.
  Based on patch by Eric Anholt.
2008-12-04 02:42:28 -02:00
Julien Cristau
f841d4e3cc Move RELEASE_DATE closer to AC_INIT so it's more likely to be updated 2008-12-03 23:02:03 +01:00
Kristian Høgsberg
110a71d11a Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found. 2008-12-03 11:22:38 -05:00
Paulo Cesar Pereira de Andrade
180bad8477 Add visibility flags to XSERVER_CFLAGS.
This is done to actually change DIX_CFLAGS, as not all "modules" use
XORG_CFLAGS.
  Also export the symbols that are required by other modules after
the change.
2008-12-02 02:50:45 -02:00
Kristian Høgsberg
afeacb8e74 Bump dri2proto requirement to 1.99.3. 2008-12-01 21:34:23 -05:00
Paulo Cesar Pereira de Andrade
45c8bd0fe5 Enable compiling the X Server and modules with hidden symbols by default.
Note that it checks if support for symbol visibility is available by
the compiler, not if it is functional. It may have problems on non x86
architectures.
  To disable the feature, just pass the option "--disable-visibility"
to the X Server configure script.
  Unless using an alternate build schema, drivers built from a git
checkout will use the same "visibility" related CFLAGS used to compile
the X Server.
2008-11-28 02:01:57 -02:00
Keith Packard
fc70839431 Add server support for RRGetScreenResourcesCurrent
This depends on randrproto 1.2.99.1

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-11-26 15:50:54 -08:00
Alan Hourihane
f710ce269c bump master to 1.6.99.1 (now the 1.6 branch is created) 2008-11-26 20:02:44 +00:00
Keith Packard
4715f079b9 Merge commit 'origin/master' 2008-11-25 22:19:08 -08:00
Keith Packard
9ffc671939 Move matrix operations from X server to pixman 0.13.2
pixman 0.13.2 now holds all of the matrix operations. This leaves
the protocol conversion routines and some ABI stubs in place

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-11-25 22:17:58 -08:00
Adam Jackson
5bb86bafd6 PCI: Remove non-pciaccess path for x86. 2008-11-24 23:40:02 -05:00
Keith Packard
c2f254da69 Randr now depends on Render for matrices 2008-11-24 13:24:36 -08:00
Jeremy Huddleston
8e2287c220 XQuartz: Updated some code to use newer server API 2008-11-22 13:57:45 -08:00
Jeremy Huddleston
701f8e3a94 XQuartz: Update applewm deps
(cherry picked from commit 0ad91c59be)
2008-11-21 11:55:43 -08:00
Matthieu Herrb
10d472bf9d Support for BSD apm
XXX check amd64 pci init
2008-11-21 18:07:03 +01:00
Rémi Cardona
1e4412abc4 drop unused HAVE_LIBDRM_2_2
Signed-off-by: Julien Cristau <jcristau@debian.org>
2008-11-20 15:25:43 +01:00
Alan Coopersmith
570835b9a8 Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
Depends on commit 70e18a3b6b to get
definition of xf86InitVidMem on Solaris.
2008-11-19 10:19:20 -08:00
Jeremy Huddleston
e8112784e8 XQuartz: Integrated xpbproxy into the server.
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 4294493632)
2008-11-15 19:52:34 -08:00
Michel Dänzer
e5271c3747 Set libdrm flags correctly even when only DRI2 is enabled. 2008-11-15 13:27:42 +01:00
Jeremy Huddleston
b078936571 XQuartz: Initial work on readding GLX to the 1.5 server
(cherry picked from commit a186cab6ae)
2008-11-14 15:10:32 -08:00
Adam Jackson
6d21fbf006 kdrive: Bye bye Xvesa 2008-11-05 11:39:46 -05:00
Peter Hutterer
d972399566 Purge device-based WindowAccess code.
Really, this was a bad idea. It's not security, the UI features that would
have been cool (e.g. clicking through windows) aren't implemented anyway, and
there's nothing you can't achieve just by using plain XI anyway.

Requires inputproto 1.9.99.6.
2008-11-04 16:04:15 +10:30
Daniel Stone
f4036f6ace Remove XEvIE
It's unmaintained and has been broken for quite a while; MPX finally
smashed it completely.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-04 16:01:07 +10:30
Jeremy Huddleston
3695f62d07 XQuartz: Require applewmproto-1.1.1
(cherry picked from commit ed235e3406)
2008-10-21 09:32:09 -07:00
Jeremy Huddleston
6dbfca571f Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH 2008-10-07 10:07:03 -07:00
Jeremy Huddleston
6020c3fbfe XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c)
(cherry picked from commit 88033a66a5)
2008-10-03 11:11:47 -07:00
Jeremy Huddleston
505c216d03 Added dep on applewmproto 1.1.0
(cherry picked from commit b350b06674)
2008-10-03 11:11:37 -07:00