[oe-commits] org.oe.dev merge of 'e9e7550c64fb618ca229a869b9a5ccae9c437121'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Jul 22 14:43:53 UTC 2007
merge of 'e9e7550c64fb618ca229a869b9a5ccae9c437121'
and 'efa64132e0fc0c02d7eb3be193b7df736281ee8a'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 11f7fe52979b2ee9abafdfceeca3addb08ec96ce
ViewMTN: http://monotone.openembedded.org/revision.psp?id=11f7fe52979b2ee9abafdfceeca3addb08ec96ce
Files:
1
classes/efl1.bbclass
packages/efl++
packages/efl++/efl++-fb_cvs.bb
packages/efl++/efl++-x11_cvs.bb
packages/efl++/efl++.inc
packages/efl++/files
packages/efl++/files/disable-smart.patch
packages/efl++/files/fix-src.pro.patch
packages/musicbrainz/libmusicbrainz_2.1.2.bb
packages/musicbrainz/libmusicbrainz_2.1.4.bb
packages/e17/enna
packages/efl1/etk-native
packages/e17/edje-editor_cvs.bb
packages/e17/enna_svn.bb
packages/e17/exhibit_cvs.bb
packages/efl1/eflpp_cvs.bb
packages/efl1/etk-native_cvs.bb
packages/musicbrainz/libmusicbrainz_3.0.1.bb
classes/efl_library.bbclass
conf/distro/include/sane-srcdates.inc
packages/efl1/esmart_cvs.bb
packages/taglib/taglib_1.4.bb
packages/taglib/taglibc_1.4.bb
packages/geoclue/geoclue_git.bb
packages/webkit/webkit/Makefile.shared
packages/webkit/webkit/WebKit.pro
Diffs:
#
# mt diff -re9e7550c64fb618ca229a869b9a5ccae9c437121 -r11f7fe52979b2ee9abafdfceeca3addb08ec96ce
#
#
#
# delete "classes/efl1.bbclass"
#
# delete "packages/efl++"
#
# delete "packages/efl++/efl++-fb_cvs.bb"
#
# delete "packages/efl++/efl++-x11_cvs.bb"
#
# delete "packages/efl++/efl++.inc"
#
# delete "packages/efl++/files"
#
# delete "packages/efl++/files/disable-smart.patch"
#
# delete "packages/efl++/files/fix-src.pro.patch"
#
# rename "packages/musicbrainz/libmusicbrainz_2.1.2.bb"
# to "packages/musicbrainz/libmusicbrainz_2.1.4.bb"
#
# add_dir "packages/e17/enna"
#
# add_dir "packages/efl1/etk-native"
#
# add_file "packages/e17/edje-editor_cvs.bb"
# content [740c05ae1ecafcda56ba3f18f5b2fe0dac6332be]
#
# add_file "packages/e17/enna_svn.bb"
# content [54210860447fe567d01be8573abb04a167e9c1cc]
#
# add_file "packages/e17/exhibit_cvs.bb"
# content [29fad610360202f480fede26fb0c3c7c81eca8e7]
#
# add_file "packages/efl1/eflpp_cvs.bb"
# content [b55ba494477a039487e7bf33d30cb8d99947394b]
#
# add_file "packages/efl1/etk-native_cvs.bb"
# content [24762ce075076d9dcc7feea45c57ad02ea43ea76]
#
# add_file "packages/musicbrainz/libmusicbrainz_3.0.1.bb"
# content [d5ac482856546cff7a5115d7afd5413ebd5bba73]
#
# patch "classes/efl_library.bbclass"
# from [b3ae5ff81c40f3b543f2519e362531a715eeef03]
# to [9f05c0b66273f55a4febe214ee17814ca010f922]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [0dcb9e0e4e87a918b1f6dcdc07054dde621b8bbb]
# to [72eb6f38fb84f6735815864c6dbb9980a5cfbe3d]
#
# patch "packages/efl1/esmart_cvs.bb"
# from [ee68efdac13ac563cdc6a6c8e818e1f391d255ce]
# to [d2f3fcc4b634993e1088d65ea71588d2e7e57db4]
#
# patch "packages/musicbrainz/libmusicbrainz_2.1.4.bb"
# from [f1b857d0c2658546d8e2dea8bd039fd5caa2daf0]
# to [9c70cdf3ad872cc2b9f5bf67233f035eabbebcd4]
#
# patch "packages/taglib/taglib_1.4.bb"
# from [9b30f2ebb123c03e7caab528ae91e8eabc29e799]
# to [95c3d0a183ed6167101a89a3684c94090bca0b9a]
#
# patch "packages/taglib/taglibc_1.4.bb"
# from [e8fef8fd3a493b9b4da7170b1ffaeb59b870cf85]
# to [c612c09cd5e88f8074a856179ff84c2431ff0eec]
#
============================================================
--- packages/e17/edje-editor_cvs.bb 740c05ae1ecafcda56ba3f18f5b2fe0dac6332be
+++ packages/e17/edje-editor_cvs.bb 740c05ae1ecafcda56ba3f18f5b2fe0dac6332be
@@ -0,0 +1,12 @@
+DESCRIPTION = "Edje-Editor is just that."
+LICENSE = "MIT"
+DEPENDS = "etk"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "${E_CVS};module=e17/proto/edje_editor"
+S = "${WORKDIR}/edje_editor"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
============================================================
--- packages/e17/enna_svn.bb 54210860447fe567d01be8573abb04a167e9c1cc
+++ packages/e17/enna_svn.bb 54210860447fe567d01be8573abb04a167e9c1cc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Enna is a media center application based on EFL"
+LICENSE = "GPL"
+DEPENDS = "curl dbus eet evas edje ecore edbus emotion libmusicbrainz libxml2 taglibc"
+SECTION = "x11/multimedia"
+PV = "0.2.0+svn${SRCDATE}"
+
+inherit e
+
+SRC_URI = "svn://enna.svn.sourceforge.net/svnroot/enna/trunk;module=enna;proto=http \
+ file://locale-is-broken.patch;patch=1"
+S = "${WORKDIR}/enna"
+
+do_configure_prepend() {
+ touch po/Makefile.in.in
+}
+
============================================================
--- packages/e17/exhibit_cvs.bb 29fad610360202f480fede26fb0c3c7c81eca8e7
+++ packages/e17/exhibit_cvs.bb 29fad610360202f480fede26fb0c3c7c81eca8e7
@@ -0,0 +1,10 @@
+DESCRIPTION = "Exhibit is the ETK picture viewer"
+DEPENDS = "evas ecore edje etk epsilon engrave"
+LICENSE = "MIT"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+
+inherit e
+
+SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/exhibit"
+S = "${WORKDIR}/${PN}"
============================================================
--- packages/efl1/eflpp_cvs.bb b55ba494477a039487e7bf33d30cb8d99947394b
+++ packages/efl1/eflpp_cvs.bb b55ba494477a039487e7bf33d30cb8d99947394b
@@ -0,0 +1,10 @@
+DESCRIPTION = "EFLpp are C++ bindings to the EFL"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/"
+LICENSE = "LGPL"
+DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
+PV = "0.1.0+cvs${SRCDATE}"
+
+inherit efl_library
+
+SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME}"
============================================================
--- packages/efl1/etk-native_cvs.bb 24762ce075076d9dcc7feea45c57ad02ea43ea76
+++ packages/efl1/etk-native_cvs.bb 24762ce075076d9dcc7feea45c57ad02ea43ea76
@@ -0,0 +1,10 @@
+require etk_cvs.bb
+inherit native
+DEPENDS = "evas-native ecore-native edje-native"
+
+SRC_URI += "file://no-tests.patch;patch=1"
+
+do_stage_append() {
+ mv ${STAGING_DIR}/include/etk ${STAGING_INCDIR}
+}
+
============================================================
--- packages/musicbrainz/libmusicbrainz_3.0.1.bb d5ac482856546cff7a5115d7afd5413ebd5bba73
+++ packages/musicbrainz/libmusicbrainz_3.0.1.bb d5ac482856546cff7a5115d7afd5413ebd5bba73
@@ -0,0 +1,16 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
+It allows you to access the data held on the MusicBrainz server."
+HOMEPAGE = "http://musicbrainz.org"
+LICENSE = "LGPL"
+DEPENDS = "expat"
+
+SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- classes/efl_library.bbclass b3ae5ff81c40f3b543f2519e362531a715eeef03
+++ classes/efl_library.bbclass 9f05c0b66273f55a4febe214ee17814ca010f922
@@ -5,5 +5,5 @@ FILES_${PN}-tests = "${bindir}/${PN} ${b
PACKAGES =+ "${PN}-tests"
FILES_${PN}-tests = "${bindir}/${PN} ${bindir}/*_* ${datadir}"
-FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la"
+FILES_${PN}-dev += "${bindir}/*-config ${libdir}/${PN}/*.a ${libdir}/${PN}/*.la ${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la"
FILES_${PN} = "${libdir}/*.so*"
============================================================
--- conf/distro/include/sane-srcdates.inc 0dcb9e0e4e87a918b1f6dcdc07054dde621b8bbb
+++ conf/distro/include/sane-srcdates.inc 72eb6f38fb84f6735815864c6dbb9980a5cfbe3d
@@ -92,6 +92,7 @@ SRCDATE_e-utils ?= "20070601"
SRCDATE_elitaire ?= "20070504"
SRCDATE_entice ?= "20070601"
SRCDATE_e-utils ?= "20070601"
+SRCDATE_enna ?= "20070721"
# Misc apps, sorted by alphabet
SRCDATE_avetanabt ?= "20060814"
============================================================
--- packages/efl1/esmart_cvs.bb ee68efdac13ac563cdc6a6c8e818e1f391d255ce
+++ packages/efl1/esmart_cvs.bb d2f3fcc4b634993e1088d65ea71588d2e7e57db4
@@ -5,6 +5,8 @@ inherit efl_library
inherit efl_library
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
PACKAGES =+ "${PN}-textentry \
${PN}-thumb \
${PN}-container \
============================================================
--- packages/musicbrainz/libmusicbrainz_2.1.2.bb f1b857d0c2658546d8e2dea8bd039fd5caa2daf0
+++ packages/musicbrainz/libmusicbrainz_2.1.4.bb 9c70cdf3ad872cc2b9f5bf67233f035eabbebcd4
@@ -1,15 +1,13 @@
-DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. The library allows you to access the data held on the MusicBrainz server."
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
+It allows you to access the data held on the MusicBrainz server."
HOMEPAGE = "http://musicbrainz.org"
LICENSE = "LGPL"
DEPENDS = "expat"
-SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz"
+SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
inherit autotools pkgconfig
do_stage() {
-autotools_stage_all
+ autotools_stage_all
}
-
-
-
============================================================
--- packages/taglib/taglib_1.4.bb 9b30f2ebb123c03e7caab528ae91e8eabc29e799
+++ packages/taglib/taglib_1.4.bb 95c3d0a183ed6167101a89a3684c94090bca0b9a
@@ -28,11 +28,11 @@ do_stage_append() {
do
install $i ${STAGING_INCDIR}/taglib/
done
- for i in `find taglib -name "*.tcc"`
- do
- install $i ${STAGING_INCDIR}/taglib/
- done
- oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR}
+ for i in `find taglib -name "*.tcc"`
+ do
+ install $i ${STAGING_INCDIR}/taglib/
+ done
+ oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR}
}
do_install() {
============================================================
--- packages/taglib/taglibc_1.4.bb e8fef8fd3a493b9b4da7170b1ffaeb59b870cf85
+++ packages/taglib/taglibc_1.4.bb c612c09cd5e88f8074a856179ff84c2431ff0eec
@@ -29,5 +29,5 @@ do_install() {
}
do_install() {
- oe_libinstall -so -C bindings/c libtag_c ${D}${libdir}
+ oe_libinstall -so -C bindings/c libtag_c ${D}${libdir}
}
#
# mt diff -refa64132e0fc0c02d7eb3be193b7df736281ee8a -r11f7fe52979b2ee9abafdfceeca3addb08ec96ce
#
#
#
# patch "packages/geoclue/geoclue_git.bb"
# from [d79909b0acc99332e0d6dbb777efa246c18c3153]
# to [c5a3d2adf2b42eac3d326986a0d339213f41376e]
#
# patch "packages/webkit/webkit/Makefile.shared"
# from [dc6db91a44fe03b497caf9ed6a058f22412249fa]
# to [4571aedc66a52b2d05fcb37b50ee169ffdc1b721]
#
# patch "packages/webkit/webkit/WebKit.pro"
# from [c4db9377c267835f4ec934a4d53207e26c25b99c]
# to [63fd1bd947de2d3abe6a011685e6173bf0a804e1]
#
============================================================
--- packages/geoclue/geoclue_git.bb d79909b0acc99332e0d6dbb777efa246c18c3153
+++ packages/geoclue/geoclue_git.bb c5a3d2adf2b42eac3d326986a0d339213f41376e
@@ -1,7 +1,7 @@ HOMEPAGE = "http://live.gnome.org/GeoClu
DESCRIPTION = "GeoClue is a project that provide all kinds of geography information to an application"
HOMEPAGE = "http://live.gnome.org/GeoClue"
-DEPENDS = "gpsd libxml2 libsoup dbus-glib"
+DEPENDS = "libgpsmgr libgpsbt gtk+ gpsd libxml2 gconf-dbus libsoup dbus-glib"
PV = "0.0+git${SRCDATE}"
PR = "r0"
@@ -13,6 +13,11 @@ S = "${WORKDIR}/git"
S = "${WORKDIR}/git"
+
+LDFLAGS_append = " -lgthread-2.0 "
+
+EXTRA_OECONF = " --enable-applet=no "
+
do_install_append() {
mkdir -p ${D}/usr/share/
cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share
============================================================
--- packages/webkit/webkit/Makefile.shared dc6db91a44fe03b497caf9ed6a058f22412249fa
+++ packages/webkit/webkit/Makefile.shared 4571aedc66a52b2d05fcb37b50ee169ffdc1b721
@@ -1,20 +1,21 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+SCRIPTS_PATH ?= ../WebKitTools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
all:
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
debug d development dev develop: force
- ../WebKitTools/Scripts/set-webkit-configuration --debug
+ $(SCRIPTS_PATH)/set-webkit-configuration --debug
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
release r deployment dep deploy: force
- ../WebKitTools/Scripts/set-webkit-configuration --release
+ $(SCRIPTS_PATH)/set-webkit-configuration --release
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
universal u: force
( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
clean:
- ( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+ ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
force: ;
============================================================
--- packages/webkit/webkit/WebKit.pro c4db9377c267835f4ec934a4d53207e26c25b99c
+++ packages/webkit/webkit/WebKit.pro 63fd1bd947de2d3abe6a011685e6173bf0a804e1
@@ -1,8 +1,9 @@ SUBDIRS += \
TEMPLATE = subdirs
CONFIG += ordered
!gdk-port:CONFIG += qt-port
qt-port:SUBDIRS += WebKitQt/Plugins
SUBDIRS += \
+ JavaScriptCore/pcre/dftables.pro \
WebCore \
JavaScriptCore/kjs/testkjs.pro
More information about the Openembedded-commits
mailing list