diff options
| author | jkim <jkim@FreeBSD.org> | 2008-03-06 08:48:43 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2008-03-06 08:48:43 +0800 |
| commit | 02a1c0254b5e78f277f11629c2c48acfcbeaaa0e (patch) | |
| tree | 4c881fc2654f5520e22d4887b92ed6de17bb6d50 /x11-servers | |
| parent | 14c9212d5813a90fd16be0a9e95f4be486ae4d88 (diff) | |
| download | freebsd-ports-gnome-02a1c0254b5e78f277f11629c2c48acfcbeaaa0e.tar.gz freebsd-ports-gnome-02a1c0254b5e78f277f11629c2c48acfcbeaaa0e.tar.zst freebsd-ports-gnome-02a1c0254b5e78f277f11629c2c48acfcbeaaa0e.zip | |
- Check correct POSIX spec. date for clock_gettime(2) whether
CLOCK_MONOTONIC is available.
- If FreeBSD-specific CLOCK_MONOTONIC_FAST is available, use it
instead of precise but slow gettimeofday(2) or CLOCK_MONOTONIC.
Reviewed by: stable, x11
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-configure | 11 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-os-utils.c | 14 |
3 files changed, 26 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index a20f5b397094..0c9c0dd9e1ee 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-server PORTVERSION= 1.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \ diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure new file mode 100644 index 000000000000..1c8c8f38d3a1 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2008-02-28 16:08:55.000000000 -0500 ++++ configure 2008-02-28 16:11:19.000000000 -0500 +@@ -30376,7 +30376,7 @@ + else + cat >conftest.$ac_ext <<_ACEOF + +-#define _POSIX_C_SOURCE 199309L ++#define _POSIX_C_SOURCE 200112L + #include <time.h> + + int main(int argc, char *argv[]) { diff --git a/x11-servers/xorg-server/files/patch-os-utils.c b/x11-servers/xorg-server/files/patch-os-utils.c new file mode 100644 index 000000000000..a5509b86539a --- /dev/null +++ b/x11-servers/xorg-server/files/patch-os-utils.c @@ -0,0 +1,14 @@ +--- os/utils.c.orig 2007-08-23 15:04:55.000000000 -0400 ++++ os/utils.c 2008-02-29 13:11:01.000000000 -0500 +@@ -525,7 +525,11 @@ + + #ifdef MONOTONIC_CLOCK + struct timespec tp; ++#if defined(__FreeBSD__) && defined(CLOCK_MONOTONIC_FAST) ++ if (clock_gettime(CLOCK_MONOTONIC_FAST, &tp) == 0) ++#else + if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) ++#endif + return (tp.tv_sec * 1000) + (tp.tv_nsec / 1000000L); + #endif + |