[oe-commits] org.oe.dev merge of '17f165259b5092d4fb5def6145d429af967f491a'

mickeyl commit openembedded-commits at lists.openembedded.org
Tue Oct 23 10:44:19 UTC 2007 

merge of '17f165259b5092d4fb5def6145d429af967f491a'
     and '63916b741165f48e46f4d9b000ec2b036ff1beb4'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5db403bd5d17402720832bf15a2ac01a04220cad
ViewMTN: http://monotone.openembedded.org/revision/info/5db403bd5d17402720832bf15a2ac01a04220cad
Files:
1
packages/gstreamer/gst-meta-base_0.10.bb
packages/mkfontscale-native_1.0.3.bb
packages/xorg-app/mkfontscale-native_1.0.3.bb
packages/mkfontscale_1.0.3.bb
packages/xorg-app/mkfontscale_1.0.3.bb
packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/binutils/binutils_2.18.bb
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-rp_2.6.21.bb
Diffs:

#
# mt diff -r17f165259b5092d4fb5def6145d429af967f491a -r5db403bd5d17402720832bf15a2ac01a04220cad
#
# 
# 
# patch "packages/gstreamer/gst-meta-base_0.10.bb"
#  from [f7556e526303b21566c49eb45960b865ca58944b]
#    to [997c6ca039a778157fe99f9a3ec60d498181ec59]
# 
============================================================
--- packages/gstreamer/gst-meta-base_0.10.bb	f7556e526303b21566c49eb45960b865ca58944b
+++ packages/gstreamer/gst-meta-base_0.10.bb	997c6ca039a778157fe99f9a3ec60d498181ec59
@@ -1,8 +1,8 @@ DEPENDS = "gstreamer gst-plugins-base gs
 # Based on its sibling on Poky which is copyright (C) 2006,2007  OpenedHand LTD
 
 DESCRIPTION = "Gstreamer package groups"
 DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-PR = "r9"
+PR = "r10"
 
 PACKAGES = "\
     gst-meta-base \
@@ -20,17 +20,15 @@ RDEPENDS_gst-meta-base = "\
     gst-plugin-audioconvert \
     gst-plugin-audioresample \
     gst-plugin-typefindfunctions \
-    gst-plugin-videoscale \
     gst-plugin-autodetect"
 
 RRECOMMENDS_gst-meta-base = "\
     gst-plugin-gnomevfs \
     gst-plugin-alsa \
     gst-plugin-ximagesink \
-    gst-plugin-typefindfunctions \
     gst-plugin-videoscale \
-    gst-plugin-ffmpegcolorspace \
-    gst-plugin-autodetect"
+    gst-plugin-videorate \
+    gst-plugin-ffmpegcolorspace"
 
 RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
@@ -49,6 +47,9 @@ RDEPENDS_gst-meta-video = "\
     gst-meta-base \
     gst-plugin-avi \
     gst-plugin-matroska \
+    gst-plugin-mpegstream \
+    gst-plugin-mpegaudioparse \
+    gst-plugin-mpegvideoparse \
     gst-plugin-mpeg2dec"
 
 RRECOMMENDS_gst-meta-video = "\


