* Re: [PATCH 2/5] kernel.bbclass: respect MACHINE_KERNEL_PR
From: Koen Kooi @ 2011-10-20 11:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1319109715.16061.4.camel@ted>
Op 20 okt. 2011, om 13:21 heeft Richard Purdie het volgende geschreven:
> On Thu, 2011-10-20 at 08:23 +0200, Koen Kooi wrote:
>> Op 28 sep. 2011, om 22:04 heeft Otavio Salvador het volgende geschreven:
>>
>>> On Wed, Sep 28, 2011 at 16:50, Richard Purdie
>>> <richard.purdie@linuxfoundation.org> wrote:
>>>>> This patch improves the current situation and I don't foresee the
>>>>> autoPR code working soon
>>>>
>>>> Which is why we need to switch to that model and shake out the issues
>>>> sooner than later. Enough is enough with the PR madness and we need to
>>>> get to grips and fix it.
>>>
>>> I fully agree this is the way to go but this doesn't mean we ought to
>>> hold this patch until all this happens. This patch allows the removal
>>> of the kernel.bbclass from meta-oe so reducing the delta between
>>> oe-core and meta-oe.
>>
>> So a month later and no sign of the mythical working
>> auto-PR-incrementer or work on it.
>
> A month where we were stabilising for a release. Its on the 1.2 feature
> list and as it happens I've been hearing questions about what is needed
> here.
>
>> So can this patch go in? It would mean we can drop kernel.bbclass
>> from meta-oe.
>
> I *HATE* this PR bumping stuff. I've just been told we likely need to
> bump the PR for anything using libGL which once again shows that build
> system basically failing to automate building things.
>
> So I'm drawing a line here and no, we can't take this. If its fine to
> expect people to bump PR values manually for lib* changes, its fine for
> kernels too. I'd suggest you do drop this from meta-oe and we start
> building up pressure for the problem to get fixed properly rather than
> letting people wallpaper over the cracks.
I have products to ship, so treating meta-oe as a plaything and break this for the sake of breaking it is unacceptable. I'll let oe-core have the monopoly on high-qualitily, but broken metadata.
^ permalink raw reply
* Re: [PATCH 2/5] kernel.bbclass: respect MACHINE_KERNEL_PR
From: Richard Purdie @ 2011-10-20 11:21 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <67E90C92-F94E-4FF2-ADA5-A5295C4F1279@dominion.thruhere.net>
On Thu, 2011-10-20 at 08:23 +0200, Koen Kooi wrote:
> Op 28 sep. 2011, om 22:04 heeft Otavio Salvador het volgende geschreven:
>
> > On Wed, Sep 28, 2011 at 16:50, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >>> This patch improves the current situation and I don't foresee the
> >>> autoPR code working soon
> >>
> >> Which is why we need to switch to that model and shake out the issues
> >> sooner than later. Enough is enough with the PR madness and we need to
> >> get to grips and fix it.
> >
> > I fully agree this is the way to go but this doesn't mean we ought to
> > hold this patch until all this happens. This patch allows the removal
> > of the kernel.bbclass from meta-oe so reducing the delta between
> > oe-core and meta-oe.
>
> So a month later and no sign of the mythical working
> auto-PR-incrementer or work on it.
A month where we were stabilising for a release. Its on the 1.2 feature
list and as it happens I've been hearing questions about what is needed
here.
> So can this patch go in? It would mean we can drop kernel.bbclass
> from meta-oe.
I *HATE* this PR bumping stuff. I've just been told we likely need to
bump the PR for anything using libGL which once again shows that build
system basically failing to automate building things.
So I'm drawing a line here and no, we can't take this. If its fine to
expect people to bump PR values manually for lib* changes, its fine for
kernels too. I'd suggest you do drop this from meta-oe and we start
building up pressure for the problem to get fixed properly rather than
letting people wallpaper over the cracks.
Cheers,
Richard
^ permalink raw reply
* Re: [CONSOLIDATED PULL - v2 09/26] x86 tune files: set baselib for x32 tune as libx32
From: Phil Blundell @ 2011-10-20 9:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <84da55babd48c9de760d3ff271ba97e6a65926c8.1319096633.git.sgw@linux.intel.com>
On Thu, 2011-10-20 at 00:50 -0700, Saul Wold wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Why is this a good thing? There is no explanation in the commit
message.
p.
^ permalink raw reply
* Re: [PATCH 2/6] gmp: also generate the libgmpcxx library
From: Phil Blundell @ 2011-10-20 9:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4E9FD2B2.5000508@intel.com>
On Thu, 2011-10-20 at 00:50 -0700, Saul Wold wrote:
> The example case I found was a coreutils package that was built prior to
> this change failed to fulfill it's dependencies after this change when
> creating an image. If I rebuild coreutils with the newer gmp build,
> then all is well, I think we need to understand this better before
> making this change.
>
> Did something else change in the packaging that would cause use to look
> the mapping above?
If you've now got two DSOs in one output package (which it sounds like
you might have, since libgmpcxx was apparently added) then the autonamer
will be defeated. They need to go in separate PACKAGES for that to work
out right.
p.
^ permalink raw reply
* sdk path problem
From: James Limbouris @ 2011-10-20 8:22 UTC (permalink / raw)
To: openembedded-core@lists.openembedded.org
Hi,
I have been using meta-toolchain-qte in the past to cross compile a Qt app, and the Linux kernel.
Recently I replaced my old SDK image with a fresh one, and found that I could not link vmlinux anymore.
When building the kernel, I use the following ('rica' is the distribution name):
export PATH=$PATH:/usr/local/rica-eglibc-i686-armv5te/sysroots/i686-ricasdk-linux/usr/bin/armv5te-rica-linux-gnueabi/
make ARCH=arm CROSS_COMPILE=arm-rica-linux-gnueabi- zImage
The new error message is:
Kernel: arch/arm/boot/Image is ready
AS arch/arm/boot/compressed/head.o
GZIP arch/arm/boot/compressed/piggy.gz
CC arch/arm/boot/compressed/misc.o
AS arch/arm/boot/compressed/piggy.o
LD arch/arm/boot/compressed/vmlinux
arm-rica-linux-gnueabi-ld: cannot find libgcc.a: No such file or directory
Comparing the build with the old sdk to the build with the new one, I find that the command line for linking has changed from:
arm-rica-linux-gnueabi-ld -EL --defsym zreladdr=0x80008000 --defsym initrd_phys=0x80800000 --defsym params_phys=0x80000100 -p --no-undefined -X /usr/local/rica-eglibc-i686-armv5te/sysroots/arm-rica-linux-gnueabi/usr/lib/arm-rica-linux-gnueabi/4.5.4/libgcc.a -T arch/arm/boot/compressed/vmlinux.lds arch/arm/boot/compressed/head.o arch/arm/boot/compressed/piggy.o arch/arm/boot/compressed/misc.o -o arch/arm/boot/compressed/vmlinux
to:
arm-rica-linux-gnueabi-ld -EL --defsym zreladdr=0x80008000 --defsym initrd_phys=0x80800000 --defsym params_phys=0x80000100 -p --no-undefined -X libgcc.a -T arch/arm/boot/compressed/vmlinux.lds arch/arm/boot/compressed/head.o arch/arm/boot/compressed/piggy.o arch/arm/boot/compressed/misc.o -o arch/arm/boot/compressed/vmlinux
So libgcc.a has lost its path qualification.
I also straced the two linker commands, and found that they differed in one sequence.
Old:
lstat64("/usr/local/rica-eglibc-i686-armv5te", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
lstat64("/usr/local/rica-eglibc-i686-armv5te/sysroots", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
lstat64("/usr/local/rica-eglibc-i686-armv5te/sysroots/arm-rica-linux-gnueabi", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
New:
lstat64("/usr/local/rica-eglibc-i686-armv5te", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
lstat64("/usr/local/rica-eglibc-i686-armv5te/sysroots", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
lstat64("/usr/local/rica-eglibc-i686-armv5te/sysroots/arm-rica-linux-gnueabi", 0xbffe67cc) = -1 ENOENT (No such file or directory)
Both toolchains are looking for a sysroot at 'arm-rica-linux-gnueabi', but the new toolchain should be looking at 'armv5te-rica-linux-gnueabi', as the names have changed.
I'm not yet acquainted with the darker arts of toolchain generation. Can anyone help with this?
Regards,
James Limbouris
^ permalink raw reply
* Re: [PATCH 2/6] gmp: also generate the libgmpcxx library
From: Koen Kooi @ 2011-10-20 8:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4E9FD2B2.5000508@intel.com>
Op 20 okt. 2011, om 09:50 heeft Saul Wold het volgende geschreven:
> On 10/18/2011 05:30 PM, nitin.a.kamble@intel.com wrote:
>> From: Nitin A Kamble<nitin.a.kamble@intel.com>
>>
>> configure runs few checks to make sure c++ compiler and runtime are working as expected
>> with the --enable-cxx=detect option.
>>
> Somehow this change has also changed what the gmp package provides, before this change the package provided libgmp10 via PKG_gmp: libgmp10, after this change, the libgmp10 is no longer provided and causes other breakage.
>
> The example case I found was a coreutils package that was built prior to this change failed to fulfill it's dependencies after this change when creating an image. If I rebuild coreutils with the newer gmp build, then all is well, I think we need to understand this better before making this change.
>
> Did something else change in the packaging that would cause use to look the mapping above?
I suspect the shlib renaming doesn't happen when 2 libraries are present without LEAD_SONAME being set in the recipe. I suggest making a new subpackage for libgmpcxx.
regards,
Koen
^ permalink raw reply
* [CONSOLIDATED PULL - v2 26/26] distro-tracking-fields: update fields for tzdata and gst-plugins-good
From: Saul Wold @ 2011-10-20 7:51 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Joshua Lock <josh@linux.intel.com>
These recipes were each updated and so should their tracking data be.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 770f835..1f3540e 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -1714,14 +1714,14 @@ RECIPE_LATEST_RELEASE_DATE_pn-udev = "06/2010"
RECIPE_COMMENTS_pn-udev = "may need different versions for different kernels"
RECIPE_STATUS_pn-tzdata = "green"
-RECIPE_LATEST_VERSION_pn-tzdata = "2011k"
-RECIPE_LATEST_RELEASE_DATE_pn-tzdata = "Sep 26, 2011"
-RECIPE_LAST_UPDATE_pn-tzdata = "Oct 6, 2011"
+RECIPE_LATEST_VERSION_pn-tzdata = "2011l"
+RECIPE_LATEST_RELEASE_DATE_pn-tzdata = "Oct 10, 2011"
+RECIPE_LAST_UPDATE_pn-tzdata = "Oct 18, 2011"
RECIPE_MAINTAINER_pn-tzdata = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-tzdata = "not done"
RECIPE_INTEL_SECTION_pn-tzdata = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-tzdata = "1 month"
-RECIPE_MANUAL_CHECK_DATE_pn-tzdata = "Oct 6, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-tzdata = "Oct 18, 2011"
RECIPE_COMMENTS_pn-tzdata = ""
DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
@@ -2585,11 +2585,11 @@ RECIPE_MAINTAINER_pn-gst-plugins-base = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-gst-plugins-good="green"
DISTRO_PN_ALIAS_pn-gst-plugins-good = "Meego=gst-plugins-good Fedora=gstreamer-plugins-good OpenSuSE=gstreamer-plugins-good Ubuntu=gst-plugins-good0.10 Mandriva=gstreamer0.10-plugins-good Debian=gst-plugins-good0.10"
-RECIPE_LATEST_VERSION_pn-gst-plugins-good="0.10.28"
+RECIPE_LATEST_VERSION_pn-gst-plugins-good="0.10.30"
RECIPE_NO_OF_PATCHES_pn-gst-plugins-good="0"
-RECIPE_LATEST_RELEASE_DATE_pn-gst-plugins-good="2011/03/08"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-plugins-good="2 month"
-RECIPE_LAST_UPDATE_pn-gst-plugins-good = "Apr 15, 2011"
+RECIPE_LATEST_RELEASE_DATE_pn-gst-plugins-good="Jun 15, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-plugins-good="1 month"
+RECIPE_LAST_UPDATE_pn-gst-plugins-good = "Oct 19, 2011"
RECIPE_MAINTAINER_pn-gst-plugins-good = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-gst-plugins-ugly="green"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 25/26] gst-plugins-good: correctly handle gconf schema
From: Saul Wold @ 2011-10-20 7:51 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Joshua Lock <josh@linux.intel.com>
Add the shipped gconf schema to the base package and inherit the gconf class
so that scheme processing is handled via post* scripts.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../gstreamer/gst-plugins-good_0.10.30.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
index 96855aa..d63b09a 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
speex libsoup-2.4 pulseaudio"
-PR = "r2"
+PR = "r3"
-inherit gettext
+inherit gettext gconf
EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check"
@@ -20,3 +20,5 @@ do_configure_prepend() {
SRC_URI[md5sum] = "62fd7a3ef187c4f99b3d7c352d58dae9"
SRC_URI[sha256sum] = "b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6"
+
+FILES_${PN} += "${sysconfdir}/gconf/schemas/gstreamer-0.10.schemas"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 24/26] tzcode-native: update SRC_URI to new IANA location
From: Saul Wold @ 2011-10-20 7:51 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Joshua Lock <josh@linux.intel.com>
The TZ database has moved, it's now hosted by IANA.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../recipes-extended/tzcode/tzcode-native_2011i.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/tzcode/tzcode-native_2011i.bb b/meta/recipes-extended/tzcode/tzcode-native_2011i.bb
index 0cdf400..b8ccff0 100644
--- a/meta/recipes-extended/tzcode/tzcode-native_2011i.bb
+++ b/meta/recipes-extended/tzcode/tzcode-native_2011i.bb
@@ -4,8 +4,8 @@ PR = "r0"
LIC_FILES_CHKSUM = "file://${WORKDIR}/README;md5=3ae8198f82258417ce29066d3b034035"
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz;name=tzcode \
- ftp://elsie.nci.nih.gov/pub/tzdata2011i.tar.gz;name=tzdata"
+SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
+ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
SRC_URI[tzcode.md5sum] = "cf7f4335b7c8682899fa2814e711c1b2"
SRC_URI[tzcode.sha256sum] = "f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 23/26] tzdata: updated SRC_URI and update to 2011k
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Joshua Lock <josh@linux.intel.com>
tzdata is now hosted by IANA at http://www.iana.org/time-zones
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../tzdata/{tzdata_2011k.bb => tzdata_2011l.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/tzdata/{tzdata_2011k.bb => tzdata_2011l.bb} (96%)
diff --git a/meta/recipes-extended/tzdata/tzdata_2011k.bb b/meta/recipes-extended/tzdata/tzdata_2011l.bb
similarity index 96%
rename from meta/recipes-extended/tzdata/tzdata_2011k.bb
rename to meta/recipes-extended/tzdata/tzdata_2011l.bb
index 45f2c4d..140f8ed 100644
--- a/meta/recipes-extended/tzdata/tzdata_2011k.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2011l.bb
@@ -12,10 +12,10 @@ RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
timezone-australia timezone-europe timezone-indian \
timezone-iso3166.tab timezone-pacific timezone-zone.tab"
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz;name=tzdata"
+SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
-SRC_URI[tzdata.md5sum] = "9da1c2d4d1a01f9f504b73ccd371830f"
-SRC_URI[tzdata.sha256sum] = "51f7d2a42b7fb9465feced642a6676afdf8b04a071e55f3fef1f0925bd67ef21"
+SRC_URI[tzdata.md5sum] = "bae1b93673e1aef80186c90dfd493f1c"
+SRC_URI[tzdata.sha256sum] = "cb9fec68a19c9c3b900bb71f3ca20d0051a863f765387b52fc2d144a5bbb0c7d"
S = "${WORKDIR}"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 22/26] gst-plugins-good: update to 0.10.30
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
...good_0.10.28.bb => gst-plugins-good_0.10.30.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gst-plugins-good_0.10.28.bb => gst-plugins-good_0.10.30.bb} (84%)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
similarity index 84%
rename from meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
rename to meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
index 6c837a7..96855aa 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.28.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.30.bb
@@ -18,5 +18,5 @@ do_configure_prepend() {
rm ${S}/m4/lib-link.m4 || true
}
-SRC_URI[md5sum] = "6ef1588921f59d85c44ee2e49a3c97a0"
-SRC_URI[sha256sum] = "adfbce68b9fbadb7a7aeda2227af6afe1928ef025af4158726617b9d6834b028"
+SRC_URI[md5sum] = "62fd7a3ef187c4f99b3d7c352d58dae9"
+SRC_URI[sha256sum] = "b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 17/26] libsdl: update to 1.2.14
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Kang Kai <kai.kang@windriver.com>
Update libsdl to 1.2.14
* update configure_tweak.patch
* update bb file, including add configure option --disable-video-ps3,
drop acinclude.m4 and kernel-asm-page.patch and remove old libtool macros
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
meta/recipes-graphics/libsdl/files/acinclude.m4 | 189 -------------
.../libsdl/files/configure_tweak.patch | 281 +++++++++-----------
.../libsdl/files/kernel-asm-page.patch | 15 -
.../libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb} | 17 +-
4 files changed, 139 insertions(+), 363 deletions(-)
delete mode 100644 meta/recipes-graphics/libsdl/files/acinclude.m4
delete mode 100644 meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
rename meta/recipes-graphics/libsdl/{libsdl_1.2.11.bb => libsdl_1.2.14.bb} (81%)
diff --git a/meta/recipes-graphics/libsdl/files/acinclude.m4 b/meta/recipes-graphics/libsdl/files/acinclude.m4
deleted file mode 100644
index ca2df9d..0000000
--- a/meta/recipes-graphics/libsdl/files/acinclude.m4
+++ /dev/null
@@ -1,189 +0,0 @@
-# Local macros for the SDL configure.in script
-
-dnl Function to link an architecture specific file
-dnl LINK_ARCH_SRC(source_dir, arch, source_file)
-AC_DEFUN([COPY_ARCH_SRC],
-[
- old="$srcdir/$1/$2/$3"
- new="$1/$3"
- if test ! -d $1; then
- echo "Creating directory $1"
- mkdir -p $1
- fi
- echo "Copying $old -> $new"
- cat >$new <<__EOF__
-/* WARNING: This file was automatically generated!
- * Original: $old
- */
-__EOF__
- cat >>$new <$old
-])
-
-#
-# --- esd.m4 ---
-#
-# Configure paths for ESD
-# Manish Singh 98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-dnl
-AC_DEFUN([AM_PATH_ESD],
-[dnl
-dnl Get the cflags and libraries from the esd-config script
-dnl
-AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)],
- esd_prefix="$withval", esd_prefix="")
-AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
- esd_exec_prefix="$withval", esd_exec_prefix="")
-AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program],
- , enable_esdtest=yes)
-
- if test x$esd_exec_prefix != x ; then
- esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
- if test x${ESD_CONFIG+set} != xset ; then
- ESD_CONFIG=$esd_exec_prefix/bin/esd-config
- fi
- fi
- if test x$esd_prefix != x ; then
- esd_args="$esd_args --prefix=$esd_prefix"
- if test x${ESD_CONFIG+set} != xset ; then
- ESD_CONFIG=$esd_prefix/bin/esd-config
- fi
- fi
-
- AC_PATH_PROG(ESD_CONFIG, esd-config, no)
- min_esd_version=ifelse([$1], ,0.2.7,$1)
- AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
- no_esd=""
- if test "$ESD_CONFIG" = "no" ; then
- no_esd=yes
- else
- ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
- ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-
- esd_major_version=`$ESD_CONFIG $esd_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- esd_minor_version=`$ESD_CONFIG $esd_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_esdtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $ESD_CFLAGS"
- LIBS="$LIBS $ESD_LIBS"
-dnl
-dnl Now check if the installed ESD is sufficiently new. (Also sanity
-dnl checks the results of esd-config to some extent
-dnl
- rm -f conf.esdtest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <esd.h>
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.esdtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_esd_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_esd_version");
- exit(1);
- }
-
- if (($esd_major_version > major) ||
- (($esd_major_version == major) && ($esd_minor_version > minor)) ||
- (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
- printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
- printf("*** to point to the correct copy of esd-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_esd" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$ESD_CONFIG" = "no" ; then
- echo "*** The esd-config script installed by ESD could not be found"
- echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the ESD_CONFIG environment variable to the"
- echo "*** full path to esd-config."
- else
- if test -f conf.esdtest ; then
- :
- else
- echo "*** Could not run ESD test program, checking why..."
- CFLAGS="$CFLAGS $ESD_CFLAGS"
- LIBS="$LIBS $ESD_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <esd.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding ESD or finding the wrong"
- echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means ESD was incorrectly installed"
- echo "*** or that you have moved ESD since it was installed. In the latter case, you"
- echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- ESD_CFLAGS=""
- ESD_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(ESD_CFLAGS)
- AC_SUBST(ESD_LIBS)
- rm -f conf.esdtest
-])
-
diff --git a/meta/recipes-graphics/libsdl/files/configure_tweak.patch b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
index 90a2888..55d203a 100644
--- a/meta/recipes-graphics/libsdl/files/configure_tweak.patch
+++ b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
@@ -1,14 +1,7 @@
-Index: SDL-1.2.11/configure.in
-===================================================================
---- SDL-1.2.11.orig/configure.in 2006-06-27 05:48:33.000000000 +0100
-+++ SDL-1.2.11/configure.in 2008-02-21 19:48:47.000000000 +0000
-@@ -40,13 +40,13 @@
- AC_SUBST(LT_AGE)
-
- dnl Detect the canonical build and host environments
--AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
-+AC_CONFIG_AUX_DIR(./build-scripts)
- AC_CANONICAL_HOST
+--- SDL-1.2.14/configure.in.orig 2011-10-18 14:51:32.044167004 +0800
++++ SDL-1.2.14/configure.in 2011-10-18 14:51:42.374167009 +0800
+@@ -48,9 +48,9 @@
+ dnl AC_CANONICAL_HOST
AC_C_BIGENDIAN
if test x$ac_cv_c_bigendian = xyes; then
- AC_DEFINE(SDL_BYTEORDER, 4321)
@@ -18,8 +11,8 @@ Index: SDL-1.2.11/configure.in
+ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order")
fi
- dnl Set up the compiler and linker flags
-@@ -107,7 +107,7 @@
+ dnl Check for tools
+@@ -139,7 +139,7 @@
AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]),
, enable_libc=yes)
if test x$enable_libc = xyes; then
@@ -28,7 +21,7 @@ Index: SDL-1.2.11/configure.in
dnl Check for C library headers
AC_HEADER_STDC
-@@ -118,7 +118,7 @@
+@@ -150,7 +150,7 @@
if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then
AC_CHECK_TYPE(int64_t)
if test x$ac_cv_type_int64_t = xyes; then
@@ -37,8 +30,8 @@ Index: SDL-1.2.11/configure.in
fi
have_inttypes=yes
fi
-@@ -127,11 +127,11 @@
- AC_FUNC_ALLOCA
+@@ -166,11 +166,11 @@
+
AC_FUNC_MEMCMP
if test x$ac_cv_func_memcmp_working = xyes; then
- AC_DEFINE(HAVE_MEMCMP)
@@ -49,9 +42,9 @@ Index: SDL-1.2.11/configure.in
- AC_DEFINE(HAVE_STRTOD)
+ AC_DEFINE(HAVE_STRTOD,1,"")
fi
- AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep)
-
-@@ -146,40 +146,40 @@
+ AC_CHECK_FUNC(mprotect,
+ AC_TRY_COMPILE([
+@@ -194,40 +194,40 @@
AC_CHECK_SIZEOF(long, 4)
AC_CHECK_SIZEOF(long long, 8)
if test x$ac_cv_sizeof_char = x1; then
@@ -110,7 +103,7 @@ Index: SDL-1.2.11/configure.in
fi
# Standard C sources
-@@ -201,67 +201,67 @@
+@@ -248,25 +248,25 @@
AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]),
, enable_audio=yes)
if test x$enable_audio != xyes; then
@@ -137,8 +130,10 @@ Index: SDL-1.2.11/configure.in
if test x$enable_joystick != xyes; then
- AC_DEFINE(SDL_JOYSTICK_DISABLED)
+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
+ else
+ SOURCES="$SOURCES $srcdir/src/joystick/*.c"
fi
- AC_ARG_ENABLE(cdrom,
+@@ -274,43 +274,43 @@
AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
, enable_cdrom=yes)
if test x$enable_cdrom != xyes; then
@@ -189,7 +184,7 @@ Index: SDL-1.2.11/configure.in
fi
dnl See if the OSS audio interface is supported
-@@ -289,12 +289,12 @@
+@@ -338,12 +338,12 @@
int arg = SNDCTL_DSP_SETFRAGMENT;
],[
have_oss=yes
@@ -204,7 +199,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c"
SOURCES="$SOURCES $srcdir/src/audio/dma/*.c"
have_audio=yes
-@@ -314,45 +314,7 @@
+@@ -363,35 +363,7 @@
AC_ARG_ENABLE(alsa,
AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
, enable_alsa=yes)
@@ -218,18 +213,7 @@ Index: SDL-1.2.11/configure.in
- AC_ARG_ENABLE(alsa-shared,
-AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
- , enable_alsa_shared=yes)
-- if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-- ALSA_LIBS="-L/lib $ALSA_LIBS"
-- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
-- fi
-- fi
-- alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
-- alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
-- echo "-- $alsa_lib_spec -> $alsa_lib"
+- alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
-
- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
@@ -240,6 +224,7 @@ Index: SDL-1.2.11/configure.in
- fi
- if test x$have_loadso = xyes && \
- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
+- echo "-- dynamic libasound -> $alsa_lib"
- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
@@ -251,7 +236,7 @@ Index: SDL-1.2.11/configure.in
}
dnl Check whether we want to use IRIX 6.5+ native audio or not
-@@ -371,7 +333,7 @@
+@@ -410,7 +382,7 @@
AC_MSG_RESULT($have_dmedia)
# Set up files for the audio library
if test x$have_dmedia = xyes; then
@@ -260,7 +245,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
have_audio=yes
-@@ -408,7 +370,7 @@
+@@ -447,7 +419,7 @@
AC_MSG_RESULT($have_mme)
# Set up files for the audio library
if test x$have_mme = xyes; then
@@ -269,52 +254,52 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/audio/mme/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS"
-@@ -433,7 +395,7 @@
- esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
- echo "-- $esd_lib_spec -> $esd_lib"
+@@ -470,7 +442,7 @@
+ , enable_esd_shared=yes)
+ esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
- AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
+ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"")
SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS"
if test x$have_loadso != xyes && \
-@@ -442,7 +404,7 @@
- fi
+@@ -480,7 +452,7 @@
if test x$have_loadso = xyes && \
test x$enable_esd_shared = xyes && test x$esd_lib != x; then
+ echo "-- dynamic libesd -> $esd_lib"
- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
fi
-@@ -485,7 +447,7 @@
- arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
- echo "-- $arts_lib_spec -> $arts_lib"
+@@ -567,7 +539,7 @@
+ , enable_arts_shared=yes)
+ arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
+ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "")
SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS"
if test x$have_loadso != xyes && \
-@@ -494,7 +456,7 @@
- fi
+@@ -577,7 +549,7 @@
if test x$have_loadso = xyes && \
test x$enable_arts_shared = xyes && test x$arts_lib != x; then
+ echo "-- dynamic libartsc -> $arts_lib"
- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
fi
-@@ -527,7 +489,7 @@
- fi
- AC_MSG_RESULT($have_nas)
- if test x$have_nas = xyes; then
+@@ -637,7 +609,7 @@
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
+ fi
+
- AC_DEFINE(SDL_AUDIO_DRIVER_NAS)
+ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"")
SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
-@@ -543,7 +505,7 @@
+ have_audio=yes
+@@ -652,7 +624,7 @@
AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]),
, enable_diskaudio=yes)
if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
@@ -323,7 +308,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/audio/disk/*.c"
fi
}
-@@ -555,7 +517,7 @@
+@@ -664,7 +636,7 @@
AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]),
, enable_dummyaudio=yes)
if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then
@@ -332,7 +317,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c"
fi
}
-@@ -571,7 +533,7 @@
+@@ -680,7 +652,7 @@
AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes)
if test x$have_mint_falcon_hdr = xyes; then
mintaudio=yes
@@ -341,16 +326,16 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/audio/mint/*.c"
SOURCES="$SOURCES $srcdir/src/audio/mint/*.S"
have_audio=yes
-@@ -602,7 +564,7 @@
+@@ -756,7 +728,7 @@
AC_PATH_PROG(NASM, nasm)
fi
if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
- AC_DEFINE(SDL_HERMES_BLITTERS)
+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"")
SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
- if test x"$NASMFLAGS" = x; then
- case $ARCH in
-@@ -713,9 +675,9 @@
+ NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/"
+
+@@ -850,9 +822,9 @@
CFLAGS="$save_CFLAGS"
if test x$have_gcc_altivec = xyes; then
@@ -362,7 +347,7 @@ Index: SDL-1.2.11/configure.in
fi
EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS"
fi
-@@ -758,7 +720,7 @@
+@@ -895,7 +867,7 @@
if test x$enable_ipod = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
@@ -371,7 +356,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
fi
}
-@@ -792,7 +754,7 @@
+@@ -929,7 +901,7 @@
EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB"
fi
@@ -380,7 +365,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/nanox/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X"
have_video=yes
-@@ -881,7 +843,7 @@
+@@ -995,7 +967,7 @@
CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
@@ -389,7 +374,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
-@@ -903,8 +865,8 @@
+@@ -1017,8 +989,8 @@
test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
echo "-- dynamic libX11 -> $x11_lib"
echo "-- dynamic libX11ext -> $x11ext_lib"
@@ -400,7 +385,7 @@ Index: SDL-1.2.11/configure.in
else
enable_x11_shared=no
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext"
-@@ -921,20 +883,20 @@
+@@ -1035,20 +1007,20 @@
AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
, enable_video_dga=yes)
if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
@@ -424,7 +409,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
fi
AC_ARG_ENABLE(video-x11-xv,
-@@ -948,14 +910,14 @@
+@@ -1062,14 +1034,14 @@
AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
, enable_video_x11_xinerama=yes)
if test x$enable_video_x11_xinerama = xyes; then
@@ -441,7 +426,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
fi
AC_ARG_ENABLE(video-x11-xrandr,
-@@ -972,8 +934,8 @@
+@@ -1086,8 +1058,8 @@
if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
echo "-- dynamic libXrender -> $xrender_lib"
echo "-- dynamic libXrandr -> $xrandr_lib"
@@ -452,25 +437,16 @@ Index: SDL-1.2.11/configure.in
definitely_enable_video_x11_xrandr=yes
else
AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
-@@ -986,7 +948,7 @@
+@@ -1100,7 +1072,7 @@
fi
fi
if test x$definitely_enable_video_x11_xrandr = xyes; then
- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"")
fi
- AC_ARG_ENABLE(video-x11-dpms,
- AC_HELP_STRING([--enable-video-x11-dpms], [enable X11 DPMS extension [[default=yes]]]),
-@@ -998,7 +960,7 @@
- [#include <X11/Xlib.h>
- ])
- if test x$have_dpms_h_hdr = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS,1,"")
- fi
- fi
fi
-@@ -1026,7 +988,7 @@
+ fi
+@@ -1127,7 +1099,7 @@
])
AC_MSG_RESULT($video_photon)
if test x$video_photon = xyes; then
@@ -479,7 +455,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph"
have_video=yes
-@@ -1040,7 +1002,7 @@
+@@ -1141,7 +1113,7 @@
CheckBWINDOW()
{
if test x$enable_video = xyes; then
@@ -488,7 +464,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
have_video=yes
fi
-@@ -1063,7 +1025,7 @@
+@@ -1164,7 +1136,7 @@
])
AC_MSG_RESULT($have_carbon)
if test x$have_carbon = xyes; then
@@ -497,7 +473,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c"
SOURCES="$SOURCES $srcdir/src/video/macrom/*.c"
have_video=yes
-@@ -1092,7 +1054,7 @@
+@@ -1193,7 +1165,7 @@
AC_MSG_RESULT($have_cocoa)
CFLAGS="$save_CFLAGS"
if test x$have_cocoa = xyes; then
@@ -506,17 +482,17 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/quartz/*.m"
have_video=yes
fi
-@@ -1118,7 +1080,7 @@
- ])
+@@ -1220,7 +1192,7 @@
AC_MSG_RESULT($video_fbcon)
if test x$video_fbcon = xyes; then
+ AC_CHECK_FUNCS(getpagesize)
- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON)
+ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"")
SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
have_video=yes
fi
-@@ -1163,7 +1125,7 @@
- fi
+@@ -1271,7 +1243,7 @@
+ AC_MSG_RESULT($video_directfb)
if test x$video_directfb = xyes; then
- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB)
@@ -524,7 +500,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
-@@ -1190,7 +1152,7 @@
+@@ -1298,7 +1270,7 @@
])
AC_MSG_RESULT($video_ps2gs)
if test x$video_ps2gs = xyes; then
@@ -533,7 +509,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c"
have_video=yes
fi
-@@ -1215,7 +1177,7 @@
+@@ -1350,7 +1322,7 @@
])
AC_MSG_RESULT($video_ggi)
if test x$video_ggi = xyes; then
@@ -542,7 +518,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/ggi/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg"
have_video=yes
-@@ -1245,7 +1207,7 @@
+@@ -1380,7 +1352,7 @@
])
AC_MSG_RESULT($video_svga)
if test x$video_svga = xyes; then
@@ -551,7 +527,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/svga/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga"
have_video=yes
-@@ -1277,7 +1239,7 @@
+@@ -1412,7 +1384,7 @@
])
AC_MSG_RESULT($video_vgl)
if test x$video_vgl = xyes; then
@@ -560,7 +536,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/vgl/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl"
have_video=yes
-@@ -1305,7 +1267,7 @@
+@@ -1440,7 +1412,7 @@
])
AC_MSG_RESULT($video_wscons)
if test x$video_wscons = xyes; then
@@ -569,7 +545,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
have_video=yes
fi
-@@ -1330,7 +1292,7 @@
+@@ -1465,7 +1437,7 @@
])
AC_MSG_RESULT($video_aalib)
if test x$video_aalib = xyes; then
@@ -578,7 +554,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
have_video=yes
-@@ -1360,7 +1322,7 @@
+@@ -1527,7 +1499,7 @@
CXXFLAGS="$OLD_CXX"
AC_MSG_RESULT($video_qtopia)
if test x$video_qtopia = xyes; then
@@ -587,7 +563,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS"
-@@ -1389,7 +1351,7 @@
+@@ -1556,7 +1528,7 @@
])
AC_MSG_RESULT($video_picogui)
if test x$video_picogui = xyes; then
@@ -596,7 +572,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/picogui/*.c"
SDL_LIBS="$SDL_LIBS -lpgui"
have_video=yes
-@@ -1413,7 +1375,7 @@
+@@ -1580,7 +1552,7 @@
video_xbios=no
if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
video_xbios=yes
@@ -605,7 +581,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/xbios/*.c"
have_video=yes
fi
-@@ -1431,7 +1393,7 @@
+@@ -1598,7 +1570,7 @@
AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes)
if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then
video_gem=yes
@@ -614,7 +590,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/gem/*.c"
SDL_LIBS="$SDL_LIBS -lgem"
have_video=yes
-@@ -1446,7 +1408,7 @@
+@@ -1613,7 +1585,7 @@
AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]),
, enable_video_dummy=yes)
if test x$enable_video_dummy = xyes; then
@@ -623,7 +599,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/dummy/*.c"
have_video=yes
fi
-@@ -1472,8 +1434,8 @@
+@@ -1640,8 +1612,8 @@
])
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
@@ -634,7 +610,7 @@ Index: SDL-1.2.11/configure.in
fi
fi
}
-@@ -1492,7 +1454,7 @@
+@@ -1660,7 +1632,7 @@
])
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
@@ -643,7 +619,7 @@ Index: SDL-1.2.11/configure.in
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
fi
fi
-@@ -1502,8 +1464,8 @@
+@@ -1670,8 +1642,8 @@
CheckWIN32GL()
{
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -654,7 +630,7 @@ Index: SDL-1.2.11/configure.in
fi
}
-@@ -1511,7 +1473,7 @@
+@@ -1679,7 +1651,7 @@
CheckBeGL()
{
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -663,7 +639,7 @@ Index: SDL-1.2.11/configure.in
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
fi
}
-@@ -1520,7 +1482,7 @@
+@@ -1688,7 +1660,7 @@
CheckMacGL()
{
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -672,7 +648,7 @@ Index: SDL-1.2.11/configure.in
case "$host" in
*-*-darwin*)
if test x$enable_video_cocoa = xyes; then
-@@ -1552,8 +1514,8 @@
+@@ -1720,8 +1692,8 @@
OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
OSMESA_LIBS=`$OSMESA_CONFIG --libs`
fi
@@ -683,7 +659,7 @@ Index: SDL-1.2.11/configure.in
SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS"
SDL_LIBS="$SDL_LIBS $OSMESA_LIBS"
-@@ -1563,7 +1525,7 @@
+@@ -1731,7 +1703,7 @@
if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
# Dynamic linking
if test "x$have_osmesa_hdr" = "xyes"; then
@@ -692,7 +668,7 @@ Index: SDL-1.2.11/configure.in
fi
fi
fi
-@@ -1590,7 +1552,7 @@
+@@ -1765,7 +1737,7 @@
])
AC_MSG_RESULT($use_input_events)
if test x$use_input_events = xyes; then
@@ -701,7 +677,7 @@ Index: SDL-1.2.11/configure.in
fi
fi
}
-@@ -1612,7 +1574,7 @@
+@@ -1787,7 +1759,7 @@
])
AC_MSG_RESULT($enable_input_tslib)
if test x$enable_input_tslib = xyes; then
@@ -710,7 +686,7 @@ Index: SDL-1.2.11/configure.in
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
fi
fi
-@@ -1635,7 +1597,7 @@
+@@ -1810,7 +1782,7 @@
AC_MSG_CHECKING(pth)
AC_MSG_RESULT($use_pth)
if test "x$use_pth" = xyes; then
@@ -719,7 +695,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/thread/pth/*.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c"
SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`"
-@@ -1741,7 +1703,7 @@
+@@ -1916,7 +1888,7 @@
# Do futher testing if we have pthread support...
if test x$use_pthreads = xyes; then
@@ -728,7 +704,7 @@ Index: SDL-1.2.11/configure.in
EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
-@@ -1763,7 +1725,7 @@
+@@ -1938,7 +1910,7 @@
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
],[
has_recursive_mutexes=yes
@@ -737,7 +713,7 @@ Index: SDL-1.2.11/configure.in
])
fi
if test x$has_recursive_mutexes = xno; then
-@@ -1774,7 +1736,7 @@
+@@ -1949,7 +1921,7 @@
pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
],[
has_recursive_mutexes=yes
@@ -746,7 +722,7 @@ Index: SDL-1.2.11/configure.in
])
fi
AC_MSG_RESULT($has_recursive_mutexes)
-@@ -1849,7 +1811,7 @@
+@@ -2024,7 +1996,7 @@
fi
if test x$enable_video = xyes; then
@@ -755,7 +731,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
have_video=yes
-@@ -1871,7 +1833,7 @@
+@@ -2046,7 +2018,7 @@
have_directx=yes
fi
if test x$enable_video = xyes -a x$have_directx = xyes; then
@@ -764,19 +740,16 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
have_video=yes
fi
-@@ -1904,9 +1866,9 @@
+@@ -2077,7 +2049,7 @@
+ AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS",
+ AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl",
AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl")))
- AC_CHECK_LIB(dl, dlvsym, have_dlvsym=yes)
- if test x$have_dlvsym = xyes; then
-- AC_DEFINE(HAVE_DLVSYM)
-+ AC_DEFINE(HAVE_DLVSYM,1,"")
- fi
- AC_DEFINE(SDL_LOADSO_DLOPEN)
+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
have_loadso=yes
fi
-@@ -1923,7 +1885,7 @@
+@@ -2094,7 +2066,7 @@
AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes)
AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem)
if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then
@@ -785,7 +758,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c"
SDL_LIBS="$SDL_LIBS -lldg -lgem"
have_loadso=yes
-@@ -2049,11 +2011,11 @@
+@@ -2225,11 +2197,11 @@
have_machine_joystick=yes
])
if test x$have_machine_joystick = xyes; then
@@ -799,7 +772,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
-@@ -2072,7 +2034,7 @@
+@@ -2248,7 +2220,7 @@
if test x$enable_clock_gettime = xyes; then
AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
if test x$have_clock_gettime = xyes; then
@@ -808,7 +781,7 @@ Index: SDL-1.2.11/configure.in
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
fi
fi
-@@ -2103,7 +2065,7 @@
+@@ -2279,7 +2251,7 @@
CheckIPod
# Set up files for the timer library
if test x$enable_timers = xyes; then
@@ -817,7 +790,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
have_timers=yes
fi
-@@ -2166,17 +2128,17 @@
+@@ -2345,17 +2317,17 @@
if test x$enable_audio = xyes; then
case $ARCH in
sysv5|solaris|hpux)
@@ -838,7 +811,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
have_audio=yes
;;
-@@ -2186,7 +2148,7 @@
+@@ -2365,7 +2337,7 @@
if test x$enable_joystick = xyes; then
case $ARCH in
linux)
@@ -847,7 +820,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
have_joystick=yes
;;
-@@ -2196,32 +2158,32 @@
+@@ -2375,32 +2347,32 @@
if test x$enable_cdrom = xyes; then
case $ARCH in
linux|solaris)
@@ -886,7 +859,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
have_cdrom=yes
;;
-@@ -2229,7 +2191,7 @@
+@@ -2408,7 +2380,7 @@
fi
# Set up files for the thread library
if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
@@ -895,7 +868,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
-@@ -2237,7 +2199,7 @@
+@@ -2416,7 +2388,7 @@
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
@@ -904,7 +877,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
have_timers=yes
fi
-@@ -2256,20 +2218,20 @@
+@@ -2435,20 +2407,20 @@
CheckPTHREAD
# Set up files for the audio library
if test x$enable_audio = xyes; then
@@ -928,7 +901,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
have_timers=yes
fi
-@@ -2294,29 +2256,29 @@
+@@ -2473,29 +2445,29 @@
CheckNASM
# Set up files for the audio library
if test x$enable_audio = xyes; then
@@ -963,7 +936,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
-@@ -2325,13 +2287,13 @@
+@@ -2504,13 +2476,13 @@
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
@@ -979,7 +952,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
have_loadso=yes
fi
-@@ -2356,25 +2318,25 @@
+@@ -2579,25 +2551,25 @@
CheckBeGL
# Set up files for the audio library
if test x$enable_audio = xyes; then
@@ -1009,7 +982,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/thread/beos/*.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
-@@ -2382,13 +2344,13 @@
+@@ -2605,7 +2577,7 @@
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
@@ -1018,14 +991,21 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
have_timers=yes
fi
- # Set up files for the shared object loading library
+@@ -2613,11 +2585,11 @@
if test x$enable_loadso = xyes; then
-- AC_DEFINE(SDL_LOADSO_BEOS)
-+ AC_DEFINE(SDL_LOADSO_BEOS,1,"")
- SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
- have_loadso=yes
- fi
-@@ -2425,7 +2387,7 @@
+ case "$host" in
+ *-*-beos*)
+- AC_DEFINE(SDL_LOADSO_BEOS)
++ AC_DEFINE(SDL_LOADSO_BEOS,1,"")
+ SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
+ ;;
+ *-*-haiku*)
+- AC_DEFINE(SDL_LOADSO_DLOPEN)
++ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
+ SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
+ ;;
+ esac
+@@ -2653,7 +2625,7 @@
# Set up files for the shared object loading library
# (this needs to be done before the dynamic X11 check)
if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
@@ -1034,16 +1014,13 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
have_loadso=yes
fi
-@@ -2443,28 +2405,28 @@
+@@ -2671,26 +2643,26 @@
# Set up files for the audio library
if test x$enable_audio = xyes; then
- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO)
+ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"")
SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c"
-- AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/macrom/*.c"
have_audio=yes
fi
# Set up files for the joystick library
@@ -1051,8 +1028,8 @@ Index: SDL-1.2.11/configure.in
- AC_DEFINE(SDL_JOYSTICK_IOKIT)
+ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"")
SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
have_joystick=yes
+ need_iokit_framework=yes
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
@@ -1068,7 +1045,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
have_timers=yes
fi
-@@ -2500,30 +2462,30 @@
+@@ -2731,30 +2703,30 @@
# Set up files for the audio library
if test x$enable_threads = xyes -a x$enable_pth = xyes; then
if test x$enable_audio = xyes; then
@@ -1104,7 +1081,7 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
SOURCES="$SOURCES $srcdir/src/timer/mint/*.S"
fi
-@@ -2536,20 +2498,20 @@
+@@ -2767,20 +2739,20 @@
CheckPTHREAD
# Set up files for the video library
if test x$enable_video = xyes; then
@@ -1128,14 +1105,14 @@ Index: SDL-1.2.11/configure.in
SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
have_timers=yes
fi
-@@ -2566,31 +2528,31 @@
- # Verify that we have all the platform specific files we need
- if test x$have_joystick != xyes; then
- if test x$enable_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_DISABLED)
-+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
- fi
+@@ -2799,31 +2771,31 @@
+ if test x$enable_joystick = xyes; then
+ if test x$have_joystick != xyes; then
+ # Wants joystick subsystem, but doesn't have a platform-specific backend...
+- AC_DEFINE(SDL_JOYSTICK_DUMMY)
++ AC_DEFINE(SDL_JOYSTICK_DUMMY,1,"")
SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
+ fi
fi
if test x$have_cdrom != xyes; then
if test x$enable_cdrom = xyes; then
diff --git a/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch b/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
deleted file mode 100644
index e698167..0000000
--- a/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
-index 4e3d662..de38a3c 100644
---- a/src/video/Xext/Xxf86dga/XF86DGA.c
-+++ b/src/video/Xext/Xxf86dga/XF86DGA.c
-@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
- #define HAS_MMAP_ANON
- #include <sys/types.h>
- #include <sys/mman.h>
--#include <asm/page.h> /* PAGE_SIZE */
-+#include <unistd.h>
- #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
- #define HAS_GETPAGESIZE
- #endif /* linux */
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
similarity index 81%
rename from meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
rename to meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 74489b0..6b23344 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -13,17 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
-PR = "r8"
+PR = "r0"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
- file://acinclude.m4 \
file://configure_tweak.patch \
- file://kernel-asm-page.patch "
+ "
S = "${WORKDIR}/SDL-${PV}"
-SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149"
-SRC_URI[sha256sum] = "6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730"
+SRC_URI[md5sum] = "e52086d1b508fa0b76c52ee30b55bec4"
+SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6"
inherit autotools binconfig pkgconfig
@@ -31,7 +30,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
--enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
- --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+ --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
--enable-input-events --enable-pthreads \
${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
@@ -41,7 +40,11 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
PARALLEL_MAKE = ""
do_configure_prepend() {
- cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4
+ # Remove old libtool macros.
+ MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
+ for i in ${MACROS}; do
+ rm -f acinclude/$i
+ done
}
BBCLASSEXTEND = "nativesdk"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 21/26] module.bbclass: add lock to prevent error bulding ext modules
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Anders Darander <anders@chargestorm.se>
When external modules are built, files in $STAGING_KERNEL_DIR/scripts/basic will/can get
rebuilt.
This raises a potential race condition. Prevent this by adding a lock around the
do_make_scripts() function. Further, make sure that the kernel has been installed
to the sysroot, prior to executing this new task.
Signed-off-by: Anders Darander <anders@chargestorm.se>
---
meta/classes/module.bbclass | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 572df0d..53c16b7 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -14,8 +14,11 @@ do_make_scripts() {
-C ${STAGING_KERNEL_DIR} scripts
}
+addtask make_scripts before do_compile
+do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
+do_make_scripts[deptask] = "do_populate_sysroot"
+
module_do_compile() {
- do_make_scripts
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
KERNEL_SRC=${STAGING_KERNEL_DIR} \
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 20/26] chkconfig: Update to 1.3.55
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Wenzong Fan <wenzong.fan@windriver.com>
Update chkconfig to 1.3.55 from 1.3.52.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/chkconfig/{chkconfig_1.3.52.bb => chkconfig_1.3.55.bb} (83%)
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
similarity index 83%
rename from meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
rename to meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
index 6dc8a0e..0e50936 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.52.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.55.bb
@@ -12,12 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018"
DEPENDS = "libnewt popt"
-PR = "r1"
+PR = "r0"
SRC_URI = "http://fedorahosted.org/releases/c/h/chkconfig/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "a576808a6d66763606d750ec451bab6d"
-SRC_URI[sha256sum] = "aa36bf7fd3f7c6e3371eddd8a7846b83435c48f132cc5919d83a830504b797d6"
+SRC_URI[md5sum] = "de562d5bff5116d1acf2d3191603096b"
+SRC_URI[sha256sum] = "ac5e8f6c5ed83f5b65a3dd9187f8c534f167193446082e6a6576a0d9f72ba968"
inherit autotools gettext
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 19/26] ccache: update to 3.1.6
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Wenzong Fan <wenzong.fan@windriver.com>
Update ccache to 3.1.6 from 3.1.5.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
.../ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/ccache/{ccache_3.1.5.bb => ccache_3.1.6.bb} (47%)
diff --git a/meta/recipes-devtools/ccache/ccache_3.1.5.bb b/meta/recipes-devtools/ccache/ccache_3.1.6.bb
similarity index 47%
rename from meta/recipes-devtools/ccache/ccache_3.1.5.bb
rename to meta/recipes-devtools/ccache/ccache_3.1.6.bb
index 9a967b2..e87468a 100644
--- a/meta/recipes-devtools/ccache/ccache_3.1.5.bb
+++ b/meta/recipes-devtools/ccache/ccache_3.1.6.bb
@@ -4,5 +4,5 @@ PR = "r0"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=80e92ec45d4fca91f127864fb9e5d932"
-SRC_URI[md5sum] = "b1a9684828eae68382d6afc98ce80d24"
-SRC_URI[sha256sum] = "54afc35c672ce451e04a478cfc0eb74c1ba184e27ef24881206602aa0eb94d63"
+SRC_URI[md5sum] = "e6565e7d6c95d1e35b7a0d67e39901e8"
+SRC_URI[sha256sum] = "59f58bb73f00db5bbff36b8eb530d3000c86b3110e34cf8dba9e2a5d19eb684f"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 18/26] distro_tracking_fields: update packages tracking fields
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Kang Kai <kai.kang@windriver.com>
Update packages tracking fields including ghostscript, libsdl,
libxml-sax-perl and liburi-perl.
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 24 ++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index e68bbe1..770f835 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5878,6 +5878,24 @@ RECIPE_MAINTAINER_pn-libnewt = "Kai Kang <kai.kang@windriver.com>"
RECIPE_LAST_UPDATE_pn-libnewt = "Jul 27, 2011"
RECIPE_MANUAL_CHECK_DATE_pn-libnewt = "Jul 27, 2011"
+RECIPE_STATUS_pn-libxml-sax-perl = "green"
+RECIPE_LATEST_VERSION_pn-libxml-sax-perl = "0.99"
+RECIPE_MAINTAINER_pn-libxml-sax-perl = "Kai Kang <kai.kang@windriver.com>"
+RECIPE_LAST_UPDATE_pn-libxml-sax-perl = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libxml-sax-perl = "Oct 19, 2011"
+
+RECIPE_STATUS_pn-liburi-perl = "green"
+RECIPE_LATEST_VERSION_pn-liburi-perl = "1.59"
+RECIPE_MAINTAINER_pn-liburi-perl = "Kai Kang <kai.kang@windriver.com>"
+RECIPE_LAST_UPDATE_pn-liburi-perl = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-liburi-perl = "Oct 19, 2011"
+
+RECIPE_STATUS_pn-ghostscript = "red"
+RECIPE_LATEST_VERSION_pn-ghostscript = "9.04"
+RECIPE_MAINTAINER_pn-ghostscript = "Kai Kang <kai.kang@windriver.com>"
+RECIPE_LAST_UPDATE_pn-ghostscript = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn = "Oct 19, 2011"
+
RECIPE_STATUS_pn-createrepo = "green"
RECIPE_LATEST_VERSION_pn-createrepo = "0.9.9"
RECIPE_MAINTAINER_pn-createrepo = "Saul Wold <sgw@linux.intel.com>"
@@ -5951,7 +5969,13 @@ RECIPE_MAINTAINER_pn-linux-yocto = "Darren Hart <dvhart@linux.intel.com>"
DISTRO_PN_ALIAS_pn-linux-yocto-rt = "Debian=linux-base Ubuntu=linux"
RECIPE_MAINTAINER_pn-linux-yocto-rt = "Darren Hart <dvhart@linux.intel.com>"
+RECIPE_STATUS_pn-libsdl = "green"
+RECIPE_LATEST_VERSION_pn-libsdl = "1.2.14"
+RECIPE_LAST_UPDATE_pn-libsdl = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libsdl = "Jul 28, 2011"
+RECIPE_MAINTAINER_pn-libsdl = "Kai Kang <kai.kang@windriver.com>"
DISTRO_PN_ALIAS_pn-libsdl = "Fedora=SDL Opensuse=SDL"
+
DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv"
DISTRO_PN_ALIAS_pn-qt4-native = "Fedora=qt4 Debian=qt4-dev-tools"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 14/26] ghostscript: update to 9.04
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Kang Kai <kai.kang@windriver.com>
Remove the old version and update ghostscript to 9.04.
* update ghostscript-9.02-prevent_recompiling.patch
* because soobj is not used any more, remove soobj related work
* gs provides a configure option --with-install-cups to install cups related
files but disabled by default, so need update post install scripts
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../ghostscript/ghostscript/arm/soobjarch.h | 40 -----------
.../ghostscript-9.02-prevent_recompiling.patch | 74 ++++++++++----------
.../ghostscript/ghostscript/i586/soobjarch.h | 41 -----------
.../ghostscript/ghostscript/mips/soobjarch.h | 40 -----------
.../ghostscript/ghostscript/powerpc/soobjarch.h | 40 -----------
.../ghostscript/ghostscript/powerpc64/soobjarch.h | 40 -----------
.../ghostscript/ghostscript/x86-64/soobjarch.h | 40 -----------
.../{ghostscript_9.02.bb => ghostscript_9.04.bb} | 24 +++---
8 files changed, 49 insertions(+), 290 deletions(-)
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h
delete mode 100644 meta/recipes-extended/ghostscript/ghostscript/x86-64/soobjarch.h
rename meta/recipes-extended/ghostscript/{ghostscript_9.02.bb => ghostscript_9.04.bb} (82%)
diff --git a/meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
deleted file mode 100644
index e8772cd..0000000
--- a/meta/recipes-extended/ghostscript/ghostscript/arm/soobjarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
- /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
- /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
- /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
- /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
index 8fde77f..c37e4c4 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/ghostscript-9.02-prevent_recompiling.patch
@@ -6,39 +6,39 @@ Upstream-Status: Pending
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---- a/base/unix-aux.mak.orig 2011-05-03 15:35:55.196887997 +0800
-+++ b/base/unix-aux.mak 2011-05-03 15:37:57.766888003 +0800
-@@ -57,45 +57,45 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.
+--- a/base/unix-aux.mak.orig 2011-10-17 16:12:20.354167007 +0800
++++ a/base/unix-aux.mak 2011-10-17 16:16:26.774167008 +0800
+@@ -67,45 +67,45 @@
# -------------------------- Auxiliary programs --------------------------- #
--$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h)
-- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
+-$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
+- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
-
-# On the RS/6000 (at least), compiling genarch.c with gcc with -O
-# produces a buggy executable.
--$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS)
-- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
+-$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
+- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
-
--$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS)
-- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
+-$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS)
+- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
-
--$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS)
-- $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
+-$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS)
+- $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
-
--$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS)
-- $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
+-$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS)
+- $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
-
-# To get GS to use the system zlib, you remove/hide the gs/zlib directory
-# which means that the mkromfs build can't find the zlib source it needs.
-# So it's split into two targets, one using the zlib source directly.....
--MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
-- $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
-- $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
-- $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
+-MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gscdefs.$(OBJ) $(AUX)gsmisc.$(OBJ) \
+- $(AUX)gpmisc.$(OBJ) $(AUX)gslibctx.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
+- $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
+- $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
-
-$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0)
-- $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
+- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
-
-# .... and one using the zlib library linked via the command line
-MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
@@ -47,37 +47,37 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
- $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
-
-$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1)
-- $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
+- $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
-
--$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB)
+-$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
- $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
-+#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h)
-+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
++#$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
+#
+## On the RS/6000 (at least), compiling genarch.c with gcc with -O
+## produces a buggy executable.
-+#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS)
-+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
++#$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
+#
-+#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS)
-+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
++#$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS)
++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
+#
-+#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS)
-+# $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
++#$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS)
++# $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
+#
-+#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS)
-+# $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
++#$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS)
++# $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
+#
+## To get GS to use the system zlib, you remove/hide the gs/zlib directory
+## which means that the mkromfs build can't find the zlib source it needs.
+## So it's split into two targets, one using the zlib source directly.....
-+#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
-+# $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gslibctx.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) \
-+# $(GLOBJ)gp_unix.$(OBJ) $(GLOBJ)gp_unifs.$(OBJ) $(GLOBJ)gp_unifn.$(OBJ) \
-+# $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
++#MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gscdefs.$(OBJ) $(AUX)gsmisc.$(OBJ) \
++# $(AUX)gpmisc.$(OBJ) $(AUX)gslibctx.$(OBJ) $(AUX)gp_getnv.$(OBJ) \
++# $(AUX)gp_unix.$(OBJ) $(AUX)gp_unifs.$(OBJ) $(AUX)gp_unifn.$(OBJ) \
++# $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
+#
+#$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0)
-+# $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
++# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
+#
+## .... and one using the zlib library linked via the command line
+#MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
@@ -86,9 +86,9 @@ Signed-off-by: Kang Kai <kai.kang@windriver.com>
+# $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
+#
+#$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1)
-+# $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
++# $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
+#
-+#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB)
++#$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
+# $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE)
# Query the environment to construct gconfig_.h.
diff --git a/meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
deleted file mode 100644
index 5817b7a..0000000
--- a/meta/recipes-extended/ghostscript/ghostscript/i586/soobjarch.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
- /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 4
-
- /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
- /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
- /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
-
diff --git a/meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
deleted file mode 100644
index 359097f..0000000
--- a/meta/recipes-extended/ghostscript/ghostscript/mips/soobjarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
- /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
- /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
- /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
- /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
deleted file mode 100644
index 359097f..0000000
--- a/meta/recipes-extended/ghostscript/ghostscript/powerpc/soobjarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
- /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 4
-#define ARCH_ALIGN_PTR_MOD 4
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
- /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 2
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 4
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
- /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
- /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h
deleted file mode 100644
index 0d0a16b..0000000
--- a/meta/recipes-extended/ghostscript/ghostscript/powerpc64/soobjarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
- /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
- /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
- /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
- /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 1
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/meta/recipes-extended/ghostscript/ghostscript/x86-64/soobjarch.h b/meta/recipes-extended/ghostscript/ghostscript/x86-64/soobjarch.h
deleted file mode 100644
index a05de29..0000000
--- a/meta/recipes-extended/ghostscript/ghostscript/x86-64/soobjarch.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Parameters derived from machine and compiler architecture. */
-/* This file is generated mechanically by genarch.c. */
-
- /* ---------------- Scalar alignments ---------------- */
-
-#define ARCH_ALIGN_SHORT_MOD 2
-#define ARCH_ALIGN_INT_MOD 4
-#define ARCH_ALIGN_LONG_MOD 8
-#define ARCH_ALIGN_PTR_MOD 8
-#define ARCH_ALIGN_FLOAT_MOD 4
-#define ARCH_ALIGN_DOUBLE_MOD 8
-
- /* ---------------- Scalar sizes ---------------- */
-
-#define ARCH_LOG2_SIZEOF_CHAR 0
-#define ARCH_LOG2_SIZEOF_SHORT 1
-#define ARCH_LOG2_SIZEOF_INT 2
-#define ARCH_LOG2_SIZEOF_LONG 3
-#define ARCH_LOG2_SIZEOF_LONG_LONG 3
-#define ARCH_SIZEOF_GX_COLOR_INDEX 8
-#define ARCH_SIZEOF_PTR 8
-#define ARCH_SIZEOF_FLOAT 4
-#define ARCH_SIZEOF_DOUBLE 8
-#define ARCH_FLOAT_MANTISSA_BITS 24
-#define ARCH_DOUBLE_MANTISSA_BITS 53
-
- /* ---------------- Unsigned max values ---------------- */
-
-#define ARCH_MAX_UCHAR ((unsigned char)0xff + (unsigned char)0)
-#define ARCH_MAX_USHORT ((unsigned short)0xffff + (unsigned short)0)
-#define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0)
-#define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0)
-
- /* ---------------- Miscellaneous ---------------- */
-
-#define ARCH_IS_BIG_ENDIAN 0
-#define ARCH_PTRS_ARE_SIGNED 0
-#define ARCH_FLOATS_ARE_IEEE 1
-#define ARCH_ARITH_RSHIFT 2
-#define ARCH_DIV_NEG_POS_TRUNCATES 1
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
similarity index 82%
rename from meta/recipes-extended/ghostscript/ghostscript_9.02.bb
rename to meta/recipes-extended/ghostscript/ghostscript_9.04.bb
index 1d48cce..dba92e9 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.02.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.04.bb
@@ -15,24 +15,24 @@ SECTION = "console/utils"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24"
-PR = "r4"
+PR = "r0"
DEPENDS = "ghostscript-native tiff jpeg fontconfig cups"
DEPENDS_virtclass-native = ""
-SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.bz2"
+SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz"
SRC_URI = "${SRC_URI_BASE} \
file://ghostscript-9.02-prevent_recompiling.patch \
file://ghostscript-9.02-genarch.patch \
file://objarch.h \
- file://soobjarch.h \
file://ghostscript-9.02-parallel-make.patch \
"
+
SRC_URI_virtclass-native = "${SRC_URI_BASE}"
-SRC_URI[md5sum] = "f67151444bd56a7904579fc75a083dd6"
-SRC_URI[sha256sum] = "03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a"
+SRC_URI[md5sum] = "9c2fb4af1eb609d09dba5bb0fa76173a"
+SRC_URI[sha256sum] = "f1e333738c41c3bf2b47ceb9806abb8045bcdc7353002c32736150425a7c1ef4"
EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper --with-fontpath=${datadir}/fonts"
@@ -47,15 +47,13 @@ do_configure () {
mkdir -p obj
mkdir -p soobj
cp ${WORKDIR}/objarch.h obj/arch.h
- cp ${WORKDIR}/soobjarch.h soobj/arch.h
oe_runconf
# copy tools from the native ghostscript build
- mkdir -p obj soobj
+ mkdir -p obj/aux soobj
for i in genarch genconf mkromfs echogs gendev genht; do
- cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/$i
- cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i soobj/$i
+ cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i
done
}
@@ -64,7 +62,9 @@ do_install_append () {
cp -r Resource ${D}${datadir}/ghostscript/${PV}/
cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/
- chown -R root:lp ${D}${sysconfdir}/cups
+ if [ -f ${D}${sysconfdir}/cups ]; then
+ chown -R root:lp ${D}${sysconfdir}/cups
+ fi
}
python do_patch_virtclass-native () {
@@ -78,14 +78,14 @@ do_configure_virtclass-native () {
do_compile_virtclass-native () {
mkdir -p obj
for i in genarch genconf mkromfs echogs gendev genht; do
- oe_runmake obj/$i
+ oe_runmake obj/aux/$i
done
}
do_install_virtclass-native () {
install -d ${D}${bindir}/ghostscript-${PV}
for i in genarch genconf mkromfs echogs gendev genht; do
- install -m 755 obj/$i ${D}${bindir}/ghostscript-${PV}/$i
+ install -m 755 obj/aux/$i ${D}${bindir}/ghostscript-${PV}/$i
done
}
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 16/26] liburi-perl: update to 1.59
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Kang Kai <kai.kang@windriver.com>
Update liburi-perl to 1.59
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
.../{liburi-perl_1.58.bb => liburi-perl_1.59.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/perl/{liburi-perl_1.58.bb => liburi-perl_1.59.bb} (81%)
diff --git a/meta/recipes-devtools/perl/liburi-perl_1.58.bb b/meta/recipes-devtools/perl/liburi-perl_1.59.bb
similarity index 81%
rename from meta/recipes-devtools/perl/liburi-perl_1.58.bb
rename to meta/recipes-devtools/perl/liburi-perl_1.59.bb
index 9b84e2c..877b252 100644
--- a/meta/recipes-devtools/perl/liburi-perl_1.58.bb
+++ b/meta/recipes-devtools/perl/liburi-perl_1.59.bb
@@ -4,7 +4,7 @@ and manipulate the various components that make up these strings."
SECTION = "libs"
LICENSE = "Artistic | GPLv1+"
-PR = "r2"
+PR = "r0"
LIC_FILES_CHKSUM = "file://README;beginline=26;endline=30;md5=6c33ae5c87fd1c4897714e122dd9c23d"
@@ -12,8 +12,8 @@ DEPENDS += "perl"
SRC_URI = "http://www.cpan.org/authors/id/G/GA/GAAS/URI-${PV}.tar.gz"
-SRC_URI[md5sum] = "540575aee18616ad9a21e0af7a1e7b18"
-SRC_URI[sha256sum] = "5ddeb8e4707bd4c37a3a60f634de8424e40c85bba98cf6c1053ae5e71c9b8289"
+SRC_URI[md5sum] = "fecebf8fa20e2d26ea4a1649c095e96e"
+SRC_URI[sha256sum] = "cb88d29b589db8d2adbc4713fd082284cba77883488717375f011bbd13b5cac6"
S = "${WORKDIR}/URI-${PV}"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 13/26] distro-tracking: update data for some toolchain recipes
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 42 ++++++++++++--------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index abc2cbf..e68bbe1 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3005,11 +3005,19 @@ RECIPE_STATUS_pn-run-postinsts="green" # all local code
RECIPE_LATEST_VERSION_pn-postinsts="1.0"
RECIPE_MAINTAINER_pn-postinsts = "Nitin A Kamble <nitin.a.kamble@intel.com>"
-RECIPE_STATUS_pn-nasm="green"
+RECIPE_STATUS_pn-nasm="green"
RECIPE_LATEST_VERSION_pn-nasm="2.07"
-RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Jul 06, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Oct 18, 2011"
+RECIPE_LAST_UPDATE_pn-nasm = "Jun 23, 2010"
RECIPE_MAINTAINER_pn-nasm = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+RECIPE_STATUS_pn-btrfs-tools="green"
+RECIPE_LATEST_VERSION_pn-btrfs-tools="git"
+RECIPE_MANUAL_CHECK_DATE_pn-btrfs-tools = "Oct 18, 2011"
+RECIPE_LAST_UPDATE_pn-btrfs-tools = "Jun 09, 2011"
+RECIPE_MAINTAINER_pn-btrfs-tools = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
+
RECIPE_STATUS_pn-perl="red" # upgrade needed
RECIPE_LATEST_VERSION_pn-perl="5.12.1"
RECIPE_LAST_UPDATE_pn-perl = "May 27, 2007"
@@ -3020,9 +3028,9 @@ RECIPE_LATEST_VERSION_pn-prelink="1.0+git0+0x909470ee441237563d6236c505cb2d02ddc
RECIPE_LAST_UPDATE_pn-perl = "Jul 23, 2010"
RECIPE_MAINTAINER_pn-prelink = "Mark Hatle <mark.hatle@windriver.com>"
-RECIPE_STATUS_pn-python-dbus="red"
-RECIPE_LATEST_VERSION_pn-python-dbus="0.83.1"
-RECIPE_LAST_UPDATE_pn-python-dbus = "Jul 7, 2010"
+RECIPE_STATUS_pn-python-dbus="green"
+RECIPE_LATEST_VERSION_pn-python-dbus="0.84.0"
+RECIPE_LAST_UPDATE_pn-python-dbus = "Oct 18, 2011"
RECIPE_MAINTAINER_pn-python-dbus = "Nitin A Kamble <nitin.a.kamble@intel.com>"
DISTRO_PN_ALIAS_pn-python-dbus = "Ubuntu=python-dbus Debian=python-dbus Mandriva=python-dbus"
@@ -3062,7 +3070,8 @@ RECIPE_MAINTAINER_pn-python-pyrex = "Nitin A Kamble <nitin.a.kamble@intel.com>"
DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex"
RECIPE_STATUS_pn-python-scons="green"
-RECIPE_LATEST_VERSION_pn-python-scons="2.0.1"
+RECIPE_LATEST_VERSION_pn-python-scons="2.1.0"
+RECIPE_LAST_UPDATE_pn-python-scons = "Oct 18, 2011"
DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons"
RECIPE_LAST_UPDATE_pn-python-scons = "Nov 8, 2010"
RECIPE_MAINTAINER_pn-python-scons = "Nitin A Kamble <nitin.a.kamble@intel.com>"
@@ -3087,15 +3096,16 @@ RECIPE_LATEST_VERSION_pn-unifdef="2.6.18+git"
RECIPE_MAINTAINER_pn-unifdef = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-gnu-config="green"
-RECIPE_LATEST_VERSION_pn-gnu-config="0.0+git3155524"
+RECIPE_LATEST_VERSION_pn-gnu-config="svn"
DISTRO_PN_ALIAS_pn-gnu-config = "OpenedHand"
RECIPE_LAST_UPDATE_pn-gnu-config = "Jun 21, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-gnu-config = "Jul 06, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-gnu-config = "Oct 18, 2011"
RECIPE_MAINTAINER_pn-gnu-config = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-mpfr="green"
-RECIPE_LATEST_VERSION_pn-mpfr="3.0.0"
-RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Jul 06, 2011"
+RECIPE_LATEST_VERSION_pn-mpfr="3.0.1"
+RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Oct 18, 2011"
+RECIPE_LAST_UPDATE_pn-mpfr = "Apr 07, 2011"
RECIPE_MAINTAINER_pn-mpfr = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-gmp="green"
@@ -3110,9 +3120,10 @@ RECIPE_MANUAL_CHECK_DATE_pn-libmpc = "Jan 25, 2011"
RECIPE_MAINTAINER_pn-libmpc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
DISTRO_PN_ALIAS_pn-libmpc = "Fedora=libmpc OpenSuse=libmpc2"
-RECIPE_STATUS_pn-byacc="red"
+RECIPE_STATUS_pn-byacc="green"
RECIPE_LATEST_VERSION_pn-byacc="20101229"
-RECIPE_MANUAL_CHECK_DATE_pn-byacc = "Jul 06, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-byacc = "Oct 18, 2011"
+RECIPE_LAST_UPDATE_pn-byacc = "Oct 18, 2010"
RECIPE_MAINTAINER_pn-byacc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-libconvert-asn1-perl="green"
@@ -3122,8 +3133,8 @@ RECIPE_LAST_UPDATE_pn-libconvert-asn1-perl = "Aug 13, 2010"
RECIPE_MAINTAINER_pn-libconvert-asn1-perl = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-libxml-parser-perl="green"
-RECIPE_LATEST_VERSION_pn-libxml-parser-perl="2.36"
-RECIPE_LAST_UPDATE_pn-libxml-parser-perl = "Nov 18, 2009"
+RECIPE_LATEST_VERSION_pn-libxml-parser-perl="2.41"
+RECIPE_LAST_UPDATE_pn-libxml-parser-perl = "Oct 18, 2011"
RECIPE_MAINTAINER_pn-libxml-parser-perl = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-cmake-native="green"
@@ -5922,9 +5933,6 @@ RECIPE_COMMENTS_pn-pseudo = "Yocto Project maintained"
RECIPE_MANUAL_CHECK_DATE_pn-pseudo = "Jun 06, 2011"
DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
-DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
-RECIPE_MAINTAINER_pn-btrfs-tools = "Nitin A Kamble <nitin.a.kamble@intel.com>"
-
DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
RECIPE_MAINTAINER_pn-rt-tests = "Darren Hart <dvhart@linux.intel.com>"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 15/26] libxml-sax-perl: update to 0.99
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Kang Kai <kai.kang@windriver.com>
Update libxml-sax-perl to 0.99
Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
...ml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
rename meta/recipes-extended/perl/{libxml-sax-perl_0.96.bb => libxml-sax-perl_0.99.bb} (85%)
diff --git a/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb b/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
similarity index 85%
rename from meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
rename to meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
index 97d2025..ee9ac30 100644
--- a/meta/recipes-extended/perl/libxml-sax-perl_0.96.bb
+++ b/meta/recipes-extended/perl/libxml-sax-perl_0.99.bb
@@ -11,13 +11,14 @@ SECTION = "libs"
LICENSE = "Artistic|GPLv1+"
DEPENDS += "libxml-namespacesupport-perl-native"
RDEPENDS_${PN} += "libxml-namespacesupport-perl perl-module-file-temp"
-PR = "r1"
+PR = "r0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=65c4cd8f39c24c7135ed70dacbcb09e3"
SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-SAX-${PV}.tar.gz"
-SRC_URI[md5sum] = "bdcd4119a62505184e211e9dfaef0ab1"
-SRC_URI[sha256sum] = "9bbef613afa42c46df008d537decc5a61df7e92d65463f3c900769f39e5c8e08"
+
+SRC_URI[md5sum] = "290f5375ae87fdebfdb5bc3854019f24"
+SRC_URI[sha256sum] = "32b04b8e36b6cc4cfc486de2d859d87af5386dd930f2383c49347050d6f5ad84"
S = "${WORKDIR}/XML-SAX-${PV}"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 12/26] libxml-parser-perl: upgrade from 2.40 to 2.41
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...ser-perl_2.40.bb => libxml-parser-perl_2.41.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/perl/{libxml-parser-perl_2.40.bb => libxml-parser-perl_2.41.bb} (82%)
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
similarity index 82%
rename from meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
rename to meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
index 1d1593b..caf5704 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.40.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e
DEPENDS += "expat expat-native"
-PR = "r4"
+PR = "r0"
SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
-SRC_URI[md5sum] = "c66e9adba003d0667cc40115ccd837a5"
-SRC_URI[sha256sum] = "e5e433684e799ef7b6b852c0ca31b71054717628555444d3dc9fceac0df71512"
+SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
+SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9"
S = "${WORKDIR}/XML-Parser-${PV}"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 11/26] python-dbus: upgrade from 0.83.2 to 0.84.0
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-dbus_0.83.2.bb => python-dbus_0.84.0.bb} (83%)
diff --git a/meta/recipes-devtools/python/python-dbus_0.83.2.bb b/meta/recipes-devtools/python/python-dbus_0.84.0.bb
similarity index 83%
rename from meta/recipes-devtools/python/python-dbus_0.83.2.bb
rename to meta/recipes-devtools/python/python-dbus_0.84.0.bb
index 323dae5..fff8649 100644
--- a/meta/recipes-devtools/python/python-dbus_0.83.2.bb
+++ b/meta/recipes-devtools/python/python-dbus_0.84.0.bb
@@ -8,8 +8,8 @@ PR = "r0"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
-SRC_URI[md5sum] = "4ebcaa905bdcb4132b915196b0a3691b"
-SRC_URI[sha256sum] = "883729c98f40790021e3be0f7028ae863ee1c4a7b922a5578c1342592adfff64"
+SRC_URI[md5sum] = "fe69a2613e824463e74f10913708c88a"
+SRC_URI[sha256sum] = "b85bc7aaf1a976627ca461b1ca7b0c4ddddff709f52fe44c9b2d1d7d8fac5906"
S = "${WORKDIR}/dbus-python-${PV}"
inherit distutils-base autotools pkgconfig
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 10/26] python-scons: upgrade from 2.0.1 to 2.1.0
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Nitin A Kamble <nitin.a.kamble@intel.com>
the LICENSE.txt has added 2011 year to the copyright line he nce the MD5 sum is different.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...ative_2.0.1.bb => python-scons-native_2.1.0.bb} | 3 +--
...python-scons_2.0.1.bb => python-scons_2.1.0.bb} | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/python/{python-scons-native_2.0.1.bb => python-scons-native_2.1.0.bb} (89%)
rename meta/recipes-devtools/python/{python-scons_2.0.1.bb => python-scons_2.1.0.bb} (51%)
diff --git a/meta/recipes-devtools/python/python-scons-native_2.0.1.bb b/meta/recipes-devtools/python/python-scons-native_2.1.0.bb
similarity index 89%
rename from meta/recipes-devtools/python/python-scons-native_2.0.1.bb
rename to meta/recipes-devtools/python/python-scons-native_2.1.0.bb
index f7646a2..083ad15 100644
--- a/meta/recipes-devtools/python/python-scons-native_2.0.1.bb
+++ b/meta/recipes-devtools/python/python-scons-native_2.1.0.bb
@@ -2,5 +2,4 @@ require python-scons_${PV}.bb
inherit native
DEPENDS = "python-native"
RDEPENDS_${PN} = ""
-PR = "r1"
-
+PR = "r0"
diff --git a/meta/recipes-devtools/python/python-scons_2.0.1.bb b/meta/recipes-devtools/python/python-scons_2.1.0.bb
similarity index 51%
rename from meta/recipes-devtools/python/python-scons_2.0.1.bb
rename to meta/recipes-devtools/python/python-scons_2.1.0.bb
index 1c7939e..22df333 100644
--- a/meta/recipes-devtools/python/python-scons_2.0.1.bb
+++ b/meta/recipes-devtools/python/python-scons_2.1.0.bb
@@ -1,15 +1,15 @@
DESCRIPTION = "A Software Construction Tool"
SECTION = "devel/python"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8481211ebbeaed9cdc7ad5a3b0c98aaf"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ab8b65435c2e520ed18e67459f1f9bb9"
SRCNAME = "scons"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
-SRC_URI[md5sum] = "beca648b894cdbf85383fffc79516d18"
-SRC_URI[sha256sum] = "0a8151da41c4a26c776c84f44f747ce03e093d43be3e83b38c14a76ab3256762"
+SRC_URI[md5sum] = "47daf989e303a045b76c11236df719df"
+SRC_URI[sha256sum] = "4139ed14f60dd2ebcd47c59984d14705636180eb27b3d1b2949489e514b1921d"
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit distutils
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 09/26] x86 tune files: set baselib for x32 tune as libx32
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/conf/machine/include/ia32/arch-ia32.inc | 2 +-
meta/conf/machine/include/tune-core2.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index a52e33a..ee91983 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -44,6 +44,6 @@ PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
AVAILTUNES += "x86-64-x32"
TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
-BASE_LIB_tune-x86-64-x32 ?= "lib"
+BASE_LIB_tune-x86-64-x32 ?= "libx32"
PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32"
TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 78f8f4d..565a39c 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -20,5 +20,5 @@ PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64
AVAILTUNES += "core2-64-x32"
TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2"
-BASE_LIB_tune-core2-64-x32 ?= "lib"
+BASE_LIB_tune-core2-64-x32 ?= "libx32"
PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"
--
1.7.6.2
^ permalink raw reply related
* [CONSOLIDATED PULL - v2 08/26] insane.bbclass: print full path on invalid LICENSE_FILES_CHKSUM
From: Saul Wold @ 2011-10-20 7:50 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1319096633.git.sgw@linux.intel.com>
From: Darren Hart <dvhart@linux.intel.com>
Currently only the basename is printed when os.path.isfile() returns a failure
for the license file. If the file is present, but in the wrong directory, this
can be non-obvious to debug. Use the full path instead.
Make a minor grammatical correction in the error message while we're at it.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta/classes/insane.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b861e85..017f7be 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -330,7 +330,7 @@ def package_qa_check_license(workdir, d):
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
srclicfile = os.path.join(srcdir, path)
if not os.path.isfile(srclicfile):
- raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to invalid file: " + path)
+ raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile)
if 'md5' not in parm:
bb.error(pn + ": md5 checksum is not specified for ", url)
--
1.7.6.2
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox