summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch13
-rw-r--r--packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch18
-rw-r--r--packages/asterisk/asterisk_1.2.9.1.bb4
-rw-r--r--packages/dillo/dillo-0.8.6/.mtn2git_empty (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty)0
-rw-r--r--packages/dillo/dillo-0.8.6/dillo.desktop9
-rw-r--r--packages/dillo/dillo-0.8.6/dillo.pngbin0 -> 4175 bytes
-rw-r--r--packages/dillo/dillo-0.8.6/font.patch15
-rw-r--r--packages/dillo/dillo_0.8.6.bb31
-rw-r--r--packages/links/links-x11_2.1pre22.bb21
-rw-r--r--packages/links/links_2.1pre22.bb19
-rw-r--r--packages/linux/linux-openzaurus_2.6.16+git.bb35
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb10
-rw-r--r--packages/linux/linux-openzaurus_2.6.17.bb37
-rw-r--r--packages/mplayer/files/Makefile.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch)0
-rw-r--r--packages/mplayer/files/libfaad-fixed.patch16
-rw-r--r--packages/mplayer/files/vo_w100.c (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c)0
-rw-r--r--packages/mplayer/files/vo_w100_api.h (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h)0
-rw-r--r--packages/mplayer/files/vo_w100_fb.h (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h)0
-rw-r--r--packages/mplayer/files/w100-Makefile.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch)0
-rw-r--r--packages/mplayer/files/w100-configure.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch)0
-rw-r--r--packages/mplayer/files/w100-mplayer.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch)0
-rw-r--r--packages/mplayer/files/w100-video_out.patch (renamed from packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch)0
-rw-r--r--packages/mplayer/mplayer_1.0pre8.bb (renamed from packages/mplayer/mplayer_1.0pre7+cvs20060519.bb)6
-rw-r--r--packages/mplayer/mplayer_svn.bb74
-rw-r--r--packages/nunome/.mtn2git_empty0
-rw-r--r--packages/nunome/files/.mtn2git_empty0
-rw-r--r--packages/nunome/files/nunome.patch197
-rw-r--r--packages/nunome/nunome_1.0.1.bb40
-rw-r--r--packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty0
-rw-r--r--packages/opie-taskbar/opie-taskbar/htcuniversal/opie82
-rw-r--r--packages/opie-taskbar/opie-taskbar_1.2.1.bb2
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb2
-rw-r--r--packages/python/python-pexpect_2.1.bb (renamed from packages/python/python-pexpect_0.99.bb)2
-rw-r--r--packages/tinymail/tinymail_svn.bb4
-rw-r--r--packages/tslib/tslib/htcuniversal/tslib.sh3
-rw-r--r--packages/tslib/tslib_cvs.bb4
-rw-r--r--packages/uim/.mtn2git_empty0
-rw-r--r--packages/uim/files/.mtn2git_empty0
-rw-r--r--packages/uim/files/uim-module-manager.patch11
-rw-r--r--packages/uim/uim-native_1.1.0.bb5
-rw-r--r--packages/uim/uim_1.1.0.bb98
-rw-r--r--packages/vnc/tightvnc/Makefile2
-rw-r--r--packages/xserver/xserver-kdrive/xcalibrate.patch351
-rw-r--r--packages/xserver/xserver-kdrive_X11R7.1-1.1.0.bb3
-rw-r--r--packages/zroadmap/files/qt2-fixes.patch25
-rw-r--r--packages/zroadmap/zroadmap_1.0.12.bb (renamed from packages/zroadmap/zroadmap_1.0.8.bb)25
46 files changed, 1097 insertions, 67 deletions
diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch
new file mode 100644
index 0000000000..a909513b1c
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-compat-getloadavg.patch
@@ -0,0 +1,13 @@
+diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h
+--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100
++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100
+@@ -75,7 +75,9 @@
+ #define HAVE_STRTOQ
+
+ #ifdef _BSD_SOURCE
++#ifndef __UCLIBC__
+ #define HAVE_GETLOADAVG
++#endif /* __UCLIBC__ */
+ #endif
+
+ #ifdef __linux__
diff --git a/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch
new file mode 100644
index 0000000000..23657bcc76
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.9.1/uclibc-dsn.patch
@@ -0,0 +1,18 @@
+diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c
+--- asterisk-1.0.7-old/dns.c 2004-06-22 22:11:15.000000000 +0200
++++ asterisk-1.0.7-new/dns.c 2005-03-19 17:38:06.000000000 +0100
+@@ -153,7 +153,13 @@
+
+ #if defined(res_ninit)
+ #define HAS_RES_NINIT
+-#else
++#endif
++
++#ifdef __UCLIBC__
++#undef HAS_RES_NINIT
++#endif
++
++#ifndef HAS_RES_NINIT
+ AST_MUTEX_DEFINE_STATIC(res_lock);
+ #if 0
+ #warning "Warning, res_ninit is missing... Could have reentrancy issues"
diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb
index b08e178388..46f24c0e35 100644
--- a/packages/asterisk/asterisk_1.2.9.1.bb
+++ b/packages/asterisk/asterisk_1.2.9.1.bb
@@ -2,9 +2,11 @@ DESCRIPTION="The Asterisk open source software PBX"
HOMEPAGE="www.asterisk.org"
LICENSE="GPL"
DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt"
-PR = "r4"
+PR = "r5"
SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
+ file://uclibc-compat-getloadavg.patch;patch=1 \
+ file://uclibc-dsn.patch;patch=1 \
file://asterisk.patch;patch=1"
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty b/packages/dillo/dillo-0.8.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/.mtn2git_empty
+++ b/packages/dillo/dillo-0.8.6/.mtn2git_empty
diff --git a/packages/dillo/dillo-0.8.6/dillo.desktop b/packages/dillo/dillo-0.8.6/dillo.desktop
new file mode 100644
index 0000000000..6c5f994da4
--- /dev/null
+++ b/packages/dillo/dillo-0.8.6/dillo.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Web browser
+Comment=Dillo
+Exec=dillo
+Terminal=0
+Type=Application
+Icon=dillo.png
+Categories=Application;PIM;GPE
+StartupNotify=True
diff --git a/packages/dillo/dillo-0.8.6/dillo.png b/packages/dillo/dillo-0.8.6/dillo.png
new file mode 100644
index 0000000000..99c942f190
--- /dev/null
+++ b/packages/dillo/dillo-0.8.6/dillo.png
Binary files differ
diff --git a/packages/dillo/dillo-0.8.6/font.patch b/packages/dillo/dillo-0.8.6/font.patch
new file mode 100644
index 0000000000..ace3da8dd6
--- /dev/null
+++ b/packages/dillo/dillo-0.8.6/font.patch
@@ -0,0 +1,15 @@
+--- dillo-0.8.5/src/dw_style.c.orig 2005-12-20 13:01:19.000000000 +0000
++++ dillo-0.8.5/src/dw_style.c 2005-12-20 13:03:34.000000000 +0000
+@@ -330,6 +330,12 @@
+ }
+
+ if (font->font == NULL) {
++ /* Try another platform-font that should be available. (fam83) */
++ font->font =
++ gdk_font_load
++ ("-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1");
++ }
++ if (font->font == NULL) {
+ /* Can't load any suitable font! */
+ g_warning ("Can't load any ISO8859-1 font!?! :(");
+ font->font =
diff --git a/packages/dillo/dillo_0.8.6.bb b/packages/dillo/dillo_0.8.6.bb
new file mode 100644
index 0000000000..be4a59b034
--- /dev/null
+++ b/packages/dillo/dillo_0.8.6.bb
@@ -0,0 +1,31 @@
+SECTION = "x11/network"
+DESCRIPTION = "Lightweight gtk+ browser."
+LICENSE = "GPL"
+DEPENDS = "gtk+-1.2 libpng"
+SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.bz2 \
+ file://font.patch;patch=1 \
+ file://dillo.desktop \
+ file://dillo.png"
+
+
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+PRIORITY = "optional"
+
+RCONFLICTS = "dillo2"
+
+S = "${WORKDIR}/dillo-${PV}/"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += " /usr/lib/dillo/ /usr/bin/dpid /usr/bin/dpidc "
+
+export PNG_CONFIG = "${STAGING_BINDIR}/libpng-config"
+
+EXTRA_OECONF = "--disable-dlgui"
+
+do_install_append() {
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 ${WORKDIR}/dillo.desktop ${D}${datadir}/applications/dillo.desktop
+ install -m 0644 ${WORKDIR}/dillo.png ${D}${datadir}/pixmaps/dillo.png
+}
diff --git a/packages/links/links-x11_2.1pre22.bb b/packages/links/links-x11_2.1pre22.bb
new file mode 100644
index 0000000000..f763df7f60
--- /dev/null
+++ b/packages/links/links-x11_2.1pre22.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+DEPENDS = "jpeg libpng flex openssl zlib libx11"
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+RCONFLICTS = "links"
+
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+
+SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
+ file://ac-prog-cxx.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+ --without-libtiff --without-svgalib --without-fb \
+ --without-directfb --without-pmshell --without-atheos \
+ --with-x --without-gpm --without-sdl"
+
+S = "${WORKDIR}/links-${PV}"
diff --git a/packages/links/links_2.1pre22.bb b/packages/links/links_2.1pre22.bb
new file mode 100644
index 0000000000..e0a991e148
--- /dev/null
+++ b/packages/links/links_2.1pre22.bb
@@ -0,0 +1,19 @@
+LICENSE = "GPL"
+SECTION = "console/network"
+DEPENDS = "jpeg libpng gpm flex openssl zlib"
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+RCONFLICTS="links-x11"
+
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
+
+SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
+ file://ac-prog-cxx.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+ --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+ --without-libtiff --without-svgalib --with-fb \
+ --without-directfb --without-pmshell --without-atheos \
+ --without-x --without-sdl"
diff --git a/packages/linux/linux-openzaurus_2.6.16+git.bb b/packages/linux/linux-openzaurus_2.6.16+git.bb
index 9977b7e2a7..a268ea2dfa 100644
--- a/packages/linux/linux-openzaurus_2.6.16+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.16+git.bb
@@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1"
# Hacks should clearly named and at the bottom
# ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;tag=553698f944ed715dfe023b4cef07601f0ce735f0 \
+ ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
+ ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \
+ ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \
+ ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \
+ ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \
+ ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \
+ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
- ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
- ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \
+ ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \
file://00-hostap.patch;patch=1;status=pending \
file://10-pcnet.patch;patch=1;status=pending \
- ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \
- ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \
- ${RPSRC}/poodle_ssp-r1.patch;patch=1 \
- ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \
- ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
- ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
- ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
-# ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \
+# ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \
${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
${RPSRC}/asoc_fixups-r1.patch;patch=1 \
${RPSRC}/hx2750_base-r25.patch;patch=1 \
@@ -49,12 +48,15 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
${DOSRC}/kexec-arm-r2.patch;patch=1 \
${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
${RPSRC}/poodle_pm-r1.patch;patch=1 \
+ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://hrw-pcmcia-ids-r2.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
file://add-oz-release-string.patch;patch=1;status=unmergable \
+ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
file://pxa-serial-hack.patch;patch=1;status=hack \
@@ -78,15 +80,10 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi
# http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \
# ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \
-# These patches would really help collie/poodle but we
-# need someone to maintain them
-# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
-# (Pavel Machek's git tree has updated versions of this?)
-# Also parts were recently committed to mainline by rmk (drivers/mfd/)
-# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1
-# (This is mostly in mainline now?)
-# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
-# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
+# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
+# (Pavel Machek's git tree has updated versions of this?)
+# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
+
SRC_URI_append_tosa = "\
${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index c35d1d8e75..08a64160c1 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -67,8 +67,6 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
file://00-hostap.patch;patch=1;status=pending \
file://10-pcnet.patch;patch=1;status=pending \
- ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
- ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
${RPSRC}/asoc_fixups-r0.patch;patch=1 \
${RPSRC}/hx2750_base-r24.patch;patch=1 \
@@ -80,11 +78,11 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/input_power-r4.patch;patch=1 \
${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
- ${RPSRC}/collie_frontlight-r1.patch;patch=1 \
- ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \
+ ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \
+ ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \
${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
${RPSRC}/pm_changes-r1.patch;patch=1 \
- ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
${DOSRC}/kexec-arm-r2.patch;patch=1 \
@@ -97,6 +95,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
file://add-oz-release-string.patch;patch=1;status=unmergable \
+ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index dae8e49e68..cb3f0a6313 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -16,21 +16,20 @@ DEFAULT_PREFERENCE = "-1"
# Hacks should clearly named and at the bottom
# ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
+ ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
+ ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \
+ ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \
+ ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \
+ ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \
+ ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \
+ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
- ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
- ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \
+ ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \
file://00-hostap.patch;patch=1;status=pending \
file://10-pcnet.patch;patch=1;status=pending \
- ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \
- ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \
- ${RPSRC}/poodle_ssp-r1.patch;patch=1 \
- ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \
- ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
- ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
- ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
-# ${RPSRC}/alsa/asoc-v0.10rc8.patch;patch=1 \
+# ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \
${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
${RPSRC}/asoc_fixups-r1.patch;patch=1 \
${RPSRC}/hx2750_base-r25.patch;patch=1 \
@@ -49,12 +48,15 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
${DOSRC}/kexec-arm-r2.patch;patch=1 \
${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \
${RPSRC}/poodle_pm-r1.patch;patch=1 \
+ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://hrw-pcmcia-ids-r2.patch;patch=1 \
${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
file://add-oz-release-string.patch;patch=1;status=unmergable \
+ ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
file://pxa-serial-hack.patch;patch=1;status=hack \
@@ -78,15 +80,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
# http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \
# ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \
-# These patches would really help collie/poodle but we
-# need someone to maintain them
-# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
-# (Pavel Machek's git tree has updated versions of this?)
-# Also parts were recently committed to mainline by rmk (drivers/mfd/)
-# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1
-# (This is mostly in mainline now?)
-# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
-# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
+# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/)
+# (Pavel Machek's git tree has updated versions of this?)
+# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1
+
SRC_URI_append_tosa = "\
${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch b/packages/mplayer/files/Makefile.patch
index da316ad129..da316ad129 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/Makefile.patch
+++ b/packages/mplayer/files/Makefile.patch
diff --git a/packages/mplayer/files/libfaad-fixed.patch b/packages/mplayer/files/libfaad-fixed.patch
new file mode 100644
index 0000000000..2b85179038
--- /dev/null
+++ b/packages/mplayer/files/libfaad-fixed.patch
@@ -0,0 +1,16 @@
+--- mplayer-1.1.5/libfaad2/Makefile.orig 2006-05-12 14:45:49.000000000 +0100
++++ mplayer-1.1.5/libfaad2/Makefile 2006-05-12 14:46:36.000000000 +0100
+@@ -6,11 +6,11 @@
+ SRCS = bits.c cfft.c common.c decoder.c drc.c error.c filtbank.c hcr.c huffman.c ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c ps_dec.c ps_syntax.c pulse.c rvlc.c sbr_dct.c sbr_dec.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c specrec.c ssr.c ssr_fb.c ssr_ipqf.c syntax.c tns.c
+ OBJS = $(SRCS:.c=.o)
+
+-CFLAGS = -I. $(OPTFLAGS)
++#CFLAGS = -I. $(OPTFLAGS)
+
+ # Uncomment this to use the FIXED_POINT implementation of FAAD2.
+ # This should improve performance, especially for SBR files.
+-#CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT
++CFLAGS = -I. $(OPTFLAGS) -DFIXED_POINT
+
+ .SUFFIXES: .c .o
+
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c b/packages/mplayer/files/vo_w100.c
index 702707c656..702707c656 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100.c
+++ b/packages/mplayer/files/vo_w100.c
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h b/packages/mplayer/files/vo_w100_api.h
index 59cf58be26..59cf58be26 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_api.h
+++ b/packages/mplayer/files/vo_w100_api.h
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h b/packages/mplayer/files/vo_w100_fb.h
index 39318c645b..39318c645b 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/vo_w100_fb.h
+++ b/packages/mplayer/files/vo_w100_fb.h
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch b/packages/mplayer/files/w100-Makefile.patch
index 01899556d3..01899556d3 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-Makefile.patch
+++ b/packages/mplayer/files/w100-Makefile.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch b/packages/mplayer/files/w100-configure.patch
index 03610610e4..03610610e4 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-configure.patch
+++ b/packages/mplayer/files/w100-configure.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch b/packages/mplayer/files/w100-mplayer.patch
index 4bed6326d1..4bed6326d1 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-mplayer.patch
+++ b/packages/mplayer/files/w100-mplayer.patch
diff --git a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch b/packages/mplayer/files/w100-video_out.patch
index 9855853fe6..9855853fe6 100644
--- a/packages/mplayer/mplayer-1.0pre7+cvs20060519/w100-video_out.patch
+++ b/packages/mplayer/files/w100-video_out.patch
diff --git a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb b/packages/mplayer/mplayer_1.0pre8.bb
index 9298f0645c..a55c59dc96 100644
--- a/packages/mplayer/mplayer_1.0pre7+cvs20060519.bb
+++ b/packages/mplayer/mplayer_1.0pre8.bb
@@ -5,8 +5,7 @@ HOMEPAGE = "http://www.mplayerhq.hu/"
DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
RDEPENDS = "mplayer-common"
LICENSE = "GPL"
-SRC_URI = "http://www.xora.org.uk/oe/mplayer_20060519.tar.bz2 \
- http://www.xora.org.uk/oe/ffmpeg_20060519.tar.bz2 \
+SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
file://vo_w100.c \
file://vo_w100_api.h \
file://vo_w100_fb.h \
@@ -25,7 +24,7 @@ PARALLEL_MAKE = ""
DEPENDS_append_c7x0 = " sharp-aticore-oss"
-S = "${WORKDIR}/mplayer_20060519"
+S = "${WORKDIR}/MPlayer-${PV}"
PACKAGES =+ "mencoder"
@@ -60,7 +59,6 @@ EXTRA_OECONF = " \
EXTRA_OECONF_append_c7x0 = " --enable-w100 "
do_configure() {
- cp -r ${WORKDIR}/ffmpeg_20060519/libavcodec ${WORKDIR}/ffmpeg_20060519/libavutil ${WORKDIR}/ffmpeg_20060519/libavformat ${S}
cp ${WORKDIR}/vo_w100.c ${S}/libvo
cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb
new file mode 100644
index 0000000000..7af431430b
--- /dev/null
+++ b/packages/mplayer/mplayer_svn.bb
@@ -0,0 +1,74 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.mplayerhq.hu/"
+DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common"
+RDEPENDS = "mplayer-common"
+LICENSE = "GPL"
+SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \
+ file://vo_w100.c \
+ file://vo_w100_api.h \
+ file://vo_w100_fb.h \
+ file://Makefile.patch;patch=1 \
+ file://w100-configure.patch;patch=1 \
+ file://w100-Makefile.patch;patch=1 \
+ file://w100-video_out.patch;patch=1 \
+ file://w100-mplayer.patch;patch=1"
+
+MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
+RCONFLICTS_${PN} = "mplayer-atty"
+RREPLACES_${PN} = "mplayer-atty"
+
+PV = "1.0pre8+svn${SRCDATE}"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+
+PARALLEL_MAKE = ""
+
+DEPENDS_append_c7x0 = " sharp-aticore-oss"
+
+S = "${WORKDIR}/mplayer/trunk/"
+
+PACKAGES =+ "mencoder"
+
+FILES_${PN} = "${bindir}/mplayer"
+FILES_mencoder = "${bindir}/mencoder"
+
+inherit autotools
+
+EXTRA_OECONF = " \
+ --prefix=/usr \
+ --mandir=${mandir} \
+ --target=${TARGET_SYS} \
+ \
+ --enable-mencoder \
+ --disable-gui \
+ --enable-largefiles \
+ --disable-linux-devfs \
+ --disable-lirc \
+ --disable-lircc \
+ --disable-tv \
+ --enable-rtc \
+ --disable-smb \
+ --disable-win32 \
+ \
+ --enable-tremor-low \
+ --disable-mp3lib \
+ \
+ --disable-x11 \
+ --enable-sdl \
+ --enable-fbdev "
+
+EXTRA_OECONF_append_c7x0 = " --enable-w100 "