diff options
| author | Michael Forney <mforney@mforney.org> | 2016-06-25 22:31:24 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-06-25 22:33:45 -0700 |
| commit | 4eb283ce9e6b5377a7ce41d834fdc8e9c49e7489 (patch) | |
| tree | d65199ae763e7e01c1798f92a49d23cdc2afb426 | |
| parent | 70c75a2c55ae911dcac9492dd4867888ca68496c (diff) | |
Add libpciaccess 0.13.4
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | desktop/gen.rc | 1 | ||||
| -rw-r--r-- | desktop/libpciaccess/config.h | 46 | ||||
| -rw-r--r-- | desktop/libpciaccess/gen.rc | 18 | ||||
| -rw-r--r-- | desktop/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch | 30 | ||||
| m--------- | desktop/libpciaccess/src | 0 | ||||
| -rwxr-xr-x | fetch.rc | 1 |
7 files changed, 99 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 0cd622e0..c83acbaa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,6 +58,9 @@ [submodule "desktop/plan9fonts/src"] path = desktop/plan9fonts/src url = https://github.com/rtrn/plan9fonts +[submodule "desktop/libpciaccess/src"] + path = desktop/libpciaccess/src + url = https://anongit.freedesktop.org/git/xorg/lib/libpciaccess.git [submodule "devel/cparser/src"] path = devel/cparser/src url = http://pp.ipd.kit.edu/git/cparser.git diff --git a/desktop/gen.rc b/desktop/gen.rc index 3714d086..66821915 100644 --- a/desktop/gen.rc +++ b/desktop/gen.rc @@ -1 +1,2 @@ +subgen libpciaccess subgen plan9fonts diff --git a/desktop/libpciaccess/config.h b/desktop/libpciaccess/config.h new file mode 100644 index 00000000..d325750e --- /dev/null +++ b/desktop/libpciaccess/config.h @@ -0,0 +1,46 @@ +#include <config-posix.h> + +#define HAVE_ERR_H 1 +/* #undef HAVE_MACHINE_MTRR_H */ +/* #undef HAVE_MACHINE_SYSARCH_H */ +#define HAVE_MEMORY_H 1 +/* #undef HAVE_MTRR */ +/* #undef HAVE_PCI_IO_PC_DOMAIN */ +/* #undef HAVE_ZLIB */ +/* #undef LINUX_ROM */ +#define LT_OBJDIR ".libs/" +#define PACKAGE "libpciaccess" +#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess" +#define PACKAGE_NAME "libpciaccess" +#define PACKAGE_STRING "libpciaccess 0.13.4" +#define PACKAGE_TARNAME "libpciaccess" +#define PACKAGE_URL "" +#define PACKAGE_VERSION "0.13.4" +#define PACKAGE_VERSION_MAJOR 0 +#define PACKAGE_VERSION_MINOR 13 +#define PACKAGE_VERSION_PATCHLEVEL 4 +#define PCIIDS_PATH "/share/hwdata" +#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 "0.13.4" +#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 */ diff --git a/desktop/libpciaccess/gen.rc b/desktop/libpciaccess/gen.rc new file mode 100644 index 00000000..d433a104 --- /dev/null +++ b/desktop/libpciaccess/gen.rc @@ -0,0 +1,18 @@ +cflags\ + -D HAVE_CONFIG_H\ + -I include\ + -I '$dir' \ + -I '$srcdir'/include + +lib libpciaccess.a src/^(\ + common_bridge.c\ + common_iterator.c\ + common_init.c\ + common_interface.c\ + common_io.c\ + common_capability.c\ + common_device_name.c\ + common_map.c\ + common_vgaarb.c\ + linux_sysfs.c linux_devmem.c\ +) diff --git a/desktop/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/desktop/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch new file mode 100644 index 00000000..c9a955b2 --- /dev/null +++ b/desktop/libpciaccess/patch/0001-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch @@ -0,0 +1,30 @@ +From a371658cdd5df0ca35cce64de9694edd27106a06 Mon Sep 17 00:00:00 2001 +From: Felix Janda <felix.janda@posteo.de> +Date: Fri, 1 May 2015 16:36:50 +0200 +Subject: [PATCH] linux_sysfs.c: Include <limits.h> for PATH_MAX + +Fixes compilation with musl libc. + +Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> +Signed-off-by: Felix Janda <felix.janda@posteo.de> +Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +--- + src/linux_sysfs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c +index 50d94cf..3f95e53 100644 +--- a/src/linux_sysfs.c ++++ b/src/linux_sysfs.c +@@ -45,6 +45,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <limits.h> + #include <sys/mman.h> + #include <dirent.h> + #include <errno.h> +-- +2.9.0 + diff --git a/desktop/libpciaccess/src b/desktop/libpciaccess/src new file mode 160000 +Subproject 201d1a7623c83f611761f67d4411c3c266f8f37 @@ -91,6 +91,7 @@ fetch core/tz git fetch core/ubase git fetch core/xz git fetch core/zlib git +fetch desktop/libpciaccess git fetch desktop/plan9fonts git fetch devel/cparser git fetch devel/libfirm git |
