summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc3
-rw-r--r--packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch19
-rw-r--r--packages/binutils/binutils_2.18.bb6
-rw-r--r--packages/busybox/busybox_1.7.2.bb6
-rw-r--r--packages/gstreamer/gst-meta-base_0.10.bb11
-rw-r--r--packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch20
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.5.bb5
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.6.bb8
-rw-r--r--packages/linux/linux-ezx_2.6.21.bb6
-rw-r--r--packages/linux/linux-rp_2.6.21.bb2
-rw-r--r--packages/mpeg2dec/mpeg2dec_0.4.0b.bb29
-rw-r--r--packages/xorg-app/mkfontscale-native_1.0.3.bb (renamed from packages/mkfontscale-native_1.0.3.bb)0
-rw-r--r--packages/xorg-app/mkfontscale_1.0.3.bb (renamed from packages/mkfontscale_1.0.3.bb)0
13 files changed, 75 insertions, 40 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 0695c8cc3a..61560e3c44 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -668,7 +668,6 @@ PREFERRED_VERSION_hildon-libs ?= "0.15.1"
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_miau ?= "0.5.3"
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"
diff --git a/packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch b/packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch
new file mode 100644
index 0000000000..c5e4234f22
--- /dev/null
+++ b/packages/binutils/binutils-2.18/binutils-2.16.1-e300c2c3.patch
@@ -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@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)
diff --git a/packages/binutils/binutils_2.18.bb b/packages/binutils/binutils_2.18.bb
index 78000c7af6..b6a230cb18 100644
--- a/packages/binutils/binutils_2.18.bb
+++ b/packages/binutils/binutils_2.18.bb
@@ -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"
+
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 0963e9bb9d..80a5aa2da6 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,6 +1,6 @@
require busybox.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -14,7 +14,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
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 @@ SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;pat
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
}
diff --git a/packages/gstreamer/gst-meta-base_0.10.bb b/packages/gstreamer/gst-meta-base_0.10.bb
index 0666f226d0..3a33b2086c 100644
--- a/packages/gstreamer/gst-meta-base_0.10.bb
+++ b/packages/gstreamer/gst-meta-base_0.10.bb
@@ -2,7 +2,7 @@
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 = "\
diff --git a/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch b/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch
new file mode 100644
index 0000000000..79a03741ac
--- /dev/null
+++ b/packages/gstreamer/gst-plugins-ugly/gstsid_autofoo_HACK.patch
@@ -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"
+
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb b/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
deleted file mode 100644
index 51ce56dc1f..0000000000
--- a/packages/gstreamer/gst-plugins-ugly_0.10.5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gst-plugins.inc
-
-DEPENDS += "gst-plugins-base"
-SRC_URI += "file://cross-compile.patch;patch=1"
-PR = "r4"
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.6.bb b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
index 9eb6410d09..c88a4db990 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.6.bb
@@ -1,7 +1,9 @@
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"
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index db561a7f0d..7ba2556bb8 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
HOMEPAGE = "http://www.openezx.org"
EZX = "ezxdev"
-PR = "${EZX}-r23"
+PR = "${EZX}-r24"
require linux.inc
@@ -92,8 +92,8 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
#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)}'
diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb
index 3f155942e9..795e727ed3 100644
--- a/packages/linux/linux-rp_2.6.21.bb
+++ b/packages/linux/linux-rp_2.6.21.bb
@@ -2,6 +2,8 @@ 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
diff --git a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
index c279893ee5..571ddc4b12 100644
--- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
+++ b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb
@@ -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"
-
-S = "${WORKDIR}/mpeg2dec-0.4.0"
+PR = "r4"
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.*"
diff --git a/packages/mkfontscale-native_1.0.3.bb b/packages/xorg-app/mkfontscale-native_1.0.3.bb
index 0b3578ec11..0b3578ec11 100644
--- a/packages/mkfontscale-native_1.0.3.bb
+++ b/packages/xorg-app/mkfontscale-native_1.0.3.bb
diff --git a/packages/mkfontscale_1.0.3.bb b/packages/xorg-app/mkfontscale_1.0.3.bb
index 2f5eab7d63..2f5eab7d63 100644
--- a/packages/mkfontscale_1.0.3.bb
+++ b/packages/xorg-app/mkfontscale_1.0.3.bb
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 11:26:04 +0000