summaryrefslogtreecommitdiffstats
path: root/patches/DirectFB-1.4.3
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-01-20 00:35:17 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-01-20 00:40:28 +0100
commit2d451300a6d7d80ab71e9bfb9b825c1d9c475399 (patch)
treea75dfae282c4d0ca45f55b03ae8a3a4125dad0f0 /patches/DirectFB-1.4.3
parent4b84cfd3c5b809b2c4f8370f16126ea83c907d39 (diff)
downloadptxdist-2d451300a6d7d80ab71e9bfb9b825c1d9c475399.tar.gz
ptxdist-2d451300a6d7d80ab71e9bfb9b825c1d9c475399.tar.xz
[directfb] fix powerpc build
...by porting the missing 1.3.0 patches Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/DirectFB-1.4.3')
-rw-r--r--patches/DirectFB-1.4.3/0001-fix-X11-detection.patch (renamed from patches/DirectFB-1.4.3/configure.in.patch)11
-rw-r--r--patches/DirectFB-1.4.3/0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch33
-rw-r--r--patches/DirectFB-1.4.3/series4
3 files changed, 43 insertions, 5 deletions
diff --git a/patches/DirectFB-1.4.3/configure.in.patch b/patches/DirectFB-1.4.3/0001-fix-X11-detection.patch
index 8b3bb4f68..9570ad2c8 100644
--- a/patches/DirectFB-1.4.3/configure.in.patch
+++ b/patches/DirectFB-1.4.3/0001-fix-X11-detection.patch
@@ -1,14 +1,16 @@
-Subject: [directfb] fix X11 detection
+From ab900fcc9de2c1e2146cbf56abe95caebeba1caa Mon Sep 17 00:00:00 2001
From: Erwin Rol <erwin@erwinrol.com>
-X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=blobdiff_plain;f=configure.in;fp=configure.in;h=6b7e0bacb1615dc56afffc2d00b6999b11327613;hp=1ca4d6d7cb925eef48b259af5e372c79b90c615d;hb=2dad4f2dde329f4bfc0e9e658b7171ea16d080dd;hpb=b49b12c58b8df83b8127cdebf20c426a70f1bb1b
+Date: Wed, 20 Jan 2010 00:15:56 +0100
+Subject: [PATCH 1/2] fix X11 detection
Use pkgconfig for X11 detection. This diff is simply cherrypicked from
upstream and should not be needed anymore for the next release
of directfb.
Signed-off-by: Erwin Rol <erwin@erwinrol.com>
-
---
+ configure.in | 14 ++------------
+ 1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/configure.in b/configure.in
index 1ca4d6d..6b7e0ba 100644
@@ -35,3 +37,6 @@ index 1ca4d6d..6b7e0ba 100644
fi
AM_CONDITIONAL(X11_CORE, test "$enable_x11" = "yes")
+--
+1.6.6
+
diff --git a/patches/DirectFB-1.4.3/0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch b/patches/DirectFB-1.4.3/0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch
new file mode 100644
index 000000000..fa00110f2
--- /dev/null
+++ b/patches/DirectFB-1.4.3/0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch
@@ -0,0 +1,33 @@
+From be2ee14c009408145dcb2fe26a4667b3e7ed554b Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 20 Jan 2010 00:16:34 +0100
+Subject: [PATCH 2/2] disable ppc memcpy that needs kernel kernel config file
+
+ppcasm_memcpy_cachable.S needs the kernel config to compile.
+This patch simply disables the file.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ lib/direct/Makefile.am | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/lib/direct/Makefile.am b/lib/direct/Makefile.am
+index ff89144..33ed187 100644
+--- a/lib/direct/Makefile.am
++++ b/lib/direct/Makefile.am
+@@ -22,12 +22,7 @@ EXTRA_DIST = \
+ ppc_asm.h
+
+ if BUILDPPCASM
+-if HAVE_LINUX
+-ppcasm_sources = ppcasm_memcpy.S ppcasm_memcpy_cachable.S
+-else
+ ppcasm_sources = ppcasm_memcpy.S
+-endif
+-
+ ppcasm_headers = ppcasm_memcpy.h ppc_asm.h
+ endif
+
+--
+1.6.6
+
diff --git a/patches/DirectFB-1.4.3/series b/patches/DirectFB-1.4.3/series
index d963ed311..d8faf44c2 100644
--- a/patches/DirectFB-1.4.3/series
+++ b/patches/DirectFB-1.4.3/series
@@ -1,2 +1,2 @@
-configure.in.patch
-
+0001-fix-X11-detection.patch
+0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch