* [PATCH 1/3] fontconfig: upgrade to 2.9.0
2012-05-28 5:47 [PATCH 0/3] Package updates: fontconfig, fontsproto, libpciaccess Laurentiu Palcu
@ 2012-05-28 5:47 ` Laurentiu Palcu
2012-05-28 5:47 ` [PATCH 2/3] fontsproto: upgrade to 2.1.2 Laurentiu Palcu
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Laurentiu Palcu @ 2012-05-28 5:47 UTC (permalink / raw)
To: openembedded-core
Other changes:
- licence checksums because the licence headers changed slightly:
several other authors were added and Keith Packard's name has been
replaced with "author(s)". That's it.
- rebased the fix-pkgconfig.patch to apply on 2.9.0
- removed all sed instructions in do_configure_append() that were
changing fc-arch/Makefile. In the new version the fc-arch/ directory
has been removed in order to make the package cross-compiling safe
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../97_fontconfig | 0
.../fix-pkgconfig.patch | 4 ++--
...-native_2.8.0.bb => fontconfig-native_2.9.0.bb} | 0
.../{fontconfig_2.8.0.bb => fontconfig_2.9.0.bb} | 16 ++++++----------
4 files changed, 8 insertions(+), 12 deletions(-)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 => fontconfig-2.9.0}/97_fontconfig (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig-2.8.0 => fontconfig-2.9.0}/fix-pkgconfig.patch (84%)
rename meta/recipes-graphics/fontconfig/{fontconfig-native_2.8.0.bb => fontconfig-native_2.9.0.bb} (100%)
rename meta/recipes-graphics/fontconfig/{fontconfig_2.8.0.bb => fontconfig_2.9.0.bb} (80%)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
similarity index 84%
rename from meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
rename to meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
index 30415fc..6be04a1 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch
@@ -4,8 +4,8 @@ Upstream-Status: Inappropriate [configuration]
fontconfig.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- fontconfig-2.8.0.orig/fontconfig.pc.in
-+++ fontconfig-2.8.0/fontconfig.pc.in
+--- fontconfig-2.9.0.orig/fontconfig.pc.in
++++ fontconfig-2.9.0/fontconfig.pc.in
@@ -7,5 +7,5 @@
Description: Font configuration and customization library
Version: @VERSION@
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
similarity index 100%
rename from meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
similarity index 80%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
index 55c04cc..7f3f111 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb
@@ -12,22 +12,22 @@ HOMEPAGE = "http://www.fontconfig.org"
BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
LICENSE = "MIT-style & MIT & PD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \
- file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \
- file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \
+ file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \
+ file://src/fccache.c;beginline=1077;endline=1092;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f"
SECTION = "libs"
DEPENDS = "expat freetype zlib"
-PR = "r4"
+PR = "r0"
SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
file://fix-pkgconfig.patch \
file://97_fontconfig"
-SRC_URI[md5sum] = "77e15a92006ddc2adbb06f840d591c0e"
-SRC_URI[sha256sum] = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
+SRC_URI[md5sum] = "26c83855ed256b5c032baae032fadc4f"
+SRC_URI[sha256sum] = "ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a"
PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
@@ -66,22 +66,18 @@ do_configure_append () {
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
- sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
- sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
- sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
- sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] fontsproto: upgrade to 2.1.2
2012-05-28 5:47 [PATCH 0/3] Package updates: fontconfig, fontsproto, libpciaccess Laurentiu Palcu
2012-05-28 5:47 ` [PATCH 1/3] fontconfig: upgrade to 2.9.0 Laurentiu Palcu
@ 2012-05-28 5:47 ` Laurentiu Palcu
2012-05-28 5:48 ` [PATCH 3/3] libpciaccess: upgrade to 0.13.1 Laurentiu Palcu
2012-05-30 12:02 ` [PATCH 0/3] Package updates: fontconfig, fontsproto, libpciaccess Richard Purdie
3 siblings, 0 replies; 5+ messages in thread
From: Laurentiu Palcu @ 2012-05-28 5:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../{fontsproto_2.1.1.bb => fontsproto_2.1.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{fontsproto_2.1.1.bb => fontsproto_2.1.2.bb} (77%)
diff --git a/meta/recipes-graphics/xorg-proto/fontsproto_2.1.1.bb b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.2.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-proto/fontsproto_2.1.1.bb
rename to meta/recipes-graphics/xorg-proto/fontsproto_2.1.2.bb
index af59240..d87786e 100644
--- a/meta/recipes-graphics/xorg-proto/fontsproto_2.1.1.bb
+++ b/meta/recipes-graphics/xorg-proto/fontsproto_2.1.2.bb
@@ -15,5 +15,5 @@ PE = "1"
BBCLASSEXTEND = "native"
-SRC_URI[md5sum] = "37102ffcaa73f77d700acd6f7a25d8f0"
-SRC_URI[sha256sum] = "9c9abc81e2927e6b6ffc6eece1f3fbc7559f506a2848673a21e72c0ae4d639bc"
+SRC_URI[md5sum] = "c5f4f1fb4ba7766eedbc9489e81f3be2"
+SRC_URI[sha256sum] = "869c97e5a536a8f3c9bc8b9923780ff1f062094bab935e26f96df3d6f1aa68a9"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] libpciaccess: upgrade to 0.13.1
2012-05-28 5:47 [PATCH 0/3] Package updates: fontconfig, fontsproto, libpciaccess Laurentiu Palcu
2012-05-28 5:47 ` [PATCH 1/3] fontconfig: upgrade to 2.9.0 Laurentiu Palcu
2012-05-28 5:47 ` [PATCH 2/3] fontsproto: upgrade to 2.1.2 Laurentiu Palcu
@ 2012-05-28 5:48 ` Laurentiu Palcu
2012-05-30 12:02 ` [PATCH 0/3] Package updates: fontconfig, fontsproto, libpciaccess Richard Purdie
3 siblings, 0 replies; 5+ messages in thread
From: Laurentiu Palcu @ 2012-05-28 5:48 UTC (permalink / raw)
To: openembedded-core
Removed also the fix_deletion_of_last_handle.patch because the new
version includes it.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../fix_deletion_of_last_handle.patch | 51 --------------------
...ciaccess_0.12.902.bb => libpciaccess_0.13.1.bb} | 6 +--
2 files changed, 2 insertions(+), 55 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.12.902.bb => libpciaccess_0.13.1.bb} (64%)
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch b/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
deleted file mode 100644
index 1933f45..0000000
--- a/meta/recipes-graphics/xorg-lib/libpciaccess-0.12.902/fix_deletion_of_last_handle.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream-Status: Backport
-
-The below patch is from
-http://cgit.freedesktop.org/xorg/lib/libpciaccess/commit/?id=a798395a1bfd9d06d40e2d8d14377a156c94429a
-It would appear in the next .tar.bz2 release.
-
-------------------------------
-
-commit a798395a1bfd9d06d40e2d8d14377a156c94429a
-Author: Daniel Drake <dsd@laptop.org>
-Date: Fri Nov 25 12:28:48 2011 -0600
-
- delete_io_handle: fix deletion of last handle
-
- When num_ios goes from 1 to 0, a realloc(ios, 0); call is made.
- This is equivalent to free(ios) and NULL is returned.
-
- However, the previous logic in the code incorrectly discards this NULL
- return value. When we next call new_io_handle(), realloc(ios, X) is
- called with "ios" pointing to freed memory. This causes glibc to abort.
-
- Correct this logic to detect the 1-to-0 case and handle it correctly.
- Other cases are unchanged; there is still value in checking the
- return value from realloc() as it also returns NULL on error.
-
- Signed-off-by: Daniel Drake <dsd@laptop.org>
- Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
-diff --git a/src/common_io.c b/src/common_io.c
-index f1319f8..5b35e07 100644
---- a/src/common_io.c
-+++ b/src/common_io.c
-@@ -64,10 +64,15 @@ delete_io_handle(struct pci_io_handle *handle)
- }
- }
-
-- new = realloc(ios, sizeof(struct pci_io_handle) * (num_ios - 1));
-- if (new)
-- ios = new;
- num_ios--;
-+ if (num_ios) {
-+ new = realloc(ios, sizeof(struct pci_io_handle) * num_ios);
-+ if (new)
-+ ios = new;
-+ } else {
-+ free(ios);
-+ ios = NULL;
-+ }
- }
-
- _pci_hidden void
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
similarity index 64%
rename from meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb
rename to meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
index 37d291f..178e220 100644
--- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.12.902.bb
+++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.1.bb
@@ -5,8 +5,6 @@ PCI bus and devices in a platform-independent way."
require xorg-lib-common.inc
-SRC_URI += "file://fix_deletion_of_last_handle.patch"
-
LICENSE = "MIT & MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=de01cb89a769dc657d4c321c209ce4fc"
@@ -14,5 +12,5 @@ PR = "r0"
DEPENDS += "xproto virtual/libx11"
-SRC_URI[md5sum] = "f1db198398a8a1143822acc230843e8c"
-SRC_URI[sha256sum] = "0861d5bf68b598baa307e5c9b06dfd38ae03096b46e36b236106517bcd14b63a"
+SRC_URI[md5sum] = "399a419ac6a54f0fc07c69c9bdf452dc"
+SRC_URI[sha256sum] = "27ab68f645691a4ca258dcc9d131040586e134f9233ce079794496f6264da084"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 0/3] Package updates: fontconfig, fontsproto, libpciaccess
2012-05-28 5:47 [PATCH 0/3] Package updates: fontconfig, fontsproto, libpciaccess Laurentiu Palcu
` (2 preceding siblings ...)
2012-05-28 5:48 ` [PATCH 3/3] libpciaccess: upgrade to 0.13.1 Laurentiu Palcu
@ 2012-05-30 12:02 ` Richard Purdie
3 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2012-05-30 12:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Mon, 2012-05-28 at 08:47 +0300, Laurentiu Palcu wrote:
> This patchset includes some leftovers from a previous commit that weren't merged because there were some
> suspicions that some packages (especially libpciaccess) might have some problems compiling/running on some
> architectures.
>
> This is what I tested:
> - that the packages compile fine on x86/ppc/arm/mips;
> - basic functionality in qemu for all architectures;
>
> Laurentiu Palcu (3):
> fontconfig: upgrade to 2.9.0
> fontsproto: upgrade to 2.1.2
> libpciaccess: upgrade to 0.13.1
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread