diff options
Diffstat (limited to 'packages')
139 files changed, 3246 insertions, 1272 deletions
diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index dc3d71040c..d050add3a5 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -44,7 +44,7 @@ RDEPENDS_angstrom-base-wifi = "\ " RDEPENDS_angstrom-x11-base-depends := "\ - diet-x11 \ + libx11 \ virtual/xserver" RDEPENDS_angstrom-gpe-task-base := "\ diff --git a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch index 209232ed6d..ab7fb42eaa 100644 --- a/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch +++ b/packages/anthy/anthy-native/native-mkanthydic-mkdepgraph.patch @@ -1,16 +1,16 @@ ---- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:08:56 +0200 -+++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:11:18 +0200 -@@ -15,7 +15,7 @@ - udict dict.args.in +--- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900 ++++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 10:56:25.770000000 +0900 +@@ -3,7 +3,7 @@ + CLEANFILES = anthy.dic + INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\" - # Generate the dictionary --noinst_PROGRAMS = mkanthydic -+bin_PROGRAMS = mkanthydic - mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h - mkanthydic_LDADD = ../src-diclib/libanthydic.la +-noinst_PROGRAMS = mkfiledic ++bin_PROGRAMS = mkfiledic + mkfiledic_SOURCES = mkfiledic.c + mkfiledic_LDADD = ../src-diclib/libdiclib.la ---- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:08:33 +0200 -+++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:11:28 +0200 +--- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900 ++++ anthy-7811/depgraph/Makefile.am 2006-06-18 10:57:19.420000000 +0900 @@ -9,7 +9,7 @@ EXTRA_DIST = indepword.txt $(DEPWORDS) @@ -18,5 +18,28 @@ -noinst_PROGRAMS = mkdepgraph +bin_PROGRAMS = mkdepgraph mkdepgraph_SOURCES = mkdepgraph.c - mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la + mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la + +--- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900 ++++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:21:56.300000000 +0900 +@@ -16,7 +16,8 @@ + udict dict.args.in + + # Generate the dictionary +-noinst_PROGRAMS = mkworddic ++#noinst_PROGRAMS = mkworddic ++bin_PROGRAMS = mkworddic + mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h + mkworddic_LDADD = ../src-worddic/libanthydic.la + +--- anthy-7811/mkmatrix/Makefile.am~ 2006-06-18 11:29:52.110000000 +0900 ++++ anthy-7811/mkmatrix/Makefile.am 2006-06-18 11:32:30.630000000 +0900 +@@ -1,6 +1,7 @@ + EXTRA_DIST = dep.sorted +-noinst_PROGRAMS = mkmatrix ++#noinst_PROGRAMS = mkmatrix ++bin_PROGRAMS = mkmatrix + INCLUDES = -I$(top_srcdir)/include + mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm + mkmatrix_SOURCES = mkmatrix.c diff --git a/packages/anthy/anthy-native_6801.bb b/packages/anthy/anthy-native_7811.bb index dbcf851024..138abe87c8 100644 --- a/packages/anthy/anthy-native_6801.bb +++ b/packages/anthy/anthy-native_7811.bb @@ -1,3 +1,4 @@ require anthy_${PV}.bb -DEPENDS ="" +PACKAGES = "" +DEPENDS = "" inherit native diff --git a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch index e5cecbf570..86e6513d13 100644 --- a/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch +++ b/packages/anthy/anthy/native-mkanthydic-mkdepgraph.patch @@ -1,40 +1,84 @@ ---- anthy-6801/mkanthydic/Makefile.am.orig 2005-08-06 12:14:58 +0200 -+++ anthy-6801/mkanthydic/Makefile.am 2005-08-06 12:15:13 +0200 -@@ -15,12 +15,12 @@ - udict dict.args.in +--- anthy-7811/mkanthydic/Makefile.am~ 2006-05-13 18:28:35.000000000 +0900 ++++ anthy-7811/mkanthydic/Makefile.am 2006-06-18 11:07:19.080000000 +0900 +@@ -3,12 +3,12 @@ + CLEANFILES = anthy.dic + INCLUDES = -I$(top_srcdir)/include -DSRCDIR=\"$(srcdir)\" - # Generate the dictionary --noinst_PROGRAMS = mkanthydic --mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h --mkanthydic_LDADD = ../src-diclib/libanthydic.la -+#noinst_PROGRAMS = mkanthydic -+#mkanthydic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h -+#mkanthydic_LDADD = ../src-diclib/libanthydic.la +-noinst_PROGRAMS = mkfiledic +-mkfiledic_SOURCES = mkfiledic.c +-mkfiledic_LDADD = ../src-diclib/libdiclib.la ++#noinst_PROGRAMS = mkfiledic ++#mkfiledic_SOURCES = mkfiledic.c ++#mkfiledic_LDADD = ../src-diclib/libdiclib.la --anthy.dic : mkanthydic -- ./mkanthydic -f ./dict.args -+anthy.dic : -+ mkanthydic -f ./dict.args +-anthy.dic : mkfiledic ../mkworddic/anthy.wdic ../depgraph/anthy.dep +- ./mkfiledic ++anthy.dic : ../mkworddic/anthy.wdic ../depgraph/anthy.dep ++ mkfiledic - # To install ---- anthy-6801/depgraph/Makefile.am.orig 2005-08-06 12:14:03 +0200 -+++ anthy-6801/depgraph/Makefile.am 2005-08-06 12:15:43 +0200 -@@ -9,12 +9,12 @@ + # To install + +--- anthy-7811/depgraph/Makefile.am~ 2006-06-02 00:20:54.000000000 +0900 ++++ anthy-7811/depgraph/Makefile.am 2006-06-18 11:08:13.350000000 +0900 +@@ -9,11 +9,11 @@ EXTRA_DIST = indepword.txt $(DEPWORDS) # Generate the dictionary -noinst_PROGRAMS = mkdepgraph -mkdepgraph_SOURCES = mkdepgraph.c --mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la +-mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la +#noinst_PROGRAMS = mkdepgraph +#mkdepgraph_SOURCES = mkdepgraph.c -+#mkdepgraph_LDADD = ../src-diclib/libanthydic.la ../src-main/libanthy.la ++#mkdepgraph_LDADD = ../src-main/libanthy.la ../src-worddic/libanthydic.la -anthy.dep : mkdepgraph - ./mkdepgraph -+anthy.dep : ++anthy.dep : + mkdepgraph + noinst_DATA = anthy.dep + +--- anthy-7811/mkworddic/Makefile.am~ 2006-05-13 18:29:07.000000000 +0900 ++++ anthy-7811/mkworddic/Makefile.am 2006-06-18 11:18:35.810000000 +0900 +@@ -16,14 +16,14 @@ + udict dict.args.in + + # Generate the dictionary +-noinst_PROGRAMS = mkworddic +-mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h +-mkworddic_LDADD = ../src-worddic/libanthydic.la ++#noinst_PROGRAMS = mkworddic ++#mkworddic_SOURCES = mkdic.c writewords.c mkudic.c mkdic.h ++#mkworddic_LDADD = ../src-worddic/libanthydic.la + + noinst_DATA = anthy.wdic + +-anthy.wdic : mkworddic +- ./mkworddic -f ./dict.args ++anthy.wdic : ++ mkworddic -f ./dict.args + + # To install - pkgdata_DATA = anthy.dep +--- anthy-7811/mkmatrix/Makefile.am~ 2006-06-02 00:19:41.000000000 +0900 ++++ anthy-7811/mkmatrix/Makefile.am 2006-06-18 11:31:37.250000000 +0900 +@@ -1,12 +1,12 @@ + EXTRA_DIST = dep.sorted + +-noinst_PROGRAMS = mkmatrix +-INCLUDES = -I$(top_srcdir)/include +-mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm +-mkmatrix_SOURCES = mkmatrix.c ++#noinst_PROGRAMS = mkmatrix ++#INCLUDES = -I$(top_srcdir)/include ++#mkmatrix_LDADD = ../src-worddic/libanthydic.la -lm ++#mkmatrix_SOURCES = mkmatrix.c + + noinst_DATA = matrix + CLEANFILES = matrix + +-matrix : mkmatrix $(top_srcdir)/mkmatrix/dep.sorted +- ./mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix ++matrix : $(top_srcdir)/mkmatrix/dep.sorted ++ mkmatrix $(top_srcdir)/mkmatrix/dep.sorted -o matrix diff --git a/packages/anthy/anthy_6801.bb b/packages/anthy/anthy_7811.bb index c277639430..a6c8eff200 100644 --- a/packages/anthy/anthy_6801.bb +++ b/packages/anthy/anthy_7811.bb @@ -6,16 +6,17 @@ DEPENDS = "anthy-native" SECTION = "libs/inputmethod" PR = "r0" -SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/15893/anthy-6801.tar.gz \ +SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \ file://not_build_elc.patch;patch=1 \ file://2ch_t.patch;patch=1 \ file://change_anthy_dic_path.patch;patch=1 \ file://native-mkanthydic-mkdepgraph.patch;patch=1" + S = "${WORKDIR}/anthy-${PV}" inherit autotools pkgconfig -PACKAGES = "${PN} libanthy0 libanthy-dev" +PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev" DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)" DESCRIPTION_libanthy0 = "Anthy runtime library" @@ -27,9 +28,19 @@ LEAD_SONAME = "libanthy.so.0" RDEPENDS_anthy = "libanthy0" FILES_libanthy0 = "${libdir}/libanthy.so.* \ - ${libdir}/libanthydic.so.* \ - ${libdir}/libanthyinput.so.*" -FILES_libanthy-dev = "${libdir}/libanthy* \ - ${includedir}/anthy \ - ${libdir}/pkgconfig/anthy.pc" -FILES_${PN} = "${bindir}/* ${datadir}/* ${sysconfdir}/*" + ${libdir}/libanthydic.so.* \ + ${libdir}/libanthyinput.so.*" +FILES_libanthy-dev = "${libdir}/libanthy*.la \ + ${libdir}/libanthy*.a \ + ${libdir}/libanthy*.so \ + ${includedir}/anthy \ + ${libdir}/pkgconfig/anthy.pc" +FILES_${PN}-el = "${datadir}/emacs/*" +FILES_${PN} = "${datadir}/* \ + ${bindir}/* \ + ${sysconfdir}/anthy-conf" + + +do_stage() { + autotools_stage_all +} diff --git a/packages/anthy/files/change_anthy_dic_path.patch b/packages/anthy/files/change_anthy_dic_path.patch index 7d6356bc38..1ea80a6390 100644 --- a/packages/anthy/files/change_anthy_dic_path.patch +++ b/packages/anthy/files/change_anthy_dic_path.patch @@ -1,11 +1,13 @@ -diff -urNad anthy/anthy-conf.in /tmp/dpep.kiMfmZ/anthy/anthy-conf.in ---- anthy/anthy-conf.in 2004-05-02 20:31:25.000000000 +0900 -+++ /tmp/dpep.kiMfmZ/anthy/anthy-conf.in 2004-10-24 08:40:37.000000000 +0900 -@@ -1,6 +1,6 @@ +--- anthy-7811/anthy-conf.in~ 2006-05-13 18:27:50.000000000 +0900 ++++ anthy-7811/anthy-conf.in 2006-06-18 19:23:59.890000000 +0900 +@@ -1,7 +1,7 @@ # not /usr but should be ${prefix}/share. - ANTHYDIR @prefix@/share/anthy/ +-ANTHYDIR @prefix@/share/anthy/ -DIC_FILE @prefix@/share/anthy/anthy.dic -+DIC_FILE /var/lib/anthy/anthy.dic ++ANTHYDIR /usr/share/anthy/ ++DIC_FILE /usr/share/anthy/anthy.dic INDEPWORD indepword.txt DEPWORD master.depword - #ZIPDICT_EUC /var/lib/canna/dic/canna/zipcode.ctd +-ZIPDICT_EUC @prefix@/share/anthy/zipcode.t ++ZIPDICT_EUC /usr/share/anthy/zipcode.t + WORDS_FILE /usr/share/dict/words diff --git a/packages/anthy/files/not_build_elc.patch b/packages/anthy/files/not_build_elc.patch index 56368027e7..d3f269c46a 100644 --- a/packages/anthy/files/not_build_elc.patch +++ b/packages/anthy/files/not_build_elc.patch @@ -1,13 +1,13 @@ -diff -urNad /home/omote/debian/debian-official/japanese/anthy/anthy-4k/anthy-4809/src-util/Makefile.am anthy-4809/src-util/Makefile.am ---- /home/omote/debian/debian-official/japanese/anthy/anthy-4k/anthy-4809/src-util/Makefile.am 2003-11-24 20:59:35.000000000 +0900 -+++ anthy-4809/src-util/Makefile.am 2003-12-11 19:22:56.000000000 +0900 -@@ -5,7 +5,8 @@ - ELISP_FILES = anthy.el anthy-isearch.el anthy-dic.el anthy-conf.el leim-list.el +diff -Naur anthy-7811/src-util.orig/Makefile.am anthy-7811/src-util/Makefile.am +--- anthy-7811/src-util.orig/Makefile.am 2006-06-18 10:47:55.790000000 +0900 ++++ anthy-7811/src-util/Makefile.am 2006-06-18 10:48:23.860000000 +0900 +@@ -6,7 +6,8 @@ + anthy-isearch.el anthy-azik.el anthy-kyuri.el EXTRA_DIST = $(ELISP_FILES) typetab dic-tool-usage.txt rcsize.rb - bin_PROGRAMS = anthy-dic-tool anthy-agent --ELCFILES = anthy.elc anthy-dic.elc -+#ELCFILES = anthy.elc anthy-dic.elc -+ELCFILES = + bin_PROGRAMS = anthy-dic-tool anthy-agent anthy-morphological-analyzer +-ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc ++#ELCFILES = anthy.elc anthy-dic.elc anthy-azik.elc anthy-conf.elc anthy-isearch.elc anthy-kyuri.elc leim-list.elc ++ELCFILES = if ELISP lisp_LISP = $(ELISP_FILES) endif diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb new file mode 100644 index 0000000000..95c930d8e8 --- /dev/null +++ b/packages/avahi/avahi_0.6.12.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +SECTION = "network" +PRIORITY = "optional" +AUTHOR = "Lennart Poettering <lennart@poettering.net>" +HOMEPAGE = "http://avahi.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +LICENSE= "GPL" + +DEPENDS = "expat libdaemon dbus" +RRECOMMENDS = "libnss-mdns" + +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" + +PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" + +FILES_libavahi-common = "${libdir}/libavahi-common.so.*" +FILES_libavahi-core= "${libdir}/libavahi-core.so.*" +FILES_avahi-daemon = "${sbindir}/avahi-daemon \ + ${sysconfdir}/avahi/avahi-daemon.conf \ + ${sysconfdir}/avahi/hosts \ + ${sysconfdir}/avahi/services \ + ${sysconfdir}/dbus-1 \ + ${sysconfdir}/init.d/avahi-daemon \ + ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/avahi/avahi-service.dtd \ + ${datadir}/avahi/service-types" +FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ + ${sysconfdir}/avahi/avahi-dnsconfd.action \ + ${sysconfdir}/init.d/avahi-dnsconfd" +FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" +FILES_avahi-utils = "${bindir}/avahi-*" + +CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" + +EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" +inherit autotools pkgconfig update-rc.d + +INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" +INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" + +pkg_postinst_avahi-daemon () { + grep avahi /etc/group || addgroup avahi + grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + /etc/init.d/dbus-1 force-reload +} + +pkg_postrm_avahi-daemon () { + deluser avahi || true + delgroup avahi || true +} diff --git a/packages/mplayer/mplayer-1.0pre7/.mtn2git_empty b/packages/base-files/base-files/h5xxx/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mplayer/mplayer-1.0pre7/.mtn2git_empty +++ b/packages/base-files/base-files/h5xxx/.mtn2git_empty diff --git a/packages/base-files/base-files/h5xxx/fstab b/packages/base-files/base-files/h5xxx/fstab new file mode 100644 index 0000000000..b44d7eacee --- /dev/null +++ b/packages/base-files/base-files/h5xxx/fstab @@ -0,0 +1,8 @@ +/dev/mtdblock/1 / jffs2 defaults 1 1 +#breaks h51xx +/dev/mtdblock/2 /home jffs2 defaults 1 1 +proc /proc proc defaults 0 0 +/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0 +/dev/mmc/part1 /media/card auto defaults,noauto,noatime,user,exec,suid 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 0 0 diff --git a/packages/bluez/bluez-hcidump_1.31.bb b/packages/bluez/bluez-hcidump_1.31.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.31.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" +S = "${WORKDIR}/bluez-hcidump-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" + +inherit autotools diff --git a/packages/bluez/bluez-libs_3.1.bb b/packages/bluez/bluez-libs_3.1.bb new file mode 100644 index 0000000000..d740bd80a9 --- /dev/null +++ b/packages/bluez/bluez-libs_3.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty b/packages/bluez/bluez-utils/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mplayer/mplayer-1.0pre8/.mtn2git_empty +++ b/packages/bluez/bluez-utils/.mtn2git_empty diff --git a/packages/bluez/bluez-utils/02dtl1_cs.sh b/packages/bluez/bluez-utils/02dtl1_cs.sh new file mode 100644 index 0000000000..fd81508010 --- /dev/null +++ b/packages/bluez/bluez-utils/02dtl1_cs.sh @@ -0,0 +1,57 @@ +#!/bin/sh + +case "$1" in + suspend) + if [ "`/bin/hciconfig`" != "" ]; then + #If hciconfig outputs anything then there's probably a Bluetooth + # CF card in the slot so shut it down. + hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'` + hciconfig hci0 down + killall hciattach > /dev/null 2>&1 + fi + ;; + + resume) + #check for kernel version + if [ "`uname -r | grep 2.4.`" != "" ]; then + k="o" + elif [ "`uname -r | grep 2.6.`" != "" ]; then + k="ko" + else + exit 0 + fi + + if test -e /sbin/cardctl; then + CARDCTL=/sbin/cardctl + elif test -e /sbin/pccardctl; then + CARDCTL=/sbin/pccardctl + else + exit 0 + fi + + if [ "`lsmod | grep hci_uart`" != "" ]; then + #If the hci_usb module is still loaded then there's a serial based + # Bluetooth CF card in the slot, which only needs a resume to get it going + # again. + rfcomm bind all + $CARDCTL resume + hciconfig hci0 up + else + # only works for nokia dtl1 cards + for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k + do + #Enumerate all the self-contained Bluetooth CF card drivers + f=`echo $f | sed 's/\.'$k'$//'` + f=`basename $f` + if [ "`lsmod | grep $f`" != "" ]; then + #If one of these drivers is still loaded, then there is probably + #a non-serial based Bluetooth CF card in the slot that needs + #ejecting and reinserting to get it going again + rfcomm bind all + $CARDCTL eject + $CARDCTL insert + hciconfig hci0 up + fi + done + fi +esac diff --git a/packages/bluez/bluez-utils/hciattach-ti-bts.patch b/packages/bluez/bluez-utils/hciattach-ti-bts.patch new file mode 100644 index 0000000000..217c32619d --- /dev/null +++ b/packages/bluez/bluez-utils/hciattach-ti-bts.patch @@ -0,0 +1,489 @@ +--- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 ++++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 +@@ -58,6 +58,8 @@ + #define HCI_UART_3WIRE 2 + #define HCI_UART_H4DS 3 + ++#include "ti_bts.h" ++ + struct uart_t { + char *type; + int m_id; +@@ -67,6 +69,7 @@ + int speed; + int flags; + int (*init) (int fd, struct uart_t *u, struct termios *ti); ++ char *bts; /* bluetooth script */ + }; + + #define FLOW_CTL 0x0001 +@@ -256,6 +259,114 @@ + return 0; + } + ++static int brf6150(int fd, struct uart_t *u, struct termios *ti) ++{ ++ bts_t *bfp; ++ int i; ++ unsigned long vers; ++ unsigned char actionbuf[256]; ++ unsigned char resp[128]; /* Response */ ++ unsigned long count; ++ unsigned short atype; ++ ++ if (u->bts == NULL) /* no script, ignore */ ++ return 0; ++ ++ bfp = bts_load_script( u->bts, &vers ); ++ if (bfp == NULL) ++ return -1; ++ ++ fprintf( stderr, "Loading BTS script version %lu\n", vers ); ++ ++ while ((count = bts_next_action( bfp, actionbuf, ++ sizeof actionbuf - 1, &atype )) != 0) { ++ if (atype == ACTION_REMARKS) { ++ if (actionbuf[0] != 0) ++ fprintf( stderr, "%s\n", actionbuf ); ++ } ++ else if (atype == ACTION_SEND_COMMAND) { ++#if 0 ++ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ int n; ++ n = write(fd, actionbuf, count); ++ if (n < 0 || n < count) { ++ perror("Failed to write TI action command"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_WAIT_EVENT) { ++ action_wait_t *wait = (action_wait_t *)actionbuf; ++#if 0 ++ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size ); ++ for (i=0; i<wait->size; i++) { ++ fprintf( stderr, "0x%02x ", wait->data[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ usleep(wait->msec); /* seems they give usec, not msec */ ++ /* Read reply. */ ++ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { ++ perror("Failed to read TI command response"); ++ return -1; ++ } ++ if (count < wait->size) { ++ fprintf( stderr, "TI command response is short."); ++ } ++ for (i=0; i<wait->size; i++) { ++ if (i == 3) continue; /* ignore */ ++ if (resp[i] != wait->data[i]) { ++ fprintf( stderr, "TI command response does not match expected result.\n" ); ++ } ++ } ++ } ++ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { ++ action_serial_t *sercmd = (action_serial_t *)actionbuf; ++ ++ /* Set actual baudrate */ ++ fprintf( stderr, ++ "BTS changing baud rate to %u, flow control to %u\n", ++ sercmd->baud, sercmd->flow_control ); ++ ++ tcflush(fd, TCIOFLUSH); ++ ++ if (sercmd->flow_control) ++ ti->c_cflag |= CRTSCTS; ++ else ++ ti->c_cflag &= ~CRTSCTS; ++ if (tcsetattr(fd, TCSANOW, ti) < 0) { ++ perror("Can't set port settings"); ++ return -1; ++ } ++ ++ u->speed = sercmd->baud; ++ ++ tcflush(fd, TCIOFLUSH); ++ if (set_speed(fd, ti, sercmd->baud) < 0) { ++ perror("Can't set baud rate"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_DELAY) { ++ action_delay_t *delay = (action_delay_t *)actionbuf; ++ usleep(delay->msec); /* seems they give usec, not msec */ ++ } ++ else { ++ fprintf( stderr, "BTS action type = %d: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++ } ++ } ++ bts_unload_script( bfp ); ++ return 0; ++} ++ + static int texas(int fd, struct uart_t *u, struct termios *ti) + { + struct timespec tm = {0, 50000}; +@@ -296,15 +407,26 @@ + } while (resp[4] != cmd[1] && resp[5] != cmd[2]); + + /* Verify manufacturer */ +- if ((resp[11] & 0xFF) != 0x0d) ++ if (resp[11] != 0x0d) + fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n"); + + /* Print LMP version */ +- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF); ++ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]); + + /* Print LMP subversion */ +- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF); ++ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]); ++ if ((resp[14] >> 2) == 3) { ++ int err; ++ nanosleep(&tm, NULL); + ++ /* BRF6150 */ ++ if ((err=brf6150( fd, u, ti )) != 0) { ++ fprintf( stderr, "TI script failed (err=%d)\n", ++ err ); ++ return -1; ++ } ++ } ++ + nanosleep(&tm, NULL); + return 0; + } +@@ -1103,7 +1225,7 @@ + { + printf("hciattach - HCI UART driver initialization utility\n"); + printf("Usage:\n"); +- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow]\n"); ++ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n"); + printf("\thciattach -l\n"); + } + +@@ -1118,11 +1240,12 @@ + struct sigaction sa; + struct pollfd p; + char dev[PATH_MAX]; ++ char *bts = NULL; + + detach = 1; + printpid = 0; + +- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { ++ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { + switch(opt) { + case 'b': + send_break = 1; +@@ -1144,6 +1267,10 @@ + init_speed = atoi(optarg); + break; + ++ case 'S': ++ bts = optarg; ++ break; ++ + case 'l': + for (i = 0; uart[i].type; i++) { + printf("%-10s0x%04x,0x%04x\n", uart[i].type, +@@ -1215,6 +1342,8 @@ + if (init_speed) + u->init_speed = init_speed; + ++ u->bts = bts; ++ + memset(&sa, 0, sizeof(sa)); + sa.sa_flags = SA_NOCLDSTOP; + sa.sa_handler = sig_alarm; +--- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 ++++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 +@@ -37,7 +37,7 @@ + + noinst_PROGRAMS = hcisecfilter ppporc + +-hciattach_SOURCES = hciattach.c hciattach_st.c ++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c + + hciconfig_SOURCES = hciconfig.c csr.h csr.c + hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a +--- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 ++++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 +@@ -0,0 +1,116 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation; ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++#ifndef BT_SCRIPT_H ++#define BT_SCRIPT_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ * Define the interface of Bluetooth Script ++ */ ++ ++typedef void bts_t; ++ ++ ++#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ ++#define ACTION_WAIT_EVENT 2 /* Wait for data */ ++#define ACTION_SERIAL_PORT_PARAMETERS 3 ++#define ACTION_DELAY 4 ++#define ACTION_RUN_SCRIPT 5 ++#define ACTION_REMARKS 6 ++ ++/* ++ * Structure for ACTION_SEND_COMMAND ++ */ ++typedef struct tagCActionCommand ++{ ++ unsigned char data[1]; /* Data to send */ ++} action_command_t; ++ ++/* ++ * Structure for ACTION_WAIT_EVENT ++ */ ++typedef struct tagCActionWaitEvent ++{ ++ unsigned long msec; /* in milliseconds */ ++ unsigned long size; ++ unsigned char data[1]; /* Data to wait for */ ++} action_wait_t; ++ ++ ++/* ++ * Structure for ACTION_SERIAL_PORT_PARAMETERS ++ */ ++typedef struct tagCActionSerialPortParameters ++{ ++ unsigned long baud; ++ unsigned long flow_control; ++} action_serial_t; ++ ++/* Flow Control Type */ ++#define FCT_NONE 0 ++#define FCT_HARDWARE 1 ++ ++#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ ++ ++ ++/* ++ * Structure for ACTION_DELAY ++ */ ++typedef struct tagCActionDelay ++{ ++ unsigned long msec; /* in milliseconds */ ++} action_delay_t; ++ ++/* ++ * Structure for ACTION_RUN_SCRIPT ++ */ ++typedef struct tagCActionRunScript ++{ ++ char filename[1]; ++} action_run_t; ++ ++/* ++ * Structure for ACTION_REMARKS ++ */ ++typedef struct tagCActionRemarks ++{ ++ char m_szRemarks[1]; ++} action_remarks_t; ++ ++ ++const char *cis_create_filename(const unsigned char* cmdparms); ++bts_t * bts_load_script(const char* fname, unsigned long* version); ++unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype); ++void bts_unload_script(bts_t* bts_fp); ++ ++#ifdef __cplusplus ++}; ++#endif ++ ++#endif /* BT_SCRIPT_H */ ++ +--- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 ++++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 +@@ -0,0 +1,149 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation; ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include "ti_bts.h" ++ ++#ifndef MAKEWORD ++#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) ++#endif ++ ++#define TI_MANUFACTURER_ID 13 ++ ++/* ++ * Common Init Script specific ++ */ ++const char * ++cis_create_filename(const unsigned char* cmdparms) ++{ ++ static char bts_file[50]; ++ ++ /* Check for TI's id */ ++ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); ++ ++ if (TI_MANUFACTURER_ID == manfid) { ++ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); ++ ++ unsigned short chip = (version & 0x7C00) >> 10; ++ unsigned short min_ver = (version & 0x007F); ++ unsigned short maj_ver = (version & 0x0380) >> 7; ++ ++ if (0 != (version & 0x8000)) { ++ maj_ver |= 0x0008; ++ } ++ ++ sprintf( bts_file, "TIInit_%d.%d.%d.bts", ++ (int)chip, (int)maj_ver, (int)min_ver); ++ ++ return &bts_file[0]; ++ } ++ return NULL; ++} ++ ++typedef struct tagCHeader ++{ ++ unsigned long magic; ++ unsigned long version; ++ unsigned char future[24]; ++} cheader_t; ++ ++ ++/* The value 0x42535442 stands for (in ASCII) BTSB */ ++/* which is Bluetooth Script Binary */ ++#define FILE_HEADER_MAGIC 0x42535442 ++ ++ ++bts_t * ++bts_load_script(const char* fname, unsigned long* version) ++{ ++ bts_t* bts = NULL; ++ FILE* fp = fopen(fname, "rb"); ++ ++ if (NULL != fp) { ++ /* Read header */ ++ cheader_t header; ++ ++ /* Read header */ ++ if (1 == fread(&header, sizeof(header), 1, fp)) { ++ /* Check magic number for correctness */ ++ if (header.magic == FILE_HEADER_MAGIC) { ++ /* If user wants the version number */ ++ if (NULL != version) { ++ *version = header.version; ++ } ++ bts = (bts_t*)fp; ++ } ++ } ++ /* If failed reading the file, close it */ ++ if (NULL == bts) { ++ fclose(fp); ++ } ++ } ++ return bts; ++} ++ ++unsigned long ++bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype) ++{ ++ unsigned long bytes = 0; ++ FILE* fp = (FILE*)bts_fp; ++ unsigned char action_hdr[4]; ++ ++ if (bts_fp == NULL) ++ return 0; ++ ++ /* Each Action has the following: */ ++ /* UINT16 type of this action */ ++ /* UINT16 size of rest */ ++ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ ++ ++ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { ++ unsigned short type = *(unsigned short*)&action_hdr[0]; ++ unsigned short size = *(unsigned short*)&action_hdr[2]; ++ ++ if (size <= nMaxSize) { ++ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); ++ ++ if (nread == size) { ++ *ptype = type; ++ bytes = (unsigned long)size; ++ } ++ } ++ } ++ ++ return bytes; ++} ++ ++void ++bts_unload_script(bts_t* bts_fp) ++{ ++ FILE* fp = (FILE*)bts_fp; ++ ++ if (NULL != fp) { ++ fclose(fp); ++ } ++} ++ diff --git a/packages/bluez/bluez-utils/hcid.conf b/packages/bluez/bluez-utils/hcid.conf new file mode 100644 index 0000000000..bb935aa23d --- /dev/null +++ b/packages/bluez/bluez-utils/hcid.conf @@ -0,0 +1,57 @@ +# +# HCI daemon configuration file. +# + +# HCId options +options { + # Automatically initialize new devices + autoinit yes; + + # Security Manager mode + # none - Security manager disabled + # auto - Use local PIN for incoming connections + # user - Always ask user for a PIN + # + security auto; + + # Pairing mode + # none - Pairing disabled + # multi - Allow pairing with already paired devices + # once - Pair once and deny successive attempts + pairing multi; + + # Default PIN code for incoming connections + passkey "BlueZ"; +} + +# Default settings for HCI devices +device { + # Local device name + # %d - device id + # %h - host name + name "BlueZ (%d)"; + + # Local device class + class 0x120112; + + # Default packet type + #pkt_type DH1,DM1,HV1; + + # Inquiry and Page scan + iscan enable; pscan enable; + + # Default link mode + # none - no specific policy + # accept - always accept incoming connections + # master - become master on incoming connections, + # deny role switch on outgoing connections + lm accept; + + # Default link policy + # none - no specific policy + # rswitch - allow role switch + # hold - allow hold mode + # sniff - allow sniff mode + # park - allow park mode + lp rswitch,hold,sniff,park; +} diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb new file mode 100644 index 0000000000..46565b8c1b --- /dev/null +++ b/packages/bluez/bluez-utils_3.1.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} dbus" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" +RREPLACES = "bluez-utils-dbus" +RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + file://hciattach-ti-bts.patch;patch=1" + +# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol +# Let's default to that instead of 'any' until further notice... +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x" +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + mv ${D}${bindir}/* ${D}${base_bindir}/ + rmdir ${D}${bindir} ${D}${sbindir} + chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig + install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool" +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" diff --git a/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty b/packages/dbus/dbus-0.90/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/mplayer/mplayer-atty-1.1.5/.mtn2git_empty +++ b/packages/dbus/dbus-0.90/.mtn2git_empty diff --git a/packages/dbus/dbus-0.90/dbus-1.init b/packages/dbus/dbus-0.90/dbus-1.init new file mode 100644 index 0000000000..60440b7223 --- /dev/null +++ b/packages/dbus/dbus-0.90/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-glib/.mtn2git_empty b/packages/dbus/dbus-glib/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbus/dbus-glib/.mtn2git_empty diff --git a/packages/dbus/dbus-glib/cross.patch b/packages/dbus/dbus-glib/cross.patch new file mode 100644 index 0000000000..6d1d9d8e7e --- /dev/null +++ b/packages/dbus/dbus-glib/cross.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- dbus-0.20/configure.in~cross ++++ dbus-0.20/configure.in +@@ -466,6 +466,7 @@ + exit (0); + ]])], + [have_abstract_sockets=yes], ++ [have_abstract_sockets=no], + [have_abstract_sockets=no]) + AC_LANG_POP(C) + AC_MSG_RESULT($have_abstract_sockets) diff --git a/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch b/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch new file mode 100644 index 0000000000..68edc54038 --- /dev/null +++ b/packages/dbus/dbus-glib/dbus-glib-0.70-fix-includes.patch @@ -0,0 +1,21 @@ +--- dbus-glib-0.70/dbus/Makefile.am.fix_includes 2006-07-17 13:00:39.000000000 -0400 ++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-17 20:09:00.000000000 -0400 +@@ -38,13 +38,13 @@ + dbus-gvalue.c \ + dbus-gvalue.h \ + dbus-gthread.c \ +- dbus-glib.h \ +- dbus-glib-lowlevel.h \ +- dbus-glib-error-enum.h \ + $(DBUS_GLIB_INTERNALS) + + libdbus_glib_HEADERS = \ +- dbus-gtype-specialized.h ++ dbus-gtype-specialized.h \ ++ dbus-glib.h \ ++ dbus-glib-lowlevel.h \ ++ dbus-glib-error-enum.h + + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + + diff --git a/packages/dbus/dbus-glib/no-examples.patch b/packages/dbus/dbus-glib/no-examples.patch new file mode 100644 index 0000000000..483153db74 --- /dev/null +++ b/packages/dbus/dbus-glib/no-examples.patch @@ -0,0 +1,8 @@ +--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 ++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++SUBDIRS = . + + INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" + diff --git a/packages/dbus/dbus-glib/no-introspect.patch b/packages/dbus/dbus-glib/no-introspect.patch new file mode 100644 index 0000000000..7057a63020 --- /dev/null +++ b/packages/dbus/dbus-glib/no-introspect.patch @@ -0,0 +1,17 @@ +--- dbus-glib-0.70/tools/Makefile.am.orig 2006-07-23 15:53:06.000000000 +0200 ++++ dbus-glib-0.70/tools/Makefile.am 2006-07-23 15:53:53.000000000 +0200 +@@ -3,14 +3,8 @@ + nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + +-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) +- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml +- + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + +-dbus-bus-introspect.xml: +- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml +- + EXTRA_DIST = run-with-tmp-session-bus.sh + + CLEANFILES = \ diff --git a/packages/dbus/dbus-glib_0.70.bb b/packages/dbus/dbus-glib_0.70.bb new file mode 100644 index 0000000000..304e7aca48 --- /dev/null +++ b/packages/dbus/dbus-glib_0.70.bb @@ -0,0 +1,30 @@ +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-glib-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://dbus-glib-0.70-fix-includes.patch;patch=1 \ + file://no-examples.patch;patch=1 \ + file://no-introspect.patch;patch=1" + +inherit autotools pkgconfig gettext + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" + +do_configure_prepend() { + install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/ +} + +do_stage () { + oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR} + + autotools_stage_includes +} + +FILES_${PN}-dev += "${bindir}/dbus-binding-tool" diff --git a/packages/dbus/dbus-python/.mtn2git_empty b/packages/dbus/dbus-python/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbus/dbus-python/.mtn2git_empty diff --git a/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch b/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch new file mode 100644 index 0000000000..17b78d938a --- /dev/null +++ b/packages/dbus/dbus-python/dbus-python-0.70-fix-binary-modules-dir.patch @@ -0,0 +1,18 @@ +--- dbus-python-0.70/setup.py.fix-binary-modules-dir 2006-07-17 20:30:07.000000000 -0400 ++++ dbus-python-0.70/setup.py 2006-07-17 20:30:22.000000000 -0400 +@@ -92,12 +92,12 @@ + "dbus/_util", + ], + ext_modules=[ +- Extension("dbus_bindings", ["dbus/dbus_bindings.pyx"], ++ Extension("dbus/dbus_bindings", ["dbus/dbus_bindings.pyx"], + include_dirs=dbus_includes, + libraries=["dbus-1"], + + ), +- Extension("dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], ++ Extension("dbus/dbus_glib_bindings", ["dbus/dbus_glib_bindings.pyx"], + include_dirs=dbus_glib_includes, + libraries=["dbus-glib-1", "dbus-1", "glib-2.0"], + define_macros=[ + diff --git a/packages/dbus/dbus-python_0.70.bb b/packages/dbus/dbus-python_0.70.bb new file mode 100644 index 0000000000..7bfbc931ed --- /dev/null +++ b/packages/dbus/dbus-python_0.70.bb @@ -0,0 +1,15 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "devel/python" +PRIORITY = "optional" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another - python bindings" +LICENSE = "GPL" +PR = "r0" +DEPENDS = "python-native" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-python-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://dbus-python-0.70-fix-binary-modules-dir.patch;patch=1" + +inherit distutils diff --git a/packages/dbus/dbus_0.90.bb b/packages/dbus/dbus_0.90.bb new file mode 100644 index 0000000000..e48b09e4ff --- /dev/null +++ b/packages/dbus/dbus_0.90.bb @@ -0,0 +1,62 @@ +DEFAULT_PREFERENCE="-1" + +SECTION = "base" +PR = "r0" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl" + +SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init" + +inherit autotools pkgconfig update-rc.d gettext + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include" + +pkg_postinst_dbus() { +#!/bin/sh + +# can't do adduser stuff offline +if [ "x$D" != "x" ]; then + exit 1 +fi + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +mkdir -p $MESSAGEHOME || true +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +} + +EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ + --disable-checks --disable-xml-docs --disable-doxygen-docs \ + --with-xml=expat --without-x" + +do_stage () { + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ + install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_dbus', 'dbus-1', d) +} diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc index 32e22e16f8..d15664549e 100644 --- a/packages/gcc/gcc3-build.inc +++ b/packages/gcc/gcc3-build.inc @@ -11,11 +11,11 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" BINV ?= "${PV}" # gcj doesn't work on some architectures -JAVA = ",java" -JAVA_arm = "" -JAVA_armeb = "" -JAVA_mipsel = "" -JAVA_sh3 = "" +JAVA ?= ",java" +JAVA_arm ?= "" +JAVA_armeb ?= "" +JAVA_mipsel ?= "" +JAVA_sh3 ?= "" # gcc4-build sets this to f95 FORTRAN ?= "f77" LANGUAGES ?= "c,c++,${FORTRAN}${JAVA}" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index 6e332dceca..35124823a0 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -29,11 +29,16 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc -EXTRA_OECONF += "--disable-libssp" - -FORTRAN = "" -HAS_GFORTRAN = "" +#Set the fortran bits +FORTRAN = "" +HAS_GFORTRAN = "no" HAS_G2C = "no" +#Set the java bits +JAVA_arm = "" + +include gcc3-build.inc + + +EXTRA_OECONF += " --disable-libssp " diff --git a/packages/hdparm/files/.mtn2git_empty b/packages/hdparm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hdparm/files/.mtn2git_empty diff --git a/packages/hdparm/hdparm-6.3/uclibc.patch b/packages/hdparm/files/uclibc.patch index 495d7491bb..495d7491bb 100644 --- a/packages/hdparm/hdparm-6.3/uclibc.patch +++ b/packages/hdparm/files/uclibc.patch diff --git a/packages/hdparm/hdparm-6.6/.mtn2git_empty b/packages/hdparm/hdparm-6.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/hdparm/hdparm-6.6/.mtn2git_empty diff --git a/packages/hdparm/hdparm-6.6/bswap.patch b/packages/hdparm/hdparm-6.6/bswap.patch new file mode 100644 index 0000000000..6b0506ceb5 --- /dev/null +++ b/packages/hdparm/hdparm-6.6/bswap.patch @@ -0,0 +1,37 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- hdparm-5.8/hdparm.c~bswap ++++ hdparm-5.8/hdparm.c +@@ -20,8 +20,9 @@ + #include <linux/types.h> + #include <linux/hdreg.h> + #include <linux/major.h> +-#include <asm/byteorder.h> +-//#include <endian.h> ++#include <byteswap.h> ++ ++#define le16_to_cpus(x) bswap_16(htons(x)) + + #include "hdparm.h" + +@@ -1160,7 +1162,7 @@ + } + } else { + for(i = 0; i < 0x100; ++i) { +- __le16_to_cpus(&id[i]); ++ le16_to_cpus(&id[i]); + } + identify((void *)id, NULL); + } +@@ -1380,7 +1382,7 @@ + } + for (i = 0; count >= 4; ++i) { + sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); +- __le16_to_cpus((__u16 *)(&sbuf[i])); ++ le16_to_cpus((__u16 *)(&sbuf[i])); + b += 5; + count -= 5; + } diff --git a/packages/hdparm/hdparm_6.6.bb b/packages/hdparm/hdparm_6.6.bb new file mode 100644 index 0000000000..94d1e6e9bf --- /dev/null +++ b/packages/hdparm/hdparm_6.6.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "hdparm is a Linux shell utility for viewing \ +and manipulating various IDE drive and driver parameters." +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \ + file://bswap.patch;patch=1 \ + file://uclibc.patch;patch=1" + +do_install () { + install -d ${D}/${sbindir} ${D}/${mandir}/man8 + oe_runmake 'DESTDIR=${D}' install +} diff --git a/packages/images/.mtn2git_empty b/packages/images/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/images/.mtn2git_empty diff --git a/packages/meta/bootstrap-image.bb b/packages/images/bootstrap-image.bb index 1791dd8f56..1791dd8f56 100644 --- a/packages/meta/bootstrap-image.bb +++ b/packages/images/bootstrap-image.bb diff --git a/packages/meta/dvb-image.bb b/packages/images/dvb-image.bb index fa964b4490..fa964b4490 100644 --- a/packages/meta/dvb-image.bb +++ b/packages/images/dvb-image.bb diff --git a/packages/meta/e-image-core.bb b/packages/images/e-image-core.bb index 9a1ed51a1a..9a1ed51a1a 100644 --- a/packages/meta/e-image-core.bb +++ b/packages/images/e-image-core.bb diff --git a/packages/meta/e-image.bb b/packages/images/e-image.bb index 99f3858f66..99f3858f66 100644 --- a/packages/meta/e-image.bb +++ b/packages/images/e-image.bb diff --git a/packages/meta/essential-image.bb b/packages/images/essential-image.bb index 53510ddc09..53510ddc09 100644 --- a/packages/meta/essential-image.bb +++ b/packages/images/essential-image.bb diff --git a/packages/meta/essential-machine-image.bb b/packages/images/essential-machine-image.bb index c3c7b33b92..c3c7b33b92 100644 --- a/packages/meta/essential-machine-image.bb +++ b/packages/images/essential-machine-image.bb diff --git a/packages/meta/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb index c8e24ae035..c8e24ae035 100644 --- a/packages/meta/gpe-image-blank-user.bb +++ b/packages/images/gpe-image-blank-user.bb diff --git a/packages/meta/gpe-image.bb b/packages/images/gpe-image.bb index 92bed0dd5c..92bed0dd5c 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/images/gpe-image.bb diff --git a/packages/meta/ludeos-image.bb b/packages/images/ludeos-image.bb index 669ff49634..669ff49634 100644 --- a/packages/meta/ludeos-image.bb +++ b/packages/images/ludeos-image.bb diff --git a/packages/meta/maemo-image.bb b/packages/images/maemo-image.bb index 2adc88b958..2adc88b958 100644 --- a/packages/meta/maemo-image.bb +++ b/packages/images/maemo-image.bb diff --git a/packages/meta/mythfront-image.bb b/packages/images/mythfront-image.bb index 7836258940..7836258940 100644 --- a/packages/meta/mythfront-image.bb +++ b/packages/images/mythfront-image.bb diff --git a/packages/meta/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb index d1bdbe64b9..d1bdbe64b9 100644 --- a/packages/meta/nslu2-linksys-image.bb +++ b/packages/images/nslu2-linksys-image.bb diff --git a/packages/meta/nylon-image-base.bb b/packages/images/nylon-image-base.bb index a4f6d17dd8..a4f6d17dd8 100644 --- a/packages/meta/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb diff --git a/packages/meta/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb index be20ddde78..be20ddde78 100644 --- a/packages/meta/nylon-image-extra.bb +++ b/packages/images/nylon-image-extra.bb diff --git a/packages/meta/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb index e3ac80720d..e3ac80720d 100644 --- a/packages/meta/nylon-image-mini.bb +++ b/packages/images/nylon-image-mini.bb diff --git a/packages/meta/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index 8d10e9a30f..8d10e9a30f 100644 --- a/packages/meta/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb diff --git a/packages/meta/opie-image.bb b/packages/images/opie-image.bb index c786f67e0b..c786f67e0b 100644 --- a/packages/meta/opie-image.bb +++ b/packages/images/opie-image.bb diff --git a/packages/meta/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb index 113608736a..113608736a 100644 --- a/packages/meta/opie-kdepim-image.bb +++ b/packages/images/opie-kdepim-image.bb diff --git a/packages/meta/pivotboot-image.bb b/packages/images/pivotboot-image.bb index 50634e0353..50634e0353 100644 --- a/packages/meta/pivotboot-image.bb +++ b/packages/images/pivotboot-image.bb diff --git a/packages/meta/sdl-image.bb b/packages/images/sdl-image.bb index 0f3254b56e..0f3254b56e 100644 --- a/packages/meta/sdl-image.bb +++ b/packages/images/sdl-image.bb diff --git a/packages/meta/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb index be7f28fb91..be7f28fb91 100644 --- a/packages/meta/sectest-gpe-image.bb +++ b/packages/images/sectest-gpe-image.bb diff --git a/packages/meta/slugos-image.bb b/packages/images/slugos-image.bb index 428a48bc28..428a48bc28 100644 --- a/packages/meta/slugos-image.bb +++ b/packages/images/slugos-image.bb diff --git a/packages/meta/slugos-imagename.bb b/packages/images/slugos-imagename.bb index 2637524407..2637524407 100644 --- a/packages/meta/slugos-imagename.bb +++ b/packages/images/slugos-imagename.bb diff --git a/packages/meta/twin-image.bb b/packages/images/twin-image.bb index 7015f7020c..7015f7020c 100644 --- a/packages/meta/twin-image.bb +++ b/packages/images/twin-image.bb diff --git a/packages/meta/uml-image.bb b/packages/images/uml-image.bb index 6ebbf04537..6ebbf04537 100644 --- a/packages/meta/uml-image.bb +++ b/packages/images/uml-image.bb diff --git a/packages/meta/unslung-image.bb b/packages/images/unslung-image.bb index e57960ecdb..e57960ecdb 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/images/unslung-image.bb diff --git a/packages/meta/xfce-image.bb b/packages/images/xfce-image.bb index 5605a6b2ee..5605a6b2ee 100644 --- a/packages/meta/xfce-image.bb +++ b/packages/images/xfce-image.bb diff --git a/packages/meta/xterminal-image.bb b/packages/images/xterminal-image.bb index 2b98ec98fc..2b98ec98fc 100644 --- a/packages/meta/xterminal-image.bb +++ b/packages/images/xterminal-image.bb diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index ab8f4d63e0..bfb91f2f56 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -2,12 +2,13 @@ include ipkg-utils_${PV}.bb SRC_URI += "file://ipkg-utils-fix.patch;patch=1" RDEPENDS = "" -PR = "r7" +PR = "r8" inherit native # Avoid circular dependencies from package_ipk.bbclass PACKAGES = "" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils" do_stage() { for i in ${INSTALL}; do diff --git a/packages/ipkg-utils/ipkg-utils/.mtn2git_empty b/packages/ipkg-utils/ipkg-utils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils/.mtn2git_empty diff --git a/packages/ipkg-utils/ipkg-utils/index_speedup.patch b/packages/ipkg-utils/ipkg-utils/index_speedup.patch new file mode 100644 index 0000000000..bef28a9df1 --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils/index_speedup.patch @@ -0,0 +1,53 @@ +Index: ipkg-utils/ipkg-make-index +=================================================================== +--- ipkg-utils.orig/ipkg-make-index 2005-03-20 18:10:54.000000000 +0000 ++++ ipkg-utils/ipkg-make-index 2006-07-24 09:18:16.000000000 +0100 +@@ -37,6 +37,21 @@ + if os.path.exists(pkg_dir + "/" + filename + ".asc"): + os.rename(pkg_dir + "/" + filename + ".asc", locale_dir + "/" + filename + ".asc") + ++def md5sum(file): ++ import md5 ++ sum = md5.new() ++ f = open(file, "r") ++ while 1: ++ data = f.read(1024) ++ if not data: break ++ sum.update(data) ++ f.close() ++ if sys.version[:1] > '2': ++ # when using Python 2.0 or newer ++ return sum.hexdigest() ++ else: ++ return string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'') ++ + old_filename = None + packages_filename = None + filelist_filename = "Packages.filelist" +@@ -87,7 +102,7 @@ + files.sort() + for filename in files: + basename = os.path.basename(filename) +- if old_pkg_hash.has_key(basename): ++ if old_pkg_hash.has_key(basename) and old_pkg_hash[basename].md5 == md5sum(filename) and old_pkg_hash[basename].size == os.stat(filename)[6]: + if (verbose): + sys.stderr.write("Found %s in Packages\n" % (filename,)) + pkg = old_pkg_hash[basename] +Index: ipkg-utils/ipkg.py +=================================================================== +--- ipkg-utils.orig/ipkg.py 2005-01-20 23:09:10.000000000 +0000 ++++ ipkg-utils/ipkg.py 2006-07-24 09:16:44.000000000 +0100 +@@ -210,8 +210,13 @@ + value = value + '\n' + line + if name == 'size': + self.size = int(value) ++ elif name == 'md5sum': ++ self.md5 = value + elif self.__dict__.has_key(name): + self.__dict__[name] = value ++ else: ++ print "Lost field %s, %s" % (name,value) ++ + if line[0] == '\n': + return # consumes one blank line at end of package descriptoin + else: diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 12ed042f15..48c7445828 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,9 +5,10 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r11" +PR = "r12" -SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" +SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ + file://index_speedup.patch;patch=1" S = "${WORKDIR}/ipkg-utils" diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb index a7d68d5350..6f6a1ea4fd 100644 --- a/packages/ipkg/ipkg-native_0.99.163.bb +++ b/packages/ipkg/ipkg-native_0.99.163.bb @@ -5,5 +5,5 @@ include ipkg-native.inc inherit autotools pkgconfig native -SRC_URI = "http://ftp.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz" +SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz" diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb new file mode 100644 index 0000000000..997daf43b0 --- /dev/null +++ b/packages/libnss-mdns/libnss-mdns_0.8.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "NSS module for Multicast DNS name resolution" +HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" + +RRECOMMENDS_${PN} = "avahi-daemon zeroconf" +PR = "r0" + +EXTRA_OECONF = "--libdir=/lib" +S = "${WORKDIR}/nss-mdns-${PV}" + +SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" + +inherit autotools + +pkg_postinst () { + cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} + +pkg_prerm () { + cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb new file mode 100644 index 0000000000..4e55160042 --- /dev/null +++ b/packages/libsexy/libsexy_0.1.8.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" +HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" +AUTHOR = "Christian Hammond <chipx86@chipx86.com>" +MAINTAINER = "Koen Kooi <koen@handhelds.org>"" +PR = "r0" + +DEPENDS = "gtk+ enchant libxml2" + +SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + + diff --git a/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h5xxx b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h5xxx new file mode 100644 index 0000000000..4d012c89e0 --- /dev/null +++ b/packages/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh40/defconfig-h5xxx @@ -0,0 +1,1627 @@ +# +# Automatically generated make config: don't edit +# +CONFIG_ARM=y +# CONFIG_EISA is not set +# CONFIG_SBUS is not set +# CONFIG_MCA is not set +CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_GENERIC_BUST_SPINLOCK is not set +# CONFIG_GENERIC_ISA_DMA is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +# CONFIG_OBSOLETE is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +# CONFIG_MODVERSIONS is not set +CONFIG_KMOD=y + +# +# System Type +# +# CONFIG_ARCH_ANAKIN is not set +# CONFIG_ARCH_ARCA5K is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_CAMELOT is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_OMAHA is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_MX1ADS is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_RISCSTATION is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_AT91RM9200DK is not set +# CONFIG_MINIMAL_OOPS is not set + +# +# Linux As Bootldr support +# +# CONFIG_LAB is not set +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set + +# +# Archimedes/A5000 Implementations +# + +# +# Archimedes/A5000 Implementations (select only ONE) +# +# CONFIG_ARCH_ARC is not set +# CONFIG_ARCH_A5K is not set + +# +# Footbridge Implementations +# +# CONFIG_ARCH_CATS is not set +# CONFIG_ARCH_PERSONAL_SERVER is not set +# CONFIG_ARCH_EBSA285_ADDIN is not set +# CONFIG_ARCH_EBSA285_HOST is not set +# CONFIG_ARCH_NETWINDER is not set + +# +# SA11x0 Implementations +# +# CONFIG_SA1100_ACCELENT is not set +# CONFIG_SA1100_ASSABET is not set +# CONFIG_ASSABET_NEPONSET is not set +# CONFIG_SA1100_ADSBITSY is not set +# CONFIG_SA1100_BRUTUS is not set +# CONFIG_SA1100_CEP is not set +# CONFIG_SA1100_CERF is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set +# CONFIG_SA1100_CONSUS is not set +# CONFIG_SA1100_EXTENEX1 is not set +# CONFIG_SA1100_FLEXANET is not set +# CONFIG_SA1100_FREEBIRD is not set +# CONFIG_SA1100_FRODO is not set +# CONFIG_SA1100_GRAPHICSCLIENT is not set +# CONFIG_SA1100_GRAPHICSMASTER is not set +# CONFIG_SA1100_HACKKIT is not set +# CONFIG_SA1100_BADGE4 is not set +# CONFIG_SA1100_JORNADA720 is not set +# CONFIG_SA1100_JORNADA56X is not set +# CONFIG_SA1100_HUW_WEBPANEL is not set +# CONFIG_SA1100_ITSY is not set +# CONFIG_SA1100_LART is not set +# CONFIG_SA1100_NANOENGINE is not set +# CONFIG_SA1100_OMNIMETER is not set +# CONFIG_SA1100_PANGOLIN is not set +# CONFIG_SA1100_PLEB is not set +# CONFIG_SA1100_PT_SYSTEM3 is not set +# CONFIG_SA1100_SHANNON is not set +# CONFIG_SA1100_SHERMAN is not set +# CONFIG_SA1100_SIMPAD is not set +# CONFIG_SA1100_SIMPUTER is not set +# CONFIG_SA1100_PFS168 is not set +# CONFIG_SA1100_VICTOR is not set +# CONFIG_SA1100_XP860 is not set +# CONFIG_SA1100_YOPY is not set +# CONFIG_SA1100_USB is not set +# CONFIG_SA1100_USB_NETLINK is not set +# CONFIG_SA1100_USB_CHAR is not set +# CONFIG_REGISTERS is not set + +# +# Intel PXA250/210 Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_PXA_CERF is not set +CONFIG_ARCH_H3900=y +CONFIG_ARCH_H1900=y +CONFIG_ARCH_H5400=y +# CONFIG_ARCH_H2200 is not set +CONFIG_ARCH_AXIM=y +CONFIG_PXA_USB=m +CONFIG_PXA_USB_NETLINK=m +CONFIG_PXA_USB_CHAR=m + +# +# CLPS711X/EP721X Implementations +# +# CONFIG_ARCH_AUTCPU12 is not set +# CONFIG_ARCH_CDB89712 is not set +# CONFIG_ARCH_CLEP7312 is not set +# CONFIG_ARCH_EDB7211 is not set +# CONFIG_ARCH_P720T is not set +# CONFIG_ARCH_FORTUNET is not set +# CONFIG_ARCH_EP7211 is not set +# CONFIG_ARCH_EP7212 is not set +# CONFIG_ARCH_ACORN is not set +# CONFIG_FOOTBRIDGE is not set +# CONFIG_FOOTBRIDGE_HOST is not set +# CONFIG_FOOTBRIDGE_ADDIN is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +# CONFIG_CPU_26 is not set +# CONFIG_CPU_ARM610 is not set +# CONFIG_CPU_ARM710 is not set +# CONFIG_CPU_ARM720T is not set +# CONFIG_CPU_ARM920T is not set +# CONFIG_CPU_ARM922T is not set +# CONFIG_PLD is not set +# CONFIG_CPU_ARM926T is not set +# CONFIG_CPU_ARM1020 is not set +# CONFIG_CPU_ARM1026 is not set +# CONFIG_CPU_SA110 is not set +# CONFIG_CPU_SA1100 is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_XSCALE=y +CONFIG_XSCALE_PXA250=y +# CONFIG_XSCALE_80200_OLD is not set +# CONFIG_CPU_32v3 is not set +# CONFIG_CPU_32v4 is not set +# CONFIG_SA1100_IPAQ is not set +CONFIG_PXA_IPAQ=y +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq iPAQ Handheld +# +CONFIG_IPAQ_HAL=m +# CONFIG_H3600_MICRO is not set +CONFIG_IPAQ_HAS_ROSELLA=y +CONFIG_IPAQ_HAS_ASIC3=y +CONFIG_H3600_ASIC=m +CONFIG_H3900_ASIC_DEBUG=m +CONFIG_H5400_ASIC=m +CONFIG_H1900_ASIC=m +CONFIG_H1900_TS=m +CONFIG_H3600_HARDWARE=y +CONFIG_IPAQ_SLEEVE=m +CONFIG_SLEEVE_DEBUG=y +CONFIG_SLEEVE_DEBUG_VERBOSE=0 +# CONFIG_SLEEVE_IRQ_DEMUX is not set + +# +# Dell Axim X5 +# +CONFIG_AXIM_HAL=m + +# +# Processor Features +# +# CONFIG_DISCONTIGMEM is not set + +# +# General setup +# +# CONFIG_PCI is not set +# CONFIG_ISA is not set +# CONFIG_ISA_DMA is not set +# CONFIG_ZBOOT_ROM is not set +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CPU_FREQ=y +CONFIG_HOTPLUG=y + +# +# PCMCIA/CardBus support +# +CONFIG_PCMCIA=m +# CONFIG_I82092 is not set +# CONFIG_I82365 is not set +# CONFIG_TCIC is not set +# CONFIG_PCMCIA_CLPS6700 is not set +# CONFIG_PCMCIA_SA1100 is not set +CONFIG_PCMCIA_PXA=m +# CONFIG_MERCURY_BACKPAQ is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_SAMSUNG_ASIC=m +# CONFIG_MMC_S3C2410 is not set +CONFIG_MMC_H5400=m +CONFIG_MMC_ASIC3=m +CONFIG_NET=y +CONFIG_SYSVIPC=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_XIP_KERNEL is not set + +# +# At least one math emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_FASTFPE is not set +CONFIG_KCORE_ELF=y +# CONFIG_KCORE_AOUT is not set +# CONFIG_BINFMT_AOUT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +CONFIG_PM=y +CONFIG_APM=m +# CONFIG_HWTIMER is not set +# CONFIG_ARTHUR is not set +CONFIG_CMDLINE="keepinitrd" +CONFIG_ALIGNMENT_TRAP=y + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_PC_CML1=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_PC_PCMCIA=m +# CONFIG_PARPORT_ARC is not set +# CONFIG_PARPORT_IDP is not set +# CONFIG_PARPORT_AMIGA is not set +# CONFIG_PARPORT_MFC3 is not set +# CONFIG_PARPORT_ATARI is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_SUNBPP is not set +# CONFIG_PARPORT_OTHER is not set +# CONFIG_PARPORT_1284 is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +CONFIG_MTD_DEBUG=y +CONFIG_MTD_DEBUG_VERBOSE=1 +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_GEOMETRY=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_MAP_BANK_WIDTH_8=y +CONFIG_MTD_MAP_BANK_WIDTH_16=y +CONFIG_MTD_MAP_BANK_WIDTH_32=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +CONFIG_MTD_CFI_INTELEXT=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# CONFIG_MTD_OBSOLETE_CHIPS is not set +# CONFIG_MTD_AMDSTD is not set +# CONFIG_MTD_SHARP is not set +# CONFIG_MTD_JEDEC is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_IPAQ=y +# CONFIG_MTD_ARM_INTEGRATOR is not set +# CONFIG_MTD_CDB89712 is not set +# CONFIG_MTD_SA1100 is not set +# CONFIG_MTD_DC21285 is not set +# CONFIG_MTD_IQ80310 is not set +# CONFIG_MTD_LUBBOCK is not set +# CONFIG_MTD_IXP425 is not set +# CONFIG_MTD_EPXA10DB is not set +# CONFIG_MTD_FORTUNET is not set +# CONFIG_MTD_AUTCPU12 is not set +# CONFIG_MTD_EDB7312 is not set +# CONFIG_MTD_H720X is not set +# CONFIG_MTD_IMPA7 is not set +# CONFIG_MTD_CEIVA is not set +# CONFIG_MTD_NOR_TOTO is not set +# CONFIG_MTD_PCI is not set +# CONFIG_MTD_PCMCIA is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLKMTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCPROBE is not set +# CONFIG_MTD_DOCECC is not set + +# +# NAND Flash Device Drivers +# +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_NAND_SPIA is not set +# CONFIG_MTD_NAND_TOTO is not set +# CONFIG_MTD_NAND_AUTCPU12 is not set +# CONFIG_MTD_NAND_EDB7312 is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set + +# +# Plug and Play configuration +# +# CONFIG_PNP is not set +# CONFIG_ISAPNP is not set + +# +# Block devices +# +# CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_CISS_SCSI_TAPE is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +CONFIG_NVRD=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_MD_LINEAR is not set +# CONFIG_MD_RAID0 is not set +# CONFIG_MD_RAID1 is not set +# CONFIG_MD_RAID5 is not set +# CONFIG_MD_MULTIPATH is not set +CONFIG_BLK_DEV_LVM=m +CONFIG_BLK_DEV_DM=m + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +# CONFIG_NETLINK_DEV is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +CONFIG_IP_NF_FTP=m +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_TFTP is not set +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_MAC=m +# CONFIG_IP_NF_MATCH_PKTTYPE is not set +CONFIG_IP_NF_MATCH_MARK=m +CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_DSCP is not set +CONFIG_IP_NF_MATCH_AH_ESP=m +CONFIG_IP_NF_MATCH_LENGTH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_TCPMSS=m +# CONFIG_IP_NF_MATCH_HELPER is not set +CONFIG_IP_NF_MATCH_STATE=m +# CONFIG_IP_NF_MATCH_CONNTRACK is not set +# CONFIG_IP_NF_MATCH_UNCLEAN is not set +# CONFIG_IP_NF_MATCH_OWNER is not set +CONFIG_IP_NF_FILTER=m +# CONFIG_IP_NF_TARGET_REJECT is not set +# CONFIG_IP_NF_TARGET_MIRROR is not set +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +# CONFIG_IP_NF_NAT_LOCAL is not set +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set +CONFIG_IP_NF_NAT_IRC=m +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_DSCP is not set +CONFIG_IP_NF_TARGET_MARK=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_COMPAT_IPCHAINS=m +CONFIG_IP_NF_NAT_NEEDED=y +# CONFIG_IP_NF_COMPAT_IPFWADM is not set +CONFIG_IPV6=m +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_MOBILITY=m +CONFIG_IPV6_MOBILITY_MN=m +# CONFIG_IPV6_MOBILITY_HA is not set +CONFIG_IPV6_MOBILITY_DEBUG=y + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_LIMIT=m +CONFIG_IP6_NF_MATCH_MAC=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +CONFIG_IP6_NF_MATCH_MULTIPORT=m +# CONFIG_IP6_NF_MATCH_OWNER is not set +CONFIG_IP6_NF_MATCH_MARK=m +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AHESP is not set +# CONFIG_IP6_NF_MATCH_LENGTH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_MARK=m +# CONFIG_KHTTPD is not set +# CONFIG_ATM is not set +# CONFIG_VLAN_8021Q is not set + +# +# +# +# CONFIG_IPX is not set +# CONFIG_ATALK is not set + +# +# Appletalk devices +# +# CONFIG_DEV_APPLETALK is not set +# CONFIG_DECNET is not set +CONFIG_BRIDGE=m +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_LLC is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_NET_FASTROUTE is not set +# CONFIG_NET_HW_FLOWCONTROL is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +CONFIG_IPSEC=m + +# +# IPSec options (FreeS/WAN) +# +CONFIG_KLIPS_AUTH_HMAC_MD5=y +CONFIG_KLIPS_AUTH_HMAC_SHA1=y +CONFIG_KLIPS_ENC_3DES=y + +# +# ESP always enabled with tunnel mode +# +CONFIG_KLIPS_IPCOMP=y +CONFIG_KLIPS_DEBUG=y + +# +# Network device support +# +CONFIG_NETDEVICES=y + +# +# ARCnet devices +# +# CONFIG_ARCNET is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_ETHERTAP is not set + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +# CONFIG_DL2K is not set +# CONFIG_MYRI_SBUS is not set +# CONFIG_NS83820 is not set +# CONFIG_HAMACHI is not set +# CONFIG_YELLOWFIN is not set +# CONFIG_SK98LIN is not set +# CONFIG_TIGON3 is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP is not set +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +# CONFIG_PPP_SYNC_TTY is not set +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +# CONFIG_PPPOE is not set +# CONFIG_SLIP is not set + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y +# CONFIG_STRIP is not set +# CONFIG_WAVELAN is not set +# CONFIG_ARLAN is not set +# CONFIG_AIRONET4500 is not set +# CONFIG_AIRONET4500_NONCS is not set +# CONFIG_AIRONET4500_PROC is not set +# CONFIG_HERMES is not set +# CONFIG_SPECTRUM24T is not set + +# +# Wireless Pcmcia cards support +# +# CONFIG_PCMCIA_HERMES is not set +CONFIG_AIRO_CS=m +# CONFIG_WVLAN_CS is not set +# CONFIG_MWVLAN_CS is not set +# CONFIG_HOSTAP is not set +# CONFIG_HOSTAP_CS is not set +CONFIG_NET_WIRELESS=y +# CONFIG_ATMELWLAN is not set +# CONFIG_ATMELWLAN_USB_503A_RFMD is not set +# CONFIG_ATMELWLAN_PCMCIA_502A is not set +# CONFIG_ATMELWLAN_PCMCIA_3COM is not set +# CONFIG_ATMELWLAN_PCMCIA_502AD is not set +# CONFIG_ATMELWLAN_PCMCIA_502AE is not set +# CONFIG_ATMELWLAN_PCMCIA_504 is not set + +# +# Token Ring devices +# +# CONFIG_TR is not set +# CONFIG_NET_FC is not set +# CONFIG_RCPCI is not set +# CONFIG_SHAPER is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set + +# +# PCMCIA network device support +# +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_AXNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_ARCNET_COM20020_CS is not set +# CONFIG_PCMCIA_IBMTR is not set +CONFIG_NET_PCMCIA_RADIO=y +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_NETWAVE=m +CONFIG_PCMCIA_WAVELAN=m +# CONFIG_AIRONET4500_CS is not set + +# +# Amateur Radio support +# +# CONFIG_HAMRADIO is not set + +# +# IrDA (infrared) support +# +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +CONFIG_IRDA_CACHE_LAST_LSAP=y +CONFIG_IRDA_FAST_RR=y +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m +CONFIG_IRPORT_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# FIR device drivers +# +# CONFIG_USB_IRDA is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +CONFIG_PXA_FIR=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m + +# +# IDE, ATA and ATAPI Block devices +# +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_HD_IDE is not set +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_IDEDISK_STROKE is not set +# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set +# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set +# CONFIG_BLK_DEV_IDEDISK_IBM is not set +# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set +# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set +# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set +# CONFIG_BLK_DEV_IDEDISK_WD is not set +# CONFIG_BLK_DEV_COMMERIAL is not set +# CONFIG_BLK_DEV_TIVO is not set +CONFIG_BLK_DEV_IDECS=m +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_BLK_DEV_CMD640 is not set +# CONFIG_BLK_DEV_CMD640_ENHANCED is not set +# CONFIG_BLK_DEV_ISAPNP is not set +# CONFIG_IDE_CHIPSETS is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_DMA_NONPCI is not set +# CONFIG_BLK_DEV_IDE_MODES is not set +# CONFIG_BLK_DEV_ATARAID is not set +# CONFIG_BLK_DEV_ATARAID_PDC is not set +# CONFIG_BLK_DEV_ATARAID_HPT is not set + +# +# SCSI support +# +CONFIG_SCSI=m + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_SD_EXTRA_DEVS=40 +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_SR_EXTRA_DEVS=2 +CONFIG_CHR_DEV_SG=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_DEBUG_QUEUES is not set +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_7000FASST is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AHA152X is not set +# CONFIG_SCSI_AHA1542 is not set +# CONFIG_SCSI_AHA1740 is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_IN2000 is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_MEGARAID is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DTC3280 is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_EATA_DMA is not set +# CONFIG_SCSI_EATA_PIO is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_GENERIC_NCR5380 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_NCR53C406A is not set +# CONFIG_SCSI_NCR53C7xx is not set +# CONFIG_SCSI_PAS16 is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_PSI240I is not set +# CONFIG_SCSI_QLOGIC_FAS is not set +# CONFIG_SCSI_SIM710 is not set +# CONFIG_SCSI_SYM53C416 is not set +# CONFIG_SCSI_T128 is not set +# CONFIG_SCSI_U14_34F is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +CONFIG_SCSI_PCMCIA=y +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set + +# +# I2O device support +# +# CONFIG_I2O is not set +# CONFIG_I2O_BLOCK is not set +# CONFIG_I2O_LAN is not set +# CONFIG_I2O_SCSI is not set +# CONFIG_I2O_PROC is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input core support +# +CONFIG_INPUT=m +CONFIG_INPUT_KEYBDEV=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_UINPUT=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +CONFIG_SERIAL_EXTENDED=y +# CONFIG_SERIAL_MANY_PORTS is not set +# CONFIG_SERIAL_SHARE_IRQ is not set +# CONFIG_SERIAL_DETECT_IRQ is not set +# CONFIG_SERIAL_MULTIPORT is not set +# CONFIG_HUB6 is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_ANAKIN is not set +# CONFIG_SERIAL_ANAKIN_CONSOLE is not set +# CONFIG_SERIAL_S3C2410 is not set +# CONFIG_SERIAL_S3C2410_CONSOLE is not set +# CONFIG_SERIAL_AMBA is not set +# CONFIG_SERIAL_AMBA_CONSOLE is not set +# CONFIG_SERIAL_CLPS711X is not set +# CONFIG_SERIAL_CLPS711X_CONSOLE is not set +# CONFIG_SERIAL_21285 is not set +# CONFIG_SERIAL_21285_OLD is not set +# CONFIG_SERIAL_21285_CONSOLE is not set +# CONFIG_SERIAL_UART00 is not set +# CONFIG_SERIAL_UART00_CONSOLE is not set +# CONFIG_SERIAL_SA1100 is not set +# CONFIG_SERIAL_SA1100_CONSOLE is not set +# CONFIG_SERIAL_SIR_PXA is not set +# CONFIG_SERIAL_8250 is not set +# CONFIG_SERIAL_8250_CONSOLE is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_MANY_PORTS is not set +# CONFIG_SERIAL_8250_SHARE_IRQ is not set +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_MULTIPORT is not set +# CONFIG_SERIAL_8250_HUB6 is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=32 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_NEWTONKBD=m +# CONFIG_SA1100_PROFILER is not set + +# +# Compaq iPAQ H3600 support +# +CONFIG_TOUCHSCREEN_H3600=m +# CONFIG_H3600_BACKPAQ_FPGA is not set +# CONFIG_H3600_BACKPAQ_ACCEL is not set +# CONFIG_H3600_BACKPAQ_GASGAUGE is not set +# CONFIG_H3600_BACKPAQ_SRAM is not set +# CONFIG_H3600_BACKPAQ_AUDIO is not set +# CONFIG_H3600_STOWAWAY is not set +# CONFIG_H3800_MICROKBD is not set +# CONFIG_SA1100_LIRC is not set +CONFIG_H5400_BUZZER=m +CONFIG_H5400_FSI=m + +# +# I2C support +# +CONFIG_I2C=m +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +CONFIG_I2C_PXA_ALGO=m +CONFIG_I2C_PXA_ADAP=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_PROC=m +# CONFIG_I2C_DS1307 is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set +# CONFIG_L3_ALGOBIT is not set +# CONFIG_L3_BIT_SA1100_GPIO is not set + +# +# Other L3 adapters +# +# CONFIG_L3_S3C2410 is not set +# CONFIG_L3_SA1111 is not set +# CONFIG_L3_BACKPAQ is not set +# CONFIG_BIT_SA1100_GPIO is not set + +# +# SPI support +# +# CONFIG_SPI is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +CONFIG_MOUSE=m +# CONFIG_PSMOUSE is not set +# CONFIG_82C710_MOUSE is not set +# CONFIG_PC110_PAD is not set +# CONFIG_MK712_MOUSE is not set + +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_NS558 is not set +# CONFIG_INPUT_LIGHTNING is not set +# CONFIG_INPUT_PCIGAME is not set +# CONFIG_INPUT_CS461X is not set +# CONFIG_INPUT_EMU10K1 is not set +CONFIG_INPUT_SERIO=m +CONFIG_INPUT_SERPORT=m + +# +# Joysticks +# +# CONFIG_INPUT_ANALOG is not set +# CONFIG_INPUT_A3D is not set +# CONFIG_INPUT_ADI is not set +# CONFIG_INPUT_COBRA is not set +# CONFIG_INPUT_GF2K is not set +# CONFIG_INPUT_GRIP is not set +# CONFIG_INPUT_INTERACT is not set +# CONFIG_INPUT_TMDC is not set +# CONFIG_INPUT_SIDEWINDER is not set +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_IFORCE_232 is not set +# CONFIG_INPUT_WARRIOR is not set +# CONFIG_INPUT_MAGELLAN is not set +# CONFIG_INPUT_SPACEORB is not set +# CONFIG_INPUT_SPACEBALL is not set +# CONFIG_INPUT_STINGER is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_SC520_WDT is not set +# CONFIG_PCWATCHDOG is not set +# CONFIG_21285_WATCHDOG is not set +# CONFIG_977_WATCHDOG is not set +# CONFIG_SA1100_WATCHDOG is not set +CONFIG_PXA_WATCHDOG=m +# CONFIG_OMAHA_WATCHDOG is not set +# CONFIG_EUROTECH_WDT is not set +# CONFIG_IB700_WDT is not set +# CONFIG_WAFER_WDT is not set +# CONFIG_I810_TCO is not set +# CONFIG_MIXCOMWD is not set +# CONFIG_60XX_WDT is not set +# CONFIG_SC1200_WDT is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_W83877F_WDT is not set +# CONFIG_WDT is not set +# CONFIG_WDTPCI is not set +# CONFIG_MACHZ_WDT is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +CONFIG_PXA_RTC=m +CONFIG_PXA_RTC_HACK=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_PCMCIA_SERIAL_CS=m +CONFIG_PCMCIA_MOBILISCAN_CS=m +# CONFIG_AXIM_TS is not set +CONFIG_AXIM_KEY=m +# CONFIG_AXIM_KEY_FIX is not set + +# +# Multimedia devices +# +CONFIG_MEDIA=m +CONFIG_VIDEO_DEV=m +CONFIG_V4L2_DEV=m + +# +# Video For Linux +# +CONFIG_VIDEO_PROC_FS=y +# CONFIG_I2C_PARPORT is not set + +# +# Video Adapters +# +# CONFIG_VIDEO_PMS is not set +# CONFIG_VIDEO_BWQCAM is not set +# CONFIG_VIDEO_CQCAM is not set +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZORAN_BUZ is not set +# CONFIG_VIDEO_ZORAN_DC10 is not set +# CONFIG_VIDEO_ZORAN_LML33 is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_MEYE is not set +# CONFIG_VIDEO_CYBERPRO is not set +# CONFIG_VIDEO_H3600_BACKPAQ is not set +# CONFIG_VIDEO_HAWKEYE is not set + +# +# Video for Linux 2 (V4L2) +# +CONFIG_VIDEO_WINNOV_CS=m + +# +# Radio Adapters +# +# CONFIG_RADIO_CADET is not set +# CONFIG_RADIO_RTRACK is not set +# CONFIG_RADIO_RTRACK2 is not set +# CONFIG_RADIO_AZTECH is not set +# CONFIG_RADIO_GEMTEK is not set +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_RADIO_MIROPCM20 is not set +# CONFIG_RADIO_MIROPCM20_RDS is not set +# CONFIG_RADIO_SF16FMI is not set +# CONFIG_RADIO_TERRATEC is not set +# CONFIG_RADIO_TRUST is not set +# CONFIG_RADIO_TYPHOON is not set +# CONFIG_RADIO_ZOLTRIX is not set + +# +# File systems +# +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_ADFS_FS is not set +# CONFIG_ADFS_FS_RW is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_BFS_FS is not set +CONFIG_EXT3_FS=m +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_UMSDOS_FS=m +CONFIG_VFAT_FS=m +# CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_JFFS2_LZO is not set +# CONFIG_JFFS2_LZARI is not set +# CONFIG_JFFS2_CMODE_NONE is not set +CONFIG_JFFS2_CMODE_PRIORITY=y +# CONFIG_JFFS2_CMODE_SIZE is not set +CONFIG_JFFS2_PROC=y +CONFIG_CRAMFS=y +CONFIG_TMPFS=y +CONFIG_RAMFS=y +CONFIG_ISO9660_FS=m +# CONFIG_JOLIET is not set +# CONFIG_ZISOFS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS_RW is not set +# CONFIG_HPFS_FS is not set +CONFIG_PROC_FS=y +CONFIG_DEVFS_FS=y +CONFIG_DEVFS_MOUNT=y +# CONFIG_DEVFS_DEBUG is not set +# CONFIG_DRIVERFS_FS is not set +CONFIG_DEVPTS_FS=y +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX4FS_RW is not set +# CONFIG_ROMFS_FS is not set +CONFIG_EXT2_FS=m +# CONFIG_SYSV_FS is not set +# CONFIG_UDF_FS is not set +# CONFIG_UDF_RW is not set +# CONFIG_UFS_FS is not set +# CONFIG_UFS_FS_WRITE is not set + +# +# Network File Systems +# +# CONFIG_CODA_FS is not set +# CONFIG_INTERMEZZO_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_ROOT_NFS is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_SUNRPC=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_NCP_FS is not set +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +# CONFIG_ZISOFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_SMB_NLS=y +CONFIG_NLS=y + +# +# Native Language Support +# +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Console drivers +# +CONFIG_PC_KEYMAP=y +# CONFIG_VGA_CONSOLE is not set + +# +# Frame-buffer support +# +CONFIG_FB=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FB_ACORN is not set +# CONFIG_FB_ANAKIN is not set +# CONFIG_FB_CLPS711X is not set +# CONFIG_FB_S3C2410 is not set +# CONFIG_FB_SA1100 is not set +# CONFIG_FB_EPSON1356 is not set +# CONFIG_FB_MQ200 is not set +CONFIG_FB_PXA=y +# CONFIG_FB_PXA_8BPP is not set +CONFIG_FB_PXA_16BPP=y +CONFIG_FB_MQ1100=y +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FBCON_ADVANCED=y +# CONFIG_FBCON_MFB is not set +# CONFIG_FBCON_CFB2 is not set +# CONFIG_FBCON_CFB4 is not set +# CONFIG_FBCON_CFB8 is not set +CONFIG_FBCON_CFB16=y +# CONFIG_FBCON_CFB24 is not set +# CONFIG_FBCON_CFB32 is not set +# CONFIG_FBCON_AFB is not set +# CONFIG_FBCON_ILBM is not set +# CONFIG_FBCON_IPLAN2P2 is not set +# CONFIG_FBCON_IPLAN2P4 is not set +# CONFIG_FBCON_IPLAN2P8 is not set +# CONFIG_FBCON_MAC is not set +# CONFIG_FBCON_VGA_PLANES is not set +# CONFIG_FBCON_VGA is not set +# CONFIG_FBCON_HGA is not set +# CONFIG_FBCON_NO_LOGO is not set +# CONFIG_FBCON_FONTWIDTH8_ONLY is not set +CONFIG_FBCON_FONTS=y +CONFIG_FONT_8x8=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set + +# +# Sound +# +CONFIG_SOUND=y +# CONFIG_SOUND_BT878 is not set +# CONFIG_SOUND_CMPCI is not set +# CONFIG_SOUND_EMU10K1 is not set +# CONFIG_MIDI_EMU10K1 is not set +# CONFIG_SOUND_FUSION is not set +# CONFIG_SOUND_CS4281 is not set +# CONFIG_SOUND_ES1370 is not set +# CONFIG_SOUND_ES1371 is not set +# CONFIG_SOUND_ESSSOLO1 is not set +# CONFIG_SOUND_MAESTRO is not set +# CONFIG_SOUND_MAESTRO3 is not set +# CONFIG_SOUND_ICH is not set +# CONFIG_SOUND_RME96XX is not set +# CONFIG_SOUND_SONICVIBES is not set +# CONFIG_SOUND_TRIDENT is not set +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_VIA82CXXX is not set +# CONFIG_MIDI_VIA82CXXX is not set +CONFIG_SOUND_H3900_UDA1380=m +CONFIG_SOUND_H5400=m +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +# CONFIG_SOUND_SGALAXY is not set +# CONFIG_SOUND_ADLIB is not set +# CONFIG_SOUND_ACI_MIXER is not set +# CONFIG_SOUND_CS4232 is not set +# CONFIG_SOUND_SSCAPE is not set +# CONFIG_SOUND_GUS is not set +# CONFIG_SOUND_VMIDI is not set +# CONFIG_SOUND_TRIX is not set +# CONFIG_SOUND_MSS is not set +# CONFIG_SOUND_MPU401 is not set +# CONFIG_SOUND_NM256 is not set +# CONFIG_SOUND_MAD16 is not set +# CONFIG_SOUND_PAS is not set +# CONFIG_PAS_JOYSTICK is not set +# CONFIG_SOUND_PSS is not set +# CONFIG_SOUND_SB is not set +# CONFIG_SOUND_AWE32_SYNTH is not set +# CONFIG_SOUND_WAVEFRONT is not set +# CONFIG_SOUND_MAUI is not set +# CONFIG_SOUND_YM3812 is not set +# CONFIG_SOUND_OPL3SA1 is not set +# CONFIG_SOUND_OPL3SA2 is not set +# CONFIG_SOUND_YMFPCI is not set +# CONFIG_SOUND_YMFPCI_LEGACY is not set +# CONFIG_SOUND_UART6850 is not set +# CONFIG_SOUND_AEDSP16 is not set +# CONFIG_SOUND_VIDC is not set +# CONFIG_SOUND_WAVEARTIST is not set +CONFIG_SOUND_PXA_AC97=m +# CONFIG_SOUND_TVMIXER is not set + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set +# CONFIG_MCP_SA1100 is not set +# CONFIG_MCP_UCB1200 is not set +# CONFIG_MCP_UCB1200_AUDIO is not set +# CONFIG_MCP_UCB1200_TS is not set +# CONFIG_MCP_UCB1400_TS is not set + +# +# Console Switches +# +# CONFIG_SWITCHES is not set + +# +# USB support +# +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_LONG_TIMEOUT is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_UHCI is not set +# CONFIG_USB_UHCI_ALT is not set +CONFIG_USB_OHCI=m +# CONFIG_USB_OHCI_SA1111 is not set +CONFIG_USB_OHCI_H5400=m +CONFIG_USB_SL811HS=m +CONFIG_USB_SL811HS_CS=m + +# +# USB Device Class drivers +# +CONFIG_USB_AUDIO=m +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_BLUETOOTH is not set +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_HP8200e is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_ACM is not set +CONFIG_USB_PRINTER=m + +# +# USB Human Interface Devices (HID) +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDDEV is not set +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_WACOM is not set + +# +# USB Imaging devices +# +# CONFIG_USB_DC2XX is not set +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_SCANNER is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USB_HPUSBSCSI is not set + +# +# USB Multimedia devices +# +CONFIG_USB_IBMCAM=m +CONFIG_USB_OV511=m +CONFIG_USB_PWC=m +# CONFIG_USB_QC is not set +CONFIG_USB_SE401=m +CONFIG_USB_STV680=m +CONFIG_USB_VICAM=m +# CONFIG_USB_DSBR is not set +# CONFIG_USB_DABUSB is not set + +# +# USB Network adaptors +# +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_CATC is not set +CONFIG_USB_CDCETHER=m +# CONFIG_USB_USBNET is not set + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_VISOR is not set +CONFIG_USB_SERIAL_IPAQ=m +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_KLSI is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OMNINET is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_BRLVGER is not set + +# +# Support for USB gadgets +# +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_PXA2XX=y +# CONFIG_USB_GADGET_N9604 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_SUPERH is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_CONTROLLER is not set +CONFIG_USB_PXA2XX=m +CONFIG_USB_GADGET_CONTROLLER=m +# CONFIG_USB_GADGET_DUALSPEED is not set + +# +# USB Gadget Drivers +# +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m + +# +# Linux As Bootldr Modules +# +# CONFIG_BIG_KERNEL is not set +# CONFIG_USE_DATE_CODE is not set +# CONFIG_YMODEM is not set +# CONFIG_LAB_DUMMY is not set +# CONFIG_LAB_CRC is not set +# CONFIG_LAB_YMODEM is not set +# CONFIG_LAB_MTD is not set +# CONFIG_LAB_COPY is not set +# CONFIG_LAB_COPY_YMODEM is not set +# CONFIG_LAB_COPY_FLASH is not set +# CONFIG_LAB_COPY_FS is not set +# CONFIG_LAB_COPY_WRAPPER is not set + +# +# Bluetooth support +# +CONFIG_BLUEZ=m +CONFIG_BLUEZ_L2CAP=m +CONFIG_BLUEZ_SCO=m +CONFIG_BLUEZ_RFCOMM=m +CONFIG_BLUEZ_RFCOMM_TTY=y +CONFIG_BLUEZ_BNEP=m +CONFIG_BLUEZ_BNEP_MC_FILTER=y +CONFIG_BLUEZ_BNEP_PROTO_FILTER=y +CONFIG_BLUEZ_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BLUEZ_HCIUSB=m +# CONFIG_BLUEZ_HCIUSB_SCO is not set +CONFIG_BLUEZ_HCIUART=m +CONFIG_BLUEZ_HCIUART_H4=y +CONFIG_BLUEZ_HCIUART_BCSP=y +# CONFIG_BLUEZ_HCIUART_BCSP_TXCRC is not set +# CONFIG_BLUEZ_HCIBFUSB is not set +CONFIG_BLUEZ_HCIDTL1=m +CONFIG_BLUEZ_HCIBT3C=m +CONFIG_BLUEZ_HCIBLUECARD=m +CONFIG_BLUEZ_HCIBTUART=m +# CONFIG_BLUEZ_HCIVHCI is not set + +# +# Kernel hacking +# +# CONFIG_FRAME_POINTER is not set +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_NO_PGT_CACHE is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SLAB is not set +CONFIG_MAGIC_SYSRQ=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_WAITQ is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set +# CONFIG_DEBUG_DC21285_PORT is not set +# CONFIG_DEBUG_CLPS711X_UART2 is not set + +# +# Library routines +# +# CONFIG_CRC32 is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +# CONFIG_REED_SOLOMON is not set +CONFIG_FW_LOADER=m diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index ef42191005..7fcfc93943 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -59,5 +59,5 @@ do_deploy() { do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_compile diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb index 32068528aa..d3733b3e70 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb @@ -3,12 +3,10 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." MAINTAINER = "Phil Blundell <pb@handhelds.org>" LICENSE = "GPL" PR = "r0" -DEFAULT_PREFERENCE="-1" - KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)' +COMPATIBLE_MACHINE = '(h3900|h5xxx)' SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ file://defconfig-${PACKAGE_ARCH} \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index d883a86a1a..e7b7c68b91 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 = "r9" +PR = "r10" DEFAULT_PREFERENCE = "-1" @@ -29,8 +29,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \ file://00-hostap.patch;patch=1;status=merged \ file://10-pcnet.patch;patch=1;status=merged \ - ${RPSRC}/asoc-v0.11pre2-oz.patch;patch=1 \ - ${RPSRC}/asoc_updates-r1.patch;patch=1 \ + ${RPSRC}/asoc-v0.11pre5-oz.patch;patch=1 \ + ${RPSRC}/asoc_fixes2-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r25.patch;patch=1 \ ${RPSRC}/hx2750_bl-r7.patch;patch=1 \ ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \ @@ -48,7 +48,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ ${RPSRC}/poodle_pm-r1.patch;patch=1 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ - ${RPSRC}/poodle_audio-r0.patch;patch=1 \ + ${RPSRC}/poodle_audio-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r3.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ diff --git a/packages/lttng/lttng-control_0.6.bb b/packages/lttng/lttng-control_0.12.bb index b18f507e9d..1596995fb0 100644 --- a/packages/lttng/lttng-control_0.6.bb +++ b/packages/lttng/lttng-control_0.12.bb @@ -3,11 +3,11 @@ DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \ extract program execution details from the Linux operating system and \ interpret them." LICENSE = "GPL" -MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>" +MAINTAINER = "Richard Purdie <richard@openedhand.com>" -SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-28042006.tar.gz" +SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-21062006.tar.gz" -S = "${WORKDIR}/ltt-control-${PV}-28042006" +S = "${WORKDIR}/ltt-control-${PV}-21062006" inherit autotools diff --git a/packages/meta/package-index.bb b/packages/meta/package-index.bb index f230af0e27..0f8c450e37 100644 --- a/packages/meta/package-index.bb +++ b/packages/meta/package-index.bb @@ -27,8 +27,6 @@ do_build[nostamp] = 1 do_build[dirs] = "${DEPLOY_DIR_IPK}" do_build() { set -ex - rm -f Packages - touch Packages ipkg-make-index -r Packages -p Packages -l Packages.filelist -m . set +ex } diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch new file mode 100644 index 0000000000..8eec79f291 --- /dev/null +++ b/packages/mplayer/files/Makefile-codec-cfg.patch @@ -0,0 +1,11 @@ +--- trunk/Makefile.orig 2006-07-24 09:55:12.000000000 +0100 ++++ trunk/Makefile 2006-07-24 09:56:18.000000000 +0100 +@@ -410,7 +410,7 @@ + endif + + codec-cfg: codec-cfg.c codec-cfg.h help_mp.h +- $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ ++ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -DCODECS2HTML codec-cfg.c -o $@ + + codecs.conf.h: codec-cfg etc/codecs.conf + ./codec-cfg ./etc/codecs.conf > $@ diff --git a/packages/mplayer/files/libfaad-fixed.patch b/packages/mplayer/files/libfaad-fixed.patch deleted file mode 100644 index 2b85179038..0000000000 --- a/packages/mplayer/files/libfaad-fixed.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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.0pre8/libmpcodecs-ogg-include.patch b/packages/mplayer/files/libmpcodecs-ogg-include.patch index 619c4b0cd2..619c4b0cd2 100644 --- a/packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch +++ b/packages/mplayer/files/libmpcodecs-ogg-include.patch diff --git a/packages/mplayer/files/libmpdemux-ogg-include-svn.patch b/packages/mplayer/files/libmpdemux-ogg-include-svn.patch new file mode 100644 index 0000000000..52b7029bc5 --- /dev/null +++ b/packages/mplayer/files/libmpdemux-ogg-include-svn.patch @@ -0,0 +1,11 @@ +--- trunk/libmpdemux/Makefile.orig 2006-07-24 10:11:06.000000000 +0100 ++++ trunk/libmpdemux/Makefile 2006-07-24 10:12:02.000000000 +0100 +@@ -208,7 +208,7 @@ + OBJS = $(SRCS:.c=.o) + OBJS += $(CPLUSPLUSSRCS:.cpp=.o) + INCLUDE = -I.. -I../loader $(LIBAV_INC) +-CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) ++CFLAGS = $(INCLUDE) $(OPTFLAGS) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) + CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS + CPLUSPLUS = $(CC) + diff --git a/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch b/packages/mplayer/files/libmpdemux-ogg-include.patch index 541f4a03ee..541f4a03ee 100644 --- a/packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch +++ b/packages/mplayer/files/libmpdemux-ogg-include.patch diff --git a/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch b/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch deleted file mode 100644 index d5a7a30505..0000000000 --- a/packages/mplayer/files/mplayer-1.0_pre7-gcc4.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff -bBur MPlayer-20050413-orig/configure MPlayer-20050413/configure ---- MPlayer-20050413-orig/configure 2005-04-06 14:57:08.000000000 +0300 -+++ MPlayer-20050413/configure 2005-04-14 16:20:41.000000000 +0300 -@@ -604,7 +604,7 @@ - cc_version="v. ?.??, bad" - cc_verc_fail=yes - ;; -- 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]) -+ 2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*) - _cc_major=`echo $cc_version | cut -d '.' -f 1` - _cc_minor=`echo $cc_version | cut -d '.' -f 2` - _cc_mini=`echo $cc_version | cut -d '.' -f 3` -diff -bBur MPlayer-20050413-orig/liba52/imdct.c MPlayer-20050413/liba52/imdct.c ---- MPlayer-20050413-orig/liba52/imdct.c 2005-03-23 01:27:18.000000000 +0200 -+++ MPlayer-20050413/liba52/imdct.c 2005-04-14 16:48:54.000000000 +0300 -@@ -937,7 +937,8 @@ - /* 4-7. iterations */ - for (m=3; m < 7; m++) { - two_m = (1 << m); -- two_m_plus_one = two_m<<1; -+ int two_m_plus_four=two_m<<4; -+ complex_t* buf_plus_128=buf+128; - asm volatile( - "movl %0, %%esi \n\t" - ".balign 16 \n\t" -@@ -963,7 +964,7 @@ - "addl %2, %%esi \n\t" - "cmpl %1, %%esi \n\t" - " jb 1b \n\t" -- :: "g" (buf), "m" (buf+128), "m" (two_m_plus_one<<3), "r" (two_m<<3), -+ :: "g" (buf), "m" (buf_plus_128), "m" (two_m_plus_four), "r" (two_m<<3), - "r" (sseW[m]) - : "%esi", "%edi", "%edx" - ); -diff -bBur MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c ---- MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c 2005-02-27 10:56:26.000000000 +0200 -+++ MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c 2005-04-14 16:35:07.000000000 +0300 -@@ -2648,6 +2648,8 @@ - static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){ - int64_t dc_mask, eq_mask; - int64_t sums[10*8*2]; -+ int64_t dc_and_eq_mask; -+ - src+= step*3; // src points to begin of the 8x8 Block - //START_TIMER - asm volatile( -@@ -2754,8 +2756,9 @@ - : "r" (src), "r" ((long)step), "m" (c->pQPb), "m"(c->ppMode.flatnessThreshold) - : "%"REG_a - ); -+ dc_and_eq_mask=dc_mask & eq_mask; - -- if(dc_mask & eq_mask){ -+ if(dc_and_eq_mask){ - long offset= -8*step; - int64_t *temp_sums= sums; - -@@ -2930,7 +2933,7 @@ - " js 1b \n\t" - - : "+r"(offset), "+r"(temp_sums) -- : "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask) -+ : "r" ((long)step), "r"(src - offset), "m"(dc_and_eq_mask) - ); - }else - src+= step; // src points to begin of the 8x8 Block -diff -bBur MPlayer-20050413-orig/libmpdemux/frequencies.h MPlayer-20050413/libmpdemux/frequencies.h ---- MPlayer-20050413-orig/libmpdemux/frequencies.h 2001-11-17 00:06:48.000000000 +0200 -+++ MPlayer-20050413/libmpdemux/frequencies.h 2005-04-14 16:36:51.000000000 +0300 -@@ -104,7 +104,7 @@ - /* --------------------------------------------------------------------- */ - - extern struct CHANLISTS chanlists[]; --extern struct STRTAB chanlist_names[]; -+/* extern struct STRTAB chanlist_names[]; */ - - extern int chantab; - extern struct CHANLIST *chanlist; -diff -bBur MPlayer-20050413-orig/mmx.h MPlayer-20050413/mmx.h ---- MPlayer-20050413-orig/mmx.h 2001-10-28 13:47:21.000000000 +0200 -+++ MPlayer-20050413/mmx.h 2005-04-14 16:22:54.000000000 +0300 -@@ -353,11 +353,11 @@ - #define mmx_m2r(op, mem, reg) \ - __asm__ __volatile__ (#op " %0, %%" #reg \ - : /* nothing */ \ -- : "X" (mem)) -+ : "m" (mem)) - - #define mmx_r2m(op, reg, mem) \ - __asm__ __volatile__ (#op " %%" #reg ", %0" \ -- : "=X" (mem) \ -+ : "=m" (mem) \ - : /* nothing */ ) - - #define mmx_r2r(op, regs, regd) \ -@@ -367,8 +367,8 @@ - __asm__ __volatile__ ("movq %0, %%mm0\n\t" \ - #op " %1, %%mm0\n\t" \ - "movq %%mm0, %0" \ -- : "=X" (memd) \ -- : "X" (mems)) -+ : "=m" (memd) \ -+ : "m" (mems)) - - #endif - -diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/postproc/swscale_template.c ---- MPlayer-20050413-orig/postproc/swscale_template.c 2005-02-17 01:47:00.000000000 +0200 -+++ MPlayer-20050413/postproc/swscale_template.c 2005-04-14 16:46:12.000000000 +0300 -@@ -2136,6 +2136,7 @@ - else - { - long counter= -2*dstW; -+ uint8_t* ptr=src+filterSize; - // filter-= counter*filterSize/2; - filterPos-= counter/2; - dst-= counter/2; -@@ -2177,7 +2178,7 @@ - " jnc 1b \n\t" - - : "+r" (counter), "+r" (filter) -- : "m" (filterPos), "m" (dst), "m"(src+filterSize), -+ : "m" (filterPos), "m" (dst), "m"(ptr), - "m" (src), "r" ((long)filterSize*2) - : "%"REG_b, "%"REG_a, "%"REG_c - ); -@@ -2320,6 +2321,8 @@ - { - #endif - //NO MMX just normal asm ... -+ int xInc_hi=xInc>>16; -+ int xInc_lo=xInc&0xffff; - asm volatile( - "xor %%"REG_a", %%"REG_a" \n\t" // i - "xor %%"REG_b", %%"REG_b" \n\t" // xx -@@ -2356,7 +2359,7 @@ - " jb 1b \n\t" - - -- :: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc>>16), "m" (xInc&0xFFFF) -+ :: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc_hi), "m" (xInc_lo) - : "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi" - ); - #ifdef HAVE_MMX2 -@@ -2515,6 +2518,8 @@ - else - { - #endif -+ int xInc_hi=xInc>>16; -+ int xInc_lo=xInc&0xffff; - asm volatile( - "xor %%"REG_a", %%"REG_a" \n\t" // i - "xor %%"REG_b", %%"REG_b" \n\t" // xx -@@ -2548,7 +2553,7 @@ - "cmp %2, %%"REG_a" \n\t" - " jb 1b \n\t" - -- :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc>>16)), "m" ((xInc&0xFFFF)), -+ :: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)), - "r" (src2) - : "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi" - ); - ---- MPlayer-1.0pre7/libvo/aclib_template.c 2005-04-25 08:26:11.000000000 +0000 -+++ MPlayer-1.0pre7.az/libvo/aclib_template.c 2005-04-25 08:26:17.000000000 +0000 -@@ -249,8 +249,8 @@ - MOVNTQ" %%mm6, 48(%1)\n" - MOVNTQ" %%mm7, 56(%1)\n" - :: "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from=((const unsigned char *)from)+64; -+ to=((unsigned char *)to)+64; - } - - // printf(" %d %d\n", (int)from&1023, (int)to&1023); -@@ -338,8 +338,8 @@ - MOVNTQ" %%mm6, 48(%1)\n" - MOVNTQ" %%mm7, 56(%1)\n" - :: "r" (from), "r" (to) : "memory"); -- ((const unsigned char *)from)+=64; -- ((unsigned char *)to)+=64; -+ from=((const unsigned char *)from)+64; -+ to=((unsigned char *)to)+64; - } - - #endif /* Have SSE */ diff --git a/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch b/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch deleted file mode 100644 index 9c84bdd05c..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./vidix/drivers/Makefile 2004-09-24 19:05:49.000000000 +0930 -+++ ./vidix/drivers/Makefile~mplayer-w100_1.0pre3.1.modified.diff 2003-10-23 02:15:33.000000000 +0930 -@@ -151,7 +138,7 @@ - - install: - mkdir -p $(LIBDIR)/mplayer/vidix -- -install -m 755 -s -p *.so $(LIBDIR)/mplayer/vidix -+ -install -m 755 -p *.so $(LIBDIR)/mplayer/vidix - uninstall: - rm -f $(LIBDIR)/mplayer/vidix/*.so - rmdir -p --ignore-fail-on-non-empty $(LIBDIR)/mplayer/vidix diff --git a/packages/mplayer/mplayer-1.0pre7/Makefile.patch b/packages/mplayer/mplayer-1.0pre7/Makefile.patch deleted file mode 100644 index 07d8cd1cea..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/Makefile.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- MPlayer-1.0pre7/Makefile.orig 2005-04-18 09:01:02.021562376 +0100 -+++ MPlayer-1.0pre7/Makefile 2005-04-18 09:11:13.018676696 +0100 -@@ -8,11 +8,6 @@ - - PRG_CFG = codec-cfg - --# Do not strip the binaries at installation --ifeq ($(STRIPBINARIES),yes) --INSTALLSTRIP = -s --endif -- - # These subdirectories require installation due to binaries within them. - ifeq ($(VIDIX),yes) - SUBDIRS += libdha vidix -@@ -244,7 +239,7 @@ - ifeq ($(TARGET_WIN32),yes) - windres -o osdep/mplayer-rc.o osdep/mplayer.rc - endif -- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -ljpeg -lpng $(LDFLAGS) - - mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a - winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ -@@ -277,7 +272,7 @@ - $(MENCODER_DEP): version.h help_mp.h - - $(PRG_CFG): version.h codec-cfg.c codec-cfg.h -- $(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS) -+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS) - - install: $(ALL_PRG) - ifeq ($(VIDIX),yes) -@@ -365,7 +360,6 @@ - @for a in $(PARTS); do $(MAKE) -C $$a distclean; done - - strip: -- strip -s $(ALL_PRG) - - dep: depend - diff --git a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch deleted file mode 100644 index 9ca1266c4b..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- MPlayer-1.0pre7/libmpcodecs/Makefile.orig 2005-04-19 12:09:24.313075760 +0100 -+++ MPlayer-1.0pre7/libmpcodecs/Makefile 2005-04-19 12:09:55.204379568 +0100 -@@ -50,7 +50,7 @@ - SRCS2=$(ENCODER_SRCS) - OBJS2=$(SRCS2:.c=.o) - --CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE -+CFLAGS = -I.. $(OPTFLAGS) -I. -Inative -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE - - .SUFFIXES: .c .o - diff --git a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch deleted file mode 100644 index 059a397926..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- MPlayer-1.0pre7/libmpdemux/Makefile.orig 2005-04-19 12:03:18.032758832 +0100 -+++ MPlayer-1.0pre7/libmpdemux/Makefile 2005-04-19 12:04:01.934084816 +0100 -@@ -36,8 +36,8 @@ - - OBJS = $(SRCS:.c=.o) - OBJS += $(CPLUSPLUSSRCS:.cpp=.o) --INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) --CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) -+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) -+CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) - CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) - CPLUSPLUS = $(CC) - diff --git a/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff b/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff deleted file mode 100644 index cabfcf8c41..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff +++ /dev/null @@ -1,446 +0,0 @@ -diff -ruN MPlayer-1.0pre3/Makefile MPlayer-1.0pre3.custom/Makefile ---- MPlayer-1.0pre3.orig/Makefile Tue Dec 9 06:33:31 2003 -+++ MPlayer-1.0pre3/Makefile Thu Dec 11 16:18:27 2003 -@@ -17,7 +17,7 @@ - - # These subdirectories require installation due to binaries within them. - ifeq ($(VIDIX),yes) --SUBDIRS += libdha vidix -+SUBDIRS += vidix - DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done - endif - -@@ -45,7 +45,7 @@ - PARTS += libfaad2 - endif - ifeq ($(VIDIX),yes) --PARTS += libdha vidix -+PARTS += vidix - endif - ifeq ($(FAME),yes) - PARTS += libfame -@@ -81,7 +81,7 @@ - COMMON_DEPS += libfaad2/libfaad2.a - endif - ifeq ($(VIDIX),yes) --COMMON_DEPS += libdha/libdha.so vidix/libvidix.a -+COMMON_DEPS += vidix/libvidix.a - endif - ifeq ($(FAME),yes) - COMMON_DEPS += libfame/libfame.a -diff -ruN MPlayer-1.0pre3.orig/configure MPlayer-1.0pre3/configure ---- MPlayer-1.0pre3.orig/configure Tue Dec 9 06:33:31 2003 -+++ MPlayer-1.0pre3/configure Thu Dec 11 17:29:38 2003 -@@ -2151,7 +2151,7 @@ - #include <sys/types.h> - int main(void) { printf("%d\n", sizeof(size_t)*8); return 0; } - EOF --cc_check && _wordsize=`$TMPO` && _mp_wordsize="#define MP_WORDSIZE $_wordsize" -+cc_check && _wordsize="32" && _mp_wordsize="#define MP_WORDSIZE $_wordsize" - echores "$_wordsize" - - -@@ -2289,6 +2289,8 @@ - EOF - if mingw32 ; then - _ld_pthread='' -+elif true ; then -+ _ld_pthread='-lpthread' - elif ( cc_check && $TMPO ) ; then # QNX - _ld_pthread='' - elif ( cc_check -lpthread && $TMPO ) ; then -diff -ruN MPlayer-1.0pre3.orig/vidix/drivers/Makefile MPlayer-1.0pre3/vidix/drivers/Makefile ---- MPlayer-1.0pre3.orig/vidix/drivers/Makefile Thu Oct 23 01:45:33 2003 -+++ MPlayer-1.0pre3/vidix/drivers/Makefile Thu Dec 11 17:13:01 2003 -@@ -124,6 +131,12 @@ - - $(SIS_VID): $(SIS_OBJS) - $(CC) -shared $(SIS_OBJS) $(SIS_LIBS) -Wl,-soname,$(SIS_VID) -o $(SIS_VID) -+ -+$(W100_OBJS): $(W100_SRCS) -+ $(CC) -c $(W100_CFLAGS) -o $@ $< -+ -+$(W100_VID): $(W100_OBJS) -+ $(CC) -shared $(W100_OBJS) $(W100_LIBS) -Wl,-soname,$(W100_VID) -o $(W100_VID) - - clean: - rm -f *.o *.so *~ -diff -ruN MPlayer-1.0pre3.orig/vidix/drivers/w100_vid.c MPlayer-1.0pre3/vidix/drivers/w100_vid.c ---- MPlayer-1.0pre3.orig/vidix/drivers/w100_vid.c Thu Jan 1 09:00:00 1970 -+++ MPlayer-1.0pre3/vidix/drivers/w100_vid.c Thu Dec 11 16:24:01 2003 -@@ -0,0 +1,375 @@ -+#include <errno.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <inttypes.h> -+#include <unistd.h> -+ -+#include "../vidix.h" -+#include "../fourcc.h" -+#include "../../config.h" -+#include "aticore.h" -+ -+#define UNUSED(v) ((void)(v)) -+ -+static uint16_t st_overlayHandle; -+ -+static vidix_capability_t w100_cap = -+{ -+ "ATI W100 driver", -+ "AGAWA Koji <kaoru-K@self-core.org>", -+ TYPE_OUTPUT, -+ { 0, 0, 0, 0 }, /* reserved */ -+ 480, /* max width */ -+ 640, /* max height */ -+ 4, /* min width */ -+ 4, /* min height */ -+ -1, /* max framerate */ -+ FLAG_EQUALIZER, /* flags */ -+ 0x1002, /* VENDOR_ATI(libdha/pci_vendors.h) */ -+ -1, /* device id */ -+ { 0, 0, 0, 0 } /* reserved */ -+}; -+ -+unsigned int vixGetVersion(void) -+{ -+ return VIDIX_VERSION; -+} -+ -+int vixProbe(int verbose, int force) -+{ -+ UNUSED(verbose); -+ UNUSED(force); -+ return 0; -+} -+ -+int vixInit(void) -+{ -+ if (AtiCore_ProcessAttach()) { -+ if (AtiCore_AllocOverlay(&st_overlayHandle)) -+ return 0; -+ } -+ -+ return ENOSYS; -+} -+ -+void vixDestroy(void) -+{ -+ AtiCore_SetOverlayOnOff(st_overlayHandle, 0); -+ AtiCore_ReleaseOverlay(st_overlayHandle); -+ AtiCore_ProcessDetach(); -+} -+ -+int vixGetCapability(vidix_capability_t *to) -+{ -+ memcpy(to, &w100_cap, sizeof(vidix_capability_t)); -+ return 0; -+} -+ -+static int is_supported_fourcc(uint32_t fourcc) -+{ -+ switch(fourcc) { -+ case IMGFMT_YV12: -+ return 1; -+ default: -+ return 0; -+ } -+} -+ -+int vixQueryFourcc(vidix_fourcc_t *to) -+{ -+ if (is_supported_fourcc(to->fourcc)) { -+ to->depth = VID_DEPTH_1BPP | VID_DEPTH_2BPP | -+ VID_DEPTH_4BPP | VID_DEPTH_8BPP | -+ VID_DEPTH_12BPP| VID_DEPTH_15BPP| -+ VID_DEPTH_16BPP| VID_DEPTH_24BPP| -+ VID_DEPTH_32BPP; -+ to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK; -+/* to->flags = VID_CAP_EXPAND | VID_CAP_SHRINK | VID_CAP_COLORKEY; */ -+ return 0; -+ } else -+ to->depth = to->flags = 0; -+ -+ return ENOSYS; -+} -+ -+int vixGetGrKeys(vidix_grkey_t *grkey) -+{ -+ UNUSED(grkey); -+ return 0; -+} -+ -+int vixSetGrKeys(const vidix_grkey_t *grkey) -+{ -+ UNUSED(grkey); -+ return 0; -+} -+ -+static vidix_video_eq_t st_equal = -+{ -+ VEQ_CAP_BRIGHTNESS, -+ 0, 0, 0, 0, 0, 0, 0, 0 -+}; -+ -+int vixPlaybackGetEq(vidix_video_eq_t * eq) -+{ -+ memcpy(eq, &st_equal, sizeof(st_equal)); -+ return 0; -+} -+ -+int vixPlaybackSetEq(const vidix_video_eq_t * eq) -+{ -+ int br; -+ -+ if (eq->cap & VEQ_CAP_BRIGHTNESS) -+ st_equal.brightness = eq->brightness; -+ if (eq->cap & VEQ_CAP_CONTRAST) -+ st_equal.contrast = eq->contrast; -+ if (eq->cap & VEQ_CAP_SATURATION) -+ st_equal.saturation = eq->saturation; -+ if (eq->cap & VEQ_CAP_HUE) -+ st_equal.hue = eq->hue; -+ if (eq->cap & VEQ_CAP_RGB_INTENSITY) { -+ st_equal.red_intensity = eq->red_intensity; -+ st_equal.green_intensity = eq->green_intensity; -+ st_equal.blue_intensity = eq->blue_intensity; -+ } -+ st_equal.flags = eq->flags; -+ -+ br = (st_equal.brightness + 1000) * 127 / 2000; -+ if (br < 0) -+ br = 0; -+ if (br > 127) -+ br = 127; -+ if (br > 64) -+ br -= 64; -+ else -+ br += 64; -+ -+ AtiCore_SetDisplayBrightness(br); -+ -+ return 0; -+} -+ -+static uint32_t st_frameOffsets[VID_PLAY_MAXFRAMES]; -+static vidix_playback_t st_playbackInfo; -+static ATI_OVERLAYPROP st_overlayProp; -+ -+int vixConfigPlayback(vidix_playback_t *info) -+{ -+ int src_w, src_h; -+ int drw_w, drw_h; -+ int y_pitch, uv_pitch; -+ int i, ret, newNumFrames; -+ ATI_CLIPRECT clipRect; -+ uint32_t base; -+ uint32_t internalVramSize, internalVramAddr; -+ uint32_t externalVramSize, externalVramAddr; -+ int useExternalVram = 0; -+ -+ if (!is_supported_fourcc(info->fourcc)) -+ return -1; -+ -+ src_w = info->src.w; -+ src_h = info->src.h; -+ drw_w = info->dest.w; -+ drw_h = info->dest.h; -+ -+ switch (info->fourcc) { -+ case IMGFMT_YV12: -+ y_pitch = (src_w + 15) & ~15; -+ uv_pitch = ((src_w / 2) + 7) & ~7; -+ info->offset.y = 0; -+ info->offset.v = y_pitch * src_h; -+ info->offset.u = info->offset.v + uv_pitch * (src_h / 2); -+ info->frame_size = y_pitch * src_h + 2 * uv_pitch * (src_h / 2); -+ break; -+ default: -+ return -1; -+ } -+/* fprintf(stderr, "w100_vid: num_frames:%d\n", info->num_frames); */ -+/* fprintf(stderr, "w100_vid: y_pitch:%d\n", y_pitch); */ -+ -+/* fprintf(stderr, "w100_vid: struct info {\n"); */ -+/* fprintf(stderr, "w100_vid: src.x:%d. src.y:%d. src.w:%d, src.h:%d,\n", */ -+/* info->src.x, info->src.y, info->src.w, info->src.h); */ -+/* fprintf(stderr, "w100_vid: dest.x:%d. dest.y:%d. dest.w:%d, dest.h:%d,\n", */ -+/* info->dest.x, info->dest.y, info->dest.w, info->dest.h); */ -+/* fprintf(stderr, "w100_vid: offset.y:%d, offset.v:%d offset.y:%d\n", */ -+/* info->offset.y, info->offset.v, info->offset.u); */ -+/* fprintf(stderr, "w100_vid: frame_size:%d,\n", info->frame_size); */ -+ -+ GetAvailableVideoMem(&internalVramSize, &externalVramSize); -+ AtiCore_SetupMemoryTransfer(0, &internalVramAddr); -+ AtiCore_TerminateMemoryTransfer(); -+ AtiCore_SetupMemoryTransfer(0xF000000, &externalVramAddr); -+ AtiCore_TerminateMemoryTransfer(); -+ -+/* info->num_frames = 1; */ -+ useExternalVram = (getenv("MPLAYER_W100_USEEXTVRAM") ? 1 : 0); -+ -+ if (useExternalVram) { -+ /* $B%U%l!<%`%P%C%U%!$H$7$FMxMQ$5$l$F$$$kItJ,$O;H$o$J$$(B */ -+ base = 640 * 480 * 2; -+ newNumFrames = (externalVramSize - (640 * 480 * 2)) -+ / info->frame_size; -+ -+ /* FIXME: $B30It(B VRAM $B$K%*!<%P%l%$$r3NJ]$9$k$H!"(BVGA/QVGA $BLd$o$:(B -+ $BI=<($,GH>u$KMp$l$k!#(B @SL-C700/C750 */ -+ } else { -+ /* $B%U%l!<%`%P%C%U%!It$b;H$o$J$$$H!"(BVRAM $BMFNL$,B-$j$J$$(B */ -+/* base = 320 * 240 * 2; */ -+ base = 320 * 4 * 2; -+ memset((void *)internalVramAddr, 0x00, 320 * 4 * 2); -+ newNumFrames = internalVramSize / info->frame_size; -+ } -+ -+ if (newNumFrames > info->num_frames) -+ newNumFrames = info->num_frames; -+ if (newNumFrames > VID_PLAY_MAXFRAMES) -+ newNumFrames = VID_PLAY_MAXFRAMES; -+ info->num_frames = newNumFrames; -+ -+ info->dga_addr = -+ (void *)(useExternalVram ? externalVramAddr : internalVramAddr); -+/* fprintf(stderr, "w100_vid: num_frames:%d,\n", info->num_frames); */ -+ -+ info->dest.pitch.y = 16; -+ info->dest.pitch.u = 16; -+ info->dest.pitch.v = 16; -+ -+/* fprintf(stderr, "w100_vid: }\n"); */ -+/* fprintf(stderr, "w100_vid: base:%d\n", base); */ -+ -+ for (i = 0; i < info->num_frames; ++i) { -+ info->offsets[i] = base + info->frame_size * i; -+ st_frameOffsets[i] = info->offsets[i] -+ + (useExternalVram ? 0xF000000 : 0); -+ } -+ -+ st_overlayProp.lpSrcBitmap = (void *)st_frameOffsets[0]; -+ st_overlayProp.XCoord = 0; -+ st_overlayProp.YCoord = 0; -+ st_overlayProp.SrcPitch = y_pitch; -+ st_overlayProp.SrcHeight = src_h; -+ st_overlayProp.OverlayWidth = y_pitch; -+ st_overlayProp.OverlayHeight = src_h; -+ st_overlayProp.lpOverlayKey = 0; -+ st_overlayProp.OverlayFormat = OVLTYPE_YUV420; -+ -+ ret = AtiCore_SetupOverlay(st_overlayHandle, &st_overlayProp); -+/* printf("w100_vid: AtiCore_SetupOverlay: ret=%d\n", ret); */ -+ -+ clipRect.X_Top_Left = 0; -+ clipRect.Y_Top_Left = 0; -+ clipRect.X_Bottom_Right = st_overlayProp.SrcPitch; -+ clipRect.Y_Bottom_Right = st_overlayProp.SrcHeight; -+ AtiCore_SetDstClippingRect(&clipRect); -+ clipRect.X_Bottom_Right = info->src.w; -+ clipRect.Y_Bottom_Right = info->src.h; -+ AtiCore_SetSrcClippingRect(&clipRect); -+ -+/* AtiCore_SetOverlayPos(st_overlayHandle, info->dest.x, info->dest.y); */ -+ AtiCore_SetOverlayPos(st_overlayHandle, 4, 0); -+ -+ AtiCore_SetRopOperation(ROP3_SRCCOPY); -+ AtiCore_SetDstType(DSTTYPE_8BPP); -+ AtiCore_SetSrcType(SRCTYPE_EQU_DST); -+ -+ vixPlaybackSetEq(&st_equal); -+ -+ memcpy(&st_playbackInfo, info, sizeof(*info)); -+ -+/* fprintf(stderr, "w100_vid: ---- vixConfigPlayback complete.\n"); */ -+ -+ return 0; -+} -+ -+int vixPlaybackOn(void) -+{ -+ AtiCore_SetOverlayOnOff(st_overlayHandle, 1); -+ -+ return 0; -+} -+ -+int vixPlaybackOff(void) -+{ -+ AtiCore_SetOverlayOnOff(st_overlayHandle, 0); -+ -+ return 0; -+} -+ -+int vixPlaybackFrameSelect(unsigned int frame) -+{ -+ st_overlayProp.lpSrcBitmap = (void *)st_frameOffsets[frame]; -+ AtiCore_SetupOverlay(st_overlayHandle, &st_overlayProp); -+ -+#if 0 -+ ATI_STRETCH stretchOptions; -+ ATI_POINT dpPoint; -+ ATI_RECT srcRect, dstRect; -+ int ret; -+ -+/* fprintf(stderr, "w100_vid: vixPlaybackFrameSelect(frame=%d)\n", frame); */ -+/* fprintf(stderr, "w100_vid: dga_addr:0x%08x, offset:%d,\n", */ -+/* st_playbackInfo.dga_addr, st_frameOffsets[frame]); */ -+ -+ stretchOptions.Count = 1; -+ stretchOptions.ScaleXFactor = 4; -+ stretchOptions.ScaleYFactor = 4; -+ stretchOptions.BlendOn = 0; -+ stretchOptions.dummy1 = 0; -+ -+ dpPoint.XCoord = 0; -+ dpPoint.YCoord = 0; -+ -+ srcRect.XCoord = st_playbackInfo.src.x; -+ srcRect.YCoord = st_playbackInfo.src.y; -+ srcRect.Width = st_playbackInfo.src.w; -+ srcRect.Height = st_playbackInfo.src.h; -+ fprintf(stderr, "%d, %d, %d, %d\n", srcRect.XCoord, srcRect.YCoord, -+ srcRect.Width, srcRect.Height); -+ -+ dstRect.XCoord = 0; -+ dstRect.YCoord = 0; -+ dstRect.Width = 432;//st_playbackInfo.src.w; -+ dstRect.Height = 592;//st_playbackInfo.src.h; -+ -+#if 1 -+ while (AtiCore_WaitComplete(100) != 1) -+ ; -+ -+ AtiCore_SetRopOperation( ROP3_SRCCOPY ); -+ AtiCore_SetDstType( DSTTYPE_8BPP ); -+ AtiCore_SetSrcType( SRCTYPE_EQU_DST ); -+ -+ ret = AtiCore_SetSrcPitchOffset(st_playbackInfo.src.w, -+ st_frameOffsets[frame]); -+ fprintf(stderr, "AtiCore_SetSrcPitchOffset(%d, %x) %d\n", -+ st_playbackInfo.src.w, st_frameOffsets[frame], ret); -+ ret = AtiCore_SetDstPitchOffset(432, 0); -+/* printf("AtiCore_SetDstPitchOffset: ret=%d\n", ret); */ -+ -+/* ret = AtiCore_BitBltFilpRotate(0, &srcRect, &dstRect); */ -+ ret = AtiCore_StretchBlt(&stretchOptions, &dpPoint, &srcRect); -+ fprintf(stderr, "AtiCore_StretchBlt: ret=%d\n", ret); -+ -+#else -+ { -+ int y, srcOffset = 0, dstOffset = 0; -+ fprintf(stderr, "%d %d %d\n", st_playbackInfo.src.h, -+ st_playbackInfo.src.w, 0); -+ for (y = 0; y < st_playbackInfo.src.h; ++y) { -+ memcpy( -+ 0xF1100000 + dstOffset, -+ st_playbackInfo.dga_addr + st_playbackInfo.offsets[frame] + srcOffset, -+ st_playbackInfo.src.w); -+ srcOffset += st_playbackInfo.src.w; -+ dstOffset += 432; -+ } -+ } -+#endif -+#endif -+ -+ return 0; -+} diff --git a/packages/mplayer/mplayer-1.0pre7/sdl.patch b/packages/mplayer/mplayer-1.0pre7/sdl.patch deleted file mode 100644 index d74c8397b9..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/sdl.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./configure.orig 2004-09-24 19:09:56.000000000 +0930 -+++ ./configure 2004-09-24 19:22:21.000000000 +0930 -@@ -3554,38 +3554,6 @@ - ################# - - --echocheck "SDL" --if test -z "$_sdlconfig" ; then -- if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then -- _sdlconfig="sdl-config" -- elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then -- _sdlconfig="sdl11-config" -- else -- _sdlconfig=false -- fi --fi --if test "$_sdl" = auto || test "$_sdl" = yes ; then -- cat > $TMPC << EOF --#include <SDL.h> --int main(int argc, char *argv[]) { return 0; } --EOF -- _sdl=no -- if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then -- if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then -- _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'` -- if test "$_sdlversion" -gt 116 ; then -- if test "$_sdlversion" -lt 121 ; then -- _def_sdlbuggy='#define BUGGY_SDL' -- else -- _def_sdlbuggy='#undef BUGGY_SDL' -- fi -- _sdl=yes -- else -- _sdl=outdated -- fi -- fi -- fi --fi - if test "$_sdl" = yes ; then - _def_sdl='#define HAVE_SDL 1' - if cygwin ; then diff --git a/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch b/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch deleted file mode 100644 index 2c8df9aa3b..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- MPlayer-1.0pre6a/vidix/drivers/Makefile.orig 2005-04-05 14:17:28.130812264 +0000 -+++ MPlayer-1.0pre6a/vidix/drivers/Makefile 2005-04-05 14:18:09.294554424 +0000 -@@ -70,7 +70,13 @@ - SAVAGE_LIBS=-L../../libdha -ldha -lm - SAVAGE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. - --all: $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID) $(UNICHROME_VID) $(SAVAGE_VID) -+W100_VID=w100_vid.so -+W100_SRCS=w100_vid.c -+W100_OBJS=w100_vid.o -+W100_LIBS=-L$(QPEDIR)/lib -laticore -+W100_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -+ -+all: $(W100_VID) - - - .SUFFIXES: .c .o diff --git a/packages/mplayer/mplayer-1.0pre7/zlib.patch b/packages/mplayer/mplayer-1.0pre7/zlib.patch deleted file mode 100644 index 6e0918d8ed..0000000000 --- a/packages/mplayer/mplayer-1.0pre7/zlib.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./configure.old 2004-09-24 01:03:55.000000000 +0930 -+++ ./configure 2004-09-24 01:04:18.000000000 +0930 -@@ -4313,13 +4313,7 @@ - echores "$_fribidi" - - --echocheck "zlib" --cat > $TMPC << EOF --#include <zlib.h> --int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; } --EOF --_zlib=no --cc_check -lz && _zlib=yes -+_zlib=yes - if test "$_zlib" = yes ; then - _def_zlib='#define HAVE_ZLIB 1' - _ld_zlib='-lz' diff --git a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch b/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch deleted file mode 100644 index 03456aca4a..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayer-1.1.4/Makefile.orig 2005-06-24 15:36:12.974059040 +0000 -+++ mplayer-1.1.4/Makefile 2005-06-24 15:36:31.628223176 +0000 -@@ -245,7 +245,7 @@ - ifeq ($(TARGET_WIN32),yes) - windres -o osdep/mplayer-rc.o osdep/mplayer.rc - endif -- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) -+ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) $(MATH_LIB) $(LDFLAGS) - cp $(PRG) $(PRG).debug - $(STRIP) $(PRG) - diff --git a/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch b/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch deleted file mode 100644 index 78161e79ee..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.5/Makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig 2005-04-07 10:19:08.392784784 +0100 -+++ Makefile 2005-04-07 10:21:26.262825352 +0100 -@@ -8,11 +8,6 @@ - - PRG_CFG = codec-cfg - --# Do not strip the binaries at installation --ifeq ($(STRIPBINARIES),yes) --INSTALLSTRIP = -s --endif -- - # These subdirectories require installation due to binaries within them. - ifeq ($(VIDIX),yes) - SUBDIRS += libdha vidix -@@ -283,7 +278,7 @@ - $(MENCODER_DEP): version.h help_mp.h - - $(PRG_CFG): version.h codec-cfg.c codec-cfg.h -- $(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS) -+ $(BUILD_CC) $(BUILD_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS) - - install: $(ALL_PRG) - ifeq ($(VIDIX),yes) -@@ -368,7 +363,6 @@ - @for a in $(PARTS); do $(MAKE) -C $$a distclean; done - - strip: -- strip -s $(ALL_PRG) - - dep: depend - diff --git a/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch b/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch deleted file mode 100644 index ad6d4504e1..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- mplayer-1.1.5/configure.orig 2005-11-08 15:07:52.000000000 +0000 -+++ mplayer-1.1.5/configure 2005-11-08 15:08:40.000000000 +0000 -@@ -4627,33 +4627,7 @@ - echocheck "ALSA audio" - if test "$_alsa" != no ; then - _alsa=no -- cat > $TMPC << EOF --#include <sys/asoundlib.h> --int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)); } --EOF -- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.5.x' -- -- cat > $TMPC << EOF --#include <sys/asoundlib.h> --int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); } --EOF -- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-sys' -- cat > $TMPC << EOF --#include <alsa/asoundlib.h> --int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); } --EOF -- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-alsa' -- -- cat > $TMPC << EOF --#include <sys/asoundlib.h> --int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); } --EOF -- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-sys' -- cat > $TMPC << EOF --#include <alsa/asoundlib.h> --int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); } --EOF -- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-alsa' -+ _alsaver='1.0.x-alsa' - fi - _def_alsa5='#undef HAVE_ALSA5' - _def_alsa9='#undef HAVE_ALSA9' diff --git a/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch b/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch deleted file mode 100644 index 962f1bc1e3..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.5/dsputil.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c.orig 2005-04-08 09:16:18.310720680 +0000 -+++ mplayer-1.0.1/libavcodec/armv4l/dsputil_arm.c 2005-04-08 09:18:11.679486008 +0000 -@@ -248,22 +248,22 @@ - c->idct_permutation_type= FF_NO_IDCT_PERM; - } - -- c->put_pixels_tab[0][0] = put_pixels16_arm; -- c->put_pixels_tab[0][1] = put_pixels16_x2_arm; -- c->put_pixels_tab[0][2] = put_pixels16_y2_arm; -- c->put_pixels_tab[0][3] = put_pixels16_xy2_arm; -- c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm; -- c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm; -- c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm; -- c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm; -- c->put_pixels_tab[1][0] = put_pixels8_arm; -- c->put_pixels_tab[1][1] = put_pixels8_x2_arm; -- c->put_pixels_tab[1][2] = put_pixels8_y2_arm; -- c->put_pixels_tab[1][3] = put_pixels8_xy2_arm; -- c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm; -- c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm; -- c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; -- c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm; -+ /* c->put_pixels_tab[0][0] = put_pixels16_arm; */ // NG! -+ c->put_pixels_tab[0][1] = put_pixels16_x2_arm; //OK! -+ c->put_pixels_tab[0][2] = put_pixels16_y2_arm; //OK! -+ /* c->put_pixels_tab[0][3] = put_pixels16_xy2_arm; /\* NG *\/ */ -+ /* c->put_no_rnd_pixels_tab[0][0] = put_pixels16_arm; // ?(.....) */ -+ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_arm; // OK -+ c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_arm; //OK -+ /* c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_arm; //NG */ -+ c->put_pixels_tab[1][0] = put_pixels8_arm; //OK -+ c->put_pixels_tab[1][1] = put_pixels8_x2_arm; //OK -+ /* c->put_pixels_tab[1][2] = put_pixels8_y2_arm; //NG */ -+ /* c->put_pixels_tab[1][3] = put_pixels8_xy2_arm; //NG */ -+ c->put_no_rnd_pixels_tab[1][0] = put_pixels8_arm;//OK -+ c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_arm; //OK -+ c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; //OK -+ /* c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;//NG */ - - #ifdef HAVE_IWMMXT - dsputil_init_iwmmxt(c, avctx); diff --git a/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch deleted file mode 100644 index 9ca1266c4b..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- MPlayer-1.0pre7/libmpcodecs/Makefile.orig 2005-04-19 12:09:24.313075760 +0100 -+++ MPlayer-1.0pre7/libmpcodecs/Makefile 2005-04-19 12:09:55.204379568 +0100 -@@ -50,7 +50,7 @@ - SRCS2=$(ENCODER_SRCS) - OBJS2=$(SRCS2:.c=.o) - --CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE -+CFLAGS = -I.. $(OPTFLAGS) -I. -Inative -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE - - .SUFFIXES: .c .o - diff --git a/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch deleted file mode 100644 index 059a397926..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- MPlayer-1.0pre7/libmpdemux/Makefile.orig 2005-04-19 12:03:18.032758832 +0100 -+++ MPlayer-1.0pre7/libmpdemux/Makefile 2005-04-19 12:04:01.934084816 +0100 -@@ -36,8 +36,8 @@ - - OBJS = $(SRCS:.c=.o) - OBJS += $(CPLUSPLUSSRCS:.cpp=.o) --INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) --CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) -+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) -+CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) - CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) - CPLUSPLUS = $(CC) - diff --git a/packages/mplayer/mplayer-atty-1.1.5/sdl.patch b/packages/mplayer/mplayer-atty-1.1.5/sdl.patch deleted file mode 100644 index d74c8397b9..0000000000 --- a/packages/mplayer/mplayer-atty-1.1.5/sdl.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./configure.orig 2004-09-24 19:09:56.000000000 +0930 -+++ ./configure 2004-09-24 19:22:21.000000000 +0930 -@@ -3554,38 +3554,6 @@ - ################# - - --echocheck "SDL" --if test -z "$_sdlconfig" ; then -- if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then -- _sdlconfig="sdl-config" -- elif ( sdl11-config --version ) >>"$TMPLOG" 2>&1 ; then -- _sdlconfig="sdl11-config" -- else -- _sdlconfig=false -- fi --fi --if test "$_sdl" = auto || test "$_sdl" = yes ; then -- cat > $TMPC << EOF --#include <SDL.h> --int main(int argc, char *argv[]) { return 0; } --EOF -- _sdl=no -- if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then -- if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` >>"$TMPLOG" 2>&1 ; then -- _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'` -- if test "$_sdlversion" -gt 116 ; then -- if test "$_sdlversion" -lt 121 ; then -- _def_sdlbuggy='#define BUGGY_SDL' -- else -- _def_sdlbuggy='#undef BUGGY_SDL' -- fi -- _sdl=yes -- else -- _sdl=outdated -- fi -- fi -- fi --fi - if test "$_sdl" = yes ; then - _def_sdl='#define HAVE_SDL 1' - if cygwin ; then diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb deleted file mode 100644 index cfc8c7a40a..0000000000 --- a/packages/mplayer/mplayer-atty_1.1.5.bb +++ /dev/null @@ -1,77 +0,0 @@ -DESCRIPTION = "Open Source multimedia player." -SECTION = "opie/multimedia" -PRIORITY = "optional" -HOMEPAGE = "http://atty.skr.jp/?Zaurus%2Fmplayer" -DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib mplayer-common" -RDEPENDS = "mplayer-common" -LICENSE = "GPL" -RCONFLICTS = "mplayer" -MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" -PR = "r5" - -SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \ - file://Makefile.patch;patch=1;pnum=0 \ - file://sdl.patch;patch=1 \ - file://Makefile-libs.patch;patch=1 \ - file://libmpdemux-ogg-include.patch;patch=1 \ - file://libmpcodecs-ogg-include.patch;patch=1 \ - file://alsa-configure.patch;patch=1 \ - file://mplayer-1.0_pre7-gcc4.patch;patch=1 " - -PARALLEL_MAKE = "" - -DEPENDS_append_c7x0 = " sharp-aticore-oss" -PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}" -PACKAGE_ARCH_akita = "${MACHINE_ARCH}" -PACKAGE_ARCH_spitz = "${MACHINE_ARCH}" - -S = "${WORKDIR}/mplayer-${PV}" - -FILES_${PN} = "${bindir}/mplayer" - -inherit autotools - -EXTRA_OECONF = " \ - --prefix=/usr \ - --mandir=${mandir} \ - --target=${TARGET_SYS} \ - --disable-shared-pp \ - \ - --disable-win32 \ - --disable-macosx \ - --disable-dvdread \ - --disable-mpdvdkit \ - --disable-tv \ - --disable-tv-v4l \ - --disable-tv-v4l2 \ - --disable-tv-bsdbt848 \ - --disable-mencoder \ - --disable-live \ - --disable-smb \ - \ - --enable-dynamic-plugins \ - --enable-fbdev \ - --enable-sdl \ - --enable-alsa \ - --with-sdl-config=${STAGING_BINDIR}/sdl-config \ - \ - --enable-mad \ - --enable-vorbis \ - \ - --enable-ossaudio \ - \ - --enable-rtc \ - --disable-ipp \ - --disable-iwmmxt \ - \ - --enable-freetype \ - --with-extralibdir=${STAGING_LIBDIR} " - -EXTRA_OECONF_append_c7x0 = " --enable-w100" -EXTRA_OECONF_append_akita = " --enable-bvdd" -EXTRA_OECONF_append_spitz = " --enable-bvdd" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb deleted file mode 100644 index 25194beec9..0000000000 --- a/packages/mplayer/mplayer_1.0pre7.bb +++ /dev/null @@ -1,96 +0,0 @@ -DESCRIPTION = "Open Source multimedia player." -SECTION = "opie/multimedia" -PRIORITY = "optional" -HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad libogg libvorbis zlib libpng jpeg mplayer-common" -RDEPENDS = "mplayer-common" -LICENSE = "GPL" -SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ - file://Makefile.patch;patch=1 \ - file://sdl.patch;patch=0 \ - file://zlib.patch;patch=0 \ - file://libmpdemux-ogg-include.patch;patch=1 \ - file://libmpcodecs-ogg-include.patch;patch=1 \ - file://mplayer-1.0_pre7-gcc4.patch;patch=1 " - -MAINTAINER="Graeme Gregory <dp@xora.org.uk>" -RCONFLICTS_${PN} = "mplayer-atty" -PR = "r3" - -PARALLEL_MAKE = "" - -DEPENDS_append_c7x0 = " sharp-aticore-oss" -PACKAGE_ARCH_c7x0 = "${MACHINE_ARCH}" -SRC_URI_append_c7x0 = "file://mplayer-w100_1.0pre3.1.modified.diff;patch=1 \ - file://Makefile-vidix.patch;patch=0 \ - file://vidix-drivers-w100.patch;patch=1 " - -S = "${WORKDIR}/MPlayer-${PV}" - -PACKAGES =+ "postproc postproc-dev" - -FILES_${PN} = "${bindir}/mplayer ${libdir}/mplayer/vidix/w100_vid.so" - -FILES_postproc = " ${libdir}/libpostproc.so.0.0.0 ${libdir}/libpostproc.so.0" -FILES_postproc-dev = " ${includedir}/postproc/postprocess.h ${libdir}/libpostproc.so ${libdir}/libpostproc.a" - -inherit autotools - -EXTRA_OECONF = " \ - --prefix=/usr \ - --mandir=${mandir} \ - --target=${TARGET_SYS} \ - --enable-shared-pp \ - \ - --disable-win32 \ - --disable-macosx \ - --disable-dvdread \ - --disable-mpdvdkit \ - --disable-tv \ - --disable-tv-v4l \ - --disable-tv-v4l2 \ - --disable-tv-bsdbt848 \ - --disable-mencoder \ - --disable-live \ - --disable-smb \ - \ - --enable-dynamic-plugins \ - --enable-fbdev \ - --enable-sdl \ - --with-sdl-config=${STAGING_BINDIR}/sdl-config \ - \ - --enable-mad \ - --enable-tremor-low \ - \ - --enable-ossaudio \ - \ - --enable-rtc \ - \ - --with-extralibdir=${STAGING_LIBDIR} " - -EXTRA_OECONF_append_c7x0 = " --enable-vidix " - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install_append () { - install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc - install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/ - oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir} - cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0 - cd ${D}${libdir} - ln -sf libpostproc.so.0.0.0 libpostproc.so.0 - ln -sf libpostproc.so.0 libpostproc.so -} - -do_stage () { - oe_libinstall -a -so -C libavcodec/libpostproc libpostproc ${STAGING_LIBDIR} - cd ${STAGING_LIBDIR} - ln -sf libpostproc.so libpostproc.so.0.0.0 - ln -sf libpostproc.so libpostproc.so.0 - - install -d ${STAGING_INCDIR}/postproc - install -m 0644 ${S}/libavcodec/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h -} - diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index 7af431430b..2a37efe3c6 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -2,18 +2,21 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "virtual/libsdl libmad zlib libpng jpeg mplayer-common" +DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame" 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://Makefile-codec-cfg.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" + file://w100-mplayer.patch;patch= \ + file://libmpdemux-ogg-include-svn.patch;patch=1 \ + file://libmpcodecs-ogg-include.patch;patch=1 \ + file://pld-onlyarm5.patch;patch=1" MAINTAINER="Graeme Gregory <dp@xora.org.uk>" RCONFLICTS_${PN} = "mplayer-atty" @@ -34,30 +37,132 @@ PACKAGES =+ "mencoder" FILES_${PN} = "${bindir}/mplayer" FILES_mencoder = "${bindir}/mencoder" -inherit autotools +inherit autotools pkgconfig EXTRA_OECONF = " \ --prefix=/usr \ - --mandir=${mandir} \ + --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 " + \ + --enable-mencoder \ + --disable-gui \ + --enable-largefiles \ + --disable-linux-devfs \ + --disable-lirc \ + --disable-lircc \ + --disable-joystick \ + --disable-vm \ + --disable-xf86keysym \ + --disable-tv \ + --disable-tv-v4l \ + --disable-tv-v4l2 \ + --disable-tv-bsdbt848 \ + --enable-rtc \ + --enable-network \ + --disable-winsock2 \ + --disable-smb \ + --disable-live \ + --disable-dvdread \ + --disable-mpdvdkit \ + --disable-cdparanoia \ + --enable-freetype \ + --disable-unrarlib \ + --disable-menu \ + --enable-sortsub \ + --disable-fribidi \ + --disable-enca \ + --disable-macosx \ + --disable-macosx-finder-support \ + --disable-macosx-bundle \ + --disable-ftp \ + --disable-vstream \ + \ + --disable-gif \ + --enable-png \ + --enable-jpeg \ + --disable-libcdio \ + --enable-liblzo \ + --disable-win32 \ + --disable-qtx \ + --disable-xanim \ + --disable-real \ + --disable-xvid \ + --disable-x264 \ + \ + --disable-libavutil_so \ + --disable-libavcodec_so \ + --disable-libavformat_so \ + --disable-libpostproc_so \ + --disable-libfame \ + \ + --enable-tremor-low \ + \ + --disable-speex \ + --disable-theora \ + --disable-faac \ + --disable-ladspa \ + --disable-libdv \ + --enable-mad \ + --disable-toolame \ + --disable-twolame \ + --disable-xmms \ + --disable-mp3lib \ + --disable-libdts \ + --enable-libmpeg2 \ + --disable-musepack \ + --disable-amr_nb \ + --disable-amr_nb-fixed \ + --disable-amr_wb \ + \ + --disable-gl \ + --disable-dga \ + --disable-vesa \ + --disable-svga \ + --enable-sdl \ + --disable-aa \ + --disable-caca \ + --disable-ggi \ + --disable-ggiwmh \ + --disable-directx \ + --disable-dxr2 \ + --disable-dxr3 \ + --disable-dvb \ + --disable-dvbhead \ + --disable-mga \ + --disable-xmga \ + --disable-xv \ + --disable-xvmc \ + --disable-vm \ + --disable-xinerama \ + --disable-x11 \ + --enable-fbdev \ + --disable-mlib \ + --disable-3dfx \ + --disable-tdfxfb \ + --disable-s3fb \ + --disable-directfb \ + --disable-zr \ + --disable-bl \ + --disable-tdfxvid \ + --disable-tga \ + --disable-pnm \ + --disable-md5sum \ + \ + --enable-alsa \ + --enable-ossaudio \ + --disable-arts \ + --disable-esd \ + --disable-polyp \ + --disable-jack \ + --disable-openal \ + --disable-nas \ + --disable-sgiaudio \ + --disable-sunaudio \ + --disable-win32waveout \ + --enable-select \ + \ + --disable-runtime-cpudetection \ + " EXTRA_OECONF_append_c7x0 = " --enable-w100 " diff --git a/packages/mtd/mtd-utils-native_20050801.bb b/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb index cd1fb7d11b..cd1fb7d11b 100644 --- a/packages/mtd/mtd-utils-native_20050801.bb +++ b/packages/mtd/mtd-utils-native_0.0.0+cvs20050801.bb diff --git a/packages/mtd/mtd-utils-native_20060223.bb b/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb index cd1fb7d11b..cd1fb7d11b 100644 --- a/packages/mtd/mtd-utils-native_20060223.bb +++ b/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb diff --git a/packages/mtd/mtd-utils_20050801.bb b/packages/mtd/mtd-utils_0.0.0+cvs20050801.bb index eb25309b36..fee110a754 100644 --- a/packages/mtd/mtd-utils_20050801.bb +++ b/packages/mtd/mtd-utils_0.0.0+cvs20050801.bb @@ -4,7 +4,7 @@ DEPENDS = "zlib" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" PR = "r0" -SRCDATE = "${PV}" +SRCDATE = "20050801" SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \ file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \ diff --git a/packages/mtd/mtd-utils_20060223.bb b/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb index 21d0f21fcd..50e4dc184f 100644 --- a/packages/mtd/mtd-utils_20060223.bb +++ b/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb @@ -4,7 +4,7 @@ DEPENDS = "zlib" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" PR = "r0" -SRCDATE = "${PV}" +SRCDATE = "20060223" SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \ file://add-exclusion-to-mkfs-jffs2-20060131.patch;patch=1 \ diff --git a/packages/mtd/mtd-utils_1.0.0.bb b/packages/mtd/mtd-utils_1.0.0.bb index 06347339a1..aae722b987 100644 --- a/packages/mtd/mtd-utils_1.0.0.bb +++ b/packages/mtd/mtd-utils_1.0.0.bb @@ -5,6 +5,10 @@ HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" PR = "r0" +# RP/kergoth: Builds seem to break with recent mtd-utils +# Can't pin down the exact problems +DEFAULT_PREFERENCE = "-1" + SRC_URI = "ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz" CFLAGS_prepend = "-I${WORKDIR}/mtd-utils-${PV}/include " diff --git a/packages/notification-daemon/notification-daemon_0.3.5.bb b/packages/notification-daemon/notification-daemon_0.3.5.bb new file mode 100644 index 0000000000..8acabfae73 --- /dev/null +++ b/packages/notification-daemon/notification-daemon_0.3.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them" +HOMEPAGE = "http://www.galago-project.org/" +LICENSE = "GPL" +DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck" + +PACKAGES = "${PN}" +FILES_${PN} = "${libexecdir}/notification-daemon \ + ${datadir}/dbus-1/services/notification-daemon.service \ + ${libdir}/notification-daemon-1.0/engines/libstandard.so \ + ${sysconfdir}/gconf/schemas/notification-daemon.schemas" + +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" +EXTRA_OECONF = "--disable-binreloc" + +inherit autotools pkgconfig diff --git a/packages/tango/.mtn2git_empty b/packages/tango/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tango/.mtn2git_empty diff --git a/packages/tango/files/.mtn2git_empty b/packages/tango/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tango/files/.mtn2git_empty diff --git a/packages/tango/files/no-icon-naming-utils.patch b/packages/tango/files/no-icon-naming-utils.patch new file mode 100644 index 0000000000..690a06f431 --- /dev/null +++ b/packages/tango/files/no-icon-naming-utils.patch @@ -0,0 +1,12 @@ +--- tango-icon-theme-0.6.1/configure.ac.orig 2005-12-10 20:48:31 +0100 ++++ tango-icon-theme-0.6.1/configure.ac 2005-12-10 20:49:18 +0100 +@@ -38,8 +38,7 @@ + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) ++ ICONMAP="true" +- AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build +- and install tango-icon-theme]) + fi + + # Check for convert from ImageMagick to add the 1x1 frame to 22x22 icons diff --git a/packages/tango/tango-icon-theme-extras_0.1.0.bb b/packages/tango/tango-icon-theme-extras_0.1.0.bb new file mode 100644 index 0000000000..d9158234e9 --- /dev/null +++ b/packages/tango/tango-icon-theme-extras_0.1.0.bb @@ -0,0 +1,8 @@ +SECTION = "unknown" +LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/" +inherit autotools pkgconfig + +SRC_URI = "http://tango-project.org/releases/${PN}-${PV}.tar.gz \ + file://no-icon-naming-utils.patch;patch=1" +EXTRA_OECONF = "--disable-icon-framing" +FILES_${PN} += "${datadir}/icons" diff --git a/packages/tango/tango-icon-theme_0.7.2.bb b/packages/tango/tango-icon-theme_0.7.2.bb new file mode 100644 index 0000000000..d9158234e9 --- /dev/null +++ b/packages/tango/tango-icon-theme_0.7.2.bb @@ -0,0 +1,8 @@ +SECTION = "unknown" +LICENSE = "http://creativecommons.org/licenses/by-sa/2.5/" +inherit autotools pkgconfig + +SRC_URI = "http://tango-project.org/releases/${PN}-${PV}.tar.gz \ + file://no-icon-naming-utils.patch;patch=1" +EXTRA_OECONF = "--disable-icon-framing" +FILES_${PN} += "${datadir}/icons" diff --git a/packages/tasks/.mtn2git_empty b/packages/tasks/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tasks/.mtn2git_empty diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb index 5db841903d..5db841903d 100644 --- a/packages/meta/task-bootstrap-unionroot.bb +++ b/packages/tasks/task-bootstrap-unionroot.bb diff --git a/packages/meta/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb index ef76ec4345..ef76ec4345 100644 --- a/packages/meta/task-bootstrap.bb +++ b/packages/tasks/task-bootstrap.bb diff --git a/packages/meta/task-dvb.bb b/packages/tasks/task-dvb.bb index 5a5c37a565..5a5c37a565 100644 --- a/packages/meta/task-dvb.bb +++ b/packages/tasks/task-dvb.bb diff --git a/packages/meta/task-e-x11.bb b/packages/tasks/task-e-x11.bb index 0f0f7b4a43..0f0f7b4a43 100644 --- a/packages/meta/task-e-x11.bb +++ b/packages/tasks/task-e-x11.bb diff --git a/packages/meta/task-essential-parts.bb b/packages/tasks/task-essential-parts.bb index 49183170c4..49183170c4 100644 --- a/packages/meta/task-essential-parts.bb +++ b/packages/tasks/task-essential-parts.bb diff --git a/packages/meta/task-essential-to-boot.bb b/packages/tasks/task-essential-to-boot.bb index 8bcd182b58..8bcd182b58 100644 --- a/packages/meta/task-essential-to-boot.bb +++ b/packages/tasks/task-essential-to-boot.bb diff --git a/packages/meta/task-gpe.bb b/packages/tasks/task-gpe.bb index 80f85238d1..80f85238d1 100644 --- a/packages/meta/task-gpe.bb +++ b/packages/tasks/task-gpe.bb diff --git a/packages/meta/task-mythfront.bb b/packages/tasks/task-mythfront.bb index a1532c1739..a1532c1739 100644 --- a/packages/meta/task-mythfront.bb +++ b/packages/tasks/task-mythfront.bb diff --git a/packages/meta/task-opie.bb b/packages/tasks/task-opie.bb index a9405522a1..a9405522a1 100644 --- a/packages/meta/task-opie.bb +++ b/packages/tasks/task-opie.bb diff --git a/packages/meta/task-pivotboot.bb b/packages/tasks/task-pivotboot.bb index 091f70f459..091f70f459 100644 --- a/packages/meta/task-pivotboot.bb +++ b/packages/tasks/task-pivotboot.bb diff --git a/packages/meta/task-python-everything_20060425.bb b/packages/tasks/task-python-everything_20060425.bb index 7fd4c8f286..7fd4c8f286 100644 --- a/packages/meta/task-python-everything_20060425.bb +++ b/packages/tasks/task-python-everything_20060425.bb diff --git a/packages/meta/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb index bb62a15472..bb62a15472 100644 --- a/packages/meta/task-python-sharprom_20060425.bb +++ b/packages/tasks/task-python-sharprom_20060425.bb diff --git a/packages/meta/task-qpe.bb b/packages/tasks/task-qpe.bb index 50f42d84fa..50f42d84fa 100644 --- a/packages/meta/task-qpe.bb +++ b/packages/tasks/task-qpe.bb diff --git a/packages/meta/task-sdk.bb b/packages/tasks/task-sdk.bb index c39ffd59f8..c39ffd59f8 100644 --- a/packages/meta/task-sdk.bb +++ b/packages/tasks/task-sdk.bb diff --git a/packages/meta/task-sdl.bb b/packages/tasks/task-sdl.bb index 046283f28f..046283f28f 100644 --- a/packages/meta/task-sdl.bb +++ b/packages/tasks/task-sdl.bb diff --git a/packages/meta/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index 4c508ec7c5..4c508ec7c5 100644 --- a/packages/meta/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb diff --git a/packages/meta/task-xterminal.bb b/packages/tasks/task-xterminal.bb index 77eb094caa..77eb094caa 100644 --- a/packages/meta/task-xterminal.bb +++ b/packages/tasks/task-xterminal.bb diff --git a/packages/tomoe/.mtn2git_empty b/packages/tomoe/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tomoe/.mtn2git_empty diff --git a/packages/tomoe/libtomoe-gtk_0.1.0.bb b/packages/tomoe/libtomoe-gtk_0.1.0.bb new file mode 100644 index 0000000000..a4dbff2085 --- /dev/null +++ b/packages/tomoe/libtomoe-gtk_0.1.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "A handwriting recognition engine" +HOMEPAGE = "http://tomoe.sourceforge.net" +SECTION = "libs" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +DEPENDS = "gtk+ tomoe" +LICENSE = "LGPL" + +inherit autotools pkgconfig + +SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz" + +do_stage() { + autotools_stage_all +} diff --git a/packages/tomoe/tomoe_0.2.1.bb b/packages/tomoe/tomoe_0.2.1.bb new file mode 100644 index 0000000000..f321142dd1 --- /dev/null +++ b/packages/tomoe/tomoe_0.2.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "A handwriting recognition engine" +HOMEPAGE = "http://tomoe.sourceforge.net" +SECTION = "libs" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +LICENSE = "LGPL" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + +SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/16048/tomoe-0.2.1.tar.gz" diff --git a/packages/tomoe/uim-tomoe-gtk_0.2.0.bb b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb new file mode 100644 index 0000000000..d0b1c5a385 --- /dev/null +++ b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "A handwriting recognition engine" +HOMEPAGE = "http://tomoe.sourceforge.net" +SECTION = "libs" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +DEPENDS = "gtk+ uim tomoe" +LICENSE = "LGPL" + +inherit autotools pkgconfig + +SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz" diff --git a/packages/tslib/tslib/h5xxx/.mtn2git_empty b/packages/tslib/tslib/h5xxx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/h5xxx/.mtn2git_empty diff --git a/packages/tslib/tslib/h5xxx/tslib.sh b/packages/tslib/tslib/h5xxx/tslib.sh new file mode 100644 index 0000000000..0de3534a51 --- /dev/null +++ b/packages/tslib/tslib/h5xxx/tslib.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +module_id() { + awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +} + +case `uname -r` in +2.4*) + TSLIB_TSDEVICE=/dev/touchscreen/0raw + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 + ;; +*) + TSLIB_TSDEVICE=`detect-stylus --device` + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf + ;; +esac + +export TSLIB_TSDEVICE TSLIB_CONFFILE + diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb index d756a5c576..55884a8b49 100644 --- a/packages/tslib/tslib_20060703.bb +++ b/packages/tslib/tslib_20060703.bb @@ -38,7 +38,7 @@ do_install_append() { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ case ${MACHINE} in - a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000) + a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000) install -d ${D}${datadir}/tslib for f in ts-2.6.conf ts.conf-h3600-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ @@ -79,6 +79,7 @@ RDEPENDS_tslib-conf_h1940 = "detect-stylus" RDEPENDS_tslib-conf_h2200 = "detect-stylus" RDEPENDS_tslib-conf_h3600 = "detect-stylus" RDEPENDS_tslib-conf_h3900 = "detect-stylus" +RDEPENDS_tslib-conf_h5xxx = "detect-stylus" RDEPENDS_tslib-conf_h6300 = "detect-stylus" RDEPENDS_tslib-conf_blueangel = "detect-stylus" RDEPENDS_tslib-conf_htcuniversal = "detect-stylus" diff --git a/packages/xlibs/libxfont_X11R7.1-1.2.0.bb b/packages/xlibs/libxfont_X11R7.1-1.2.0.bb new file mode 100644 index 0000000000..2701aef825 --- /dev/null +++ b/packages/xlibs/libxfont_X11R7.1-1.2.0.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "X font library (used by the X server)." +SECTION = "x11/libs" +PRIORITY = "optional" +#MAINTAINER = "" +LICENSE = "BSD-X" + +DEPENDS = "xproto xtrans zlib libfontenc fontcacheproto fontsproto freetype" +PROVIDES = "xfont" + +XORG_PN = "libXfont" + +include xorg-xlibs.inc + +SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-1.2.0" |