diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2006-02-22 04:31:47 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2006-02-22 04:31:47 +0000 |
| commit | d0d329b8708faf9a07695509fb73fce1129155c6 (patch) | |
| tree | 64612fa7eb472cb4541453122af7abd71f4dafd9 | |
| parent | 0f5c2df6f518225a05da96e22499628c6fbdcc69 (diff) | |
Build fixes for DragonFly. (Reported by Jeremy C. Reed)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/via_drmclient.h | 4 | ||||
| -rw-r--r-- | src/xvmc/viaXvMC.c | 1 | ||||
| -rw-r--r-- | src/xvmc/viaXvMCPriv.h | 1 |
5 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2006-02-22 Thomas Hellstrom <thomas-at-tungstengraphics.com> + + * configure.ac: + * src/via_drmclient.h: + * src/xvmc/viaXvMC.c: + * src/xvmc/viaXvMCPriv.h: + Build fixes for DragonFly. (Reported by Jeremy C. Reed) + 2006-01-13 Thomas Hellstrom <unichrome-at-shipmail-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index a685013..bfeb572 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,7 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for header files. AC_HEADER_STDC + if test "$DRI" != no; then AC_CHECK_FILE([${sdkdir}/dri.h], [have_dri_h="yes"], [have_dri_h="no"]) @@ -74,6 +75,7 @@ if test "$DRI" != no; then [have_sarea_h="yes"], [have_sarea_h="no"]) AC_CHECK_FILE([${sdkdir}/dristruct.h], [have_dristruct_h="yes"], [have_dristruct_h="no"]) + AC_CHECK_HEADER fi AC_MSG_CHECKING([whether to include DRI support]) @@ -102,6 +104,11 @@ if test "$DRI" = yes; then XVMC=no ;; esac fi + +if test "x$XVMC" = xyes; then + AC_CHECK_HEADERS(pthread.h sys/ioctl.h sys/time.h time.h,,[XVMC="no"; break],) +fi + AM_CONDITIONAL(XVMC, test x$XVMC = xyes) AC_SUBST([DRI_CFLAGS]) diff --git a/src/via_drmclient.h b/src/via_drmclient.h index 9a869de..da1fb1f 100644 --- a/src/via_drmclient.h +++ b/src/via_drmclient.h @@ -27,7 +27,9 @@ #include "drm.h" #include "xf86drm.h" -typedef CARD32 uint32_t; +#ifndef uint32_t +#define uint32_t CARD32 +#endif #define UNICHROME_LOCK(fd, lockNo, saPriv, context, lastcontext, ret) \ do { \ diff --git a/src/xvmc/viaXvMC.c b/src/xvmc/viaXvMC.c index 5e2891e..4632cc1 100644 --- a/src/xvmc/viaXvMC.c +++ b/src/xvmc/viaXvMC.c @@ -39,7 +39,6 @@ #include <fourcc.h> #include <X11/extensions/Xv.h> #include <xf86drm.h> -#include <pthread.h> #include "xf86dri.h" #include "driDrawable.h" diff --git a/src/xvmc/viaXvMCPriv.h b/src/xvmc/viaXvMCPriv.h index ee96722..b5b0a05 100644 --- a/src/xvmc/viaXvMCPriv.h +++ b/src/xvmc/viaXvMCPriv.h @@ -25,6 +25,7 @@ #ifndef _VIAXVMCPRIV_H #define _VIAXVMCPRIV_H 1 +#include <pthread.h> #include <X11/Xlibint.h> #include <X11/extensions/XvMC.h> #include <X11/extensions/XvMClib.h> |