projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed5e468)
Fix building with sanitized headers #152614.
authorMike Frysinger <vapier@gentoo.org>
Sun, 31 Dec 2006 11:25:41 +0000 (11:25 +0000)
committerMike Frysinger <vapier@gentoo.org>
Sun, 31 Dec 2006 11:25:41 +0000 (11:25 +0000)
Package-Manager: portage-2.1.2_rc4-r2

dev-libs/DirectFB/ChangeLog patch | blob | history
dev-libs/DirectFB/DirectFB-0.9.25.1.ebuild patch | blob | history
dev-libs/DirectFB/Manifest patch | blob | history
dev-libs/DirectFB/files/DirectFB-0.9.25.1-headers.patch [new file with mode: 0644] patch | blob

diff --git a/dev-libs/DirectFB/ChangeLog b/dev-libs/DirectFB/ChangeLog
index d59ba57b0e1ae16646e45723660422a92080477d..28c32ddc63545f3a38e341fae8caaa4ec0ef207b 100644 (file)
--- a/dev-libs/DirectFB/ChangeLog
+++ b/dev-libs/DirectFB/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/DirectFB
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.58 2006/10/30 23:31:37 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/ChangeLog,v 1.59 2006/12/31 11:25:41 vapier Exp $
+
+  31 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/DirectFB-0.9.25.1-headers.patch, DirectFB-0.9.25.1.ebuild:
+  Fix building with sanitized headers #152614.
 
   30 Oct 2006; Matti Bickel <mabi@gentoo.org> DirectFB-0.9.25.1.ebuild:
   Stable on ppc (bug #149813)
diff --git a/dev-libs/DirectFB/DirectFB-0.9.25.1.ebuild b/dev-libs/DirectFB/DirectFB-0.9.25.1.ebuild
index 08b2ba3229af291ab335eb08eccb71db9a7d19b2..928c33f1e73eab0b37fb156b466fdb01e454e86f 100644 (file)
--- a/dev-libs/DirectFB/DirectFB-0.9.25.1.ebuild
+++ b/dev-libs/DirectFB/DirectFB-0.9.25.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.25.1.ebuild,v 1.8 2006/10/30 23:31:37 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/DirectFB/DirectFB-0.9.25.1.ebuild,v 1.9 2006/12/31 11:25:41 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -13,9 +13,10 @@ SRC_URI="http://www.directfb.org/download/DirectFB/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 -mips ppc ~sh -sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 -mips ppc sh -sparc x86"
 IUSE="debug fbcon fusion gif jpeg mmx mpeg png sdl sse static sysfs truetype v4l v4l2 zlib"
 
+#      fusion? ( dev-libs/linux-fusion )
 DEPEND="sdl? ( media-libs/libsdl )
        gif? ( media-libs/giflib )
        png? ( media-libs/libpng )
@@ -44,6 +45,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/${PN}-0.9.24-CFLAGS.patch
+       epatch "${FILESDIR}"/${P}-headers.patch
 }
 
 src_compile() {
diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index ea0761b427a1c54b6474f34edf19f3f46b330f5e..311557866eac7fe40461f2c31b7b771e4d3ef862 100644 (file)
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -13,6 +13,10 @@ AUX DirectFB-0.9.24-CFLAGS.patch 570 RMD160 e65704cfdedd20ba96544357ab89aeb26927
 MD5 fadc9b915077bd3c9647ca8776505e60 files/DirectFB-0.9.24-CFLAGS.patch 570
 RMD160 e65704cfdedd20ba96544357ab89aeb26927e2af files/DirectFB-0.9.24-CFLAGS.patch 570
 SHA256 24fc37fa6390340f08f4cf352a6fec34acf9d2bf0fc0f572a714466cc8ab4b68 files/DirectFB-0.9.24-CFLAGS.patch 570
+AUX DirectFB-0.9.25.1-headers.patch 1739 RMD160 f2e710b7e55e21dbae1267a526d945978afab501 SHA1 3124c358490ea0ef1e227bc172c54df459498ed8 SHA256 83b1eeab6641a51ba49e9c120e5c9c157195f29305f302a8fd9cded9fa350b20
+MD5 8d2b29c0605cc30b96462fb42ed6dbf9 files/DirectFB-0.9.25.1-headers.patch 1739
+RMD160 f2e710b7e55e21dbae1267a526d945978afab501 files/DirectFB-0.9.25.1-headers.patch 1739
+SHA256 83b1eeab6641a51ba49e9c120e5c9c157195f29305f302a8fd9cded9fa350b20 files/DirectFB-0.9.25.1-headers.patch 1739
 DIST DirectFB-0.9.22.tar.gz 1957905 RMD160 653c25ef05eccd01ef345ad037736de028d99b85 SHA1 8ef5eca8a7cf0deb347dc32f5e873bb3c7c246b0 SHA256 b21cd254073013427a7b362df9b3e042abcc9eb5573ad0a963b5c18720aa32c3
 DIST DirectFB-0.9.24.tar.gz 1938861 RMD160 262b300cc00b3385f15532004aa332253d525522 SHA1 95fbde03792d21c2ac4247108b09a861ce6532dc SHA256 d2717cbd1a85a48eba9522491bbe2c74579a91af2a938dea601ef2a8c28b7f9f
 DIST DirectFB-0.9.25.1.tar.gz 2064010 RMD160 558e3eabc41635c054314d8a4c8365d648ec588d SHA1 40654da2fde2fd5539f5a0c5cdac50e1a8a52bb4 SHA256 aa1e9710ca18633ffcb74a0383fdfa39aba63e873ec9fa2ba4b7589ed2e5c56b
@@ -24,14 +28,14 @@ EBUILD DirectFB-0.9.24.ebuild 3820 RMD160 49be595a2686f3ad4d379c641b31a1b32f28f8
 MD5 098cfe6fedb45185a57fd1f9229eceb3 DirectFB-0.9.24.ebuild 3820
 RMD160 49be595a2686f3ad4d379c641b31a1b32f28f8ac DirectFB-0.9.24.ebuild 3820
 SHA256 ee4eb7cfe2fa6d398bb52dfbf5104fcfa673f3f5730eb52588c279fb601e93f7 DirectFB-0.9.24.ebuild 3820
-EBUILD DirectFB-0.9.25.1.ebuild 4058 RMD160 285560eb3d459091e02cd2788514636abe6076c4 SHA1 538564d273e5cbd7e53656f21d86a3bae3d75acb SHA256 ef2bb33e2d413140b9f15f2d76fb4f726c00f3a833b41be8ae751d284e995299
-MD5 6be1716cbe7c9022b5cc97f4e4345464 DirectFB-0.9.25.1.ebuild 4058
-RMD160 285560eb3d459091e02cd2788514636abe6076c4 DirectFB-0.9.25.1.ebuild 4058
-SHA256 ef2bb33e2d413140b9f15f2d76fb4f726c00f3a833b41be8ae751d284e995299 DirectFB-0.9.25.1.ebuild 4058
-MISC ChangeLog 8667 RMD160 884592cbcdac77c7aff4054d01e5ee6c7b8d78bd SHA1 f53438abc70b5340d4e7ef7037547d7df41061cf SHA256 18506f517b6ad88f4b13883748a7dead0208b214d813c9f6594cd60ca934eaf3
-MD5 b6f093db0283bdd0ab7e982b7e62dfab ChangeLog 8667
-RMD160 884592cbcdac77c7aff4054d01e5ee6c7b8d78bd ChangeLog 8667
-SHA256 18506f517b6ad88f4b13883748a7dead0208b214d813c9f6594cd60ca934eaf3 ChangeLog 8667
+EBUILD DirectFB-0.9.25.1.ebuild 4134 RMD160 1f2112c7f1876069ca3069d5346dfd4e67b232da SHA1 43ccff08878c1b8799348ff3337e7c2dcc935afb SHA256 621b4f27d67ac25efe90dbbc150b888256726a9f665fd3eb5eefdfd95450d3fe
+MD5 706d053a051f380879a3dccf27cb8ee4 DirectFB-0.9.25.1.ebuild 4134
+RMD160 1f2112c7f1876069ca3069d5346dfd4e67b232da DirectFB-0.9.25.1.ebuild 4134
+SHA256 621b4f27d67ac25efe90dbbc150b888256726a9f665fd3eb5eefdfd95450d3fe DirectFB-0.9.25.1.ebuild 4134
+MISC ChangeLog 8835 RMD160 f6be7f0f8aa34305bffd2a3847659e4f48b3818d SHA1 92295144c14b5c18aafb21a457fada9616b58c63 SHA256 1c18d563cd38ba46e3cfd4d8a9c68a881d18eae1e33a943aa269a60a3728e338
+MD5 f5afa247886b5f238cfd53084507d2c4 ChangeLog 8835
+RMD160 f6be7f0f8aa34305bffd2a3847659e4f48b3818d ChangeLog 8835
+SHA256 1c18d563cd38ba46e3cfd4d8a9c68a881d18eae1e33a943aa269a60a3728e338 ChangeLog 8835
 MISC metadata.xml 754 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 SHA1 d5238147a8dc90d5171dae8675f243fe5e6a8d10 SHA256 13a9cd8be775e849708c9377176d52f107a2eed78ef2ba3917188ae9cf2aeffc
 MD5 b798773c0060701f402cec4cddc05f5d metadata.xml 754
 RMD160 32770eb525647a2e16ceb208f37ede3b30f5acd3 metadata.xml 754
@@ -46,9 +50,9 @@ MD5 a1274bb7dcefcb8048db36fe5f68ec45 files/digest-DirectFB-0.9.25.1 256
 RMD160 c2ff9c1bb59724014b3134d3a6016f2326c95beb files/digest-DirectFB-0.9.25.1 256
 SHA256 12103ab1135d8e247eb85bb1f5511d69b09d277abb5c126b9923c70ab79e4f6d files/digest-DirectFB-0.9.25.1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFRotofNMcoUhJ7GwRAiOAAJwM2lUF9tSk33omMGql2cuqJ0QlrwCfaMNR
-owT6xo8hb4JICIfYJJGoOzo=
-=1ZOq
+iD8DBQFFl5578bi6rjpTunYRAiILAKCP8FNHu15OCkYnAWGYJryTKvp4OACfX8pk
+wMaZ7rtj4QKUZXYTILBMa3w=
+=ZpIt
 -----END PGP SIGNATURE-----
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 (file)
index 0000000..b0e031f
--- /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>
Unnamed repository; edit this file 'description' to name the repository.