diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-31 11:25:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-31 11:25:41 +0000 |
| commit | 1ffbea435b8fd35d6134bf963e0dea88355db0bc (patch) | |
| tree | 9135cebf2288374a9a11e7e760af4a196d435df0 /dev-libs/DirectFB/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-1ffbea435b8fd35d6134bf963e0dea88355db0bc.tar.gz gentoo-2-1ffbea435b8fd35d6134bf963e0dea88355db0bc.tar.bz2 gentoo-2-1ffbea435b8fd35d6134bf963e0dea88355db0bc.zip | |
Fix building with sanitized headers #152614.
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'dev-libs/DirectFB/files')
| -rw-r--r-- | dev-libs/DirectFB/files/DirectFB-0.9.25.1-headers.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/dev-libs/DirectFB/files/DirectFB-0.9.25.1-headers.patch b/dev-libs/DirectFB/files/DirectFB-0.9.25.1-headers.patch new file mode 100644 index 000000000000..b0e031f96081 --- /dev/null +++ b/dev-libs/DirectFB/files/DirectFB-0.9.25.1-headers.patch @@ -0,0 +1,84 @@ +Don't rely on the kernel to tell us what the cpu target is ... we'll just +use the default values all the time instead. + +http://bugs.gentoo.org/152614 + +--- lib/direct/ppcasm_memcpy_cachable.S ++++ lib/direct/ppcasm_memcpy_cachable.S +@@ -34,8 +34,6 @@ + + #define __ASSEMBLY__ + +-#include <linux/config.h> +- + #if defined(CONFIG_8xx) || defined(CONFIG_403GCX) + #define L1_CACHE_LINE_SIZE 16 + #define LG_L1_CACHE_LINE_SIZE 4 + +Don't pollute the namespace with type hacks, just use the real deal. + +--- include/dfb_types.h ++++ include/dfb_types.h +@@ -1,32 +1,7 @@ + #ifndef __DFB_TYPES_H__ + #define __DFB_TYPES_H__ + ++#include <asm/types.h> + #include <sys/types.h> + +-#ifndef USE_KOS +- +-#define __u8 u_int8_t +-#define __u16 u_int16_t +-#define __u32 u_int32_t +-#define __u64 u_int64_t +- +-#define __s8 int8_t +-#define __s16 int16_t +-#define __s32 int32_t +-#define __s64 int64_t +- +-#else +- +-#define __u8 uint8 +-#define __u16 uint16 +-#define __u32 uint32 +-#define __u64 uint64 +- +-#define __s8 sint8 +-#define __s16 sint16 +-#define __s32 sint32 +-#define __s64 sint64 +- +-#endif +- + #endif + +some arches (*cough* powerpc *cough*) are retarded and export a completely +worthless asm/page.h ... so set a fallback for PAGE_SIZE + +--- lib/direct/system.c ++++ lib/direct/system.c +@@ -35,7 +35,8 @@ + + #if HAVE_ASM_PAGE_H + #include <asm/page.h> +-#else ++#endif ++#ifndef PAGE_SIZE + #define PAGE_SIZE sysconf( _SC_PAGESIZE ) + #endif + + +Don't waste time on linux/compiler.h + +--- ./interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c ++++ ./interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c +@@ -44,7 +44,6 @@ + #include <fcntl.h> + #include <sys/ioctl.h> + +-#include <linux/compiler.h> + #include "videodev.h" + + #include <directfb.h> |