[oe-commits] org.oe.dev merge of '1a297661067ec620e2c9c90e050d5b5f78991383'
hrw commit
openembedded-commits at lists.openembedded.org
Tue Dec 11 09:24:25 UTC 2007
merge of '1a297661067ec620e2c9c90e050d5b5f78991383'
and '5480bec3f64046446cb2d5fdbba10a7a45e5d5f7'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 0477df9022563b244a5800a100d17545b4e0258b
ViewMTN: http://monotone.openembedded.org/revision/info/0477df9022563b244a5800a100d17545b4e0258b
Files:
1
packages/directfb/directfb_1.0.0.bb
packages/directfb/directfb.inc
packages/python/python-pydirectfb_cvs.bb
conf/distro/include/sane-srcdates.inc
packages/directfb/directfb_1.1.0.bb
packages/directfb/files/fix-pkgconfig-cflags.patch
packages/e17/expedite_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/linux/linux-openmoko.inc
packages/linux/linux_2.6.23.bb
packages/python/python-pygtk_2.10.4.bb
packages/tasks/task-python-everything.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
Diffs:
#
# mt diff -r1a297661067ec620e2c9c90e050d5b5f78991383 -r0477df9022563b244a5800a100d17545b4e0258b
#
#
#
# delete "packages/directfb/directfb_1.0.0.bb"
#
# add_file "packages/directfb/directfb.inc"
# content [04e19140779e214a588ce3945906a18158011979]
#
# add_file "packages/directfb/directfb_1.0.0.bb"
# content [69be4c436ee438c7a38abf4093a9edb28e35befe]
#
# add_file "packages/python/python-pydirectfb_cvs.bb"
# content [6710bb7fc1c4c248b7377e85e8c5cc3cc75b0bd5]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [7749bfba16f5e3781dfb985e24f1664204058a6e]
# to [2210b55702af66bd7496230c31bdd3b1434c3ef5]
#
# patch "packages/directfb/directfb_1.1.0.bb"
# from [25f7e8fa7c45ad4eea75025c5729c6e356a1be37]
# to [a68f8d09ee5d595104db535d8df2fc2a0d11220f]
#
# patch "packages/directfb/files/fix-pkgconfig-cflags.patch"
# from [b1641134828f046419d1672f3e0bfc662b78da14]
# to [81ccc180a89e16ab87b8148e89a42d8393fad14c]
#
# patch "packages/e17/expedite_cvs.bb"
# from [3619ffd86c2d193c30ed018a3a064296e7609850]
# to [a3eb9e6385c5b2460ac7c5d0c3509a4e97e5820f]
#
# patch "packages/efl1/evas.inc"
# from [75e7e49650901c4a5ed2bd9c2e390eb76c130a3c]
# to [597ab85948221435b09749c151bb454d6bc7c247]
#
# patch "packages/efl1/evas_cvs.bb"
# from [bf66442121095eca949f9fd7637e93fecdfcaf1c]
# to [dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b]
#
# patch "packages/linux/linux-openmoko.inc"
# from [b66ff5f175f6e86ae148096aca6dbf2b0e03b644]
# to [1ea30a4afd856ca9ab5f4ee04ae06a0e9171ddd1]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [fb5e490f36b730f495e7bf48a7fcd8af38e6a3a7]
# to [46f4e7136cce3c8d26a3f7dbc5a80a07611c6e03]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [d9b42f194943701dd3dd2cf861e84c49df9183b9]
# to [7a42ce19de5c3967c7030768ff9e0901ac72a20c]
#
# patch "packages/tasks/task-python-everything.bb"
# from [2e4ebcc640b47da88d113e5780f8f4da2e755a21]
# to [cb2d01f802774b542aaf3c1f69ba9931e7cb3982]
#
============================================================
--- packages/directfb/directfb.inc 04e19140779e214a588ce3945906a18158011979
+++ packages/directfb/directfb.inc 04e19140779e214a588ce3945906a18158011979
@@ -0,0 +1,76 @@
+DESCRIPTION = "DirectFB is a thin library that provides developers \
+with hardware graphics acceleration, input device handling and \
+abstraction, an integrated windowing system with support for \
+translucent windows and multiple display layers on top of the \
+Linux framebuffer device."
+SECTION = "libs"
+LICENSE = "LGPL"
+HOMEPAGE = "http://directfb.org"
+DEPENDS = "jpeg libpng freetype zlib tslib"
+RV = "1.0-0"
+PR = "r4"
+
+SRC_URI = " \
+ http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+ file://fix-pkgconfig-cflags.patch;patch=1 \
+ file://fix-font-missing-char.patch;patch=1 \
+ file://getpagesize.patch;patch=1 \
+ file://fix-includes.patch;patch=1 \
+ file://mkdfiff.patch;patch=1 \
+"
+S = "${WORKDIR}/DirectFB-${PV}"
+
+LDFLAGS_append =" -lts -lm"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+ --with-gfxdrivers=none \
+ --enable-libmpeg3=no \
+ --enable-freetype=yes \
+ --enable-sdl=no \
+ --enable-vnc=no \
+ --disable-x11 \
+"
+
+do_stage() {
+ autotools_stage_all
+}
+
+do_install() {
+ oe_runmake 'DESTDIR=${D}' install
+}
+
+
+#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
+#
+#python populate_packages_prepend () {
+# import os.path
+# inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
+# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
+#}
+
+# NOTE: monolithic packaging for now, should improve that eventually
+
+
+
+FILES_${PN}-dbg += "\
+ ${libdir}/directfb-${RV}/*/*/.debug/*.so \
+ ${libdir}/directfb-${RV}/*/.debug/*.so \
+"
+
+FILES_${PN}-dev += "\
+ ${bindir}/directfb-config \
+ ${libdir}/directfb-${RV}/systems/*.la \
+ ${libdir}/directfb-${RV}/inputdrivers/*.la \
+ ${libdir}/directfb-${RV}/interfaces/*/*.la \
+ ${libdir}/directfb-${RV}/wm/*.la \
+"
+
+FILES_${PN} += "\
+ ${libdir}/directfb-${RV}/systems/*.so \
+ ${libdir}/directfb-${RV}/inputdrivers/*.so \
+ ${libdir}/directfb-${RV}/interfaces/*/*.so \
+ ${libdir}/directfb-${RV}/wm/*.so \
+ ${datadir}/directfb-${PV} \
+"
============================================================
--- packages/directfb/directfb_1.0.0.bb 69be4c436ee438c7a38abf4093a9edb28e35befe
+++ packages/directfb/directfb_1.0.0.bb 69be4c436ee438c7a38abf4093a9edb28e35befe
@@ -0,0 +1,4 @@
+require directfb.inc
+
+RV = "1.0-0"
+PR = "r4"
============================================================
--- packages/python/python-pydirectfb_cvs.bb 6710bb7fc1c4c248b7377e85e8c5cc3cc75b0bd5
+++ packages/python/python-pydirectfb_cvs.bb 6710bb7fc1c4c248b7377e85e8c5cc3cc75b0bd5
@@ -0,0 +1,14 @@
+DESCRIPTION = "DirectFB Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+SRCNAME = "pydirectfb"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "ml0"
+
+SRC_URI = "cvs://anonymous@pydirectfb.cvs.sourceforge.net/cvsroot/pydirectfb;module=pydirectfb \
+ file://fix-directfb-detection.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
============================================================
--- conf/distro/include/sane-srcdates.inc 7749bfba16f5e3781dfb985e24f1664204058a6e
+++ conf/distro/include/sane-srcdates.inc 2210b55702af66bd7496230c31bdd3b1434c3ef5
@@ -112,6 +112,7 @@ SRCDATE_bl ?= "20060814"
# Misc packages, sorted by alphabet
SRCDATE_avetanabt ?= "20060814"
SRCDATE_bl ?= "20060814"
+SRCDATE_python-pydirectfb = "20071210"
SRCDATE_dvbstream ?= "20060814"
SRCDATE_dvbtraffic ?= "20060814"
SRCDATE_dvbtune ?= "20060814"
============================================================
--- packages/directfb/directfb_1.1.0.bb 25f7e8fa7c45ad4eea75025c5729c6e356a1be37
+++ packages/directfb/directfb_1.1.0.bb a68f8d09ee5d595104db535d8df2fc2a0d11220f
@@ -1,68 +1,4 @@
-DESCRIPTION = "DirectFB is a thin library that provides developers \
-with hardware graphics acceleration, input device handling and \
-abstraction, an integrated windowing system with support for \
-translucent windows and multiple display layers on top of the \
-Linux framebuffer device."
-SECTION = "libs"
-LICENSE = "LGPL"
-HOMEPAGE = "http://directfb.org"
-DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r2"
-RV = "1.1-0"
+require directfb.inc
+RV = "1.1-0"
+PR = "r3"
-SRC_URI = " \
- http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
- file://fix-pkgconfig-cflags.patch;patch=1 \
- file://fix-font-missing-char.patch;patch=1 \
- file://getpagesize.patch;patch=1 \
- file://fix-includes.patch;patch=1 \
- file://mkdfiff.patch;patch=1 \
- "
-
-S = "${WORKDIR}/DirectFB-${PV}"
-
-LDFLAGS_append =" -lts -lm"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = " \
- --with-gfxdrivers=none \
- --enable-libmpeg3=no \
- --enable-freetype=yes \
- --enable-sdl=no \
- --enable-vnc=no \
- --disable-x11 \
- "
-
-do_stage() {
- autotools_stage_all
-}
-
-do_install() {
- oe_runmake 'DESTDIR=${D}' install
-}
-
-PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
-
-#python populate_packages_prepend () {
-# import os.path
-# inputdrivers_libdir = bb.data.expand('${libdir}/directfb-${RV}/inputdrivers', d)
-# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
-#}
-FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
- ${libdir}/directfb-${RV}/*/.debug/*.so \
- "
-
-FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
- ${libdir}/directfb-${RV}/inputdrivers/*.la \
- ${libdir}/directfb-${RV}/interfaces/*/*.la \
- ${libdir}/directfb-${RV}/wm/*.la \
- "
-
-
-FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
- # ${libdir}/directfb-${RV}/inputdrivers/*.so \
- # ${libdir}/directfb-${RV}/interfaces/*/*.so \
- ${libdir}/directfb-${RV}/wm/*.so \
- ${datadir}/directfb-1.1.0 \
- "
============================================================
--- packages/directfb/files/fix-pkgconfig-cflags.patch b1641134828f046419d1672f3e0bfc662b78da14
+++ packages/directfb/files/fix-pkgconfig-cflags.patch 81ccc180a89e16ab87b8148e89a42d8393fad14c
@@ -6,7 +6,7 @@ diff -ur DirectFB-1.0.0~org/directfb-int
Version: @VERSION@
Requires: directfb = @VERSION@
-Cflags: @DFB_INTERNAL_CFLAGS@ -I at INTERNALINCLUDEDIR@
-+Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in
--- DirectFB-1.0.0~org/directfb.pc.in 2004-08-04 12:28:20.000000000 -0400
+++ DirectFB-1.0.0/directfb.pc.in 2007-03-16 22:31:33.000000000 -0400
@@ -15,7 +15,7 @@ diff -ur DirectFB-1.0.0~org/directfb.pc.
Requires: fusion direct
Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
-Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
-+Cflags: @THREADFLAGS@ -I${includedir}
++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir}
diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in
--- DirectFB-1.0.0~org/lib/direct/direct.pc.in 2005-11-23 09:18:59.000000000 -0500
+++ DirectFB-1.0.0/lib/direct/direct.pc.in 2007-03-16 22:32:13.000000000 -0400
@@ -24,7 +24,7 @@ diff -ur DirectFB-1.0.0~org/lib/direct/d
Version: @VERSION@
Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
-Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
-+Cflags: @THREADFLAGS@ -I${includedir}
++Cflags: @THREADFLAGS@ -I${includedir}/directfb -I${includedir}
diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in
--- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in 2004-05-19 07:30:56.000000000 -0400
+++ DirectFB-1.0.0/lib/fusion/fusion.pc.in 2007-03-16 22:32:34.000000000 -0400
@@ -33,7 +33,7 @@ diff -ur DirectFB-1.0.0~org/lib/fusion/f
Requires: direct
Libs: -L${libdir} -lfusion
-Cflags: -I at INCLUDEDIR@
-+Cflags: -I${includedir}
++Cflags: -I${includedir}/directfb -I${includedir}
diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
--- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in 2004-05-19 07:31:28.000000000 -0400
+++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in 2007-03-16 22:32:55.000000000 -0400
@@ -42,4 +42,4 @@ diff -ur DirectFB-1.0.0~org/lib/voodoo/v
Requires: direct
Libs: -L${libdir} -lvoodoo
-Cflags: -I at INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
-+Cflags: -I${includedir}
============================================================
--- packages/e17/expedite_cvs.bb 3619ffd86c2d193c30ed018a3a064296e7609850
+++ packages/e17/expedite_cvs.bb a3eb9e6385c5b2460ac7c5d0c3509a4e97e5820f
@@ -1,8 +1,9 @@ DEPENDS = "eet evas"
DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
DEPENDS = "eet evas"
+RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
LICENSE = "MIT"
-PV = "0.0.0+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.6.0+cvs${SRCDATE}"
+PR = "r0"
inherit autotools
============================================================
--- packages/efl1/evas.inc 75e7e49650901c4a5ed2bd9c2e390eb76c130a3c
+++ packages/efl1/evas.inc 597ab85948221435b09749c151bb454d6bc7c247
@@ -33,3 +33,5 @@ FILES_${PN} = "${libdir}/libevas*.so*"
FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
FILES_${PN} = "${libdir}/libevas*.so*"
+
+PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
============================================================
--- packages/efl1/evas_cvs.bb bf66442121095eca949f9fd7637e93fecdfcaf1c
+++ packages/efl1/evas_cvs.bb dbafdc3234a73fe9ef33b6fb8fdc7de99921d04b
@@ -1,5 +1,5 @@ require evas.inc
require evas.inc
-PR = "r2"
+PR = "r3"
EXTRA_OECONF = "\
--x-includes=${STAGING_INCDIR}/X11 \
============================================================
--- packages/linux/linux-openmoko.inc b66ff5f175f6e86ae148096aca6dbf2b0e03b644
+++ packages/linux/linux-openmoko.inc 1ea30a4afd856ca9ab5f4ee04ae06a0e9171ddd1
@@ -1,8 +1,8 @@ do_deploy_append() {
# extra stuff we need for openmoko that is not in linux.inc
do_deploy_append() {
- mv ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
- mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
+ mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
+ mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin
}
============================================================
--- packages/linux/linux_2.6.23.bb fb5e490f36b730f495e7bf48a7fcd8af38e6a3a7
+++ packages/linux/linux_2.6.23.bb 46f4e7136cce3c8d26a3f7dbc5a80a07611c6e03
@@ -6,8 +6,8 @@ DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
-DEPENDS_append_mpc8313e-rdb = "dtc-native"
-DEPENDS_append_mpc8323e-rdb = "dtc-native"
+DEPENDS_append_mpc8313e-rdb = " dtc-native"
+DEPENDS_append_mpc8323e-rdb = " dtc-native"
PR = "r7"
============================================================
--- packages/python/python-pygtk_2.10.4.bb d9b42f194943701dd3dd2cf861e84c49df9183b9
+++ packages/python/python-pygtk_2.10.4.bb 7a42ce19de5c3967c7030768ff9e0901ac72a20c
@@ -1,7 +1,7 @@ SECTION = "devel/python"
DESCRIPTION = "Python GTK+ 2.10.x Bindings"
SECTION = "devel/python"
# needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade"
+DEPENDS = "gtk+ libglade python-pycairo"
RDEPENDS = "python-shell python-pycairo python-pygobject"
PROVIDES = "python-pygtk2"
SRCNAME = "pygtk"
============================================================
--- packages/tasks/task-python-everything.bb 2e4ebcc640b47da88d113e5780f8f4da2e755a21
+++ packages/tasks/task-python-everything.bb cb2d01f802774b542aaf3c1f69ba9931e7cb3982
@@ -1,7 +1,7 @@ LICENSE = "MIT"
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml21"
+PR = "ml22"
RDEPENDS = "\
python-ao \
@@ -9,6 +9,7 @@ RDEPENDS = "\
python-constraint \
python-dbus \
python-dialog \
+ python-directfb \
python-efl \
python-pycurl \
python-fam \
#
# mt diff -r5480bec3f64046446cb2d5fdbba10a7a45e5d5f7 -r0477df9022563b244a5800a100d17545b4e0258b
#
#
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [a64e90095f6442e2dfb62961b3a54918c8c17519]
# to [df64576fea94c73841caa9d194cca699ddf9575e]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [c2bc580c5af6e6a1a1fa2ed9220455a8ca8c55f8]
# to [cf372a56d0952ca445d801dd6b169d120224b6f2]
#
============================================================
--- packages/zaurus-updater/zaurus-updater/updater.sh a64e90095f6442e2dfb62961b3a54918c8c17519
+++ packages/zaurus-updater/zaurus-updater/updater.sh df64576fea94c73841caa9d194cca699ddf9575e
@@ -375,9 +375,6 @@ done
esac
done
-# starting shell to test -- remove this from final release
-/bin/sh
-
# reboot
exit 0
============================================================
--- packages/zaurus-updater/zaurus-updater.bb c2bc580c5af6e6a1a1fa2ed9220455a8ca8c55f8
+++ packages/zaurus-updater/zaurus-updater.bb cf372a56d0952ca445d801dd6b169d120224b6f2
@@ -1,7 +1,7 @@ LICENSE = "zaurus-updater"
DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
DEPENDS = "encdec-updater-native"
LICENSE = "zaurus-updater"
-PR = "r17"
+PR = "r18"
PACKAGES = ""
PACKAGE_ARCH = "${MACHINE_ARCH}"
More information about the Openembedded-commits
mailing list