summaryrefslogtreecommitdiff
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2013-12-05configure.ac: Fixup for "Require libpciaccess for int10"Jon TURNEY1-1/+1
On 16/11/2013 01:00, Connor Behan wrote: > A --disable-pciaccess build will fail with an int10 module other than > stub. > > Signed-off-by: Connor Behan <connor.behan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > --- > configure.ac | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/configure.ac b/configure.ac > index 5e621e0..a843770 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1822,6 +1822,9 @@ if test "x$XORG" = xyes; then > if test "x$CONFIG_UDEV_KMS" = xyes; then > AC_MSG_ERROR([Platform device enumeration requires libpciaccess]) > fi > + if test "x$INT10" != xstub; then > + AC_MSG_ERROR([Cannot build int10 without libpciaccess]) > + fi > fi > AC_MSG_RESULT([$PCI]) > This causes my build to fail where --disable-int10-module --disable-pciaccess is the default (as INT10 still has the default value 'x86emu') Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-12-02miext/sync: Handle libxshmfence API changeKeith Packard1-1/+1
libxshmfence had an unfortunate 'int32_t' type for the mapped fence. That changed to exposing a 'struct shmfence' instead, which is nice and opaque and offers fine type checking across the API. This patch requires the newer version of the library and uses the new interface type. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-12-02Select directory for MIT-SHM temp files at configure timeKeith Packard1-0/+43
By default, this looks through a list of directories to find one which exists, but can be overridden with --with-shared-memory-dir=PATH This patch doesn't actually do anything with this directory, just makes it available in the configuration Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-11-26configure.ac: Require libpciaccess for int10Connor Behan1-0/+3
A --disable-pciaccess build will fail with an int10 module other than stub. Signed-off-by: Connor Behan <connor.behan@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-26configure.ac: Require libpciaccess for platform bus supportConnor Behan1-0/+4
There is currently no reason to build with --enable-config-udev-kms and --disable-pciaccess but anyone who tries this should know that the build will fail. Signed-off-by: Connor Behan <connor.behan@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-26configure.ac: Add whitespace near PCI configurationConnor Behan1-18/+17
Signed-off-by: Connor Behan <connor.behan@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-23Bump release to 1.14.99.903 (1.15 RC3)xorg-server-1.14.99.903Keith Packard1-3/+3
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-18configure: allow for --enable-libunwind and --disable-libunwindPeter Hutterer1-7/+15
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-14Stop including inline assembly .il file for Solaris Studio buildsAlan Coopersmith1-9/+0
Since all the inb/outb/etc. use in the X server itself (except for xf86SlowBcopy) has been replaced by calls to libpciaccess, we no longer need to pass inline assembly files to replace the gcc inline assembly from hw/xfree86/common/compiler.h when building Xorg itself. The .il files are still generated and installed in the SDK for the benefit of drivers who may use them. Binary diff of before and after showed that xf86SlowBcopy was the only function changed across the Xorg binary and all modules built in the Xserver build, it just calls the outb() function now instead of having the outb instructions inlined, making it a slightly slower bcopy. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-14Update to version 1.14.99.902xorg-server-1.14.99.902Keith Packard1-3/+3
1.15 RC2 Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-12Enable XTRANS_SEND_FDS on Solaris too.Alan Coopersmith1-1/+2
Requires passing through the __EXTENSIONS__ and _XOPEN_SOURCE defines in order to expose the msg_control members in struct msghdr. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-11-11Merge remote-tracking branch 'jeremyhu/master'Keith Packard1-29/+30
2013-11-11Trap SIGBUS to handle truncated shared memory segmentsKeith Packard1-0/+19
If a client passes a section of memory via file descriptor and then subsequently truncates that file, the underlying pages will be freed and the addresses invalidated. Subsequent accesses to the page will fail with a SIGBUS error. Trap that SIGBUS, figure out which segment was causing the error and then allocate new pages to fill in for that region. Mark the offending shared segment as invalid and free the resource ID so that the client will be able to tell when subsequently attempting to use the segment. Signed-off-by: Keith Packard <keithp@keithp.com> v2: Use MAP_FIXED to simplify the recovery logic (Mark Kettenis) v3: Also catch errors in ShmCreateSegment Conflicts: include/dix-config.h.in include/xorg-config.h.in
2013-11-11Require libXtrans version 1.3.2Keith Packard1-1/+1
This has the FD passing support included Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-11-11Require xextproto version 7.2.99.901Keith Packard1-1/+1
This includes the MIT-SHM FD passing requests Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-11Make XTrans FD passing support optional. Define only on LinuxKeith Packard1-0/+35
Until other operating systems have a libXtrans port for FD passing, disable this on non-Linux systems. Note that this define affects how libXtrans gets built into the X server, which is why it need only define the symbol Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-08configure.ac: Move GLX section after DRIJeremy Huddleston Sequoia1-29/+30
The GLX section of configura.ac checks the state of DRI2, so it needs to be after DRI2=auto is resolved. Also reset libgl requirement to 7.1.0 in non-dri2 case. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-11-05Use $GL_LIBS instead of -lGL for linkingKeith Packard1-1/+1
-lGL presumes that the GL library is in the system path, while $GL_LIBS is auto-detected. Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-05Link with xshmfence, reference miSyncShmScreenInit in sdksymsKeith Packard1-0/+1
This gets the server to link with xshmfence again, and also ensures that the miSyncShm code is linked into the server with the reference from sdksyms. Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-04Disable DRI3 and sync fence FD functions if xshmfence isn't availableKeith Packard1-2/+44
Make sure the server can build when the xshmfence library isn't present Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-01Set version to 1.14.99.901 (1.15 RC1)xorg-server-1.14.99.901Keith Packard1-3/+3
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-01Merge remote-tracking branch 'whot/for-keith'Keith Packard1-1/+1
2013-11-01config/APM: Add option to disable building of APM support on LinuxEgbert Eich1-7/+7
APM support in the Xserver was used to restore the console mode prior to a power management event. This was to ensure the mode upon suspend/resume was one that the system firmware or kernel could deal with. APM support is now largely obsolete, KMS drivers don't require a mode restoration anyhow. Therefore it should be possible to disable this feature. (small modification by keithp - move test for XF86PM flag after check for APM, then move XF86PM flag to xorg-config.h.in) Signed-off-by: Egbert Eich <eich@freedesktop.org> Tested-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-11-01config/ACPI: Add option to disable building of ACPI support on LinuxEgbert Eich1-1/+2
ACPI support in the Xserver was used to restore the console mode prior to a power management event. This was to ensure the mode upon suspend/resume was one that the system firmware or kernel could deal with. The feature depended on acpid to be running. Most of this functionality is now take over by systemd, KMS drivers don't require a mode restoration anyhow. Therefore it should be possible to disable this feature under some circumstances. Tested-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-31present: Add Present extensionKeith Packard1-6/+17
Provides both a software implementation using timers and driver hooks to base everything on vblank intervals. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-10-31dri3: Add DRI3 extensionKeith Packard1-6/+27
Adds DRM compatible fences using futexes. Uses FD passing to get pixmaps from DRM applications. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-11-01configure: remove a commentPeter Hutterer1-1/+1
94ed0ba1b5043ad9fc33b42756af447d5ab15bbd moved backtracing into the DIX, so this comment is outdated. since no-one noticed and it's easier to just grep than update file references, remove the comment. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
2013-10-29Merge remote-tracking branch 'whot/for-keith'Keith Packard1-1/+2
2013-10-30config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILESGaetan Nadon1-1/+2
Fix Automake warning: AC_OUTPUT should be used without arguments. www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-29Merge remote-tracking branch 'idr/glx-float-fbconfig'Keith Packard1-1/+1
2013-10-29glx: convert to direct GL dispatch (v2)Adam Jackson1-1/+1
We now expect to be linked against something that provides the GL API, instead of manually grubbing about in the DRI driver's dispatch table. Since the GLX we expose calls GL functions that are meant to be looked up dynamically, also add a way to thunk through to GetProcAddress. This includes a refresh of the generated sources, which requires a correspondingly new Mesa. The GetProcAddress stubs are at the moment merely enough to make this link against Mesa 9.2, but should really be provided for everything not in the OpenGL 1.2 ABI. v2: Explicitly hide the GetProcAddress stubs so we can't conflict with libGL symbols; fix leading tab/space issues [anholt] Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-10-29glx: Remove DRI1 AIGLX (v2)Adam Jackson1-2/+2
Mesa doesn't ship DRI1 drivers as of 8.0, which is about 18 months and three releases ago. The main reason to have wanted DRI1 AIGLX was to get a GLX compositor working, but DRI1's (lack of) memory management API meant that the cost of a GLX compositor was breaking direct GLX apps, which isn't a great tradeoff. Of the DRI1 drivers Mesa has dropped, I believe only mga stands to lose some functionality here, since it and only it has support for NV_texture_rectangle. Since that's required for every extant GLX compositor I know of, I conclude that anybody with a savage, say, would probably not notice AIGLX going away, since they wouldn't be running a GLX compositor in the first place. In the future we'd like to use GL in the server in a more natural way, as just another EGL client, including in the GLX implementation itself. Since there's no EGL implemented for DRI1 drivers, this would already doom AIGLX on DRI1 (short of entirely forking the GLX implementation, which I'm not enthusiastic about). v2: Remove DRI1 from AIGLX conditionals in configure.ac [anholt] Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-10-24glx: Handle float config types in glxConvertConfigsDaniel Czarnowski1-1/+1
Replaces old use of floatMode attribute with new, extended range of values in __DRI_ATTRIB_RENDER_TYPE. Also adds new conditions, where the float modes support requires it. Enables support for not only float configs, but packed float configs as well. v2 (idr): Whitespace and formatting fixes. Refactor render type vs. pbuffer checking to a separate function that includes a quote from the spec. Re-write commit message. Fix compiler warnings: glxdricommon.c: In function 'glxConvertConfigs': glxdricommon.c:212:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign] glxdricommon.c:212:35: note: expected 'unsigned int *' but argument is of type 'int *' glxdricommon.c:230:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign] glxdricommon.c:230:35: note: expected 'unsigned int *' but argument is of type 'int *' Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-10-18Update to version 1.14.99.3xorg-server-1.14.99.3Keith Packard1-3/+3
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-07configure.ac: Include missing proto declarations in SDK_REQUIRED_MODULESEmil Velikov1-0/+3
Commits a1d41e311c21e, 7d859bd87834d & 3ed2c6e11298c made extinit.h require the XF86 Big Font, XRes & ScrnSaver proto headers, but failed to add them to the SDK_REQUIRED_MODULES so pkg-config would find them for driver builds. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Bump version to 1.14.99.2xorg-server-1.14.99.2Keith Packard1-3/+3
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Merge remote-tracking branch 'anholt/ephyr-fixes'Keith Packard1-3/+3
2013-09-09Merge remote-tracking branch 'jturney/master'Keith Packard1-0/+1
2013-09-06Fix typo in configure warning.Thomas Klausner1-1/+1
Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-09-03Xephyr: drop remaining Xlib dependencyJulien Cristau1-2/+2
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-09-03Xephyr: move ephyrdri over to xcbJulien Cristau1-1/+1
Require new xcb-xf86dri to get fixed GetDrawableInfo. Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-09-03Xephyr: use xcb-xv instead of libXvJulien Cristau1-1/+1
v2: Massive, conflict-filled rebase. I think I resolved everything right, but this host xv code makes my eyes bleed. Touch-tested XV after the rebase (anholt). Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1) Signed-off-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Eric Anholt <eric@anholt.net>
2013-09-03Xephyr: replace XKeycodeToKeysym with xcb-keysymsJulien Cristau1-1/+1
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-09-03Xephyr: start converting hostx.c over to xcbJulien Cristau1-2/+2
v2: Dropped the hostx_load_keymap changes, now that that function is gutted (anholt). Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1) Signed-off-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Eric Anholt <eric@anholt.net>
2013-08-30Move pseudoramiX code where it can be shared between Xwin and XquartzJon TURNEY1-0/+1
Move pseudoramiX code to a separate top-level directory. Link Xwin and Xquartz with libPseudoramiX I'm not sure moving this to a top-level directory is appropriate, but I'm not sure where else it fits. Future work: pseudoramiX can probably be consolidated with the rrxinerama code (which I think provides fake xinerama data when real XINERAMA is disabled and we only have one screen) v2: fix distcheck Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
2013-08-06xfree86: improve check for posix saved idsJulien Cristau1-1/+1
Replace hardcoded SVR4 || linux || CSRG_BASED with an autoconf check and the _POSIX_SAVED_IDS macro. Suggested-by: Mark Kettenis <mark.kettenis@xs4all.nl> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org>. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-07-23configure.ac: Check for python at configure time when building XWin with AIGLXJon TURNEY1-0/+4
Check for python at configure time when building XWin with AIGLX, it's used to generate the wrapper code for native GL functions. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2013-07-23Allow DDX to provide a main()Jon TURNEY1-1/+1
XQuartz already conditionally renames main() as dix_main() so it can provide it's own main(). This isn't the ideal way of doing this, as it prevents libdix built this way from being useful with any other DDX. So instead, always name that function dix_main(), and also provide a stub main() which just calls dix_main(), which can be overriden in the DDX. Add a main() to XWin (XQuartz already has one, of course). It's no longer neccessary to link XWin and XQuartz with libmain. v2: Remove unneeded stub main hw/xwin/InitOutput.c Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2013-07-17Xephyr: Use _XEatDataWords (from Xlib 1.6) instead of _XEatDataAlan Coopersmith1-1/+1
Simplifies code and reduces risk of overflow from converting length field in X replies from words to bytes. One call to _XEatData is left in ephyrHostGLXGetStringFromServer where it's already been checked for overflow, and other values have been subtracted from it to reduce the size of data remaining to be eaten. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-07-17glxproxy: Use _XEatDataWords (from Xlib 1.6) instead of _XEatDataAlan Coopersmith1-1/+1
Reduces risk of overflow from converting length field in X replies from words to bytes. (Also seems to be what several calls were already incorrectly passing to _XEatData.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 23:55:58 +0000