[oe-commits] org.oe.dev merge of '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
mickeyl commit
oe at amethyst.openembedded.net
Mon Jun 16 14:27:45 UTC 2008
merge of '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
and '3b2129cbd868ae2da323fb4418c0120038a9d33f'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5fc614e5aaeec54eb6667a7a09ba920551217a7f
ViewMTN: http://monotone.openembedded.org/revision/info/5fc614e5aaeec54eb6667a7a09ba920551217a7f
Files:
1
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
classes/insane.bbclass
conf/machine/hx4700.conf
packages/libpcre/libpcre_7.6.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/meta/slugos-packages.bb
packages/mplayer/files/Makefile-codec-cfg.patch
packages/mplayer/files/makefile-nostrip-svn.patch
packages/packagekit/packagekit_git.bb
packages/pulseaudio/pulseaudio-alsa-wrapper.bb
Diffs:
#
# mt diff -r1ca4c522d6f876b0f973239befedba5f6ad6ab07 -r5fc614e5aaeec54eb6667a7a09ba920551217a7f
#
#
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [94d02ccc8116860a8fd6d6ae6bba2978ced283fa]
# to [31082540c36a559d8a98fd280d83efab99ea9661]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a6040c27e849359c20c484582c9820647a58683f]
# to [aeccd2cc07a122231cd66b08e8769dba7c271812]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 94d02ccc8116860a8fd6d6ae6bba2978ced283fa
+++ conf/distro/include/preferred-om-2008-versions.inc 31082540c36a559d8a98fd280d83efab99ea9661
@@ -1476,7 +1476,7 @@ PREFERRED_VERSION_pth ?= "2.0.2"
PREFERRED_VERSION_psmisc ?= "22.2"
PREFERRED_VERSION_psplash-zap ?= "1.0"
PREFERRED_VERSION_pth ?= "2.0.2"
-PREFERRED_VERSION_pulseaudio ?= "0.9.9"
+PREFERRED_VERSION_pulseaudio ?= "0.9.10"
PREFERRED_VERSION_puppy ?= "1.11"
PREFERRED_VERSION_puzz-le ?= "2.0.0"
PREFERRED_VERSION_puzzles ?= "r7436"
============================================================
--- conf/distro/include/sane-srcrevs.inc a6040c27e849359c20c484582c9820647a58683f
+++ conf/distro/include/sane-srcrevs.inc aeccd2cc07a122231cd66b08e8769dba7c271812
@@ -156,7 +156,7 @@ SRCREV_pn-opkg ?= "4488"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-opkg ?= "4488"
-SRCREV_pn-opkg-native ?= "4452"
+SRCREV_pn-opkg-native ?= "4488"
SRCREV_pn-opkg-sdk ?= "4488"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
#
# mt diff -r3b2129cbd868ae2da323fb4418c0120038a9d33f -r5fc614e5aaeec54eb6667a7a09ba920551217a7f
#
#
#
# patch "classes/insane.bbclass"
# from [071cc4297bda486033be0ee2ba642fda644a63e8]
# to [bff5115ab0019254ae563d3c8698dbf67bb256f4]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [033dab0ad4b75b58384ec3b5114b7a377fe192e3]
# to [aeccd2cc07a122231cd66b08e8769dba7c271812]
#
# patch "conf/machine/hx4700.conf"
# from [537fcae072d2c76e87e7f1e735e333ccae1bb34a]
# to [6c63f74c98cc02dd49fcfc70e3cc0a45316fc6ce]
#
# patch "packages/libpcre/libpcre_7.6.bb"
# from [c46013011971789edcc9c8fbdc494ef7dde53070]
# to [634984fadf847a04361ed5aadf7338da3d63f9b0]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [36c9a8137d42b4c94aac611cc862d753715acff1]
# to [d9f5cd32de3cb959e7f83ae4f45edc6667992bf6]
#
# patch "packages/meta/slugos-packages.bb"
# from [bb651acba25eceb3e9b533f380af13a73a9ced7f]
# to [8f81515c5aaa1108e646cbe57f516ab69335d272]
#
# patch "packages/mplayer/files/Makefile-codec-cfg.patch"
# from [8f20ee3f42444885368ec66e356a21c2a53dfcdd]
# to [851242a73fa7c45999c200bcab2eb7c2be7fb58f]
#
# patch "packages/mplayer/files/makefile-nostrip-svn.patch"
# from [0dce2aa18439336671c9afb4c39655462221bae0]
# to [62acf7f3c2e39320919e7ccd5fb9811fdc381540]
#
# patch "packages/packagekit/packagekit_git.bb"
# from [3a16f8cf1f8e4923cf19ff3b75a9a0391258ba0a]
# to [977492aeaa710cd63b6506edd559feb2651337a9]
#
# patch "packages/pulseaudio/pulseaudio-alsa-wrapper.bb"
# from [3aecd5acd439510c0a240e80a452390e88c5dc1b]
# to [a18ced602465ff6a83679b36cd30cca49cfa1ad3]
#
============================================================
--- classes/insane.bbclass 071cc4297bda486033be0ee2ba642fda644a63e8
+++ classes/insane.bbclass bff5115ab0019254ae563d3c8698dbf67bb256f4
@@ -72,6 +72,9 @@ def package_qa_get_machine_dict():
"arm" : (40, 0, 0, True, True),
"armeb" : (40, 0, 0, False, True),
},
+ "linux-gnuspe" : {
+ "powerpc": (20, 0, 0, False, True),
+ },
}
============================================================
--- conf/distro/include/sane-srcrevs.inc 033dab0ad4b75b58384ec3b5114b7a377fe192e3
+++ conf/distro/include/sane-srcrevs.inc aeccd2cc07a122231cd66b08e8769dba7c271812
@@ -81,7 +81,7 @@ SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mickeyterm ?= "7b91951addfd51850a23c23ad8ba7f853c4d3416;hb=7b91951addfd51850a23c23ad8ba7f853c4d3416"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "26455"
+SRCREV_pn-mplayer ?= "27047"
SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-navit ?= "1096"
@@ -159,7 +159,7 @@ SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-opkg-native ?= "4488"
SRCREV_pn-opkg-sdk ?= "4488"
SRCREV_pn-oprofileui ?= "160"
-SRCREV_pn-packagekit ?= "ebbbfa191257861bd19bd47ba646dce590b51858"
+SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"
============================================================
--- conf/machine/hx4700.conf 537fcae072d2c76e87e7f1e735e333ccae1bb34a
+++ conf/machine/hx4700.conf 6c63f74c98cc02dd49fcfc70e3cc0a45316fc6ce
@@ -8,6 +8,8 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
+IMAGE_FSTYPES += "jffs2"
+
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
============================================================
--- packages/libpcre/libpcre_7.6.bb c46013011971789edcc9c8fbdc494ef7dde53070
+++ packages/libpcre/libpcre_7.6.bb 634984fadf847a04361ed5aadf7338da3d63f9b0
@@ -5,7 +5,7 @@ SECTION = "devel"
themselves still follow Perl syntax and semantics. The header file for \
the POSIX-style functions is called pcreposix.h."
SECTION = "devel"
-PR = "r2"
+PR = "r3"
LICENSE = "BSD"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
file://pcre-cross.patch;patch=1"
@@ -25,7 +25,12 @@ do_compile () {
do_compile () {
# stop libtool from trying to link with host libraries - fix from #33
# this resolve build problem on amd64 - #1015
- sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+ if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
+ sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+ else
+ ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool
+ sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+ fi
# The generation of dftables can lead to timestamp problems with ccache
# because the generated config.h seems newer. It is sufficient to ensure that the
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig 36c9a8137d42b4c94aac611cc862d753715acff1
+++ packages/linux/linux-omap2-git/beagleboard/defconfig d9f5cd32de3cb959e7f83ae4f45edc6667992bf6
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.26-rc5-omap1
-# Tue Jun 10 21:11:56 2008
+# Fri Jun 13 19:50:40 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -581,7 +581,6 @@ CONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-CONFIG_MTD_NAND_OMAP2=y
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_NANDSIM is not set
@@ -1156,6 +1155,9 @@ CONFIG_SND_OMAP_SOC=y
# SoC Audio for the Texas Instruments OMAP
#
CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_OMAP3BEAGLE=y
+CONFIG_SND_SOC_TWL4030=y
#
# Open Sound System
@@ -1681,7 +1683,7 @@ CONFIG_FRAME_POINTER=y
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_ERRORS is not set
# CONFIG_DEBUG_STACK_USAGE is not set
-CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_LL=n
# CONFIG_DEBUG_ICEDCC is not set
#
============================================================
--- packages/meta/slugos-packages.bb bb651acba25eceb3e9b533f380af13a73a9ced7f
+++ packages/meta/slugos-packages.bb 8f81515c5aaa1108e646cbe57f516ab69335d272
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r54"
+PR = "r55"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -134,7 +134,6 @@ SLUGOS_PACKAGES = "\
libvorbis \
libxml2 \
lighttpd \
- linphone \
litestream \
logrotate \
lrzsz \
@@ -189,7 +188,6 @@ SLUGOS_PACKAGES = "\
pkgconfig \
popt \
portmap \
- postfix \
ppp \
procps \
psmisc \
@@ -210,7 +208,6 @@ SLUGOS_PACKAGES = "\
sipsak \
slugimage \
smartmontools \
- spandsp \
sqlite \
squid \
ssmtp \
@@ -246,7 +243,6 @@ SLUGOS_PACKAGES = "\
wview-vpro \
wview-wxt510 \
xinetd \
- yeaphone \
yp-tools ypbind ypserv \
zd1211-firmware \
zip \
@@ -260,16 +256,20 @@ SLUGOS_BROKEN_PACKAGES = "\
eciadsl \
fetchmail \
gspcav1 \
+ linphone \
lirc-modules lirc \
madfu \
motion \
openldap \
+ postfix \
pwc \
qc-usb-messenger \
+ spandsp \
syslog-ng \
task-native-sdk \
unionfs-modules unionfs-utils \
wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
+ yeaphone \
zd1211 \
"
============================================================
--- packages/mplayer/files/Makefile-codec-cfg.patch 8f20ee3f42444885368ec66e356a21c2a53dfcdd
+++ packages/mplayer/files/Makefile-codec-cfg.patch 851242a73fa7c45999c200bcab2eb7c2be7fb58f
@@ -1,11 +1,11 @@
---- /tmp/Makefile 2008-04-17 21:41:29.623907292 +0200
-+++ trunk/Makefile 2008-04-17 21:42:04.164926258 +0200
-@@ -311,7 +311,7 @@
+--- /tmp/Makefile 2008-06-10 20:55:43.100403024 +0200
++++ trunk/Makefile 2008-06-10 20:56:10.881647093 +0200
+@@ -731,7 +731,7 @@
$(CC) -o $@ $^ $(LDFLAGS_MENCODER)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
-- $(HOST_CC) -O -I. -DCODECS2HTML $< -o $@
-+ $(BUILD_CC) -O -I. -DCODECS2HTML $< -o $@
+- $(HOST_CC) -O -I. -DCODECS2HTML -o $@ $<
++ $(BUILD_CC) -O -I. -DCODECS2HTML -o $@ $<
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./codec-cfg$(EXESUF) ./etc/codecs.conf > $@
============================================================
--- packages/mplayer/files/makefile-nostrip-svn.patch 0dce2aa18439336671c9afb4c39655462221bae0
+++ packages/mplayer/files/makefile-nostrip-svn.patch 62acf7f3c2e39320919e7ccd5fb9811fdc381540
@@ -1,22 +1,11 @@
-upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping)
-
---- /tmp/Makefile 2008-04-17 21:48:32.987984542 +0200
-+++ trunk/Makefile 2008-04-17 21:48:52.042750779 +0200
-@@ -337,7 +337,7 @@
- if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
+--- /tmp/Makefile 2008-06-10 21:05:55.613676241 +0200
++++ trunk/Makefile 2008-06-10 21:06:30.701172833 +0200
+@@ -797,7 +797,7 @@
+ $(INSTALL) -d $(BINDIR) $(CONFDIR)
- install-mplayer: mplayer$(EXESUF)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
-+ $(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR)
+ install-%: %$(EXESUF) install-dirs
+- $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
++ $(INSTALL) -m 755 $< $(BINDIR)
+ install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang))
+ install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang))
- install-mplayer-man:
- for lang in $(MAN_LANG); do \
-@@ -350,7 +350,7 @@
- done
-
- install-mencoder: mencoder$(EXESUF)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
-+ $(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR)
- for lang in $(MAN_LANG); do \
- if test "$$lang" = en ; then \
- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
============================================================
--- packages/packagekit/packagekit_git.bb 3a16f8cf1f8e4923cf19ff3b75a9a0391258ba0a
+++ packages/packagekit/packagekit_git.bb 977492aeaa710cd63b6506edd559feb2651337a9
@@ -4,14 +4,13 @@ RDEPENDS_${PN} = "opkg"
LICENSE = "GPL"
DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
RDEPENDS_${PN} = "opkg"
-PV = "0.2.1+git${SRCREV}"
-PR = "r8"
+PV = "0.2.3+gitr${SRCREV}"
+PR = "r9"
SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
- file://disable-docbook2man.patch;patch=1 \
- file://d1e096c3267c1c9492041382b954e9327bc8bbec.patch;patch=1 \
- file://pk-nodocs.patch;patch=1"
+ file://disable-docbook2man.patch;patch=1"
+
S = "${WORKDIR}/git"
inherit autotools pkgconfig
============================================================
--- packages/pulseaudio/pulseaudio-alsa-wrapper.bb 3aecd5acd439510c0a240e80a452390e88c5dc1b
+++ packages/pulseaudio/pulseaudio-alsa-wrapper.bb a18ced602465ff6a83679b36cd30cca49cfa1ad3
@@ -1,6 +1,8 @@ LICENSE = "GPLv2"
DESCRIPTION = "Meta package to make alsa transparently use pulseaudio"
LICENSE = "GPLv2"
+PR = "r1"
+
SRC_URI = "file://asound.conf.pulseaudio"
RDEPENDS = "hal \
@@ -9,6 +11,10 @@ RDEPENDS = "hal \
pulseaudio-module-alsa-sink \
pulseaudio-module-alsa-source \
pulseaudio-module-hal-detect \
+ pulseaudio-module-volume-restore \
+ pulseaudio-module-default-device-restore \
+ pulseaudio-module-rescue-streams \
+ pulseaudio-module-suspend-on-idle \
libasound-module-ctl-pulse \
libasound-module-pcm-pulse \
"
More information about the Openembedded-commits
mailing list