diff options
| author | Michael Forney <mforney@mforney.org> | 2016-06-26 11:03:03 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-06-26 11:03:03 -0700 |
| commit | 6ed455ea1cc0af430d926d353944bb5b96c688ba (patch) | |
| tree | 1a281fb170b3934c77e2f1105a231836ae505fec | |
| parent | ae802b58a9d529e1ac7e6c807e67c63331658747 (diff) | |
Add libdrm 2.4.68
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | LICENSE | 1 | ||||
| -rw-r--r-- | config.rc | 4 | ||||
| -rw-r--r-- | desktop/gen.rc | 1 | ||||
| -rw-r--r-- | desktop/libdrm/config.h | 61 | ||||
| -rw-r--r-- | desktop/libdrm/gen.rc | 37 | ||||
| m--------- | desktop/libdrm/src | 0 | ||||
| -rwxr-xr-x | fetch.rc | 1 |
8 files changed, 108 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 5a4a71f8..56445fc2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,6 +64,9 @@ [submodule "desktop/expat/src"] path = desktop/expat/src url = git://git.code.sf.net/p/expat/code_git +[submodule "desktop/libdrm/src"] + path = desktop/libdrm/src + url = https://cgit.freedesktop.org/mesa/drm [submodule "desktop/libpciaccess/src"] path = desktop/libpciaccess/src url = https://anongit.freedesktop.org/git/xorg/lib/libpciaccess.git @@ -28,6 +28,7 @@ core/sinit/config.h core/tz/version.h core/xz/config.h desktop/expat/expat_config.h +desktop/libdrm/config.h desktop/libpciaccess/config.h devel/make/config.h devel/mc/config.h @@ -6,3 +6,7 @@ fn fs { false } } + +# depends on your video card +# config_video_drivers=intel +# config_video_drivers=nouveau diff --git a/desktop/gen.rc b/desktop/gen.rc index 28fd43e0..b489d251 100644 --- a/desktop/gen.rc +++ b/desktop/gen.rc @@ -1,3 +1,4 @@ subgen expat +subgen libdrm subgen libpciaccess subgen plan9fonts diff --git a/desktop/libdrm/config.h b/desktop/libdrm/config.h new file mode 100644 index 00000000..c9113b66 --- /dev/null +++ b/desktop/libdrm/config.h @@ -0,0 +1,61 @@ +#include <config-posix.h> + +/* #undef CRAY_STACKSEG_END */ +/* #undef C_ALLOCA */ +#define HAVE_ALLOCA 1 +#define HAVE_ALLOCA_H 1 +/* #undef HAVE_AMDGPU */ +/* #undef HAVE_CAIRO */ +/* #undef HAVE_CUNIT */ +/* #undef HAVE_EXYNOS */ +/* #undef HAVE_FREEDRENO */ +/* #undef HAVE_FREEDRENO_KGSL */ +/* #undef HAVE_INSTALL_TESTS */ +#define HAVE_LIBDRM_ATOMIC_PRIMITIVES 1 +/* #undef HAVE_LIBUDEV */ +/* #undef HAVE_LIB_ATOMIC_OPS */ +#define HAVE_MEMORY_H 1 +/* #undef HAVE_OMAP */ +/* #undef HAVE_RADEON */ +/* #undef HAVE_SYS_MKDEV_H */ +/* #undef HAVE_SYS_SYSCTL_H */ +/* #undef HAVE_TEGRA */ +/* #undef HAVE_VALGRIND */ +/* #undef HAVE_VC4 */ +#define HAVE_VISIBILITY 1 +/* #undef HAVE_VMWGFX */ +#define LT_OBJDIR ".libs/" +#define PACKAGE "libdrm" +#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=DRI" +#define PACKAGE_NAME "libdrm" +#define PACKAGE_STRING "libdrm 2.4.68" +#define PACKAGE_TARNAME "libdrm" +#define PACKAGE_URL "" +#define PACKAGE_VERSION "2.4.68" +/* #undef STACK_DIRECTION */ +/* #undef UDEV */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +#define VERSION "2.4.68" +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif +/* #undef _FILE_OFFSET_BITS */ +/* #undef _LARGE_FILES */ +/* #undef _MINIX */ +/* #undef _POSIX_1_SOURCE */ +/* #undef _POSIX_SOURCE */ +/* #undef size_t */ diff --git a/desktop/libdrm/gen.rc b/desktop/libdrm/gen.rc new file mode 100644 index 00000000..9cbee9d2 --- /dev/null +++ b/desktop/libdrm/gen.rc @@ -0,0 +1,37 @@ +cflags\ + -D HAVE_CONFIG_H\ + -isystem desktop/libpciaccess/src/include\ + -I include\ + -I '$dir' \ + -I '$srcdir' \ + -I '$srcdir'/include/drm + +lib libdrm.a\ + xf86drm.c\ + xf86drmHash.c\ + xf86drmRandom.c\ + xf86drmSL.c\ + xf86drmMode.c + +if(~ intel $config_video_drivers) { + cflags -D 'HAVE_INTEL=1' + lib libdrm_intel.a intel/^(\ + intel_bufmgr.c\ + intel_bufmgr_fake.c\ + intel_bufmgr_gem.c\ + intel_decode.c\ + mm.c\ + ) +} + +if(~ nouveau $config_video_drivers) { + cflags -D 'HAVE_NOUVEAU=1' + lib libdrm_nouveau.a nouveau/^(\ + nouveau.c\ + pushbuf.c\ + bufctx.c\ + abi16.c\ + ) +} + +status=() diff --git a/desktop/libdrm/src b/desktop/libdrm/src new file mode 160000 +Subproject fc09c5ab84240e9b6bd0bed01685ef004f56c4f @@ -93,6 +93,7 @@ fetch core/xz git fetch core/zlib git fetch desktop/expat git fetch desktop/libpciaccess git +fetch desktop/libdrm git fetch desktop/plan9fonts git fetch devel/cparser git fetch devel/libfirm git |