#
# mt diff -r63916b741165f48e46f4d9b000ec2b036ff1beb4 -r5db403bd5d17402720832bf15a2ac01a04220cad
#
# 
# 
# rename "packages/mkfontscale-native_1.0.3.bb"
#     to "packages/xorg-app/mkfontscale-native_1.0.3.bb"
# 
# rename "packages/mkfontscale_1.0.3.bb"
#     to "packages/xorg-app/mkfontscale_1.0.3.bb"
# 
# add_file "packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch"
#  content [d2a4596119c2ee2138efb5e83e697add3dc7e0ca]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [e755feeba1ad85fc8e37a2ef61b2f5629c6a9daf]
#    to [4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed]
# 
# patch "packages/binutils/binutils_2.18.bb"
#  from [b46a0a4a1bd2041ecada2e2cebdd7415790ad44d]
#    to [e80beedb4b56489dd310354858c96616cd0c167c]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [eb31269e5b23d7d27da1cca934cbec96a1ca3234]
#    to [8b5016d2776b0d38d689c421d789e102336bc6ff]
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [d80feb79f4ed86271008fb110587f45d2a76a4a8]
#    to [48c008dba96498446b62a8e5235f31358a38d26e]
# 
============================================================
--- packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch	d2a4596119c2ee2138efb5e83e697add3dc7e0ca
+++ packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch	d2a4596119c2ee2138efb5e83e697add3dc7e0ca
@@ -0,0 +1,19 @@
+Adds support for Freescale Power architecture e300c2 and e300c3 cores.
+http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
+
+Leon Woestenberg <leonw at mailcan.com>
+
+diff -uNr binutils-2.16.1.orig/gas/config/tc-ppc.c binutils-2.16.1/gas/config/tc-ppc.c
+--- binutils-2.16.1.orig/gas/config/tc-ppc.c	2005-03-02 13:24:01.000000000 +0000
++++ binutils-2.16.1/gas/config/tc-ppc.c	2006-07-04 11:45:24.000000000 +0100
+@@ -879,6 +879,10 @@
+       else
+ 	ppc_cpu |= PPC_OPCODE_SPE;
+     }
++  else if (strcmp (arg, "pmr") == 0)
++    {
++      ppc_cpu |= PPC_OPCODE_PMR;
++    }
+   /* -mppc64 and -m620 mean to assemble for the 64-bit PowerPC
+      620.  */
+   else if (strcmp (arg, "ppc64") == 0 || strcmp (arg, "620") == 0)
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	e755feeba1ad85fc8e37a2ef61b2f5629c6a9daf
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	4d5a7f08cdd84d2ab2ab7515d0b01729d2b6a2ed
@@ -668,7 +668,6 @@ PREFERRED_VERSION_hildon-thumbnail ?= "0
 PREFERRED_VERSION_hildon-navigator ?= "0.9.6-2"
 PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1"
 PREFERRED_VERSION_hildon-thumbnail ?= "0.11"
-PREFERRED_VERSION_hnb ?= "1.9.17"
 PREFERRED_VERSION_hostap-conf ?= "1.0"
 PREFERRED_VERSION_hostap-daemon ?= "0.4.4"
 PREFERRED_VERSION_hostap-modules ?= "0.4.7"
@@ -1232,7 +1231,7 @@ PREFERRED_VERSION_microwindows ?= "0.90"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.8"
+PREFERRED_VERSION_midori ?= "0.0.10"
 PREFERRED_VERSION_midpath ?= "0.1"
 PREFERRED_VERSION_midpath-alsa ?= "0.1"
 PREFERRED_VERSION_midpath-cldc ?= "0.1"
============================================================
--- packages/binutils/binutils_2.18.bb	b46a0a4a1bd2041ecada2e2cebdd7415790ad44d
+++ packages/binutils/binutils_2.18.bb	e80beedb4b56489dd310354858c96616cd0c167c
@@ -1,3 +1,5 @@
+PR = "r1"
+
 require binutils.inc
 
 SRC_URI = "\
@@ -10,3 +12,7 @@ SRC_URI = "\
      file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
      file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
      "
+
+# powerpc patches
+SRC_URI += "file://binutils-2.16.1-e300c2c3.patch;patch=1"
+
============================================================
--- packages/linux/linux-ezx_2.6.21.bb	eb31269e5b23d7d27da1cca934cbec96a1ca3234
+++ packages/linux/linux-ezx_2.6.21.bb	8b5016d2776b0d38d689c421d789e102336bc6ff
@@ -1,8 +1,8 @@ EZX = "ezxdev"
 DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
 AUTHOR = "The OpenEZX Team <openezx-devel at lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-r23"
+PR = "${EZX}-r24"
 
 require linux.inc
 
@@ -92,8 +92,8 @@ CMDLINE_CON = "console=tty1 "
 #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
 CMDLINE_CON = "console=tty1 "
 
-CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5"
-CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=1"
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=1 "
 # Uncomment to enable dyntick
 #CMDLINE_OTHER = "dyntick=enable"
 CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
============================================================
--- packages/linux/linux-rp_2.6.21.bb	d80feb79f4ed86271008fb110587f45d2a76a4a8
+++ packages/linux/linux-rp_2.6.21.bb	48c008dba96498446b62a8e5235f31358a38d26e
@@ -1,7 +1,9 @@ PR = "r10"
 require linux-rp.inc
 
 PR = "r10"
 
+DEFAULT_PREFERENCE_collie = "1"
+
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2

More information about the Openembedded-commits mailing list