[oe-commits] org.oe.dev merge of '9f1fe2504c55293cd4cdd2e508adf582c8ae44c3'
hrw commit
openembedded-commits at lists.openembedded.org
Wed Dec 19 10:23:20 UTC 2007
merge of '9f1fe2504c55293cd4cdd2e508adf582c8ae44c3'
and 'c33637ccb4f9f6285140370561048926fa0c712f'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 9f4b2e73abbbdeaa5c3a0d12bc2b0f4b4e17f800
ViewMTN: http://monotone.openembedded.org/revision/info/9f4b2e73abbbdeaa5c3a0d12bc2b0f4b4e17f800
Files:
1
packages/images/poky-base-image.bb
packages/images/x11-sato-image.bb
packages/atk/atk-1.2.0
packages/atk/atk-1.2.0/m4.patch
packages/atk/atk-1.6.0
packages/atk/atk-1.6.0/gtk-doc.patch
packages/atk/atk_1.10.3.bb
packages/atk/atk_1.2.0.bb
packages/atk/atk_1.6.0.bb
packages/atk/atk_1.6.1.bb
packages/atk/atk_1.9.0.bb
packages/gtk+/gtk+-2.2.4/automake-lossage.patch
packages/gtk+/gtk+-2.2.4/configure-lossage.patch
packages/gtk+/gtk+-2.2.4/glib-2.0.m4
packages/gtk+/gtk+-2.2.4/glib-gettext.m4
packages/gtk+/gtk+-2.2.4/libtool-lossage.patch
packages/gtk+/gtk+-2.2.4/no-demos.patch
packages/gtk+/gtk+-2.2.4/no-xwc.patch
packages/gtk+/gtk+-2.4.13/automake-lossage.patch
packages/gtk+/gtk+-2.4.13/disable-tooltips.patch
packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch
packages/gtk+/gtk+-2.4.13/gtk-doc.m4
packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch
packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch
packages/gtk+/gtk+-2.4.13/menu-deactivate.patch
packages/gtk+/gtk+-2.4.13/no-demos.patch
packages/gtk+/gtk+-2.4.13/no-xwc.patch
packages/gtk+/gtk+-2.4.13/scroll-timings.patch
packages/gtk+/gtk+-2.4.13/single-click.patch
packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch
packages/gtk+/gtk+-2.4.13/spinbutton.patch
packages/gtk+/gtk+-2.4.13/xsettings.patch
packages/gtk+/gtk+_2.2.4.bb
packages/gtk+/gtk+_2.4.13.bb
packages/libvorbis/libvorbis_1.2.0.bb
packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb
packages/reiserfsprogs/reiserfsprogs_3.6.19.bb
packages/tasks/task-openmoko-phone.bb
Diffs:
#
# mt diff -r9f1fe2504c55293cd4cdd2e508adf582c8ae44c3 -r9f4b2e73abbbdeaa5c3a0d12bc2b0f4b4e17f800
#
#
#
# rename "packages/images/poky-base-image.bb"
# to "packages/images/x11-sato-image.bb"
#
#
# mt diff -rc33637ccb4f9f6285140370561048926fa0c712f -r9f4b2e73abbbdeaa5c3a0d12bc2b0f4b4e17f800
#
#
#
# delete "packages/atk/atk-1.2.0"
#
# delete "packages/atk/atk-1.2.0/m4.patch"
#
# delete "packages/atk/atk-1.6.0"
#
# delete "packages/atk/atk-1.6.0/gtk-doc.patch"
#
# delete "packages/atk/atk_1.10.3.bb"
#
# delete "packages/atk/atk_1.2.0.bb"
#
# delete "packages/atk/atk_1.6.0.bb"
#
# delete "packages/atk/atk_1.6.1.bb"
#
# delete "packages/atk/atk_1.9.0.bb"
#
# delete "packages/gtk+/gtk+-2.2.4/automake-lossage.patch"
#
# delete "packages/gtk+/gtk+-2.2.4/configure-lossage.patch"
#
# delete "packages/gtk+/gtk+-2.2.4/glib-2.0.m4"
#
# delete "packages/gtk+/gtk+-2.2.4/glib-gettext.m4"
#
# delete "packages/gtk+/gtk+-2.2.4/libtool-lossage.patch"
#
# delete "packages/gtk+/gtk+-2.2.4/no-demos.patch"
#
# delete "packages/gtk+/gtk+-2.2.4/no-xwc.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/automake-lossage.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/disable-tooltips.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/gtk+-handhelds.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/gtk-doc.m4"
#
# delete "packages/gtk+/gtk+-2.4.13/gtklabel-resize-patch"
#
# delete "packages/gtk+/gtk+-2.4.13/hardcoded_libtool.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/menu-deactivate.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/no-demos.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/no-xwc.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/scroll-timings.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/single-click.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/small-gtkfilesel.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/spinbutton.patch"
#
# delete "packages/gtk+/gtk+-2.4.13/xsettings.patch"
#
# delete "packages/gtk+/gtk+_2.2.4.bb"
#
# delete "packages/gtk+/gtk+_2.4.13.bb"
#
# add_file "packages/libvorbis/libvorbis_1.2.0.bb"
# content [bfa924d59a88e448f8484e94e5e5d7e031c148bc]
#
# patch "packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb"
# from [cfc2c205925f57ee105864f9699781d1fba40303]
# to [37cbec9bfd9f24c6f483b2c8ef203c14efcac402]
#
# patch "packages/reiserfsprogs/reiserfsprogs_3.6.19.bb"
# from [d30ff32bd7b6e7f5499c0f1f370528b89c0a4d20]
# to [ae382b6725837b4e5b0fc5fe9066a6b4844944e3]
#
# patch "packages/tasks/task-openmoko-phone.bb"
# from [0c9c69c9ffea7cfbf2d1b2ac75951c5218d77da8]
# to [e581df871797084f3feefe30f1c18d23db7cdc61]
#
============================================================
--- packages/libvorbis/libvorbis_1.2.0.bb bfa924d59a88e448f8484e94e5e5d7e031c148bc
+++ packages/libvorbis/libvorbis_1.2.0.bb bfa924d59a88e448f8484e94e5e5d7e031c148bc
@@ -0,0 +1,30 @@
+SECTION = "libs"
+DEPENDS = "libogg"
+DESCRIPTION = "Ogg Vorbis is a high-quality lossy audio codec \
+that is free of intellectual property restrictions. libvorbis \
+is the main vorbis codec library."
+LICENSE = "BSD"
+
+SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+# vorbisfile.c reveals a problem in the gcc register spilling for the
+# thumb instruction set...
+FULL_OPTIMIZATION_thumb = "-O0"
+
+EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
+ --with-ogg-includes=${STAGING_INCDIR}"
+
+do_stage () {
+ oe_libinstall -a -so -C lib libvorbis ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C lib libvorbisfile ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C lib libvorbisenc ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/vorbis
+ install -m 0644 include/vorbis/vorbisenc.h \
+ include/vorbis/vorbisfile.h \
+ include/vorbis/codec.h ${STAGING_INCDIR}/vorbis/
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 vorbis.m4 ${STAGING_DATADIR}/aclocal/
+}
============================================================
--- packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb cfc2c205925f57ee105864f9699781d1fba40303
+++ packages/matchbox-applet-cards/matchbox-applet-cards_1.0.2.bb 37cbec9bfd9f24c6f483b2c8ef203c14efcac402
@@ -1,10 +1,10 @@ PR = "r1"
DESCRIPTION = "Panel applet to eject cards (from PdaXrom project)"
LICENSE = "GPL"
DEPENDS = "matchbox-wm libmatchbox"
SECTION = "x11/wm"
PR = "r1"
-SRC_URI = "http://212.10.30.205/rc12/src/mb-applet-cards-${PV}.tar.bz2 \
+SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/mb-applet-cards-${PV}.tar.bz2 \
file://oz-gpe.patch;patch=1 \
file://gpe-applet-cards \
file://cf_mount.png \
============================================================
--- packages/reiserfsprogs/reiserfsprogs_3.6.19.bb d30ff32bd7b6e7f5499c0f1f370528b89c0a4d20
+++ packages/reiserfsprogs/reiserfsprogs_3.6.19.bb ae382b6725837b4e5b0fc5fe9066a6b4844944e3
@@ -1,10 +1,12 @@ PR = "r1"
DESCRIPTION = "User-level tools for ReiserFS filesystems"
SECTION = "base"
LICENSE = "GPL"
RRECOMMENDS_${PN} = "reiserfsprogs-reiserfsck reiserfsprogs-mkreiserfs"
PR = "r1"
-SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+#Namesys.com seems to be in trouble. See bug #3482 for more information
+#SRC_URI ="ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-${PV}.tar.gz \
+SRC_URI ="${DEBIAN_MIRROR}/main/r/reiserfsprogs/reiserfsprogs_${PV}.orig.tar.gz \
file://header-fix.patch;patch=1 \
"
============================================================
--- packages/tasks/task-openmoko-phone.bb 0c9c69c9ffea7cfbf2d1b2ac75951c5218d77da8
+++ packages/tasks/task-openmoko-phone.bb e581df871797084f3feefe30f1c18d23db7cdc61
@@ -1,8 +1,7 @@ LICENSE = "MIT"
DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PROVIDES = "task-openmoko-everything"
-PR = "r71"
+PR = "r72"
inherit task
More information about the Openembedded-commits
mailing list