[oe-commits] org.oe.dev merge of '615ba6299e98edf3a5c47976f97de62b10352bf0'
coredump2 commit
openembedded-commits at lists.openembedded.org
Sat Jun 30 18:35:59 UTC 2007
merge of '615ba6299e98edf3a5c47976f97de62b10352bf0'
and '61d9290f8bf0b1072ab2cf68c220769146dace10'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: a716072bb40b66870ec9797e151cda776beacf6c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a716072bb40b66870ec9797e151cda776beacf6c
Files:
1
packages/phalanx/phalanx_22.bb
packages/cairo/cairo_1.2.2.bb
packages/cairo/cairo_1.3.14.bb
packages/cairo/cairo_1.3.4.bb
packages/cairo/cairo_1.4.0.bb
packages/cairo/cairo_1.4.2.bb
packages/cairo/cairo_1.4.4.bb
packages/librsvg/librsvg_2.11.1.bb
packages/librsvg/librsvg_2.16.0.bb
packages/librsvg/librsvg_2.6.5.bb
packages/librsvg/librsvg_2.9.5.bb
packages/agg
packages/geos
packages/agg/agg_2.5.bb
packages/cairo/cairo_1.4.10.bb
packages/geos/geos_2.2.3+3.0.0rc4.bb
packages/madwifi/madwifi-ng_r2518-20070626.bb
conf/distro/angstrom-2007.1.conf
conf/distro/include/slugos.inc
packages/cairo/cairo_git.bb
packages/gdal/gdal_1.3.2.bb
packages/librsvg/librsvg_2.16.1.bb
packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch
packages/linux/linux-rp_2.6.21.bb
packages/proj4/proj-4_4.9.bb
packages/uclibc/uclibc.inc
Diffs:
#
# mt diff -r615ba6299e98edf3a5c47976f97de62b10352bf0 -ra716072bb40b66870ec9797e151cda776beacf6c
#
#
#
# patch "packages/phalanx/phalanx_22.bb"
# from [e3381adcfec7c19aa74c36c84772e18be326673f]
# to [977094a4ed80107e90502a283f75463be1614cb6]
#
============================================================
--- packages/phalanx/phalanx_22.bb e3381adcfec7c19aa74c36c84772e18be326673f
+++ packages/phalanx/phalanx_22.bb 977094a4ed80107e90502a283f75463be1614cb6
@@ -1,13 +1,13 @@ PRIORITY = "optional"
DESCRIPTION = "Phalanx is a chess playing engine."
SECTION = "opie/libs"
PRIORITY = "optional"
-PR = "r3"
+PR = "r4"
LICENSE = "GPL"
-SRC_URI = "ftp://ftp.math.muni.cz/pub/math/people/Dobes/phalanx-22.tar.gz \
+SRC_URI = "http://ftp.debian.org/debian/pool/main/p/phalanx/phalanx_22.orig.tar.gz \
file://gcc3.patch;patch=1 \
file://capabilities \
file://description"
-S = "${WORKDIR}/Phalanx-XXII"
+S = "${WORKDIR}/phalanx-22.orig"
do_compile() {
oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" STRIP=echo LD="${CC}"
@@ -24,3 +24,4 @@ FILES_${PN} = "${palmtopdir}/chess"
}
FILES_${PN} = "${palmtopdir}/chess"
+FILES_${PN}-dbg += "${palmtopdir}/chess/engines/Phalanx/.debug"
#
# mt diff -r61d9290f8bf0b1072ab2cf68c220769146dace10 -ra716072bb40b66870ec9797e151cda776beacf6c
#
#
#
# delete "packages/cairo/cairo_1.2.2.bb"
#
# delete "packages/cairo/cairo_1.3.14.bb"
#
# delete "packages/cairo/cairo_1.3.4.bb"
#
# delete "packages/cairo/cairo_1.4.0.bb"
#
# delete "packages/cairo/cairo_1.4.2.bb"
#
# delete "packages/cairo/cairo_1.4.4.bb"
#
# delete "packages/librsvg/librsvg_2.11.1.bb"
#
# delete "packages/librsvg/librsvg_2.16.0.bb"
#
# delete "packages/librsvg/librsvg_2.6.5.bb"
#
# delete "packages/librsvg/librsvg_2.9.5.bb"
#
# add_dir "packages/agg"
#
# add_dir "packages/geos"
#
# add_file "packages/agg/agg_2.5.bb"
# content [b4ff6ac556b341c1668d3b8d54aeb8ac7c3a11c1]
#
# add_file "packages/cairo/cairo_1.4.10.bb"
# content [0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0]
#
# add_file "packages/geos/geos_2.2.3+3.0.0rc4.bb"
# content [753613f3c08e82eaca328c2dcc3a44288144ffda]
#
# add_file "packages/madwifi/madwifi-ng_r2518-20070626.bb"
# content [3a9994ed9252cf4eea51127470e69d0f8017024b]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [debe17f3dff6a267123f8b0908ce7070862a0d8d]
# to [c58a26809d150838b89f0f1388292e63412f2fcd]
#
# patch "conf/distro/include/slugos.inc"
# from [4105c50380f9423e8f6ed3e2a3621f5d19cec855]
# to [d634625f9bd8ff8d6b2556f51f7ce153b2b45d15]
#
# patch "packages/cairo/cairo_git.bb"
# from [abd5a03c8c30c52228ca0da81c7ec02e31cc1fdd]
# to [1c00263d6ad25fddad7c49bea1163479c265e3eb]
#
# patch "packages/gdal/gdal_1.3.2.bb"
# from [77075dd6c373cfca0b7183b4881c8eba5a16e7ec]
# to [4bb45e43ec84faa134d2028973c54fb6bb11e634]
#
# patch "packages/librsvg/librsvg_2.16.1.bb"
# from [dcb9af4a2cb708b6a30b261deb07a9e552bf2b95]
# to [8bd6f145210d8778845c42a2be708b17a9432328]
#
# patch "packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch"
# from [83792e28a200bea10cc3a54d3957d2e6e3939cb0]
# to [91d7f89ef3d420ced74c27bd90028782aa035bf2]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [791613c9350e496eb591d9d3114c81a1e6b2c20c]
# to [0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84]
#
# patch "packages/proj4/proj-4_4.9.bb"
# from [35b70b196c7ba5d7010365a703e2f9a9b7bc8543]
# to [8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d]
#
# patch "packages/uclibc/uclibc.inc"
# from [70cdb36f8087ed763c2c2837f43d4d34e86e9f1a]
# to [8e5578d208eaebc7f9cec32d1f12aa26433b0678]
#
============================================================
--- packages/agg/agg_2.5.bb b4ff6ac556b341c1668d3b8d54aeb8ac7c3a11c1
+++ packages/agg/agg_2.5.bb b4ff6ac556b341c1668d3b8d54aeb8ac7c3a11c1
@@ -0,0 +1,40 @@
+DESCRIPTION = "Anti Grain Geometry - A High Quality Rendering Engine for C++"
+AUTHOR = "mcseem at antigrain.com"
+HOMEPAGE = "http://www.antigrain.com"
+SECTION = "libs"
+LICENSE = "AGG License"
+DEPENDS = "virtual/libx11 virtual/libsdl freetype"
+
+PR = "r0"
+
+SRC_URI = "http://www.antigrain.com/${P}.tar.gz"
+
+S = "${WORKDIR}/${P}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
+CFLAGS += " -I{$STAGING_INCDIR} "
+
+PACKAGES =+ "${PN}-sdl ${PN}-x11"
+
+FILES_${PN}-sdl = "${libdir}/libaggplatformsdl.so.*"
+FILES_${PN}-x11 += "${libdir}/libaggplatformX11.so.*"
+FILES_${PN} = "${libdir}/libagg.so.* \
+ ${libdir}/libaggfontfreetype.so.*"
+
+LEAD_SONAME = "libagg.so"
+
+do_stage() {
+ install -m 0644 libagg.m4 ${STAGING_DATADIR}/aclocal/
+ install -d ${STAGING_INCDIR}/agg2
+ cd include
+ headers=`find . -name "*.h"`
+ for f in $headers
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/agg2/
+ done
+}
+
+
+
============================================================
--- packages/cairo/cairo_1.4.10.bb 0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0
+++ packages/cairo/cairo_1.4.10.bb 0b4c4e2659b89399b3645efcdbf2bc4f3cf8dff0
@@ -0,0 +1,6 @@
+require cairo.inc
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+PR = "r0"
+
============================================================
--- packages/geos/geos_2.2.3+3.0.0rc4.bb 753613f3c08e82eaca328c2dcc3a44288144ffda
+++ packages/geos/geos_2.2.3+3.0.0rc4.bb 753613f3c08e82eaca328c2dcc3a44288144ffda
@@ -0,0 +1,21 @@
+DESCRIPTION = "GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS)."
+HOMEPAGE = "http://geos.refractions.net/"
+LICENSE = "GPLv2""
+
+DEPENDS = "boost"
+
+PR = "r1"
+
+SRC_URI = "http://geos.refractions.net/geos-3.0.0rc4.tar.bz2"
+
+S = "${WORKDIR}/geos-3.0.0rc4"
+
+inherit autotools pkgconfig lib_package binconfig
+
+EXTRA_OECONF = "--disable-swig"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/madwifi/madwifi-ng_r2518-20070626.bb 3a9994ed9252cf4eea51127470e69d0f8017024b
+++ packages/madwifi/madwifi-ng_r2518-20070626.bb 3a9994ed9252cf4eea51127470e69d0f8017024b
@@ -0,0 +1,7 @@
+PR = "r0"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
============================================================
--- conf/distro/angstrom-2007.1.conf debe17f3dff6a267123f8b0908ce7070862a0d8d
+++ conf/distro/angstrom-2007.1.conf c58a26809d150838b89f0f1388292e63412f2fcd
@@ -138,7 +138,7 @@ PREFERRED_VERSION_freetype-native = "2.
PREFERRED_VERSION_fontconfig = "2.4.1"
PREFERRED_VERSION_freetype = "2.3.4"
PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.8"
+PREFERRED_VERSION_cairo = "1.4.10"
PREFERRED_VERSION_glib-2.0 = "2.12.12"
PREFERRED_VERSION_pango = "1.16.4"
PREFERRED_VERSION_atk = "1.10.3"
@@ -318,7 +318,6 @@ DISTRO_EXTRA_RDEPENDS += "\
${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
angstrom-version \
ipkg ipkg-collateral \
- util-linux-mount util-linux-umount \
avahi-daemon \
avahi-autoipd \
${EXTRA_STUFF} \
============================================================
--- conf/distro/include/slugos.inc 4105c50380f9423e8f6ed3e2a3621f5d19cec855
+++ conf/distro/include/slugos.inc d634625f9bd8ff8d6b2556f51f7ce153b2b45d15
@@ -142,6 +142,6 @@ IGNORE_STRIP_ERRORS = ""
# Due to upstream instability, and another OE project with conflicting
# needs, nail down a specific, known-working version of madwifi-ng.
# Remove this once the madwifi-ng stuff seems to stabilize once again.
-PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
+#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
============================================================
--- packages/cairo/cairo_git.bb abd5a03c8c30c52228ca0da81c7ec02e31cc1fdd
+++ packages/cairo/cairo_git.bb 1c00263d6ad25fddad7c49bea1163479c265e3eb
@@ -7,7 +7,7 @@ LICENSE = "MPL LGPL"
DESCRIPTION = "Cairo graphics library"
LICENSE = "MPL LGPL"
-PV = "1.4.7+git${SRCDATE}"
+PV = "1.5.1+git${SRCDATE}"
SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
"
============================================================
--- packages/gdal/gdal_1.3.2.bb 77075dd6c373cfca0b7183b4881c8eba5a16e7ec
+++ packages/gdal/gdal_1.3.2.bb 4bb45e43ec84faa134d2028973c54fb6bb11e634
@@ -5,7 +5,7 @@ SRC_URI = "http://www.gdal.org/dl/${P}.t
SRC_URI = "http://www.gdal.org/dl/${P}.tar.gz"
-inherit autotools pkgconfig
+inherit autotools pkgconfig binconfig
PARALLEL_MAKE = ""
@@ -36,3 +36,7 @@ do_package_prepend() {
os.system('cp -pPR ${D}${D}* ${D}../')
}
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/librsvg/librsvg_2.16.1.bb dcb9af4a2cb708b6a30b261deb07a9e552bf2b95
+++ packages/librsvg/librsvg_2.16.1.bb 8bd6f145210d8778845c42a2be708b17a9432328
@@ -1,9 +1,9 @@ LICENSE = "LGPL"
DESCRIPTION = "Library for rendering SVG files"
SECTION = "x11/utils"
DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
inherit autotools pkgconfig gnome
@@ -24,6 +24,13 @@ FILES_librsvg-gtk-dbg += "${libdir}/gtk-
FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
${libdir}/gtk-2.0/*/*/.debug"
+pkg_postinst_librsvg-gtk() {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+ gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+}
+
do_stage() {
autotools_stage_all
}
============================================================
--- packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch 83792e28a200bea10cc3a54d3957d2e6e3939cb0
+++ packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch 91d7f89ef3d420ced74c27bd90028782aa035bf2
@@ -298,7 +298,7 @@ Index: linux-2.6.20/drivers/input/keyboa
+ pxa_gpio_mode(REMOTE_GPIO_INT | GPIO_IN);
+ ret = request_irq(REMOTE_IRQ_INT,
+ sharpsl_rc_interrupt,
-+ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SHARED,
++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED,
+ "sharpsl_rc",
+ sharpsl_rc);
+ if (ret < 0) {
============================================================
--- packages/linux/linux-rp_2.6.21.bb 791613c9350e496eb591d9d3114c81a1e6b2c20c
+++ packages/linux/linux-rp_2.6.21.bb 0611fe14d6ba36f9557f2f7c5814c1be6fbd7f84
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r4"
+PR = "r5"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -51,6 +51,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
file://squashfs3.0-2.6.15.patch;patch=1;status=external \
file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \
+ file://sharpsl-rc-r1.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-hx2000 \
file://defconfig-collie \
============================================================
--- packages/proj4/proj-4_4.9.bb 35b70b196c7ba5d7010365a703e2f9a9b7bc8543
+++ packages/proj4/proj-4_4.9.bb 8fd0c92f1a2329d08b2c5a251cbd7d6270406e0d
@@ -1,13 +1,17 @@ LICENSE = "MIT"
DESCRIPTION = "PROJ.4 - Cartographic Projections Library"
HOMEPAGE = "http://www.remotesensing.org/proj/"
LICENSE = "MIT"
+PR = "r1"
+
inherit autotools pkgconfig
SRC_URI = "ftp://ftp.remotesensing.org/proj/proj-4.${PV}.tar.gz"
S = "${WORKDIR}/proj-4.${PV}"
+FILES_${PN} += "${datadir}/proj"
+
do_stage() {
autotools_stage_all
}
============================================================
--- packages/uclibc/uclibc.inc 70cdb36f8087ed763c2c2837f43d4d34e86e9f1a
+++ packages/uclibc/uclibc.inc 8e5578d208eaebc7f9cec32d1f12aa26433b0678
@@ -128,7 +128,7 @@ do_configure() {
sed -i -e '/CONFIG_ARM_EABI/d' ${S}/.config
- if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
+ if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
echo "CONFIG_ARM_EABI=y" >> ${S}/.config
else
echo "# CONFIG_ARM_EABI is not set" >> ${S}/.config
More information about the Openembedded-commits
mailing list