[oe-commits] org.oe.dev merge of 'ab0df719db1a0db16a19dcb44ad9ac7df72730f4'
jeremy_laine commit
openembedded-commits at lists.openembedded.org
Fri Feb 1 10:07:47 UTC 2008
merge of 'ab0df719db1a0db16a19dcb44ad9ac7df72730f4'
and 'f8e953325919c33c3f10d2427ace176d122f17b1'
Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 52827371f891ab8a65ec39e6d756afff5b2ffcfc
ViewMTN: http://monotone.openembedded.org/revision/info/52827371f891ab8a65ec39e6d756afff5b2ffcfc
Files:
1
conf/machine/qemux86.conf
packages/gnome/kanjipad_svn.bb
packages/kanjipad/kanjipad_svn.bb
packages/gtkmm/gtkmm_2.10.10.bb
packages/gtkmm/gtkmm_2.10.11.bb
conf/distro/include/preferred-opie-versions-1.2.4-pre.inc
packages/gtkmm/gtkmm.inc
packages/speex/speex_1.1.12+1.2beta1.bb
packages/speex/speex_1.1.12.bb
packages/speex/speex_1.1.7.bb
Diffs:
#
# mt diff -rab0df719db1a0db16a19dcb44ad9ac7df72730f4 -r52827371f891ab8a65ec39e6d756afff5b2ffcfc
#
#
#
# patch "conf/machine/qemux86.conf"
# from [74fdc152193ec1934216879ff766e8e13e098985]
# to [1ef7fa91b665a7e589a4201fbd887c1e415ea2f5]
#
============================================================
--- conf/machine/qemux86.conf 74fdc152193ec1934216879ff766e8e13e098985
+++ conf/machine/qemux86.conf 1ef7fa91b665a7e589a4201fbd887c1e415ea2f5
@@ -1,8 +1,9 @@ TARGET_ARCH = "i586"
#@TYPE: Machine
#@NAME: qemu x86 Emulator setup
#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
TARGET_ARCH = "i586"
+TARGET_CC_ARCH = "-march=i586"
PACKAGE_EXTRA_ARCHS = "x86"
require conf/machine/include/qemu.inc
#
# mt diff -rf8e953325919c33c3f10d2427ace176d122f17b1 -r52827371f891ab8a65ec39e6d756afff5b2ffcfc
#
#
#
# rename "packages/gnome/kanjipad_svn.bb"
# to "packages/kanjipad/kanjipad_svn.bb"
#
# rename "packages/gtkmm/gtkmm_2.10.10.bb"
# to "packages/gtkmm/gtkmm_2.10.11.bb"
#
# patch "conf/distro/include/preferred-opie-versions-1.2.4-pre.inc"
# from [0ec30d9f907b7f2ec7fc54c460d88f20d29f0199]
# to [c5c202967eaed17140ff9b44016871f4f7f7c948]
#
# patch "packages/gtkmm/gtkmm.inc"
# from [c99e2e2f13acddd410f35d4c40468e00186e71fb]
# to [2721714e04b807a38d3e7f602ab6fbddda1a0bd2]
#
# patch "packages/kanjipad/kanjipad_svn.bb"
# from [fe1180eb760254c17ec598c67c5932e64e96c3c4]
# to [24558b3aa6e372feb54f4e1df5cf5828b1667613]
#
# patch "packages/speex/speex_1.1.12+1.2beta1.bb"
# from [91f4e7440171313902585a24d4bf11d1388b5d75]
# to [f4e404c373cafd1d01bf094caec29533e4be9d2c]
#
# patch "packages/speex/speex_1.1.12.bb"
# from [c759c1cb912c80c8ffc43359b398ca2bc2947234]
# to [f522b4fa38bf020d83b6642856fd35a4a4402435]
#
# patch "packages/speex/speex_1.1.7.bb"
# from [f36ab67a057d9ca24be58dcd6db2f1c1a224ebab]
# to [ef9967a5abd83601ccfb672b15a56b2e19d2f7b6]
#
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.4-pre.inc 0ec30d9f907b7f2ec7fc54c460d88f20d29f0199
+++ conf/distro/include/preferred-opie-versions-1.2.4-pre.inc c5c202967eaed17140ff9b44016871f4f7f7c948
@@ -1,9 +1,9 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
#
# Default versions
QTE_VERSION ?= "2.3.10"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20070727"
+OPIE_SRCDATE ?= "20080127"
OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}"
OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}"
============================================================
--- packages/gtkmm/gtkmm.inc c99e2e2f13acddd410f35d4c40468e00186e71fb
+++ packages/gtkmm/gtkmm.inc 2721714e04b807a38d3e7f602ab6fbddda1a0bd2
@@ -7,9 +7,6 @@ inherit gnome autotools pkgconfig flow-l
inherit gnome autotools pkgconfig flow-lossage
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
-
LIBV = "2.4.0"
do_stage () {
@@ -19,3 +16,6 @@ do_stage () {
install -m 0644 gdk/gdkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
install -m 0644 gtk/gtkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4"
============================================================
--- packages/gnome/kanjipad_svn.bb fe1180eb760254c17ec598c67c5932e64e96c3c4
+++ packages/kanjipad/kanjipad_svn.bb 24558b3aa6e372feb54f4e1df5cf5828b1667613
@@ -1,19 +1,12 @@
-DESCRIPTION = "KanjiPad is a very simple program for handwriting recognition"
-LICENSE = "GPLv2"
+require kanjipad.inc
-DEPENDS = "gtk+ perl-native"
-
+DEPENDS += "perl-native"
PV = "2.0.0+svn${SRCDATE}"
+PR = "r1"
-inherit pkgconfig
-
SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
-
S = "${WORKDIR}/trunk"
do_compile_prepend() {
export CFLAGS='${TARGET_CFLAGS} -DFOR_PILOT_COMPAT -DKP_LIBDIR="${libdir}/kanjipad" -DBINDIR="${bindir}" `pkg-config --cflags gtk+-2.0` `pkg-config --cflags glib-2.0`'
}
-
-
-
============================================================
--- packages/speex/speex_1.1.12+1.2beta1.bb 91f4e7440171313902585a24d4bf11d1388b5d75
+++ packages/speex/speex_1.1.12+1.2beta1.bb f4e404c373cafd1d01bf094caec29533e4be9d2c
@@ -1,9 +1,9 @@ DEPENDS = "libogg"
DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
SECTION = "libs"
LICENSE = "BSD"
HOMEPAGE = "http://www.speex.org"
DEPENDS = "libogg"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz"
S = "${WORKDIR}/${PN}-1.2beta1"
@@ -27,8 +27,6 @@ do_configure_append() {
do_configure_append() {
sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
- perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
- perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
}
============================================================
--- packages/speex/speex_1.1.12.bb c759c1cb912c80c8ffc43359b398ca2bc2947234
+++ packages/speex/speex_1.1.12.bb f522b4fa38bf020d83b6642856fd35a4a4402435
@@ -1,9 +1,9 @@ DEPENDS = "libogg"
DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
SECTION = "libs"
LICENSE = "BSD"
HOMEPAGE = "http://www.speex.org"
DEPENDS = "libogg"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz"
@@ -25,8 +25,6 @@ do_configure_append() {
do_configure_append() {
sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
- perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
- perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
}
============================================================
--- packages/speex/speex_1.1.7.bb f36ab67a057d9ca24be58dcd6db2f1c1a224ebab
+++ packages/speex/speex_1.1.7.bb ef9967a5abd83601ccfb672b15a56b2e19d2f7b6
@@ -1,9 +1,9 @@ DEPENDS = "libogg"
DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
SECTION = "libs"
LICENSE = "BSD"
HOMEPAGE = "http://www.speex.org"
DEPENDS = "libogg"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.speex.org/download/speex-${PV}.tar.gz"
@@ -21,8 +21,6 @@ do_configure_append() {
do_configure_append() {
sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
- perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
- perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
}
More information about the Openembedded-commits
mailing list