From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 01/41] directfb: upgrade to 1.6.1
Date: Mon, 9 Jul 2012 08:47:15 -0700 [thread overview]
Message-ID: <8b4ddf93ab6eb9413021c3f9d3d441cd8671ef8d.1341802889.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1341802889.git.sgw@linux.intel.com>
In-Reply-To: <cover.1341802889.git.sgw@linux.intel.com>
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Removed two backported patches that already exist in the current
version and fixed a compilation issue when zlib is used.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
meta/recipes-graphics/directfb/directfb.inc | 4 ++-
.../directfb/fix-compilation-with-zlib.patch | 29 ++++++++++++++++++++
...se-ARM-assembler-for-atomic-operations-on.patch | 27 ------------------
...ibdirect-remove-include-of-linux-config.h.patch | 29 --------------------
meta/recipes-graphics/directfb/directfb_1.5.3.bb | 23 ---------------
meta/recipes-graphics/directfb/directfb_1.6.1.bb | 23 +++++++++++++++
6 files changed, 55 insertions(+), 80 deletions(-)
create mode 100644 meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
delete mode 100644 meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch
delete mode 100644 meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch
delete mode 100644 meta/recipes-graphics/directfb/directfb_1.5.3.bb
create mode 100644 meta/recipes-graphics/directfb/directfb_1.6.1.bb
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 3fd6161..a164717 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
HOMEPAGE = "http://directfb.org"
DEPENDS = "jpeg libpng freetype zlib tslib"
-SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-${PV}.tar.gz \
+INC_PR = "r0"
+
+SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
file://configurefix.patch"
diff --git a/meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch b/meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
new file mode 100644
index 0000000..8b99b4e
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+From 1d6d597050fc24769e9df2693f754bdc824a8b78 Mon Sep 17 00:00:00 2001
+From: Laurentiu Palcu <laurentiu.palcu@intel.com>
+Date: Tue, 3 Jul 2012 16:06:10 +0300
+Subject: [PATCH] fix compilation with zlib
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+---
+ src/core/surface.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/surface.c b/src/core/surface.c
+index 50434a2..52f50ab 100644
+--- a/src/core/surface.c
++++ b/src/core/surface.c
+@@ -49,6 +49,9 @@
+ #include <gfx/convert.h>
+ #include <gfx/util.h>
+
++#ifdef USE_ZLIB
++#include <zlib.h>
++#endif
+
+ D_DEBUG_DOMAIN( Core_Surface, "Core/Surface", "DirectFB Core Surface" );
+
+--
+1.7.9.5
+
diff --git a/meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch b/meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch
deleted file mode 100644
index 277189b..0000000
--- a/meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 54f775dfc516115c4d654d250189f431a82d1d42 Mon Sep 17 00:00:00 2001
-From: Denis Oliver Kropp <dok@directfb.org>
-Date: Sun, 27 May 2012 11:40:31 +0200
-Subject: [PATCH] libdirect: Use ARM assembler for atomic operations only if
- ARCH_ARMv7 is defined.
-
-Upstream-Status: backport from 1.6.0-pre1
----
- lib/direct/atomic.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/direct/atomic.h b/lib/direct/atomic.h
-index fe7664f..74d8d18 100644
---- a/lib/direct/atomic.h
-+++ b/lib/direct/atomic.h
-@@ -183,7 +183,7 @@
- #endif
-
-
--#if defined(ARCH_ARM) && !defined(ARCH_IWMMXT)
-+#if defined(ARCH_ARMv7) && !defined(ARCH_IWMMXT)
-
- static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int _new)
- {
---
-1.7.9.5
-
diff --git a/meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch b/meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch
deleted file mode 100644
index 6c014ca..0000000
--- a/meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: backport from 1.6.0-pre1
-
-From cd575a84f10d90759e069f5f2e6092251a1b84bd Mon Sep 17 00:00:00 2001
-From: Sven Neumann <s.neumann@raumfeld.com>
-Date: Fri, 23 Sep 2011 10:00:02 +0200
-Subject: [PATCH] libdirect: remove include of <linux/config.h>
-
-That header has been removed from the Linux kernel with 2.6.19
-and it should not have been needed anyway.
----
- lib/direct/ppcasm_memcpy_cachable.S | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/lib/direct/ppcasm_memcpy_cachable.S b/lib/direct/ppcasm_memcpy_cachable.S
-index 920dea2..c1ef4fa 100644
---- a/lib/direct/ppcasm_memcpy_cachable.S
-+++ b/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
---
-1.7.9.5
-
diff --git a/meta/recipes-graphics/directfb/directfb_1.5.3.bb b/meta/recipes-graphics/directfb/directfb_1.5.3.bb
deleted file mode 100644
index 9f527e1..0000000
--- a/meta/recipes-graphics/directfb/directfb_1.5.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require directfb.inc
-
-RV = "1.5-0"
-PR = "r0"
-
-DEPENDS += "sysfsutils"
-
-SRC_URI += "file://libdirect-Use-ARM-assembler-for-atomic-operations-on.patch \
- file://libdirect-remove-include-of-linux-config.h.patch"
-
-EXTRA_OECONF = "\
- --enable-freetype=yes \
- --enable-zlib \
- --with-gfxdrivers=none \
- --disable-sdl \
- --disable-vnc \
- --disable-x11 \
-"
-
-LEAD_SONAME = "libdirectfb-1.5.so.0"
-
-SRC_URI[md5sum] = "54a9ec931c8e3c82adb924194e65120e"
-SRC_URI[sha256sum] = "e57575e8bb5f6452db6d5d54d78e3a460bc08bf50b1fa10d0250936dbe2251f0"
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.1.bb
new file mode 100644
index 0000000..cafc21f
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb_1.6.1.bb
@@ -0,0 +1,23 @@
+require directfb.inc
+
+RV = "1.6-0"
+PR = "${INC_PR}.0"
+
+DEPENDS += "sysfsutils"
+
+SRC_URI += "file://fix-compilation-with-zlib.patch"
+
+EXTRA_OECONF = "\
+ --enable-freetype=yes \
+ --enable-zlib \
+ --with-gfxdrivers=none \
+ --disable-sdl \
+ --disable-vnc \
+ --disable-x11 \
+"
+
+LEAD_SONAME = "libdirectfb-1.6.so.0"
+
+SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65"
+SRC_URI[sha256sum] = "f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45"
+
--
1.7.7.6
next prev parent reply other threads:[~2012-07-09 15:59 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 15:47 [CONSOLIDATED PULL 00/41] Fixes and Updates Saul Wold
2012-07-09 15:47 ` Saul Wold [this message]
2012-07-09 15:47 ` [CONSOLIDATED PULL 02/41] directfb-examples: upgrade to 1.6.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 03/41] libx11: upgrade to 1.5.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 04/41] libx11-trim: " Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 05/41] libx11-diet: " Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 06/41] libxi: upgrade to 1.6.1 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 07/41] xinput: upgrade to 1.6.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 08/41] pixman: upgrade to 0.26.2 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 09/41] recipes.txt: Add entries for "recipes-rt" and "recipes-support" Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 10/41] gcc-common: Don't use "is" for comparing strings, use "==" Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 11/41] gthumb: run make install in parallel Saul Wold
2012-07-09 15:50 ` Burton, Ross
2012-07-09 15:47 ` [CONSOLIDATED PULL 12/41] curl: upgrade to 7.26.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 13/41] apt 0.7.14: runtime error: filename too long (tmpdir length) Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 14/41] apt 0.7.14: runtime error: Method file has died unexpectedly Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 15/41] sanity.bbclass: the tmpdir can't be longer than 410 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 16/41] startup-notification: bump PR because libxcb-util soname was changed Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 17/41] matchbox-panel-2: " Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 18/41] runqemu: fix usage() help for MACHINE setting Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 19/41] runqemu: fix support for ext4 rootfs images Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 20/41] classes/license: fix manifest to work with deb Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 21/41] init-install: Use swap_ratio in the calulation of swap_size Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 22/41] init-install: Correct ext2->ext3 typo in logging Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 23/41] init-install: Clean up partition alignment Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 24/41] grub-efi: Do not use help2man Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 25/41] pseudo: Update to 1.3.1 (fixing chroot crash) Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 26/41] utils.bbclass: add helper function to add all multilib variants of a specific package Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 27/41] libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 28/41] gnutls: make sure native is patched for gettext version Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 29/41] populate_sdk_rpm: Sync multilib configuration with rootfs_rpm Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 30/41] multilib: Enable multilib remapping for SDK generation Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 31/41] package_rpm: Avoid duplicate package generation failures Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 32/41] rpm: Fix PACKAGECONFIG dependencies Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 33/41] qemu-0.15.1: add patch to fix compilatation problems on powerpc Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 34/41] packagedata.py: Fix get_subpkgedata_fn for multilib Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 35/41] bluez4: fix packaging issue after update Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 36/41] ncurses: fix packaging issue in multilib build Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 37/41] connman: remove some obviously wrong (circa early-GNOME 2?) directories from FILES Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 38/41] connman: ship the empty plugins directory in the connman package Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 39/41] kernel.bbclass: add non-santized kernel provides Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 40/41] initscripts: use update-alternative to handle file functions Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 41/41] lsbinitscripts: increase ALTERNATIVE_PRIORITY Saul Wold
2012-07-09 16:04 ` [CONSOLIDATED PULL 00/41] Fixes and Updates Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8b4ddf93ab6eb9413021c3f9d3d441cd8671ef8d.1341802889.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox