[oe-commits] org.oe.dev merge of '17f165259b5092d4fb5def6145d429af967f491a'
oe commit
openembedded-commits at lists.openembedded.org
Tue Oct 23 10:44:34 UTC 2007
merge of '17f165259b5092d4fb5def6145d429af967f491a'
and '59cab1cf7e6555c78e83160548945b0b63b193a9'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3b746059b417b5f4dac35b18e315cd86005e0bad
ViewMTN: http://monotone.openembedded.org/revision/info/3b746059b417b5f4dac35b18e315cd86005e0bad
Files:
1
packages/fbset/fbset-modes
packages/fbset/fbset-modes/fic-gta01
packages/fbset/fbset-modes/fic-gta01/fb.modes
packages/fbset/fbset-modes.bb
packages/fbset/fbset_2.1.bb
packages/tasks/task-openmoko.bb
packages/gstreamer/gst-plugins-ugly_0.10.5.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
packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/binutils/binutils_2.18.bb
packages/busybox/busybox_1.7.2.bb
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux-rp_2.6.21.bb
packages/mpeg2dec/mpeg2dec_0.4.0b.bb
Diffs:
#
# mt diff -r17f165259b5092d4fb5def6145d429af967f491a -r3b746059b417b5f4dac35b18e315cd86005e0bad
#
#
#
# add_dir "packages/fbset/fbset-modes"
#
# add_dir "packages/fbset/fbset-modes/fic-gta01"
#
# add_file "packages/fbset/fbset-modes/fic-gta01/fb.modes"
# content [69c95216456c7e600b70f0abf276b88b6dabc0fc]
#
# add_file "packages/fbset/fbset-modes.bb"
# content [2457f644de75bfb1dd5accd49d33c36e31d7fbf5]
#
# patch "packages/fbset/fbset_2.1.bb"
# from [40a6c728d0367db58266310f67a8cd583691333e]
# to [e076fdda9b2d137ffe3b0f7e1919558a79759bda]
#
# patch "packages/tasks/task-openmoko.bb"
# from [870be401b6ac910ccf7cbc8611c17b7ebeb32882]
# to [c61e187b170a735e74e42908214d2ca1ea3c8cae]
#
============================================================
--- packages/fbset/fbset-modes/fic-gta01/fb.modes 69c95216456c7e600b70f0abf276b88b6dabc0fc
+++ packages/fbset/fbset-modes/fic-gta01/fb.modes 69c95216456c7e600b70f0abf276b88b6dabc0fc
@@ -0,0 +1,29 @@
+# Timings for GTA01 VGA and QVGA mode
+
+mode "480x640"
+ # D: 26.000 MHz, H: 43.334 kHz, V: 65.657 Hz
+ geometry 480 640 480 640 16
+ timings 38461 104 8 2 16 8 2
+ accel false
+endmode
+
+mode "vga"
+ # D: 26.000 MHz, H: 43.334 kHz, V: 65.657 Hz
+ geometry 480 640 480 640 16
+ timings 38461 104 8 2 16 8 2
+ accel false
+endmode
+
+mode "240x320"
+ # D: 8.475 MHz, H: 24.635 kHz, V: 75.569 Hz
+ geometry 240 320 240 320 16
+ timings 118000 88 8 2 2 8 2
+ accel false
+endmode
+
+mode "qvga"
+ # D: 8.475 MHz, H: 24.635 kHz, V: 75.569 Hz
+ geometry 240 320 240 320 16
+ timings 118000 88 8 2 2 8 2
+ accel false
+endmode
============================================================
--- packages/fbset/fbset-modes.bb 2457f644de75bfb1dd5accd49d33c36e31d7fbf5
+++ packages/fbset/fbset-modes.bb 2457f644de75bfb1dd5accd49d33c36e31d7fbf5
@@ -0,0 +1,18 @@
+DESCRIPTION = "Default display timings and resolutions for fbset"
+PV = "0.1.0"
+PR = "r0"
+
+ALLOW_EMPTY = "1"
+
+SRC_URI_append_fic-gta01 = " \
+ file://fb.modes"
+
+do_install() {
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/fb.modes ${D}${sysconfdir}
+}
+
+FILES_${PN} = "${sysconfdir}/fb.modes"
+PACKAGE_ARCH_${PN} = "all"
+PACKAGE_ARCH_fbset-modes = "${MACHINE}"
+
============================================================
--- packages/fbset/fbset_2.1.bb 40a6c728d0367db58266310f67a8cd583691333e
+++ packages/fbset/fbset_2.1.bb e076fdda9b2d137ffe3b0f7e1919558a79759bda
@@ -7,6 +7,7 @@ LICENSE = "GPL"
DESCRIPTION = "The fbset console tool"
LICENSE = "GPL"
+RRECOMMENDS = "fbset-modes"
PR = "r2"
============================================================
--- packages/tasks/task-openmoko.bb 870be401b6ac910ccf7cbc8611c17b7ebeb32882
+++ packages/tasks/task-openmoko.bb c61e187b170a735e74e42908214d2ca1ea3c8cae
@@ -37,6 +37,8 @@ RDEPENDS_task-openmoko-linux = "\
rsync \
screen \
psplash \
+ fbset \
+ fbset-modes \
# update-alternatives \
"
#
# mt diff -r59cab1cf7e6555c78e83160548945b0b63b193a9 -r3b746059b417b5f4dac35b18e315cd86005e0bad
#
#
#
# delete "packages/gstreamer/gst-plugins-ugly_0.10.5.bb"
#
# 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]
#
# add_file "packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch"
# content [bbdf150742e8abb6487527ca9112227eb51cd398]
#
# 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/busybox/busybox_1.7.2.bb"
# from [e0995507653a71bc95bf32102ed875598938514d]
# to [07cb779f36d353735584d53006f3eede1ea7fd89]
#
# patch "packages/gstreamer/gst-plugins-ugly_0.10.6.bb"
# from [a797c052361775643172a8cb270f3ea30d3da281]
# to [0ae18af7d536bef9d7e0e9378b0f134ee108a0cd]
#
# 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]
#
# patch "packages/mpeg2dec/mpeg2dec_0.4.0b.bb"
# from [b83c88f1275d81e0d84602ec21961f086ef8f3da]
# to [3e5344f42783243aa599a5b4311baf304d2ace25]
#
============================================================
--- 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)
============================================================
--- packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch bbdf150742e8abb6487527ca9112227eb51cd398
+++ packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch bbdf150742e8abb6487527ca9112227eb51cd398
@@ -0,0 +1,20 @@
+Index: gst-plugins-ugly-0.10.6/m4/gst-sid.m4
+===================================================================
+--- gst-plugins-ugly-0.10.6.orig/m4/gst-sid.m4
++++ gst-plugins-ugly-0.10.6/m4/gst-sid.m4
+@@ -16,14 +16,7 @@ if test $HAVE_SIDPLAY = "yes"; then
+
+ LIBS="-lsidplay"
+
+- AC_TRY_RUN([
+- #include <sidplay/player.h>
+- int main()
+- { sidTune tune = sidTune(0); }
+- ],
+- HAVE_SIDPLAY="yes",
+- HAVE_SIDPLAY="no",
+- HAVE_SIDPLAY="no")
++ HAVE_SIDPLAY="yes"
+
+ LIBS="$ac_libs_safe"
+
============================================================
--- 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/busybox/busybox_1.7.2.bb e0995507653a71bc95bf32102ed875598938514d
+++ packages/busybox/busybox_1.7.2.bb 07cb779f36d353735584d53006f3eede1ea7fd89
@@ -1,6 +1,6 @@ require busybox.inc
require busybox.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -14,7 +14,8 @@ SRC_URI = "http://www.busybox.net/downlo
file://syslog \
file://syslog.conf \
file://udhcpscript.patch;patch=1 \
- file://umount.busybox"
+ file://umount.busybox \
+ file://run_parts.c"
SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;patch=1 \
@@ -26,6 +27,7 @@ do_configure () {
EXTRA_OEMAKE_append = " V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
do_configure () {
+ cp ${WORKDIR}/run_parts.c ${S}/debianutils/
install -m 0644 ${WORKDIR}/defconfig ${S}/.config
cml1_do_configure
}
============================================================
--- packages/gstreamer/gst-plugins-ugly_0.10.6.bb a797c052361775643172a8cb270f3ea30d3da281
+++ packages/gstreamer/gst-plugins-ugly_0.10.6.bb 0ae18af7d536bef9d7e0e9378b0f134ee108a0cd
@@ -1,7 +1,9 @@ require gst-plugins.inc
require gst-plugins.inc
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
+PR = "r3"
+
SRC_URI += "file://cross-compile.patch;patch=1 \
- file://gstmad_16bit.patch;patch=1"
+ file://gstmad_16bit.patch;patch=1 \
+ file://gstsid_autofoo_HACK.patch;patch=1"
-PR = "r1"
============================================================
--- 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
============================================================
--- packages/mpeg2dec/mpeg2dec_0.4.0b.bb b83c88f1275d81e0d84602ec21961f086ef8f3da
+++ packages/mpeg2dec/mpeg2dec_0.4.0b.bb 3e5344f42783243aa599a5b4311baf304d2ace25
@@ -1,35 +1,18 @@
-DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video streams"
+DESCRIPTION = "Libraries and test programs for decoding mpeg-2 and mpeg-1 video streams"
HOMEPAGE = "http://libmpeg2.sourceforge.net/"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "virtual/libsdl"
-PROVIDES += "libmpeg2"
-RPROVIDES += "libmpeg2"
-PR = "r3"
+PR = "r4"
-S = "${WORKDIR}/mpeg2dec-0.4.0"
-
SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz"
+S = "${WORKDIR}/mpeg2dec-0.4.0"
inherit autotools pkgconfig
EXTRA_OECONF = "--enable-shared"
-PACKAGES += "libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev"
-
-FILES_${PN} += "${bindir}/*"
-FILES_libmpeg2 = "${libdir}/libmpeg2.so.*"
-FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
-FILES_libmpeg2-dev = "${libdir}/libmpeg2.so \
- ${libdir}/libmpeg2.*a \
- ${libdir}/pkgconfig/libmpeg2.pc \
- ${includedir}/mpeg2dec/mpeg2.h"
-FILES_libmpeg2convert-dev = "${libdir}/libmpeg2convert.so \
- ${libdir}/libmpeg2convert.*a \
- ${libdir}/pkgconfig/libmpeg2convert.pc \
- ${includedir}/mpeg2dec/mpeg2convert.h"
-
mpeg2dec_include = "mpeg2.h mpeg2convert.h"
do_stage () {
@@ -41,3 +24,9 @@ do_stage () {
install -m 0644 include/$i ${STAGING_INCDIR}/mpeg2dec/
done
}
+
+PACKAGES += "mpeg2dec libmpeg2 libmpeg2-dev libmpeg2convert libmpeg2convert-dev"
+
+FILES_${PN} = "${bindir}/*"
+FILES_libmpeg2 = "${libdir}/libmpeg2.so.*"
+FILES_libmpeg2convert = "${libdir}/libmpeg2convert.so.*"
More information about the Openembedded-commits
mailing list