diff options
Diffstat (limited to 'packages')
41 files changed, 4697 insertions, 95 deletions
diff --git a/packages/abiword/abiword-plugins_2.4.4.bb b/packages/abiword/abiword-plugins_2.4.4.bb index 085a0f506b..89f50d0495 100644 --- a/packages/abiword/abiword-plugins_2.4.4.bb +++ b/packages/abiword/abiword-plugins_2.4.4.bb @@ -3,7 +3,7 @@ HOMEPAGE="http://www.abiword.org"" MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE="GPLv2" -DEPENDS = "abiword libwpd gtkmathview librsvg goffice poppler" +DEPENDS = "abiword libwpd librsvg goffice poppler" PR="r0" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" diff --git a/packages/binutils/binutils_2.14.90.0.6.bb b/packages/binutils/binutils_2.14.90.0.6.bb index 9a95ae0109..b93c5f5fe1 100644 --- a/packages/binutils/binutils_2.14.90.0.6.bb +++ b/packages/binutils/binutils_2.14.90.0.6.bb @@ -1,7 +1,7 @@ SECTION = "devel" inherit autotools gettext -PR = "r2" +PR = "r3" DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" @@ -53,7 +53,7 @@ SRC_URI = \ S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -EXTRA_OECONF = "--with-sysroot=${prefix} \ +EXTRA_OECONF = "--with-sysroot=/ \ --program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/binutils/binutils_2.14.90.0.7.bb b/packages/binutils/binutils_2.14.90.0.7.bb index 8b431732de..1afdcb560f 100644 --- a/packages/binutils/binutils_2.14.90.0.7.bb +++ b/packages/binutils/binutils_2.14.90.0.7.bb @@ -5,7 +5,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r3" +PR = "r4" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks" @@ -53,7 +53,7 @@ SRC_URI = \ S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -EXTRA_OECONF = "--with-sysroot=${prefix} \ +EXTRA_OECONF = "--with-sysroot=/ \ --program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/binutils/binutils_2.15.90.0.3.bb b/packages/binutils/binutils_2.15.90.0.3.bb index 38d760d431..b5a885f3e4 100644 --- a/packages/binutils/binutils_2.15.90.0.3.bb +++ b/packages/binutils/binutils_2.15.90.0.3.bb @@ -5,7 +5,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r3" +PR = "r4" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks" @@ -51,7 +51,7 @@ SRC_URI = \ S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -EXTRA_OECONF = "--with-sysroot=${prefix} \ +EXTRA_OECONF = "--with-sysroot=/ \ --program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/binutils/binutils_2.15.91.0.1.bb b/packages/binutils/binutils_2.15.91.0.1.bb index 0257b76fb7..146a94d381 100644 --- a/packages/binutils/binutils_2.15.91.0.1.bb +++ b/packages/binutils/binutils_2.15.91.0.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "A GNU collection of binary utilities" HOMEPAGE = "http://www.gnu.org/software/binutils/" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r3" +PR = "r4" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks" @@ -50,7 +50,7 @@ SRC_URI = \ S = "${WORKDIR}/binutils-${PV}" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -EXTRA_OECONF = "--with-sysroot=${prefix} \ +EXTRA_OECONF = "--with-sysroot=/ \ --program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/binutils/binutils_2.15.91.0.2.bb b/packages/binutils/binutils_2.15.91.0.2.bb index 588d529866..9ebff8f1df 100644 --- a/packages/binutils/binutils_2.15.91.0.2.bb +++ b/packages/binutils/binutils_2.15.91.0.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r5" +PR = "r6" inherit autotools gettext diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb index 5edf4548a3..6d4a1dee69 100644 --- a/packages/binutils/binutils_2.15.94.0.1.bb +++ b/packages/binutils/binutils_2.15.94.0.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r1" +PR = "r2" inherit autotools gettext diff --git a/packages/binutils/binutils_2.16.91.0.6.bb b/packages/binutils/binutils_2.16.91.0.6.bb index 6e35d30686..268680cb53 100644 --- a/packages/binutils/binutils_2.16.91.0.6.bb +++ b/packages/binutils/binutils_2.16.91.0.6.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" +PR = "r1" # glibc 2.3 has issues with this version # of binutils. diff --git a/packages/binutils/binutils_2.16.bb b/packages/binutils/binutils_2.16.bb index 9cca585cae..5b936dcc66 100644 --- a/packages/binutils/binutils_2.16.bb +++ b/packages/binutils/binutils_2.16.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/" SECTION = "devel" LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" -PR = "r6" +PR = "r7" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \ diff --git a/packages/binutils/binutils_csl-arm-20050416.bb b/packages/binutils/binutils_csl-arm-20050416.bb index e6ce5337ae..687a46285e 100644 --- a/packages/binutils/binutils_csl-arm-20050416.bb +++ b/packages/binutils/binutils_csl-arm-20050416.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050416" -PR = "r0" +PR = "r1" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm-linux = "-1" @@ -51,7 +51,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;meth S = "${WORKDIR}/src" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -EXTRA_OECONF = "--with-sysroot=${prefix} \ +EXTRA_OECONF = "--with-sysroot=/ \ --program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/binutils/binutils_csl-arm-20050603.bb b/packages/binutils/binutils_csl-arm-20050603.bb index 4e1813b90c..575a3b93f5 100644 --- a/packages/binutils/binutils_csl-arm-20050603.bb +++ b/packages/binutils/binutils_csl-arm-20050603.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "2.15.99+csl-arm+cvs20050603" -PR = "r0" +PR = "r1" OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE_arm-linux = "1" @@ -51,7 +51,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;meth S = "${WORKDIR}/src" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -EXTRA_OECONF = "--with-sysroot=${prefix} \ +EXTRA_OECONF = "--with-sysroot=/ \ --program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb index e870c8f0b5..ecd2d634e1 100644 --- a/packages/binutils/binutils_cvs.bb +++ b/packages/binutils/binutils_cvs.bb @@ -7,7 +7,7 @@ LICENSE = "GPL" MAINTAINER = "Gerald Britton <gbritton@doomcom.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" PV = "0.0+cvs${SRCDATE}" -PR = "r2" +PR = "r3" PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks" @@ -50,7 +50,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;meth S = "${WORKDIR}/src" B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" -EXTRA_OECONF = "--with-sysroot=${prefix} \ +EXTRA_OECONF = "--with-sysroot=/ \ --program-prefix=${TARGET_PREFIX} \ --enable-shared" diff --git a/packages/freeciv/.mtn2git_empty b/packages/freeciv/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/freeciv/.mtn2git_empty diff --git a/packages/freeciv/freeciv_2.0.8.bb b/packages/freeciv/freeciv_2.0.8.bb new file mode 100644 index 0000000000..361d8e4c20 --- /dev/null +++ b/packages/freeciv/freeciv_2.0.8.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Freeciv is a free turn-based multiplayer strategy game, in which each player becomes the leader of a civilization, fighting to obtain the ultimate goal: To become the greatest civilization." +LICENSE = "GPL" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +DEPENDS = "gtk+ cairo esound zlib readline" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" + +inherit autotools pkgconfig + + + + + diff --git a/packages/gtk-engines/gtk-engines_2.7.4.bb b/packages/gtk-engines/gtk-engines_2.7.4.bb new file mode 100644 index 0000000000..c6a94549d5 --- /dev/null +++ b/packages/gtk-engines/gtk-engines_2.7.4.bb @@ -0,0 +1,31 @@ +LICENSE = "GPL" +SECTION = "x11/base" +DESCRIPTION = "GTK theme engines" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +DEPENDS = "gtk+ cairo" + +RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" +RDEPENDS_gtk-theme-metal = "gtk-engine-metal" +RDEPENDS_gtk-theme-mist = "gtk-engine-mist" +RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" +RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" +RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" +RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" +RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks" + +SRC_URI = "${GNOME_MIRROR}/${PN}/2.7/${P}.tar.bz2" + +inherit autotools pkgconfig + +PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" + +python populate_packages_prepend() { + import os.path + + engines_root = os.path.join(bb.data.getVar('libdir', d, 1), "gtk-2.0/2.4.0/engines") + themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes") + + do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') + do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') +} + diff --git a/packages/linux/linux-efika/.mtn2git_empty b/packages/linux/linux-efika/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-efika/.mtn2git_empty diff --git a/packages/linux/linux-efika/defconfig b/packages/linux/linux-efika/defconfig new file mode 100644 index 0000000000..da230a451f --- /dev/null +++ b/packages/linux/linux-efika/defconfig @@ -0,0 +1,2501 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16 +# Sat Apr 15 12:27:25 2006 +# +# CONFIG_PPC64 is not set +CONFIG_PPC32=y +CONFIG_PPC_MERGE=y +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +# CONFIG_PPC_UDBG_16550 is not set +# CONFIG_GENERIC_TBSYNC is not set +# CONFIG_DEFAULT_UIMAGE is not set + +# +# Processor support +# +# CONFIG_CLASSIC32 is not set +CONFIG_PPC_52xx=y +# CONFIG_PPC_82xx is not set +# CONFIG_PPC_83xx is not set +# CONFIG_40x is not set +# CONFIG_44x is not set +# CONFIG_8xx is not set +# CONFIG_E200 is not set +# CONFIG_E500 is not set +CONFIG_6xx=y +CONFIG_PPC_FPU=y +CONFIG_PPC_STD_MMU=y +CONFIG_PPC_STD_MMU_32=y +# CONFIG_SMP is not set + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set +CONFIG_OBSOLETE_INTERMODULE=m + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# +CONFIG_LBD=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" +# CONFIG_WANT_EARLY_SERIAL is not set + +# +# Kernel options +# +CONFIG_HIGHMEM=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_BKL=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=m +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_PROC_DEVICETREE is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_SOFTWARE_SUSPEND is not set +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_GENERIC_ISA_DMA=y +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_INDIRECT_PCI is not set +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_LEGACY_PROC=y + +# +# PCCARD (PCMCIA/CardBus) support +# +# CONFIG_PCCARD is not set + +# +# PCI Hotplug Support +# +# CONFIG_HOTPLUG_PCI is not set + +# +# Advanced setup +# +# CONFIG_ADVANCED_OPTIONS is not set + +# +# Default settings for advanced configuration options are used +# +CONFIG_HIGHMEM_START=0xfe000000 +CONFIG_LOWMEM_SIZE=0x30000000 +CONFIG_KERNEL_START=0xc0000000 +CONFIG_TASK_SIZE=0x80000000 +CONFIG_BOOT_LOAD=0x00800000 + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=m +CONFIG_XFRM=y +CONFIG_XFRM_USER=m +CONFIG_NET_KEY=m +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_FWMARK=y +CONFIG_IP_ROUTE_MULTIPATH=y +# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set +CONFIG_IP_ROUTE_VERBOSE=y +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +CONFIG_IP_VS=m +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_PROTO_ESP=y +CONFIG_IP_VS_PROTO_AH=y + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_IP_VS_FTP=m +CONFIG_IPV6=m +CONFIG_IPV6_PRIVACY=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +# CONFIG_IP_NF_CT_PROTO_SCTP is not set +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +CONFIG_IP_NF_TFTP=m +CONFIG_IP_NF_AMANDA=m +# CONFIG_IP_NF_PPTP is not set +CONFIG_IP_NF_QUEUE=m + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_IP6_NF_QUEUE=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m + +# +# Bridge: Netfilter Configuration +# +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_BROUTE=m +CONFIG_BRIDGE_EBT_T_FILTER=m +CONFIG_BRIDGE_EBT_T_NAT=m +CONFIG_BRIDGE_EBT_802_3=m +CONFIG_BRIDGE_EBT_AMONG=m +CONFIG_BRIDGE_EBT_ARP=m +CONFIG_BRIDGE_EBT_IP=m +CONFIG_BRIDGE_EBT_LIMIT=m +CONFIG_BRIDGE_EBT_MARK=m +CONFIG_BRIDGE_EBT_PKTTYPE=m +CONFIG_BRIDGE_EBT_STP=m +CONFIG_BRIDGE_EBT_VLAN=m +CONFIG_BRIDGE_EBT_ARPREPLY=m +CONFIG_BRIDGE_EBT_DNAT=m +CONFIG_BRIDGE_EBT_MARK_T=m +CONFIG_BRIDGE_EBT_REDIRECT=m +CONFIG_BRIDGE_EBT_SNAT=m +CONFIG_BRIDGE_EBT_LOG=m +# CONFIG_BRIDGE_EBT_ULOG is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +CONFIG_IP_SCTP=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_HMAC_NONE is not set +# CONFIG_SCTP_HMAC_SHA1 is not set +CONFIG_SCTP_HMAC_MD5=y + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +CONFIG_ATM=y +CONFIG_ATM_CLIP=y +# CONFIG_ATM_CLIP_NO_ICMP is not set +CONFIG_ATM_LANE=m +CONFIG_ATM_MPOA=m +CONFIG_ATM_BR2684=m +# CONFIG_ATM_BR2684_IPFILTER is not set +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_DECNET=m +# CONFIG_DECNET_ROUTER is not set +CONFIG_LLC=y +CONFIG_LLC2=m +CONFIG_IPX=m +# CONFIG_IPX_INTERN is not set +CONFIG_ATALK=m +CONFIG_DEV_APPLETALK=y +CONFIG_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +CONFIG_X25=m +CONFIG_LAPB=m +# CONFIG_NET_DIVERT is not set +CONFIG_ECONET=m +CONFIG_ECONET_AUNUDP=y +CONFIG_ECONET_NATIVE=y +CONFIG_WAN_ROUTER=m + +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CLK_JIFFIES=y +# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set +# CONFIG_NET_SCH_CLK_CPU is not set + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_SFQ=m +CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SCH_TBF=m +CONFIG_NET_SCH_GRED=m +CONFIG_NET_SCH_DSMARK=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_SCH_INGRESS=m + +# +# Classification +# +CONFIG_NET_CLS=y +# CONFIG_NET_CLS_BASIC is not set +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_ROUTE4=m +CONFIG_NET_CLS_ROUTE=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_U32=m +# CONFIG_CLS_U32_PERF is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +CONFIG_NET_CLS_POLICE=y +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_ESTIMATOR=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRNET=m +CONFIG_IRCOMM=m +# CONFIG_IRDA_ULTRA is not set + +# +# 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 + +# +# Dongle support +# +CONFIG_DONGLE=y +CONFIG_ESI_DONGLE=m +CONFIG_ACTISYS_DONGLE=m +CONFIG_TEKRAM_DONGLE=m +CONFIG_LITELINK_DONGLE=m +CONFIG_MA600_DONGLE=m +CONFIG_GIRBIL_DONGLE=m +CONFIG_MCP2120_DONGLE=m +CONFIG_OLD_BELKIN_DONGLE=m +CONFIG_ACT200L_DONGLE=m + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +CONFIG_SIGMATEL_FIR=m +# 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=m +# CONFIG_VIA_FIR is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_CMTP=m +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +# CONFIG_BT_HCIBPA10X is not set +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=m +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +# CONFIG_MTD_CMDLINE_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +CONFIG_NFTL_RW=y +CONFIG_INFTL=m +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +CONFIG_MTD_JEDECPROBE=m +CONFIG_MTD_GEN_PROBE=m +# CONFIG_MTD_CFI_ADV_OPTIONS is not set +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 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +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=m +CONFIG_MTD_CFI_AMDSTD=m +CONFIG_MTD_CFI_AMDSTD_RETRY=0 +CONFIG_MTD_CFI_STAA=m +CONFIG_MTD_CFI_UTIL=m +CONFIG_MTD_RAM=m +CONFIG_MTD_ROM=m +CONFIG_MTD_ABSENT=m +# CONFIG_MTD_OBSOLETE_CHIPS is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_PCI=m +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +# CONFIG_MTD_PMC551_BUGFIX is not set +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_SLRAM=m +CONFIG_MTD_PHRAM=m +CONFIG_MTD_MTDRAM=m +CONFIG_MTDRAM_TOTAL_SIZE=4096 +CONFIG_MTDRAM_ERASE_SIZE=128 +CONFIG_MTD_BLKMTD=m +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +CONFIG_MTD_DOC2000=m +CONFIG_MTD_DOC2001=m +CONFIG_MTD_DOC2001PLUS=m +CONFIG_MTD_DOCPROBE=m +CONFIG_MTD_DOCECC=m +# CONFIG_MTD_DOCPROBE_ADVANCED is not set +CONFIG_MTD_DOCPROBE_ADDRESS=0 + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support +# +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_FIFO=y +# CONFIG_PARPORT_PC_SUPERIO is not set +CONFIG_PARPORT_NOT_PC=y +# CONFIG_PARPORT_GSC is not set +CONFIG_PARPORT_1284=y + +# +# Plug and Play support +# + +# +# Block devices +# +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_CPQ_DA=m +CONFIG_BLK_CPQ_CISS_DA=m +CONFIG_CISS_SCSI_TAPE=y +CONFIG_BLK_DEV_DAC960=m +CONFIG_BLK_DEV_UMEM=m +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_SX8=m +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_BLK_DEV_INITRD=y +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +CONFIG_CDROM_PKTCDVD_WCACHE=y +CONFIG_ATA_OVER_ETH=m + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECD=m +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +CONFIG_BLK_DEV_IDESCSI=m +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=m +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_SHARE_IRQ=y +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=m +CONFIG_BLK_DEV_OPTI621=m +# CONFIG_BLK_DEV_SL82C105 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_BLK_DEV_AEC62XX=m +CONFIG_BLK_DEV_ALI15X3=m +# CONFIG_WDC_ALI15X3 is not set +CONFIG_BLK_DEV_AMD74XX=m +CONFIG_BLK_DEV_CMD64X=m +CONFIG_BLK_DEV_TRIFLEX=m +CONFIG_BLK_DEV_CY82C693=m +CONFIG_BLK_DEV_CS5520=m +CONFIG_BLK_DEV_CS5530=m +CONFIG_BLK_DEV_HPT34X=m +# CONFIG_HPT34X_AUTODMA is not set +CONFIG_BLK_DEV_HPT366=m +CONFIG_BLK_DEV_SC1200=m +CONFIG_BLK_DEV_PIIX=m +# CONFIG_BLK_DEV_IT821X is not set +CONFIG_BLK_DEV_NS87415=m +CONFIG_BLK_DEV_PDC202XX_OLD=m +CONFIG_PDC202XX_BURST=y +CONFIG_BLK_DEV_PDC202XX_NEW=m +CONFIG_BLK_DEV_SVWKS=m +CONFIG_BLK_DEV_SIIMAGE=m +CONFIG_BLK_DEV_SLC90E66=m +CONFIG_BLK_DEV_TRM290=m +CONFIG_BLK_DEV_VIA82CXXX=m +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +CONFIG_CHR_DEV_SCH=m + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y + +# +# SCSI Transport Attributes +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_ISCSI_TCP is not set +CONFIG_BLK_DEV_3W_XXXX_RAID=m +CONFIG_SCSI_3W_9XXX=m +CONFIG_SCSI_ACARD=m +CONFIG_SCSI_AACRAID=m +CONFIG_SCSI_AIC7XXX=m +CONFIG_AIC7XXX_CMDS_PER_DEVICE=8 +CONFIG_AIC7XXX_RESET_DELAY_MS=15000 +CONFIG_AIC7XXX_DEBUG_ENABLE=y +CONFIG_AIC7XXX_DEBUG_MASK=0 +CONFIG_AIC7XXX_REG_PRETTY_PRINT=y +CONFIG_SCSI_AIC7XXX_OLD=m +CONFIG_SCSI_AIC79XX=m +CONFIG_AIC79XX_CMDS_PER_DEVICE=32 +CONFIG_AIC79XX_RESET_DELAY_MS=15000 +CONFIG_AIC79XX_ENABLE_RD_STRM=y +CONFIG_AIC79XX_DEBUG_ENABLE=y +CONFIG_AIC79XX_DEBUG_MASK=0 +CONFIG_AIC79XX_REG_PRETTY_PRINT=y +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +CONFIG_SCSI_SATA=m +# CONFIG_SCSI_SATA_AHCI is not set +CONFIG_SCSI_SATA_SVW=m +CONFIG_SCSI_ATA_PIIX=m +# CONFIG_SCSI_SATA_MV is not set +CONFIG_SCSI_SATA_NV=m +# CONFIG_SCSI_PDC_ADMA is not set +# CONFIG_SCSI_SATA_QSTOR is not set +CONFIG_SCSI_SATA_PROMISE=m +CONFIG_SCSI_SATA_SX4=m +CONFIG_SCSI_SATA_SIL=m +# CONFIG_SCSI_SATA_SIL24 is not set +CONFIG_SCSI_SATA_SIS=m +# CONFIG_SCSI_SATA_ULI is not set +CONFIG_SCSI_SATA_VIA=m +CONFIG_SCSI_SATA_VITESSE=m +CONFIG_SCSI_SATA_INTEL_COMBINED=y +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_OMIT_FLASHPOINT is not set +CONFIG_SCSI_DMX3191D=m +CONFIG_SCSI_EATA=m +CONFIG_SCSI_EATA_TAGGED_QUEUE=y +CONFIG_SCSI_EATA_LINKED_COMMANDS=y +CONFIG_SCSI_EATA_MAX_TAGS=16 +CONFIG_SCSI_FUTURE_DOMAIN=m +CONFIG_SCSI_GDTH=m +CONFIG_SCSI_IPS=m +# CONFIG_SCSI_INITIO is not set +CONFIG_SCSI_INIA100=m +CONFIG_SCSI_PPA=m +CONFIG_SCSI_IMM=m +# CONFIG_SCSI_IZIP_EPP16 is not set +# CONFIG_SCSI_IZIP_SLOW_CTR is not set +CONFIG_SCSI_SYM53C8XX_2=m +CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 +CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 +CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 +# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set +CONFIG_SCSI_IPR=m +# CONFIG_SCSI_IPR_TRACE is not set +# CONFIG_SCSI_IPR_DUMP is not set +CONFIG_SCSI_QLOGIC_FC=m +CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y +CONFIG_SCSI_QLOGIC_1280=m +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_LPFC is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=m +# CONFIG_SCSI_NSP32 is not set +CONFIG_SCSI_DEBUG=m + +# +# Multi-device support (RAID and LVM) +# +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +# CONFIG_MD_RAID10 is not set +CONFIG_MD_RAID5=m +CONFIG_MD_RAID6=m +CONFIG_MD_MULTIPATH=m +# CONFIG_MD_FAULTY is not set +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +# CONFIG_DM_MULTIPATH is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set +# CONFIG_FUSION_SAS is not set + +# +# IEEE 1394 (FireWire) support +# +CONFIG_IEEE1394=m + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set +CONFIG_IEEE1394_OUI_DB=y +CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y +CONFIG_IEEE1394_CONFIG_ROM_IP1394=y +# CONFIG_IEEE1394_EXPORT_FULL_API is not set + +# +# Device Drivers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocol Drivers +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m + +# +# I2O device support +# +CONFIG_I2O=m +CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y +CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_CONFIG=m +CONFIG_I2O_CONFIG_OLD_IOCTL=y +# CONFIG_I2O_BUS is not set +CONFIG_I2O_BLOCK=m +CONFIG_I2O_SCSI=m +CONFIG_I2O_PROC=m + +# +# Macintosh device drivers +# +# CONFIG_WINDFARM is not set + +# +# Network device support +# +CONFIG_NETDEVICES=y +CONFIG_DUMMY=m +CONFIG_BONDING=m +CONFIG_EQUALIZER=m +CONFIG_TUN=m + +# +# ARCnet devices +# +CONFIG_ARCNET=m +CONFIG_ARCNET_1201=m +CONFIG_ARCNET_1051=m +CONFIG_ARCNET_RAW=m +# CONFIG_ARCNET_CAP is not set +CONFIG_ARCNET_COM90xx=m +CONFIG_ARCNET_COM90xxIO=m +CONFIG_ARCNET_RIM_I=m +CONFIG_ARCNET_COM20020=m +CONFIG_ARCNET_COM20020_PCI=m + +# +# PHY device support +# +# CONFIG_PHYLIB is not set + +# +# Ethernet (10 or 100Mbit) +# +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +# CONFIG_CASSINI is not set +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m + +# +# Tulip family network device support +# +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +# CONFIG_ULI526X is not set +CONFIG_HP100=m +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +CONFIG_AMD8111_ETH=m +# CONFIG_AMD8111E_NAPI is not set +CONFIG_ADAPTEC_STARFIRE=m +# CONFIG_ADAPTEC_STARFIRE_NAPI is not set +CONFIG_B44=m +CONFIG_FORCEDETH=m +# CONFIG_DGRS is not set +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +CONFIG_8139TOO_TUNE_TWISTER=y +CONFIG_8139TOO_8129=y +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +# CONFIG_TLAN is not set +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +# CONFIG_NET_POCKET is not set + +# +# Ethernet (1000 Mbit) +# +# CONFIG_ACENIC is not set +CONFIG_DL2K=m +CONFIG_E1000=m +# CONFIG_E1000_NAPI is not set +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +# CONFIG_R8169_VLAN is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=y +# CONFIG_BNX2 is not set + +# +# Ethernet (10000 Mbit) +# +# CONFIG_CHELSIO_T1 is not set +CONFIG_IXGB=m +# CONFIG_IXGB_NAPI is not set +CONFIG_S2IO=m +# CONFIG_S2IO_NAPI is not set + +# +# Token Ring devices +# +CONFIG_TR=y +CONFIG_IBMOL=m +# CONFIG_IBMLS is not set +CONFIG_3C359=m +CONFIG_TMS380TR=m +CONFIG_TMSPCI=m +CONFIG_ABYSS=m + +# +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +CONFIG_STRIP=m + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_IPW2100 is not set +# CONFIG_IPW2200 is not set +# CONFIG_AIRO is not set +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +# CONFIG_NORTEL_HERMES is not set +CONFIG_PCI_HERMES=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m + +# +# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support +# +CONFIG_PRISM54=m +# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y + +# +# Wan interfaces +# +CONFIG_WAN=y +CONFIG_DSCC4=m +CONFIG_DSCC4_PCISYNC=y +CONFIG_DSCC4_PCI_RST=y +CONFIG_LANMEDIA=m +CONFIG_SYNCLINK_SYNCPPP=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=y +CONFIG_HDLC_RAW_ETH=y +CONFIG_HDLC_CISCO=y +CONFIG_HDLC_FR=y +CONFIG_HDLC_PPP=y +CONFIG_HDLC_X25=y +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300=m +CONFIG_PC300_MLPPP=y +CONFIG_FARSYNC=m +CONFIG_DLCI=m +CONFIG_DLCI_COUNT=24 +CONFIG_DLCI_MAX=8 +CONFIG_WAN_ROUTER_DRIVERS=y +CONFIG_CYCLADES_SYNC=m +CONFIG_CYCLOMX_X25=y +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m + +# +# ATM drivers +# +# CONFIG_ATM_DUMMY is not set +CONFIG_ATM_TCP=m +CONFIG_ATM_LANAI=m +CONFIG_ATM_ENI=m +# CONFIG_ATM_ENI_DEBUG is not set +# CONFIG_ATM_ENI_TUNE_BURST is not set +CONFIG_ATM_FIRESTREAM=m +CONFIG_ATM_ZATM=m +# CONFIG_ATM_ZATM_DEBUG is not set +# CONFIG_ATM_NICSTAR is not set +CONFIG_ATM_IDT77252=m +# CONFIG_ATM_IDT77252_DEBUG is not set +# CONFIG_ATM_IDT77252_RCV_ALL is not set +CONFIG_ATM_IDT77252_USE_SUNI=y +CONFIG_ATM_AMBASSADOR=m +# CONFIG_ATM_AMBASSADOR_DEBUG is not set +CONFIG_ATM_HORIZON=m +# CONFIG_ATM_HORIZON_DEBUG is not set +# CONFIG_ATM_IA is not set +CONFIG_ATM_FORE200E_MAYBE=m +CONFIG_ATM_FORE200E_PCA=y +CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y +# CONFIG_ATM_FORE200E_USE_TASKLET is not set +CONFIG_ATM_FORE200E_TX_RETRY=16 +CONFIG_ATM_FORE200E_DEBUG=0 +CONFIG_ATM_FORE200E=m +CONFIG_ATM_HE=m +CONFIG_ATM_HE_USE_SUNI=y +CONFIG_FDDI=y +# CONFIG_DEFXX is not set +CONFIG_SKFP=m +CONFIG_HIPPI=y +CONFIG_ROADRUNNER=m +# CONFIG_ROADRUNNER_LARGE_RINGS is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +# CONFIG_PPP_MPPE is not set +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +CONFIG_NET_FC=y +CONFIG_SHAPER=m +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +CONFIG_ISDN=m + +# +# Old ISDN4Linux +# +CONFIG_ISDN_I4L=m +CONFIG_ISDN_PPP=y +CONFIG_ISDN_PPP_VJ=y +CONFIG_ISDN_MPP=y +CONFIG_IPPP_FILTER=y +CONFIG_ISDN_PPP_BSDCOMP=m +CONFIG_ISDN_AUDIO=y +CONFIG_ISDN_TTY_FAX=y +CONFIG_ISDN_X25=y + +# +# ISDN feature submodules +# +# CONFIG_ISDN_DRV_LOOP is not set +# CONFIG_ISDN_DIVERSION is not set + +# +# ISDN4Linux hardware drivers +# + +# +# Passive cards +# +CONFIG_ISDN_DRV_HISAX=m + +# +# D-channel protocol features +# +CONFIG_HISAX_EURO=y +CONFIG_DE_AOC=y +# CONFIG_HISAX_NO_SENDCOMPLETE is not set +# CONFIG_HISAX_NO_LLC is not set +# CONFIG_HISAX_NO_KEYPAD is not set +CONFIG_HISAX_1TR6=y +CONFIG_HISAX_NI1=y +CONFIG_HISAX_MAX_CARDS=8 + +# +# HiSax supported cards +# +CONFIG_HISAX_16_3=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NICCY=y +CONFIG_HISAX_BKM_A4T=y +CONFIG_HISAX_SCT_QUADRO=y +CONFIG_HISAX_GAZEL=y +CONFIG_HISAX_W6692=y +CONFIG_HISAX_HFC_SX=y +# CONFIG_HISAX_DEBUG is not set + +# +# HiSax PCMCIA card service modules +# + +# +# HiSax sub driver modules +# +CONFIG_HISAX_ST5481=m +CONFIG_HISAX_HFCUSB=m +# CONFIG_HISAX_HFC4S8S is not set +CONFIG_HISAX_FRITZ_PCIPNP=m +CONFIG_HISAX_HDLC=y + +# +# Active cards +# +# CONFIG_HYSDN is not set + +# +# CAPI subsystem +# +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_ISDN_CAPI_MIDDLEWARE=y +CONFIG_ISDN_CAPI_CAPI20=m +CONFIG_ISDN_CAPI_CAPIFS_BOOL=y +CONFIG_ISDN_CAPI_CAPIFS=m +CONFIG_ISDN_CAPI_CAPIDRV=m + +# +# CAPI hardware drivers +# + +# +# Active AVM cards +# +CONFIG_CAPI_AVM=y +# CONFIG_ISDN_DRV_AVMB1_B1PCI is not set +# CONFIG_ISDN_DRV_AVMB1_B1PCMCIA is not set +# CONFIG_ISDN_DRV_AVMB1_T1PCI is not set +# CONFIG_ISDN_DRV_AVMB1_C4 is not set + +# +# Active Eicon DIVA Server cards +# +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +CONFIG_ISDN_DIVAS_BRIPCI=y +CONFIG_ISDN_DIVAS_PRIPCI=y +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m + +# +# Telephony Support +# +CONFIG_PHONE=m +CONFIG_PHONE_IXJ=m + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_JOYDEV=m +CONFIG_INPUT_TSDEV=m +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVBUG=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_SUNKBD=m +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_XTKBD=m +CONFIG_KEYBOARD_NEWTON=m +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_SERIAL=m +# CONFIG_MOUSE_VSXXXAA is not set +CONFIG_INPUT_JOYSTICK=y +CONFIG_JOYSTICK_ANALOG=m +CONFIG_JOYSTICK_A3D=m +CONFIG_JOYSTICK_ADI=m +CONFIG_JOYSTICK_COBRA=m +CONFIG_JOYSTICK_GF2K=m +CONFIG_JOYSTICK_GRIP=m +CONFIG_JOYSTICK_GRIP_MP=m +CONFIG_JOYSTICK_GUILLEMOT=m +CONFIG_JOYSTICK_INTERACT=m +CONFIG_JOYSTICK_SIDEWINDER=m +CONFIG_JOYSTICK_TMDC=m +CONFIG_JOYSTICK_IFORCE=m +CONFIG_JOYSTICK_IFORCE_USB=y +CONFIG_JOYSTICK_IFORCE_232=y +CONFIG_JOYSTICK_WARRIOR=m +CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_SPACEORB=m +CONFIG_JOYSTICK_SPACEBALL=m +CONFIG_JOYSTICK_STINGER=m +# CONFIG_JOYSTICK_TWIDJOY is not set +CONFIG_JOYSTICK_DB9=m +CONFIG_JOYSTICK_GAMECON=m +CONFIG_JOYSTICK_TURBOGRAFX=m +# CONFIG_JOYSTICK_JOYDUMP is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_GUNZE=m +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=m +CONFIG_SERIO_PARKBD=m +CONFIG_SERIO_PCIPS2=m +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_SERIAL_NONSTANDARD=y +# CONFIG_COMPUTONE is not set +CONFIG_ROCKETPORT=m +CONFIG_CYCLADES=m +# CONFIG_CYZ_INTR is not set +# CONFIG_DIGIEPCA is not set +# CONFIG_MOXA_INTELLIO is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set +CONFIG_SYNCLINK=m +CONFIG_SYNCLINKMP=m +# CONFIG_SYNCLINK_GT is not set +CONFIG_N_HDLC=m +# CONFIG_RISCOM8 is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_RIO is not set +CONFIG_STALDRV=y +# CONFIG_STALLION is not set +# CONFIG_ISTALLION is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +CONFIG_SERIAL_8250_RSA=y + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_TIPAR=m + +# +# IPMI +# +CONFIG_IPMI_HANDLER=m +# CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m +# CONFIG_IPMI_POWEROFF is not set + +# +# Watchdog Cards +# +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +CONFIG_WDT_501_PCI=y + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_NVRAM=m +CONFIG_GEN_RTC=m +CONFIG_GEN_RTC_X=y +CONFIG_DTLK=m +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# Ftape, the floppy tape device driver +# +CONFIG_AGP=y +CONFIG_DRM=y +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_MGA is not set +CONFIG_DRM_SIS=m +# CONFIG_DRM_VIA is not set +# CONFIG_DRM_SAVAGE is not set +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# I2C support +# +CONFIG_I2C=m +CONFIG_I2C_CHARDEV=m + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_ALGOPCF=m +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_ALI1535=m +CONFIG_I2C_ALI1563=m +CONFIG_I2C_ALI15X3=m +CONFIG_I2C_AMD756=m +# CONFIG_I2C_AMD756_S4882 is not set +CONFIG_I2C_AMD8111=m +CONFIG_I2C_I801=m +CONFIG_I2C_I810=m +# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_ISA=m +# CONFIG_I2C_MPC is not set +CONFIG_I2C_NFORCE2=m +CONFIG_I2C_PARPORT=m +CONFIG_I2C_PARPORT_LIGHT=m +CONFIG_I2C_PROSAVAGE=m +CONFIG_I2C_SAVAGE4=m +CONFIG_SCx200_ACB=m +CONFIG_I2C_SIS5595=m +CONFIG_I2C_SIS630=m +CONFIG_I2C_SIS96X=m +# CONFIG_I2C_STUB is not set +CONFIG_I2C_VIA=m +CONFIG_I2C_VIAPRO=m +CONFIG_I2C_VOODOO3=m +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +# CONFIG_SENSORS_PCA9539 is not set +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_RTC8564=m +# CONFIG_SENSORS_M41T00 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# SPI support +# +# CONFIG_SPI is not set +# CONFIG_SPI_MASTER is not set + +# +# Dallas's 1-wire bus +# +CONFIG_W1=m +CONFIG_W1_MATROX=m +# CONFIG_W1_DS9490 is not set +CONFIG_W1_THERM=m +# CONFIG_W1_SMEM is not set +# CONFIG_W1_DS2433 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +CONFIG_HWMON_VID=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +# CONFIG_SENSORS_ADM1026 is not set +CONFIG_SENSORS_ADM1031=m +# CONFIG_SENSORS_ADM9240 is not set +CONFIG_SENSORS_ASB100=m +# CONFIG_SENSORS_ATXP1 is not set +CONFIG_SENSORS_DS1621=m +# CONFIG_SENSORS_F71805F is not set +CONFIG_SENSORS_FSCHER=m +# CONFIG_SENSORS_FSCPOS is not set +CONFIG_SENSORS_GL518SM=m +# CONFIG_SENSORS_GL520SM is not set +CONFIG_SENSORS_IT87=m +# CONFIG_SENSORS_LM63 is not set +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +# CONFIG_SENSORS_LM87 is not set +CONFIG_SENSORS_LM90=m +# CONFIG_SENSORS_LM92 is not set +CONFIG_SENSORS_MAX1619=m +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +CONFIG_SENSORS_VIA686A=m +# CONFIG_SENSORS_VT8231 is not set +CONFIG_SENSORS_W83781D=m +# CONFIG_SENSORS_W83792D is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83627HF=m +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Misc devices +# + +# +# Multimedia Capabilities Port drivers +# + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m + +# +# Video For Linux +# + +# +# Video Adapters +# +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_BT848=m +# CONFIG_VIDEO_BT848_DVB is not set +# CONFIG_VIDEO_SAA6588 is not set +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_PP=m +CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_SAA7134=m +# CONFIG_VIDEO_SAA7134_ALSA is not set +# CONFIG_VIDEO_SAA7134_OSS is not set +# CONFIG_VIDEO_SAA7134_DVB is not set +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +# CONFIG_VIDEO_CX88_ALSA is not set +# CONFIG_VIDEO_CX88_DVB is not set +CONFIG_VIDEO_CX88_VP3054=m +# CONFIG_VIDEO_EM28XX is not set +CONFIG_VIDEO_OVCAMCHIP=m +# CONFIG_VIDEO_AUDIO_DECODER is not set +# CONFIG_VIDEO_DECODER is not set + +# +# Radio Adapters +# +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m + +# +# Digital Video Broadcasting Devices +# +CONFIG_DVB=y +CONFIG_DVB_CORE=m + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +# CONFIG_DVB_AV7110_OSD is not set +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +# CONFIG_DVB_USB is not set +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +# CONFIG_DVB_CINERGYT2 is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +# CONFIG_DVB_B2C2_FLEXCOP is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +# CONFIG_DVB_PLUTO2 is not set + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +# CONFIG_DVB_CX24123 is not set +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +# CONFIG_DVB_CX22702 is not set +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +# CONFIG_DVB_DIB3000MB is not set +# CONFIG_DVB_DIB3000MC is not set + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terresterial DTV) frontends +# +# CONFIG_DVB_NXT200X is not set +CONFIG_DVB_OR51211=m +# CONFIG_DVB_OR51132 is not set +# CONFIG_DVB_BCM3510 is not set +CONFIG_DVB_LGDT330X=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_VIDEOBUF=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_BUF=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_IMAGEBLIT=m +CONFIG_FB_MACMODES=m +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y +CONFIG_FB_CIRRUS=m +CONFIG_FB_PM2=m +CONFIG_FB_PM2_FIFO_DISCONNECT=y +CONFIG_FB_CYBER2000=m +# CONFIG_FB_OF is not set +# CONFIG_FB_CT65550 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +CONFIG_FB_VGA16=m +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +CONFIG_FB_RIVA=m +CONFIG_FB_RIVA_I2C=y +CONFIG_FB_RIVA_DEBUG=y +CONFIG_FB_MATROX=m +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +# CONFIG_FB_MATROX_G is not set +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MULTIHEAD=y +# CONFIG_FB_RADEON_OLD is not set +CONFIG_FB_RADEON=m +CONFIG_FB_RADEON_I2C=y +# CONFIG_FB_RADEON_DEBUG is not set +CONFIG_FB_ATY128=m +CONFIG_FB_ATY=m +CONFIG_FB_ATY_CT=y +# CONFIG_FB_ATY_GENERIC_LCD is not set +CONFIG_FB_ATY_GX=y +# CONFIG_FB_SAVAGE is not set +CONFIG_FB_SIS=m +CONFIG_FB_SIS_300=y +CONFIG_FB_SIS_315=y +CONFIG_FB_NEOMAGIC=m +CONFIG_FB_KYRO=m +CONFIG_FB_3DFX=m +# CONFIG_FB_3DFX_ACCEL is not set +CONFIG_FB_VOODOO1=m +CONFIG_FB_TRIDENT=m +# CONFIG_FB_TRIDENT_ACCEL is not set +CONFIG_FB_VIRTUAL=m + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=m +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y + +# +# Logo configuration +# +# CONFIG_LOGO is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_SEQUENCER_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_BUS=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m + +# +# PCI devices +# +# CONFIG_SND_AD1889 is not set +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +# CONFIG_SND_ATIIXP_MODEM is not set +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +# CONFIG_SND_BT87X_OVERCLOCK is not set +# CONFIG_SND_CA0106 is not set +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_EMU10K1=m +# CONFIG_SND_EMU10K1X is not set +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X=m +# CONFIG_SND_HDA_INTEL is not set +CONFIG_SND_HDSP=m +# CONFIG_SND_HDSPM is not set +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +# CONFIG_SND_PCXHR is not set +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +# CONFIG_SND_VIA82XX_MODEM is not set +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m + +# +# ALSA PowerMac devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +# CONFIG_SND_USB_USX2Y is not set + +# +# Open Sound System +# +CONFIG_SOUND_PRIME=m +# CONFIG_OBSOLETE_OSS_DRIVER is not set +CONFIG_SOUND_FUSION=m +CONFIG_SOUND_ICH=m +CONFIG_SOUND_TRIDENT=m +# CONFIG_SOUND_MSNDCLAS is not set +# CONFIG_SOUND_MSNDPIN is not set +CONFIG_SOUND_OSS=m +# CONFIG_SOUND_TRACEINIT is not set +# CONFIG_SOUND_DMAP is not set +# CONFIG_SOUND_AD1816 is not set +CONFIG_SOUND_AD1889=m +CONFIG_SOUND_ADLIB=m +CONFIG_SOUND_ACI_MIXER=m +CONFIG_SOUND_VMIDI=m +CONFIG_SOUND_TRIX=m +CONFIG_SOUND_MSS=m +CONFIG_SOUND_MPU401=m +CONFIG_SOUND_PAS=m +CONFIG_SOUND_PSS=m +CONFIG_PSS_MIXER=y +CONFIG_SOUND_SB=m +CONFIG_SOUND_OPL3SA2=m +CONFIG_SOUND_UART6850=m +CONFIG_SOUND_AEDSP16=m +CONFIG_SC6600=y +CONFIG_SC6600_JOY=y +CONFIG_SC6600_CDROM=4 +CONFIG_SC6600_CDROMBASE=0x0 +# CONFIG_AEDSP16_MSS is not set +# CONFIG_AEDSP16_SBPRO is not set +# CONFIG_AEDSP16_MPU401 is not set +CONFIG_SOUND_TVMIXER=m +CONFIG_SOUND_KAHLUA=m + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_BANDWIDTH=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_SPLIT_ISO is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_UHCI_HCD=y +# CONFIG_USB_SL811_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +CONFIG_USB_STORAGE_ISD200=y +CONFIG_USB_STORAGE_DPCM=y +# CONFIG_USB_STORAGE_USBAT is not set +CONFIG_USB_STORAGE_SDDR09=y +CONFIG_USB_STORAGE_SDDR55=y +CONFIG_USB_STORAGE_JUMPSHOT=y +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +CONFIG_USB_AIPTEK=m +CONFIG_USB_WACOM=m +# CONFIG_USB_ACECAD is not set +CONFIG_USB_KBTAB=m +CONFIG_USB_POWERMATE=m +CONFIG_USB_MTOUCH=m +# CONFIG_USB_ITMTOUCH is not set +CONFIG_USB_EGALAX=m +# CONFIG_USB_YEALINK is not set +CONFIG_USB_XPAD=m +CONFIG_USB_ATI_REMOTE=m +# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB Multimedia devices +# +# CONFIG_USB_DABUSB is not set +CONFIG_USB_VICAM=m +CONFIG_USB_DSBR=m +# CONFIG_USB_ET61X251 is not set +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +CONFIG_USB_W9968CF=m +CONFIG_USB_PWC=m + +# +# USB Network Adapters +# +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=m +# CONFIG_USB_ZD1201 is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set +CONFIG_USB_SERIAL_BELKIN=m +# CONFIG_USB_SERIAL_WHITEHEAT is not set +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +# CONFIG_USB_SERIAL_CP2101 is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +# CONFIG_USB_SERIAL_KEYSPAN_MPR 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_USA19QW is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set +# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +# CONFIG_USB_SERIAL_TI is not set +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +CONFIG_USB_LED=m +CONFIG_USB_CYTHERM=m +# CONFIG_USB_PHIDGETKIT is not set +CONFIG_USB_PHIDGETSERVO=m +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# +# CONFIG_USB_ATM is not set + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +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 + +# +# MMC/SD Card support +# +# CONFIG_MMC is not set + +# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) +# + +# +# File systems +# +CONFIG_EXT2_FS=m +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=m +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set +CONFIG_JFS_FS=m +CONFIG_JFS_POSIX_ACL=y +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +CONFIG_JFS_STATISTICS=y +CONFIG_FS_POSIX_ACL=y +CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_OCFS2_FS is not set +CONFIG_MINIX_FS=m +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_QUOTA=y +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_ZISOFS_FS=m +CONFIG_UDF_FS=m +CONFIG_UDF_NLS=y + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +CONFIG_ADFS_FS=m +# CONFIG_ADFS_FS_RW is not set +CONFIG_AFFS_FS=m +CONFIG_HFS_FS=m +CONFIG_HFSPLUS_FS=m +CONFIG_BEFS_FS=m +# CONFIG_BEFS_DEBUG is not set +CONFIG_BFS_FS=m +CONFIG_EFS_FS=m +CONFIG_JFFS_FS=m +CONFIG_JFFS_FS_VERBOSE=0 +CONFIG_JFFS_PROC_FS=y +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_CRAMFS=y +CONFIG_VXFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m + +# +# Network File Systems +# +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +CONFIG_NCPFS_NFS_NS=y +CONFIG_NCPFS_OS2_NS=y +# CONFIG_NCPFS_SMALLDOS is not set +CONFIG_NCPFS_NLS=y +CONFIG_NCPFS_EXTRAS=y +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +CONFIG_RXRPC=m +# CONFIG_9P_FS is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +CONFIG_ACORN_PARTITION=y +CONFIG_ACORN_PARTITION_CUMANA=y +# CONFIG_ACORN_PARTITION_EESOX is not set +CONFIG_ACORN_PARTITION_ICS=y +# CONFIG_ACORN_PARTITION_ADFS is not set +# CONFIG_ACORN_PARTITION_POWERTEC is not set +CONFIG_ACORN_PARTITION_RISCIX=y +CONFIG_OSF_PARTITION=y +CONFIG_AMIGA_PARTITION=y +CONFIG_ATARI_PARTITION=y +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +CONFIG_BSD_DISKLABEL=y +CONFIG_MINIX_SUBPARTITION=y +CONFIG_SOLARIS_X86_PARTITION=y +CONFIG_UNIXWARE_DISKLABEL=y +CONFIG_LDM_PARTITION=y +# CONFIG_LDM_DEBUG is not set +CONFIG_SGI_PARTITION=y +CONFIG_ULTRIX_PARTITION=y +CONFIG_SUN_PARTITION=y +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="cp437" +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_ASCII=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 + +# +# Library routines +# +CONFIG_CRC_CCITT=m +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y + +# +# Instrumentation Support +# +CONFIG_PROFILING=y +CONFIG_OPROFILE=m + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_DEBUG_KERNEL is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_BOOTX_TEXT is not set +# CONFIG_PPC_EARLY_DEBUG_LPAR is not set +# CONFIG_PPC_EARLY_DEBUG_G5 is not set +# CONFIG_PPC_EARLY_DEBUG_RTAS is not set +# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set +# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set + +# +# Security options +# +# CONFIG_KEYS is not set +CONFIG_SECURITY=y +# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_CAPABILITIES=y +CONFIG_SECURITY_ROOTPLUG=m +# CONFIG_SECURITY_SECLVL is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_TEST=m + +# +# Hardware crypto devices +# diff --git a/packages/linux/linux-efika_2.6.16.bb b/packages/linux/linux-efika_2.6.16.bb new file mode 100644 index 0000000000..93a8863aba --- /dev/null +++ b/packages/linux/linux-efika_2.6.16.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Linux Kernel for the EFIKA dev platform" +SECTION = "kernel" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ + file://defconfig \ + " + +S = "${WORKDIR}/linux-2.6.16" + +inherit kernel + +KERNEL_IMAGETYPE = "zImage" + +do_configure() { + install -m 644 ${WORKDIR}/defconfig ${S}/.config + make ARCH=arm oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + + diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 027dbfb80b..4f90b9dca6 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -996,7 +996,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m # CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_CODEPAGE_852=m # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set @@ -1011,7 +1011,7 @@ CONFIG_NLS_CODEPAGE_866=m CONFIG_NLS_CODEPAGE_936=m CONFIG_NLS_CODEPAGE_950=m CONFIG_NLS_CODEPAGE_932=m -# CONFIG_NLS_CODEPAGE_949 is not set +CONFIG_NLS_CODEPAGE_949=m # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb index 797d386f8c..60b83bade2 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r10" +PR = "r11" KERNEL_SUFFIX = "unslung" diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index 8ab50cebf4..4a6864eefa 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r13" +PR = "r14" IMAGE_BASENAME = "unslung" @@ -61,32 +61,6 @@ unslung_clean_image () { # Strip symbols and fix permissions on the libgcc_s.so.1 library ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 - - # Remove some of the Samba codepages to make space - # 437 (USA) - keep - # 737 (Greek) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.737 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.737 - # 850 (Latin1) - keep - # 852 (Latin2) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.852 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.852 - # 861 (Iceland) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.861 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.861 - # 866 (Russian) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.866 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.866 - # 932 (Japanese Shift-JIS) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.932 - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.932 - # 936 (Simplified Chinese) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.936 - # 949 (Korean) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.949 - # 950 (Chinese BIG-5) - rm -f ${IMAGE_ROOTFS}/etc/samba/codepages/codepage.950 - # ISO8859-1 (Latin 1) - keep } python () { diff --git a/packages/nogravity/.mtn2git_empty b/packages/nogravity/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nogravity/.mtn2git_empty diff --git a/packages/nogravity/nogravity_2.0.bb b/packages/nogravity/nogravity_2.0.bb new file mode 100644 index 0000000000..c2b7dace45 --- /dev/null +++ b/packages/nogravity/nogravity_2.0.bb @@ -0,0 +1,25 @@ +HOMEPAGE = "http://www.realtech-vr.com/nogravity/" +LICENSE = "GPL" +MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" +DEPENDS = "libsdl-x11 zlib libpng libsdl-mixer libogg libvorbis" +SRC_URI = "http://zaurus.vivaphp.net/nogravity.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/nogravity/rt-nogravity-data.zip" + +S = "${WORKDIR}/${PN}/src/Linux/" +PACKAGES += "${PN}-data" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-sound=sdl_mixer --disable-opengl" + +FILES_${PN} += "/usr/games/nogravity/no*" +FILES_${PN}-data = "/usr/games/nogravity/*.RMX" +PACKAGE_ARCH_${PN}-data = "all" +RRECOMMENDS+${PN} = "${PN}-data" + +do_install_prepend() { + install -d ${D}/usr/games/nogravity/ + install -m 644 ${WORKDIR}/*.RMX ${D}/usr/games/nogravity/ +} + + diff --git a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb index 1843de069c..4424e99d19 100644 --- a/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb +++ b/packages/nslu2-binary-only/nslu2-linksys-libs_2.3r63.bb @@ -9,7 +9,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2" S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" do_install () { - ( cd ${S} ; rm -rf bin dev etc home mnt proc sbin share tmp upload usr var ) + ( cd ${S} ; rm -rf bin dev etc home lost+found mnt proc sbin share tmp upload usr var ) ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) } diff --git a/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb new file mode 100644 index 0000000000..4aace52412 --- /dev/null +++ b/packages/nslu2-binary-only/nslu2-linksys-sambacodepages_2.3r63.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Linksys NSLU2 Stock Firmware Samba Code Pages." +PACKAGE_ARCH = "nslu2" +SECTION = "base" +PRIORITY = "required" +PR = "r1" + +SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2" + +S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r63" + +do_install () { + ( cd ${S} ; mkdir unslung-tmp ) + ( cd ${S}/etc ; tar cvf - samba/codepages ) | ( cd ${S}/unslung-tmp; tar xvf - ) + ( cd ${S} ; rm -rf bin dev etc home lib lost+found mnt proc sbin share tmp upload usr var ) + ( cd ${S} ; mv unslung-tmp etc ) + ( cd ${S}/etc/samba/codepages; rm -f codepage.437 unicode_map.437 ) + ( cd ${S}/etc/samba/codepages; rm -f codepage.850 unicode_map.850 ) + ( cd ${S}/etc/samba/codepages; rm -f unicode_map.ISO8859-1 ) + ( cd ${S} ; tar cvf - . ) | ( cd ${D} ; tar xvf - ) +} + +PACKAGES = "${PN}" +FILES_${PN} = "/etc/samba/codepages" + +python () { + # Don't build unless we're targeting an nslu2 + if bb.data.getVar("MACHINE", d, 1) != "nslu2": + raise bb.parse.SkipPackage("NSLU2 stock firmware Samba code pages only builds for the Linksys NSLU2") +} diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index ae9d7c607c..82d7448a80 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -487,3 +487,28 @@ Added original "netconsole" code as a kernel module Fixed problem with password changing from the GUI and automatic mounting of drives and flash devices in port 1. Remove unnecessary directory /lib/modules/2.4.22-xfs/pcmcia. + +6.8: + +First beta release. + +6.9: + +Modified /etc/rc.d/rc.modules to "insmod" any nls code page modules present. + +Code Page 850 is now compiled into the kernel instead of a kernel module, +and added Code Page 949 (as a module). + +Updated the upgrade.htm file to reflect redboot as the upgrade means. + +Remove the upgrade.cgi, upgrade_ui.htm, and upgrade_ui.cgi files from the +root image as they are no longer used, and we can always use free space. + +Rearranged portions of the build procedure to remove the samba code pages in +the rootfs bb, create a new package with the removed code pages in a new +nslu2-linksys-sambacodepages.bb file (to restore the code pages, use ipkg to +install package "nslu2-linksys-sambacodepages". Note that the rootfs and the +sambacodepages bb files must be kept in sync regarding the samba code pages +that are left in the image and the ones that are added to the package (and it +is also a good idea if the kernel defconfig reflects the inclusion of NLS +support for the code pages that are left in the image, of course). diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch index fa7532401d..d1de027f9a 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch +++ b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-diversion.patch @@ -1,8 +1,10 @@ ---- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules.orig 2004-07-27 23:37:55.000000000 -0400 -+++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules 2004-09-01 21:57:34.000000000 -0400 -@@ -1,2 +1,5 @@ +--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:00:58.000000000 -0500 ++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 21:05:47.000000000 -0500 +@@ -1,4 +1,7 @@ + #!/bin/sh + +if ( [ -f /unslung/rc.modules ] && . /unslung/rc.modules ) ; then return 0 ; fi + - insmod rbuttons &>/dev/null - insmod x1226-rtc &>/dev/null + insmod pbuttons 2>/dev/null + insmod rbuttons 2>/dev/null + insmod x1226-rtc 2>/dev/null diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch new file mode 100644 index 0000000000..1eb342b715 --- /dev/null +++ b/packages/nslu2-binary-only/unslung-rootfs/rc.modules-nls.patch @@ -0,0 +1,10 @@ +--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules.orig 2006-04-14 21:05:47.000000000 -0500 ++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.modules 2006-04-14 19:56:29.000000000 -0500 +@@ -6,3 +6,7 @@ + insmod rbuttons 2>/dev/null + insmod x1226-rtc 2>/dev/null + insmod ufsd 2>/dev/null ++ ++for i in /lib/modules/`/bin/uname -r`/kernel/fs/nls/nls_cp*.o ; do ++ insmod "$i" 2>/dev/null ++done diff --git a/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi b/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi deleted file mode 100755 index 0eee123550..0000000000 --- a/packages/nslu2-binary-only/unslung-rootfs/upgrade.cgi +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/sbin/devio ">>/dev/mtdblock5" "fb#255" 2>/dev/null -/usr/sbin/DO_Reboot 2>/dev/null diff --git a/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm index 88644e305e..2301a89c0f 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm +++ b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm @@ -4,21 +4,6 @@ <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> <script language="JavaScript" type="text/javascript" src="../stdlib.js"></script> <script language="JavaScript" type="text/javascript" src="../message.js"></script> -<script language="JavaScript" type="text/javascript"> -<!-- Start Script - -function checkUpgrade() -{ - var cf=document.upgrade; - - if(!confirm("Your NSLU2 will now enter RedBoot Upgrade Mode\n(Ready/Status LED will be flashing red and green).\nYou will require either the Linux UpSlug tool or the\nWindows SerComm Upgrade tool to upload firmware.\nNote that you will not be able to access your NSLU2\nuntil you have successfully uploaded new firmware.\nClick OK to continue, Cancel to abort.")) - return; - cf.submit(); - return; -} - -// end script --> -</script> </head> <body bgcolor="white" onLoad="showMsg()" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> @@ -81,8 +66,6 @@ function checkUpgrade() <tr> <td colspan="3" bgcolor="#e7e7e7" height="6"><img src="TRANSPAR.GIF" width="1" height="6" alt="" border="0"></td> </tr> - - <tr> <th width="165" height="24">Current Firmware </th> <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> @@ -93,16 +76,33 @@ function checkUpgrade() <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> <tr> <td nowrap>Current Firmware Version:</td> - <td nowrap>@ds_sw_version# </td></tr> - <tr><td> - <div align="left"><a href="http://www.linksys.com" target="new_win"><img src="button_checkupdate.jpg" width="107" height="20" alt="" border="0"></a></div> - </td> + <td nowrap>@ds_sw_version# </td> </tr> </table></div> </td> <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="80" width="15"></td> </tr> <tr> + <th width="165" height="24">Upgrade </th> + <td width="409"><img src="TRANSPAR.GIF" width="409" height="6" alt="" border="0"></td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="24" width="15"></td> +</tr> +<tr> + <td bgcolor="#e7e7e7" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="120"></td> + <td width="409"><div class="std"><table border=0 cellspacing=0 cellpadding=4> + <tr> + </tr> + <tr> +<td colspan="2" align="left" class="smsg"> +NOTE: You cannot use this upgrade page to install new firmware on Unslung. +You must use the Redboot mechanism in order to install new firmware instead. +</td> + </tr> + </table></div> </td> + <td width="176" bgcolor="#6666cc"><img border="0" src="../UI_05.gif" height="120" width="15"></td> +</tr> + +<tr> <td bgcolor="#e7e7e7" height="30" align="right"><img border="0" src="../UI_04.gif" width="8" hspace="0" vspace="0" height="30"></td> <td height="30"> </td> <td rowspan="2" valign="bottom" bgcolor="#6666cc" height="64"><img src="../cisco.gif" hspace="0" vspace="0"></td> @@ -110,12 +110,10 @@ function checkUpgrade() <tr> <td bgcolor="black" height="34"> </td> - <td bgcolor="#6666cc" align="right" height="33" valign="middle"><a class="textbutton" href="javascript:checkUpgrade();" style="{padding:3px}"> - Enter Upgrade Mode </a> <a class="textbutton" href="javascript:openHelpWin('help/util_upg.htm')" style="{padding:3px}"> - Help </a> </td> + <td bgcolor="#6666cc" align="right" height="33" valign="middle"> + </td> </tr> - </table> </div> <input type="Hidden" name="message" value="@message#"> @@ -123,7 +121,5 @@ function checkUpgrade() <input type="Hidden" name="todo" value="@todo#"> <input type="Hidden" name="finish" value="@finish#"> </form> - </body> - </html> diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index 910ad102a9..f105e6830a 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,8 +1,8 @@ SECTION = "base" -PR = "r11" +PR = "r12" -DEPENDS = "nslu2-linksys-libs" +DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ file://README \ @@ -43,8 +43,8 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \ file://mount_usbdevfs.patch;patch=1 \ file://security-fixes.patch;patch=1 \ file://rc.sysinit-clean_var.patch;patch=1 \ + file://rc.modules-nls.patch;patch=1 \ file://upgrade.htm \ - file://upgrade.cgi \ file://telnet.htm \ file://rc.bootbin \ " @@ -66,6 +66,7 @@ do_compile () { install -m 644 ${WORKDIR}/telnet.htm ${S}/home/httpd/html/Management/telnet.htm sed -i -e 's/@version#</@version#-uNSLUng-'${DISTRO_VERSION}'</' ${S}/home/httpd/html/home.htm + install -m 644 ${WORKDIR}/upgrade.htm ${S}/home/httpd/html/Management/upgrade.htm sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${DISTRO_VERSION}/ \ ${S}/home/httpd/html/Management/upgrade.htm @@ -110,6 +111,38 @@ do_compile () { # Remove the libraries, because they are in nslu2-linksys-libs now rm -rf ${S}/lib + + # Remove some unnecessary web stuff to free space + rm -f ${S}/home/httpd/html/Management/upgrade.cgi + rm -f ${S}/home/httpd/html/Management/upgrade_ui.htm + rm -f ${S}/home/httpd/html/Management/upgrade_ui.cgi + + # Remove some of the Samba codepages to make space + # These will have to be separately packaged, like the libraries... + # 437 (USA) - keep + # 737 (Greek) + rm -f ${S}/etc/samba/codepages/codepage.737 + rm -f ${S}/etc/samba/codepages/unicode_map.737 + # 850 (Latin1) - keep + # 852 (Latin2) + rm -f ${S}/etc/samba/codepages/codepage.852 + rm -f ${S}/etc/samba/codepages/unicode_map.852 + # 861 (Iceland) + rm -f ${S}/etc/samba/codepages/codepage.861 + rm -f ${S}/etc/samba/codepages/unicode_map.861 + # 866 (Russian) + rm -f ${S}/etc/samba/codepages/codepage.866 + rm -f ${S}/etc/samba/codepages/unicode_map.866 + # 932 (Japanese Shift-JIS) + rm -f ${S}/etc/samba/codepages/codepage.932 + rm -f ${S}/etc/samba/codepages/unicode_map.932 + # 936 (Simplified Chinese) + rm -f ${S}/etc/samba/codepages/codepage.936 + # 949 (Korean) + rm -f ${S}/etc/samba/codepages/codepage.949 + # 950 (Chinese BIG-5) + rm -f ${S}/etc/samba/codepages/codepage.950 + # ISO8859-1 (Latin 1) - keep } do_install () { diff --git a/packages/vlc/vlc-gpe-0.8.4/.mtn2git_empty b/packages/vlc/vlc-gpe-0.8.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/vlc/vlc-gpe-0.8.4/.mtn2git_empty diff --git a/packages/vlc/vlc-gpe-0.8.4/pda-interface.patch b/packages/vlc/vlc-gpe-0.8.4/pda-interface.patch new file mode 100644 index 0000000000..2eadbb32f4 --- /dev/null +++ b/packages/vlc/vlc-gpe-0.8.4/pda-interface.patch @@ -0,0 +1,1669 @@ +diff -ur vlc-0.8.4a/modules/gui/pda/pda.c vlc-0.8.4a-pda/modules/gui/pda/pda.c +--- vlc-0.8.4a/modules/gui/pda/pda.c 2005-12-11 22:36:19.000000000 +0100 ++++ vlc-0.8.4a-pda/modules/gui/pda/pda.c 2006-04-04 17:41:06.000000000 +0200 +@@ -445,8 +445,6 @@ + } + + /* Manage the slider */ +-#if 0 +-#define p_area p_input->p_selected_area + if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) + { + /* Manage the slider for CPU_CAPABILITY_FPU hardware */ +@@ -461,7 +459,7 @@ + /* Update the value */ + p_intf->p_sys->p_adj->value = + p_intf->p_sys->f_adj_oldvalue = +- ( 100. * p_area->i_tell ) / p_area->i_size; ++ ( 100. * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" ); + g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ), + "value_changed" ); + } +@@ -495,7 +493,7 @@ + /* Update the value */ + p_intf->p_sys->p_adj->value = + p_intf->p_sys->i_adj_oldvalue = +- ( 100 * p_area->i_tell ) / p_area->i_size; ++ ( 100 * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" ); + g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ), + "value_changed" ); + } +@@ -515,8 +513,6 @@ + } + } + } +-#undef p_area +-#endif + } + vlc_mutex_unlock( &p_input->object_lock ); + } +diff -ur vlc-0.8.4a/modules/gui/pda/pda_callbacks.c vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c +--- vlc-0.8.4a/modules/gui/pda/pda_callbacks.c 2005-12-11 22:36:19.000000000 +0100 ++++ vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c 2006-04-05 10:26:41.000000000 +0200 +@@ -442,7 +442,7 @@ + p_intf->p_sys->b_slider_free = 1; + vlc_mutex_unlock( &p_intf->change_lock ); + +- return TRUE; ++ return FALSE; + } + + +@@ -455,7 +455,7 @@ + p_intf->p_sys->b_slider_free = 0; + vlc_mutex_unlock( &p_intf->change_lock ); + +- return TRUE; ++ return FALSE; + } + + void SliderMove(GtkRange *range, GtkScrollType scroll, gpointer user_data) +@@ -1102,6 +1102,8 @@ + p_entryStdURL = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdURL" ); + p_entryStdAnnounce = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryAnnounceChannel" ); + p_entryStdTTL = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryStdTTL" ); ++ p_checkSAP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSAP" ); ++ p_checkSLP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSLP" ); + + p_std_access = gtk_entry_get_text(GTK_ENTRY(p_entryStdAccess)); + p_std_muxer = gtk_entry_get_text(GTK_ENTRY(p_entryStdMuxer)); +diff -ur vlc-0.8.4a/modules/gui/pda/pda.glade vlc-0.8.4a-pda/modules/gui/pda/pda.glade +--- vlc-0.8.4a/modules/gui/pda/pda.glade 2005-12-11 22:36:19.000000000 +0100 ++++ vlc-0.8.4a-pda/modules/gui/pda/pda.glade 2006-04-05 10:50:39.000000000 +0200 +@@ -14,6 +14,12 @@ + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="icon">vlc16x16.png</property> ++ <property name="decorated">True</property> ++ <property name="skip_taskbar_hint">False</property> ++ <property name="skip_pager_hint">False</property> ++ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> ++ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> ++ <property name="focus_on_map">True</property> + <signal name="delete_event" handler="onPDADeleteEvent" last_modification_time="Fri, 26 Sep 2003 13:23:22 GMT"/> + + <child> +@@ -30,9 +36,23 @@ + <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property> + <property name="toolbar_style">GTK_TOOLBAR_ICONS</property> + <property name="tooltips">True</property> ++ <property name="show_arrow">True</property> + + <child> +- <widget class="button" id="tbRewind"> ++ <widget class="GtkSeparatorToolItem" id="separatortoolitem1"> ++ <property name="visible">True</property> ++ <property name="draw">True</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ </widget> ++ <packing> ++ <property name="expand">False</property> ++ <property name="homogeneous">False</property> ++ </packing> ++ </child> ++ ++ <child> ++ <widget class="GtkToolButton" id="tbRewind"> + <property name="width_request">22</property> + <property name="height_request">22</property> + <property name="visible">True</property> +@@ -40,16 +60,19 @@ + <property name="label" translatable="yes">Rewind</property> + <property name="use_underline">True</property> + <property name="icon">pda-rewindb16x16.xpm</property> +- <property name="new_group">True</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ <property name="is_important">False</property> + <signal name="clicked" handler="onRewind" last_modification_time="Fri, 26 Sep 2003 12:26:47 GMT"/> + </widget> + <packing> +- <property name="new_group">True</property> ++ <property name="expand">False</property> ++ <property name="homogeneous">True</property> + </packing> + </child> + + <child> +- <widget class="button" id="tbPause"> ++ <widget class="GtkToolButton" id="tbPause"> + <property name="width_request">22</property> + <property name="height_request">22</property> + <property name="visible">True</property> +@@ -57,12 +80,19 @@ + <property name="label" translatable="yes">Pause</property> + <property name="use_underline">True</property> + <property name="icon">pda-pauseb16x16.xpm</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ <property name="is_important">False</property> + <signal name="clicked" handler="onPause" last_modification_time="Fri, 26 Sep 2003 12:27:01 GMT"/> + </widget> ++ <packing> ++ <property name="expand">False</property> ++ <property name="homogeneous">True</property> ++ </packing> + </child> + + <child> +- <widget class="button" id="tbPlay"> ++ <widget class="GtkToolButton" id="tbPlay"> + <property name="width_request">22</property> + <property name="height_request">22</property> + <property name="visible">True</property> +@@ -70,12 +100,19 @@ + <property name="label" translatable="yes">Play</property> + <property name="use_underline">True</property> + <property name="icon">pda-playb16x16.xpm</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ <property name="is_important">False</property> + <signal name="clicked" handler="onPlay" last_modification_time="Fri, 26 Sep 2003 12:27:14 GMT"/> + </widget> ++ <packing> ++ <property name="expand">False</property> ++ <property name="homogeneous">True</property> ++ </packing> + </child> + + <child> +- <widget class="button" id="tbStop"> ++ <widget class="GtkToolButton" id="tbStop"> + <property name="width_request">22</property> + <property name="height_request">22</property> + <property name="visible">True</property> +@@ -83,12 +120,19 @@ + <property name="label" translatable="yes">Stop</property> + <property name="use_underline">True</property> + <property name="icon">pda-stopb16x16.xpm</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ <property name="is_important">False</property> + <signal name="clicked" handler="onStop" last_modification_time="Fri, 26 Sep 2003 12:27:25 GMT"/> + </widget> ++ <packing> ++ <property name="expand">False</property> ++ <property name="homogeneous">True</property> ++ </packing> + </child> + + <child> +- <widget class="button" id="tbForward"> ++ <widget class="GtkToolButton" id="tbForward"> + <property name="width_request">22</property> + <property name="height_request">22</property> + <property name="visible">True</property> +@@ -96,12 +140,32 @@ + <property name="label" translatable="yes">Forward</property> + <property name="use_underline">True</property> + <property name="icon">pda-forwardb16x16.xpm</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ <property name="is_important">False</property> + <signal name="clicked" handler="onForward" last_modification_time="Fri, 26 Sep 2003 12:27:35 GMT"/> + </widget> ++ <packing> ++ <property name="expand">False</property> ++ <property name="homogeneous">True</property> ++ </packing> + </child> + + <child> +- <widget class="button" id="tbAbout"> ++ <widget class="GtkSeparatorToolItem" id="separatortoolitem2"> ++ <property name="visible">True</property> ++ <property name="draw">True</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ </widget> ++ <packing> ++ <property name="expand">False</property> ++ <property name="homogeneous">False</property> ++ </packing> ++ </child> ++ ++ <child> ++ <widget class="GtkToolButton" id="tbAbout"> + <property name="width_request">22</property> + <property name="height_request">22</property> + <property name="visible">True</property> +@@ -109,31 +173,47 @@ + <property name="label" translatable="yes">About</property> + <property name="use_underline">True</property> + <property name="icon">vlc16x16.png</property> +- <property name="new_group">True</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ <property name="is_important">False</property> + <signal name="clicked" handler="onAbout" last_modification_time="Fri, 26 Sep 2003 12:27:44 GMT"/> + </widget> + <packing> +- <property name="new_group">True</property> ++ <property name="expand">False</property> ++ <property name="homogeneous">True</property> + </packing> + </child> + + <child> +- <widget class="GtkLabel" id="timeLabel"> ++ <widget class="GtkToolItem" id="toolitem1"> + <property name="visible">True</property> +- <property name="label">00:00:00</property> +- <property name="use_underline">False</property> +- <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> +- <property name="wrap">False</property> +- <property name="selectable">False</property> +- <property name="xalign">0.5</property> +- <property name="yalign">0.5</property> +- <property name="xpad">0</property> +- <property name="ypad">0</property> +- <property name="new_group">True</property> ++ <property name="visible_horizontal">True</property> ++ <property name="visible_vertical">True</property> ++ <property name="is_important">False</property> ++ ++ <child> ++ <widget class="GtkLabel" id="timeLabel"> ++ <property name="visible">True</property> ++ <property name="label">00:00:00</property> ++ <property name="use_underline">False</property> ++ <property name="use_markup">False</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> ++ <property name="wrap">False</property> ++ <property name="selectable">False</property> ++ <property name="xalign">0.5</property> ++ <property name="yalign">0.5</property> ++ <property name="xpad">0</property> ++ <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> ++ </widget> ++ </child> + </widget> + <packing> +- <property name="new_group">True</property> ++ <property name="expand">False</property> ++ <property name="homogeneous">False</property> + </packing> + </child> + </widget> +@@ -212,6 +292,9 @@ + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> ++ <property name="fixed_height_mode">False</property> ++ <property name="hover_selection">False</property> ++ <property name="hover_expand">False</property> + <signal name="row_activated" handler="onFileListRow" last_modification_time="Fri, 26 Sep 2003 13:30:40 GMT"/> + </widget> + </child> +@@ -240,6 +323,7 @@ + <property name="label" translatable="yes">Add to Playlist</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onAddFileToPlaylist" last_modification_time="Fri, 26 Sep 2003 12:31:03 GMT"/> + </widget> + <packing> +@@ -276,13 +360,17 @@ + <property name="label" translatable="yes">File</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> +@@ -311,13 +399,17 @@ + <property name="label" translatable="yes">MRL:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> +@@ -462,6 +554,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -486,6 +582,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -628,6 +728,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -756,6 +860,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -780,6 +888,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -798,6 +910,7 @@ + <property name="label" translatable="yes">enable</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +@@ -836,6 +949,7 @@ + <property name="label" translatable="yes">Add to Playlist</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onAddNetworkPlaylist" last_modification_time="Fri, 26 Sep 2003 12:37:36 GMT"/> + </widget> + <packing> +@@ -857,7 +971,7 @@ + </child> + </widget> + <packing> +- <property name="tab_expand">True</property> ++ <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> +@@ -868,13 +982,17 @@ + <property name="label" translatable="yes">Network</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> +@@ -923,6 +1041,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -947,6 +1069,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -971,6 +1097,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -995,6 +1125,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1019,6 +1153,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1043,6 +1181,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1067,6 +1209,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1091,6 +1237,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1115,6 +1265,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1139,6 +1293,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1163,6 +1321,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1187,6 +1349,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1677,6 +1843,7 @@ + <property name="label" translatable="yes">enable</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +@@ -1726,6 +1893,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1744,6 +1915,7 @@ + <property name="label" translatable="yes">enable</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +@@ -1786,6 +1958,7 @@ + <property name="label" translatable="yes">Add to Playlist</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onAddCameraToPlaylist" last_modification_time="Fri, 26 Sep 2003 12:47:31 GMT"/> + </widget> + <packing> +@@ -1825,6 +1998,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> +@@ -1873,6 +2050,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -1993,6 +2174,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2017,6 +2202,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2041,6 +2230,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2065,6 +2258,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2089,6 +2286,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2113,6 +2314,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2137,6 +2342,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2161,6 +2370,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2185,6 +2398,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2507,6 +2724,7 @@ + <property name="label" translatable="yes">enable</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +@@ -2553,7 +2771,7 @@ + <property name="update_policy">GTK_UPDATE_ALWAYS</property> + <property name="snap_to_ticks">False</property> + <property name="wrap">False</property> +- <property name="adjustment">800000 0 1e+06 1 10 10</property> ++ <property name="adjustment">800000 0 1000000 1 10 10</property> + </widget> + <packing> + <property name="left_attach">1</property> +@@ -2599,6 +2817,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2730,6 +2952,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2748,6 +2974,7 @@ + <property name="label" translatable="yes">enable</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +@@ -2769,6 +2996,7 @@ + <property name="label" translatable="yes">enable</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> +@@ -2796,6 +3024,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2820,6 +3052,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> +@@ -2898,6 +3134,7 @@ + <property name="label" translatable="yes">Add to Playlist</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onAddTranscodeToPlaylist" last_modification_time="Sun, 09 Nov 2003 15:55:09 GMT"/> + </widget> + <packing> +@@ -2930,13 +3167,17 @@ + <property name="label" translatable="yes">Transcode</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> +@@ -2965,6 +3206,9 @@ + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> ++ <property name="fixed_height_mode">False</property> ++ <property name="hover_selection">False</property> ++ <property name="hover_expand">False</property> + <signal name="event" handler="PlaylistEvent" last_modification_time="Fri, 26 Sep 2003 12:48:10 GMT"/> + <signal name="columns_changed" handler="onPlaylistColumnsChanged" last_modification_time="Fri, 26 Sep 2003 13:36:25 GMT"/> + <signal name="select_cursor_row" handler="onPlaylistRowSelected" last_modification_time="Fri, 26 Sep 2003 13:37:22 GMT"/> +@@ -2992,6 +3236,7 @@ + <property name="label" translatable="yes">Update</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onUpdatePlaylist" last_modification_time="Fri, 26 Sep 2003 12:48:43 GMT"/> + </widget> + <packing> +@@ -3008,6 +3253,7 @@ + <property name="label" translatable="yes">Delete</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onDeletePlaylist" last_modification_time="Fri, 26 Sep 2003 12:49:22 GMT"/> + </widget> + <packing> +@@ -3024,6 +3270,7 @@ + <property name="label" translatable="yes"> Clear </property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onClearPlaylist" last_modification_time="Fri, 26 Sep 2003 12:49:47 GMT"/> + </widget> + <packing> +@@ -3052,13 +3299,17 @@ + <property name="label" translatable="yes">Playlist</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> +@@ -3088,6 +3339,9 @@ + <property name="rules_hint">False</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> ++ <property name="fixed_height_mode">False</property> ++ <property name="hover_selection">False</property> ++ <property name="hover_expand">False</property> + </widget> + </child> + </widget> +@@ -3111,6 +3365,7 @@ + <property name="label" translatable="yes"> Save </property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onPreferenceSave" last_modification_time="Fri, 26 Sep 2003 13:26:11 GMT"/> + </widget> + <packing> +@@ -3127,6 +3382,7 @@ + <property name="label" translatable="yes"> Apply </property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onPreferenceApply" last_modification_time="Fri, 26 Sep 2003 13:26:54 GMT"/> + </widget> + <packing> +@@ -3147,6 +3403,7 @@ + <property name="label" translatable="yes"> Cancel </property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> + <signal name="pressed" handler="onPreferenceCancel" last_modification_time="Fri, 26 Sep 2003 13:27:19 GMT"/> + </widget> + <packing> +@@ -3177,13 +3434,17 @@ + <property name="label" translatable="yes">Preference</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> +@@ -3239,6 +3500,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="x">16</property> +@@ -3247,46 +3512,54 @@ + </child> + + <child> +- <widget class="GtkLabel" id="labelAuthors"> ++ <widget class="GtkLabel" id="labelCopyright"> + <property name="width_request">208</property> +- <property name="height_request">32</property> ++ <property name="height_request">16</property> + <property name="visible">True</property> +- <property name="label" translatable="yes">Authors: the VideoLAN Team, http://www.videolan.org/team/</property> ++ <property name="label" translatable="yes">(c) 1996-2004 the VideoLAN team</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_LEFT</property> +- <property name="wrap">True</property> ++ <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="x">16</property> +- <property name="y">72</property> ++ <property name="y">48</property> + </packing> + </child> + + <child> +- <widget class="GtkLabel" id="labelCopyright"> ++ <widget class="GtkLabel" id="labelAuthors"> + <property name="width_request">208</property> +- <property name="height_request">16</property> ++ <property name="height_request">32</property> + <property name="visible">True</property> +- <property name="label" translatable="yes">(c) 1996-2004 the VideoLAN team</property> ++ <property name="label" translatable="yes">Authors: the VideoLAN Team, http://www.videolan.org/team/</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> +- <property name="wrap">False</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> ++ <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="x">16</property> +- <property name="y">48</property> ++ <property name="y">72</property> + </packing> + </child> + +@@ -3305,6 +3578,10 @@ + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="x">48</property> +@@ -3328,13 +3605,17 @@ + <property name="label" translatable="yes">About</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> +- <property name="justify">GTK_JUSTIFY_CENTER</property> ++ <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> ++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> ++ <property name="width_chars">-1</property> ++ <property name="single_line_mode">False</property> ++ <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> +diff -ur vlc-0.8.4a/modules/gui/pda/pda_interface.c vlc-0.8.4a-pda/modules/gui/pda/pda_interface.c +--- vlc-0.8.4a/modules/gui/pda/pda_interface.c 2005-12-11 22:36:19.000000000 +0100 ++++ vlc-0.8.4a-pda/modules/gui/pda/pda_interface.c 2006-04-05 10:50:39.000000000 +0200 +@@ -33,13 +33,17 @@ + GdkPixbuf *pda_icon_pixbuf; + GtkWidget *vbox; + GtkWidget *toolbar; +- GtkWidget *tmp_toolbar_icon; ++ GtkIconSize tmp_toolbar_icon_size; ++ GtkWidget *separatortoolitem1; ++ GtkWidget *tmp_image; + GtkWidget *tbRewind; + GtkWidget *tbPause; + GtkWidget *tbPlay; + GtkWidget *tbStop; + GtkWidget *tbForward; ++ GtkWidget *separatortoolitem2; + GtkWidget *tbAbout; ++ GtkWidget *toolitem1; + GtkWidget *timeLabel; + GtkWidget *timeSlider; + GtkWidget *notebook; +@@ -198,8 +202,8 @@ + GtkWidget *fixed2; + GtkWidget *aboutImage; + GtkWidget *labelDescription; +- GtkWidget *labelAuthors; + GtkWidget *labelCopyright; ++ GtkWidget *labelAuthors; + GtkWidget *labelProgramName; + GtkWidget *about; + GtkTooltips *tooltips; +@@ -228,89 +232,81 @@ + gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 5); + gtk_widget_set_size_request (toolbar, 240, 22); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); ++ tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar)); + +- gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); +- +- tmp_toolbar_icon = create_pixmap (pda, "pda-rewindb16x16.xpm"); +- tbRewind = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), +- GTK_TOOLBAR_CHILD_BUTTON, +- NULL, +- _("Rewind"), +- _("Rewind"), NULL, +- tmp_toolbar_icon, NULL, NULL); +- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); ++ separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new (); ++ gtk_widget_set_name (separatortoolitem1, "separatortoolitem1"); ++ gtk_widget_show (separatortoolitem1); ++ gtk_container_add (GTK_CONTAINER (toolbar), separatortoolitem1); ++ ++ tmp_image = create_pixmap (pda, "pda-rewindb16x16.xpm"); ++ gtk_widget_show (tmp_image); ++ tbRewind = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Rewind")); + gtk_widget_set_name (tbRewind, "tbRewind"); + gtk_widget_show (tbRewind); ++ gtk_container_add (GTK_CONTAINER (toolbar), tbRewind); + gtk_widget_set_size_request (tbRewind, 22, 22); ++ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbRewind), tooltips, _("Rewind"), NULL); + +- tmp_toolbar_icon = create_pixmap (pda, "pda-pauseb16x16.xpm"); +- tbPause = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), +- GTK_TOOLBAR_CHILD_BUTTON, +- NULL, +- _("Pause"), +- _("Pause"), NULL, +- tmp_toolbar_icon, NULL, NULL); +- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); ++ tmp_image = create_pixmap (pda, "pda-pauseb16x16.xpm"); ++ gtk_widget_show (tmp_image); ++ tbPause = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Pause")); + gtk_widget_set_name (tbPause, "tbPause"); + gtk_widget_show (tbPause); ++ gtk_container_add (GTK_CONTAINER (toolbar), tbPause); + gtk_widget_set_size_request (tbPause, 22, 22); ++ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbPause), tooltips, _("Pause"), NULL); + +- tmp_toolbar_icon = create_pixmap (pda, "pda-playb16x16.xpm"); +- tbPlay = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), +- GTK_TOOLBAR_CHILD_BUTTON, +- NULL, +- _("Play"), +- _("Play"), NULL, +- tmp_toolbar_icon, NULL, NULL); +- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); ++ tmp_image = create_pixmap (pda, "pda-playb16x16.xpm"); ++ gtk_widget_show (tmp_image); ++ tbPlay = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Play")); + gtk_widget_set_name (tbPlay, "tbPlay"); + gtk_widget_show (tbPlay); ++ gtk_container_add (GTK_CONTAINER (toolbar), tbPlay); + gtk_widget_set_size_request (tbPlay, 22, 22); ++ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbPlay), tooltips, _("Play"), NULL); + +- tmp_toolbar_icon = create_pixmap (pda, "pda-stopb16x16.xpm"); +- tbStop = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), +- GTK_TOOLBAR_CHILD_BUTTON, +- NULL, +- _("Stop"), +- _("Stop"), NULL, +- tmp_toolbar_icon, NULL, NULL); +- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); ++ tmp_image = create_pixmap (pda, "pda-stopb16x16.xpm"); ++ gtk_widget_show (tmp_image); ++ tbStop = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Stop")); + gtk_widget_set_name (tbStop, "tbStop"); + gtk_widget_show (tbStop); ++ gtk_container_add (GTK_CONTAINER (toolbar), tbStop); + gtk_widget_set_size_request (tbStop, 22, 22); ++ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbStop), tooltips, _("Stop"), NULL); + +- tmp_toolbar_icon = create_pixmap (pda, "pda-forwardb16x16.xpm"); +- tbForward = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), +- GTK_TOOLBAR_CHILD_BUTTON, +- NULL, +- _("Forward"), +- _("Forward"), NULL, +- tmp_toolbar_icon, NULL, NULL); +- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); ++ tmp_image = create_pixmap (pda, "pda-forwardb16x16.xpm"); ++ gtk_widget_show (tmp_image); ++ tbForward = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Forward")); + gtk_widget_set_name (tbForward, "tbForward"); + gtk_widget_show (tbForward); ++ gtk_container_add (GTK_CONTAINER (toolbar), tbForward); + gtk_widget_set_size_request (tbForward, 22, 22); ++ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbForward), tooltips, _("Forward"), NULL); + +- gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); +- +- tmp_toolbar_icon = create_pixmap (pda, "vlc16x16.png"); +- tbAbout = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), +- GTK_TOOLBAR_CHILD_BUTTON, +- NULL, +- _("About"), +- _("About"), NULL, +- tmp_toolbar_icon, NULL, NULL); +- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); ++ separatortoolitem2 = (GtkWidget*) gtk_separator_tool_item_new (); ++ gtk_widget_set_name (separatortoolitem2, "separatortoolitem2"); ++ gtk_widget_show (separatortoolitem2); ++ gtk_container_add (GTK_CONTAINER (toolbar), separatortoolitem2); ++ ++ tmp_image = create_pixmap (pda, "vlc16x16.png"); ++ gtk_widget_show (tmp_image); ++ tbAbout = (GtkWidget*) gtk_tool_button_new (tmp_image, _("About")); + gtk_widget_set_name (tbAbout, "tbAbout"); + gtk_widget_show (tbAbout); ++ gtk_container_add (GTK_CONTAINER (toolbar), tbAbout); + gtk_widget_set_size_request (tbAbout, 22, 22); ++ gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbAbout), tooltips, _("About"), NULL); ++ ++ toolitem1 = (GtkWidget*) gtk_tool_item_new (); ++ gtk_widget_set_name (toolitem1, "toolitem1"); ++ gtk_widget_show (toolitem1); ++ gtk_container_add (GTK_CONTAINER (toolbar), toolitem1); + +- timeLabel = gtk_label_new (_("00:00:00")); ++ timeLabel = gtk_label_new ("00:00:00"); + gtk_widget_set_name (timeLabel, "timeLabel"); + gtk_widget_show (timeLabel); +- gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); +- +- gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), timeLabel, NULL, NULL); ++ gtk_container_add (GTK_CONTAINER (toolitem1), timeLabel); + + timeSlider = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 6.25, 0))); + gtk_widget_set_name (timeSlider, "timeSlider"); +@@ -372,8 +368,6 @@ + gtk_widget_set_name (vbox5, "vbox5"); + gtk_widget_show (vbox5); + gtk_container_add (GTK_CONTAINER (notebook), vbox5); +- gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (notebook), vbox5, +- TRUE, TRUE, GTK_PACK_START); + + hbox12 = gtk_hbox_new (FALSE, 0); + gtk_widget_set_name (hbox12, "hbox12"); +@@ -393,13 +387,13 @@ + gtk_widget_set_name (comboMRL, "comboMRL"); + gtk_widget_show (comboMRL); + gtk_box_pack_start (GTK_BOX (hbox12), comboMRL, TRUE, TRUE, 0); +- comboMRL_items = g_list_append (comboMRL_items, (gpointer) "udp://@:1234"); +- comboMRL_items = g_list_append (comboMRL_items, (gpointer) "udp6://@:1234"); +- comboMRL_items = g_list_append (comboMRL_items, (gpointer) "rtp://"); +- comboMRL_items = g_list_append (comboMRL_items, (gpointer) "rtp6://"); +- comboMRL_items = g_list_append (comboMRL_items, (gpointer) "ftp://"); +- comboMRL_items = g_list_append (comboMRL_items, (gpointer) "http://"); +- comboMRL_items = g_list_append (comboMRL_items, (gpointer) "mms://"); ++ comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("udp://@:1234")); ++ comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("udp6://@:1234")); ++ comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("rtp://")); ++ comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("rtp6://")); ++ comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("ftp://")); ++ comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("http://")); ++ comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("mms://")); + gtk_combo_set_popdown_strings (GTK_COMBO (comboMRL), comboMRL_items); + g_list_free (comboMRL_items); + +@@ -413,7 +407,7 @@ + gtk_widget_set_name (hseparator15, "hseparator15"); + gtk_widget_show (hseparator15); + gtk_box_pack_start (GTK_BOX (vbox5), hseparator15, FALSE, FALSE, 0); +- gtk_widget_set_size_request (hseparator15, -2, 10); ++ gtk_widget_set_size_request (hseparator15, -1, 10); + + table2 = gtk_table_new (6, 2, FALSE); + gtk_widget_set_name (table2, "table2"); +@@ -426,7 +420,6 @@ + gtk_table_attach (GTK_TABLE (table2), labelNetworkPort, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelNetworkPort), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelNetworkPort), 0, 0.5); + + labelNetworkAddress = gtk_label_new (_("Address:")); +@@ -435,7 +428,6 @@ + gtk_table_attach (GTK_TABLE (table2), labelNetworkAddress, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelNetworkAddress), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelNetworkAddress), 0, 0.5); + + entryNetworkPort_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10); +@@ -484,7 +476,6 @@ + gtk_table_attach (GTK_TABLE (table2), labelNetworkType, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelNetworkType), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelNetworkType), 0, 0.5); + + comboNetworkProtocolType = gtk_combo_new (); +@@ -516,7 +507,6 @@ + gtk_table_attach (GTK_TABLE (table2), labelNetworkProtocol, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelNetworkProtocol), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelNetworkProtocol), 0, 0.5); + + labelNetworkTranscode = gtk_label_new (_("Transcode:")); +@@ -525,7 +515,6 @@ + gtk_table_attach (GTK_TABLE (table2), labelNetworkTranscode, 0, 1, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelNetworkTranscode), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelNetworkTranscode), 0, 0.5); + + checkNetworkTranscode = gtk_check_button_new_with_mnemonic (_("enable")); +@@ -578,7 +567,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4lVideDevice, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4lVideDevice), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4lVideDevice), 0, 0.5); + + labelV4LAudioDevice = gtk_label_new (_("Audio:")); +@@ -587,7 +575,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LAudioDevice, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LAudioDevice), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LAudioDevice), 0, 0.5); + + labelV4LChannel = gtk_label_new (_("Channel:")); +@@ -596,7 +583,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LChannel, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LChannel), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LChannel), 0, 0.5); + + labelV4LNorm = gtk_label_new (_("Norm:")); +@@ -605,7 +591,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LNorm, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LNorm), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LNorm), 0, 0.5); + + labelV4LSize = gtk_label_new (_("Size:")); +@@ -614,7 +599,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSize, 0, 1, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LSize), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LSize), 0, 0.5); + + labelV4LFrequency = gtk_label_new (_("Frequency:")); +@@ -623,7 +607,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LFrequency, 0, 1, 5, 6, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LFrequency), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LFrequency), 0, 0.5); + + labelV4LSampleRate = gtk_label_new (_("Samplerate:")); +@@ -632,7 +615,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSampleRate, 0, 1, 6, 7, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LSampleRate), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LSampleRate), 0, 0.5); + + labelV4LQuality = gtk_label_new (_("Quality:")); +@@ -641,7 +623,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LQuality, 0, 1, 7, 8, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LQuality), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LQuality), 0, 0.5); + + labelV4LTuner = gtk_label_new (_("Tuner:")); +@@ -650,7 +631,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTuner, 0, 1, 9, 10, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LTuner), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LTuner), 0, 0.5); + + labelV4LSoundDirection = gtk_label_new (_("Sound:")); +@@ -659,7 +639,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSoundDirection, 0, 1, 8, 9, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LSoundDirection), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LSoundDirection), 0, 0.5); + + labelV4LMJPEG = gtk_label_new (_("MJPEG:")); +@@ -668,7 +647,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LMJPEG, 0, 1, 10, 11, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LMJPEG), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LMJPEG), 0, 0.5); + + labelV4LDecimation = gtk_label_new (_("Decimation:")); +@@ -677,7 +655,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LDecimation, 0, 1, 11, 12, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LDecimation), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LDecimation), 0, 0.5); + + comboV4lVideoDevice = gtk_combo_new (); +@@ -689,9 +666,9 @@ + (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); + gtk_combo_set_value_in_list (GTK_COMBO (comboV4lVideoDevice), TRUE, TRUE); +- comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video"); +- comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video0"); +- comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video1"); ++ comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video")); ++ comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video0")); ++ comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video1")); + gtk_combo_set_popdown_strings (GTK_COMBO (comboV4lVideoDevice), comboV4lVideoDevice_items); + g_list_free (comboV4lVideoDevice_items); + +@@ -708,10 +685,10 @@ + gtk_table_attach (GTK_TABLE (tableV4L), comboV4lAudioDevice, 1, 2, 1, 2, + (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/dsp"); +- comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio"); +- comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio0"); +- comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio1"); ++ comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/dsp")); ++ comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio")); ++ comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio0")); ++ comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio1")); + gtk_combo_set_popdown_strings (GTK_COMBO (comboV4lAudioDevice), comboV4lAudioDevice_items); + g_list_free (comboV4lAudioDevice_items); + +@@ -851,7 +828,6 @@ + gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTranscode, 0, 1, 12, 13, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelV4LTranscode), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelV4LTranscode), 0, 0.5); + + checkV4LTranscode = gtk_check_button_new_with_mnemonic (_("enable")); +@@ -875,7 +851,6 @@ + gtk_widget_set_name (Camera, "Camera"); + gtk_widget_show (Camera); + gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), Camera); +- gtk_label_set_justify (GTK_LABEL (Camera), GTK_JUSTIFY_LEFT); + + vbox1 = gtk_vbox_new (FALSE, 0); + gtk_widget_set_name (vbox1, "vbox1"); +@@ -904,7 +879,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoCodec, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelVideoCodec), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelVideoCodec), 0, 0.5); + + comboVideoCodec = gtk_combo_new (); +@@ -936,7 +910,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrate, 0, 1, 1, 2, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelVideoBitrate), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelVideoBitrate), 0, 0.5); + + labelVideoBitrateTolerance = gtk_label_new (_("Bitrate Tolerance:")); +@@ -945,7 +918,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrateTolerance, 0, 1, 2, 3, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelVideoBitrateTolerance), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelVideoBitrateTolerance), 0, 0.5); + + labelVideoKeyInterval = gtk_label_new (_("Keyframe Interval:")); +@@ -954,7 +926,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoKeyInterval, 0, 1, 3, 4, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelVideoKeyInterval), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelVideoKeyInterval), 0, 0.5); + + labelAudioCodec = gtk_label_new (_("Audio Codec:")); +@@ -963,7 +934,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioCodec, 0, 1, 5, 6, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelAudioCodec), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelAudioCodec), 0, 0.5); + + labelVideoDeinterlace = gtk_label_new (_("Deinterlace:")); +@@ -972,7 +942,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoDeinterlace, 0, 1, 4, 5, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelVideoDeinterlace), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelVideoDeinterlace), 0, 0.5); + + labelStdAccess = gtk_label_new (_("Access:")); +@@ -981,7 +950,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelStdAccess, 0, 1, 7, 8, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelStdAccess), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelStdAccess), 0, 0.5); + + labelStdMuxer = gtk_label_new (_("Muxer:")); +@@ -990,7 +958,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelStdMuxer, 0, 1, 8, 9, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelStdMuxer), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelStdMuxer), 0, 0.5); + + labelStdUrl = gtk_label_new (_("URL:")); +@@ -999,7 +966,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelStdUrl, 0, 1, 9, 10, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelStdUrl), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelStdUrl), 0, 0.5); + + labelStdTimeToLive = gtk_label_new (_("Time To Live (TTL):")); +@@ -1008,7 +974,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelStdTimeToLive, 0, 1, 10, 11, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelStdTimeToLive), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelStdTimeToLive), 0, 0.5); + + entryStdTTL_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); +@@ -1047,14 +1012,14 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), comboStdMuxer, 1, 2, 8, 9, + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("PS")); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("TS")); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MPEG1")); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("AVI")); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("OGG")); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MP4")); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MOV")); +- comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ASF")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ps")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ts")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mpeg1")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("avi")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ogg")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mp4")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mov")); ++ comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("asf")); + gtk_combo_set_popdown_strings (GTK_COMBO (comboStdMuxer), comboStdMuxer_items); + g_list_free (comboStdMuxer_items); + +@@ -1111,7 +1076,7 @@ + (GtkAttachOptions) (0), 0, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entryVideoKeyFrameInterval), TRUE); + +- entryVideoBitrateTolerance_adj = gtk_adjustment_new (800000, 0, 1e+06, 1, 10, 10); ++ entryVideoBitrateTolerance_adj = gtk_adjustment_new (800000, 0, 1000000, 1, 10, 10); + entryVideoBitrateTolerance = gtk_spin_button_new (GTK_ADJUSTMENT (entryVideoBitrateTolerance_adj), 1, 0); + gtk_widget_set_name (entryVideoBitrateTolerance, "entryVideoBitrateTolerance"); + gtk_widget_show (entryVideoBitrateTolerance); +@@ -1137,7 +1102,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioBitrate, 0, 1, 6, 7, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelAudioBitrate), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelAudioBitrate), 0, 0.5); + + comboStdAccess = gtk_combo_new (); +@@ -1160,7 +1124,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelSAP, 0, 1, 11, 12, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelSAP), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelSAP), 0, 0.5); + + checkSAP = gtk_check_button_new_with_mnemonic (_("enable")); +@@ -1183,7 +1146,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelSLP_, 0, 1, 12, 13, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelSLP_), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelSLP_), 0, 0.5); + + labelAnounceChannel = gtk_label_new (_("Announce Channel:")); +@@ -1192,7 +1154,6 @@ + gtk_table_attach (GTK_TABLE (tableTranscode), labelAnounceChannel, 0, 1, 13, 14, + (GtkAttachOptions) (GTK_FILL), + (GtkAttachOptions) (0), 0, 0); +- gtk_label_set_justify (GTK_LABEL (labelAnounceChannel), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment (GTK_MISC (labelAnounceChannel), 0, 0.5); + + comboAnnounceChannel = gtk_combo_new (); +@@ -1335,28 +1296,28 @@ + gtk_widget_show (labelDescription); + gtk_fixed_put (GTK_FIXED (fixed2), labelDescription, 16, 112); + gtk_widget_set_size_request (labelDescription, 200, 112); +- gtk_label_set_justify (GTK_LABEL (labelDescription), GTK_JUSTIFY_LEFT); + gtk_label_set_line_wrap (GTK_LABEL (labelDescription), TRUE); + ++ labelCopyright = gtk_label_new (_("(c) 1996-2004 the VideoLAN team")); ++ gtk_widget_set_name (labelCopyright, "labelCopyright"); ++ gtk_widget_show (labelCopyright); ++ gtk_fixed_put (GTK_FIXED (fixed2), labelCopyright, 16, 48); ++ gtk_widget_set_size_request (labelCopyright, 208, 16); ++ gtk_label_set_justify (GTK_LABEL (labelCopyright), GTK_JUSTIFY_CENTER); ++ + labelAuthors = gtk_label_new (_("Authors: the VideoLAN Team, http://www.videolan.org/team/")); + gtk_widget_set_name (labelAuthors, "labelAuthors"); + gtk_widget_show (labelAuthors); + gtk_fixed_put (GTK_FIXED (fixed2), labelAuthors, 16, 72); + gtk_widget_set_size_request (labelAuthors, 208, 32); +- gtk_label_set_justify (GTK_LABEL (labelAuthors), GTK_JUSTIFY_LEFT); + gtk_label_set_line_wrap (GTK_LABEL (labelAuthors), TRUE); + +- labelCopyright = gtk_label_new (_("(c) 1996-2004 the the VideoLAN team team")); +- gtk_widget_set_name (labelCopyright, "labelCopyright"); +- gtk_widget_show (labelCopyright); +- gtk_fixed_put (GTK_FIXED (fixed2), labelCopyright, 16, 48); +- gtk_widget_set_size_request (labelCopyright, 208, 16); +- + labelProgramName = gtk_label_new (_("VLC media player")); + gtk_widget_set_name (labelProgramName, "labelProgramName"); + gtk_widget_show (labelProgramName); + gtk_fixed_put (GTK_FIXED (fixed2), labelProgramName, 48, 16); + gtk_widget_set_size_request (labelProgramName, 152, 16); ++ gtk_label_set_justify (GTK_LABEL (labelProgramName), GTK_JUSTIFY_CENTER); + gtk_label_set_line_wrap (GTK_LABEL (labelProgramName), TRUE); + + about = gtk_label_new (_("About")); +@@ -1459,12 +1420,15 @@ + GLADE_HOOKUP_OBJECT_NO_REF (pda, pda, "pda"); + GLADE_HOOKUP_OBJECT (pda, vbox, "vbox"); + GLADE_HOOKUP_OBJECT (pda, toolbar, "toolbar"); ++ GLADE_HOOKUP_OBJECT (pda, separatortoolitem1, "separatortoolitem1"); + GLADE_HOOKUP_OBJECT (pda, tbRewind, "tbRewind"); + GLADE_HOOKUP_OBJECT (pda, tbPause, "tbPause"); + GLADE_HOOKUP_OBJECT (pda, tbPlay, "tbPlay"); + GLADE_HOOKUP_OBJECT (pda, tbStop, "tbStop"); + GLADE_HOOKUP_OBJECT (pda, tbForward, "tbForward"); ++ GLADE_HOOKUP_OBJECT (pda, separatortoolitem2, "separatortoolitem2"); + GLADE_HOOKUP_OBJECT (pda, tbAbout, "tbAbout"); ++ GLADE_HOOKUP_OBJECT (pda, toolitem1, "toolitem1"); + GLADE_HOOKUP_OBJECT (pda, timeLabel, "timeLabel"); + GLADE_HOOKUP_OBJECT (pda, timeSlider, "timeSlider"); + GLADE_HOOKUP_OBJECT (pda, notebook, "notebook"); +@@ -1599,8 +1563,8 @@ + GLADE_HOOKUP_OBJECT (pda, fixed2, "fixed2"); + GLADE_HOOKUP_OBJECT (pda, aboutImage, "aboutImage"); + GLADE_HOOKUP_OBJECT (pda, labelDescription, "labelDescription"); +- GLADE_HOOKUP_OBJECT (pda, labelAuthors, "labelAuthors"); + GLADE_HOOKUP_OBJECT (pda, labelCopyright, "labelCopyright"); ++ GLADE_HOOKUP_OBJECT (pda, labelAuthors, "labelAuthors"); + GLADE_HOOKUP_OBJECT (pda, labelProgramName, "labelProgramName"); + GLADE_HOOKUP_OBJECT (pda, about, "about"); + GLADE_HOOKUP_OBJECT_NO_REF (pda, tooltips, "tooltips"); +diff -ur vlc-0.8.4a/modules/gui/pda/pda_support.h vlc-0.8.4a-pda/modules/gui/pda/pda_support.h +--- vlc-0.8.4a/modules/gui/pda/pda_support.h 2005-12-11 22:36:19.000000000 +0100 ++++ vlc-0.8.4a-pda/modules/gui/pda/pda_support.h 2006-04-05 10:50:39.000000000 +0200 +@@ -15,6 +15,7 @@ + # include <libintl.h> + # undef _ + # define _(String) dgettext (PACKAGE, String) ++# define Q_(String) g_strip_context ((String), gettext (String)) + # ifdef gettext_noop + # define N_(String) gettext_noop (String) + # else +@@ -27,6 +28,7 @@ + # define dcgettext(Domain,Message,Type) (Message) + # define bindtextdomain(Domain,Directory) (Domain) + # define _(String) (String) ++# define Q_(String) g_strip_context ((String), (String)) + # define N_(String) (String) + #endif + diff --git a/packages/vlc/vlc-gpe_0.8.4.bb b/packages/vlc/vlc-gpe_0.8.4.bb new file mode 100644 index 0000000000..70da9c8ff4 --- /dev/null +++ b/packages/vlc/vlc-gpe_0.8.4.bb @@ -0,0 +1,106 @@ +DESCRIPTION = "Video player and streamer - GPE edition" +HOMEPAGE = "http://www.videolan.org" +LICENSE = "GPL" +PRIORITY = "optional" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "gpe" +PR = "r1" + +DEPENDS = "gtk+ freetype gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" + +SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.gz \ + file://pda-interface.patch;patch=1" +S = "${WORKDIR}/vlc-${PV}" + +export GTK2_CFLAGS = "`pkg-config --cflags gtk+-2.0 gthread-2.0`" +export GTK2_LIBS = "`pkg-config --libs gtk+-2.0 gthread-2.0`" +export vlc_WORKAROUNDLDFLAGS = lib/libvlc.a + +inherit autotools + +EXTRA_OECONF = "\ + --enable-sout \ + --disable-httpd \ + --disable-vlm \ + --enable-gnutls \ + --disable-dvdread \ + --disable-dvdnav \ + --disable-smb \ + --enable-dvbpsi \ + --disable-v4l \ + --disable-gnomevfs \ + --disable-libcdio \ + --disable-cddax \ + --disable-libcddb \ + --disable-vcdx \ + --disable-cdda \ + --disable-vcd \ + --disable-screen \ + --disable-ogg \ + --disable-mkv \ + --disable-mod \ + --disable-mpc \ + --enable-mad \ + --enable-ffmpeg \ + --enable-faad \ + --enable-a52 \ + --disable-dts \ + --enable-flac \ + --enable-libmpeg2 \ + --disable-vorbis \ + --enable-tremor \ + --disable-speex \ + --disable-tarkin \ + --disable-theora \ + --disable-png \ + --disable-x264 \ + --disable-cmml \ + --enable-x11 \ + --disable-xvideo \ + --disable-glx \ + --disable-opengl \ + --disable-sdl \ + --enable-freetype \ + --disable-fribidi \ + --disable-libxml2 \ + --disable-qte \ + --disable-qt-video \ + --enable-fb \ + --enable-oss \ + --disable-alsa \ + --disable-skins \ + --disable-skins2 \ + --disable-gtk \ + --disable-gtk2 \ + --enable-pda \ + --disable-gnome \ + --disable-gnome2 \ + --disable-wxwidgets \ + --disable-qt \ + --disable-kde \ + --disable-xosd \ + --disable-visual \ + --disable-goom \ + --disable-slp \ + --disable-daap \ + --disable-bonjour \ + --disable-joystick \ + --disable-plugins \ + --with-ffmpeg-mp3lame \ + --with-ffmpeg-faac \ + --with-ffmpeg-zlib \ +" + +do_install() { + autotools_do_install + + install -d ${D}${datadir}/applications + install -m 644 ipkg/vlc.gpe ${D}${datadir}/applications/vlc-gpe.desktop +} + +FILES_${PN} = "${bindir}/vlc \ + ${datadir}/applications \ + ${datadir}/vlc/pda-* \ + ${datadir}/vlc/vlc*png \ + ${datadir}/vlc/vlc*xpm \ + ${datadir}/vlc/http" diff --git a/packages/xmame/files/.mtn2git_empty b/packages/xmame/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xmame/files/.mtn2git_empty diff --git a/packages/xmame/files/tiny.mak b/packages/xmame/files/tiny.mak new file mode 100644 index 0000000000..d195a98a94 --- /dev/null +++ b/packages/xmame/files/tiny.mak @@ -0,0 +1,127 @@ +# a tiny compile is without Neogeo games + +ASTEROID=1 +#TEMPEST=1 +GALAGA=1 +CENTIPED=1 +#JOUST=1 + +## all games, obtained by : +# nm xmame.x11 | fgrep " driver_"|awk '{print $3}' |sed -e s/driver_// > allgames +## list all clones: +# ./xmame.x11 -listclones|awk '{print $1}'|sort |uniq > allclones +# sed `cat allclones |sed -e 's/^/-e s@^/' -e 's/$/$@@/'` < allgames > allbutclones + +GAMES = 4in1 8ball 8ballact ad2083 alibaba amidar anteater armorcar atlantis azurian bagman bigbucks blkhole bongo botanic bwcasino calipso cannonb catapult cavelon cavenger cclimber checkman chewing ckong conquer cosmos crush darkplnt darkwar dazzler dealer devilfsh diggerc dingo dingoe dkong dkong3 dkongjr dorodon drakton dremshpr drivfrcp eggor eyes frogger galaxian gmgalax goldbug guzzler harem heartatk hero hotshock hunchbak huncholy hustler igmo jumpbug jumpshot kingball ladybug levers lizwiz logger losttomb luctoday mariner mario mars megadon mimonkey minefld moonal2 mooncrst moonqsr moonwar mrkougar mrtnt mshuttle mspacman newsin7 nmouse orbitron ozon1 pacplus phoenix pickin pisces pleiads ponpoko porky puckman racknrol radarscp radarzon raiders redclash redufo rescue revenger rockclim rocktrv2 rpatrolb sbagman scobra scorpion scramble sfx shootbul shootgal skybase snapjack spacefrt spcfrcii spclforc spdcoin sraider stratgyx streakng strtheat superbik superbon suprglob survival swimmer tazmania theend triplep trvchlng turtles uniwars vanvan wallst warofbug woodpek zerohour zigzag + +comma:= , +empty:= +space:= $(empty) $(empty) +COREDEFS += -DTINY_NAME="$(subst $(space),$(comma),$(patsubst %,driver_%,$(GAMES)))" +COREDEFS += -DTINY_POINTER="$(subst $(space),$(comma),$(patsubst %,&driver_%,$(GAMES)))" + +# uses these CPUs +CPUS+=Z80@ +CPUS+=8085A@ +CPUS+=M6502@ +CPUS+=N2A03@ +CPUS+=I8035@ +CPUS+=I8039@ +CPUS+=S2650@ + +# uses these SOUNDs +SOUNDS+=DAC@ +SOUNDS+=SAMPLES@ +SOUNDS+=CUSTOM@ + +# basic set: pacman + dkong + galaxian + mario ... +SOUNDS+=AY8910@ +SOUNDS+=NAMCO@ +SOUNDS+=SN76496@ +SOUNDS+=TMS5110@ +SOUNDS+=NES@ +SOUNDS+=TMS36XX@ +SOUNDS+=DISCRETE@ +OBJS = \ + $(OBJ)/vidhrdw/pacman.o $(OBJ)/drivers/pacman.o \ + $(OBJ)/machine/mspacman.o $(OBJ)/machine/pacplus.o \ + $(OBJ)/machine/jumpshot.o $(OBJ)/machine/theglobp.o \ + $(OBJ)/machine/acitya.o \ + $(OBJ)/drivers/epos.o $(OBJ)/vidhrdw/epos.o \ + $(OBJ)/vidhrdw/dkong.o $(OBJ)/sndhrdw/dkong.o $(OBJ)/drivers/dkong.o \ + $(OBJ)/machine/strtheat.o $(OBJ)/machine/drakton.o \ + $(OBJ)/machine/scramble.o $(OBJ)/sndhrdw/scramble.o $(OBJ)/drivers/scramble.o \ + $(OBJ)/drivers/frogger.o \ + $(OBJ)/drivers/scobra.o \ + $(OBJ)/drivers/amidar.o \ + $(OBJ)/vidhrdw/galaxian.o $(OBJ)/sndhrdw/galaxian.o $(OBJ)/drivers/galaxian.o \ + $(OBJ)/vidhrdw/cclimber.o $(OBJ)/sndhrdw/cclimber.o $(OBJ)/drivers/cclimber.o \ + $(OBJ)/drivers/cvs.o $(OBJ)/vidhrdw/cvs.o $(OBJ)/vidhrdw/s2636.o \ + $(OBJ)/vidhrdw/mario.o $(OBJ)/sndhrdw/mario.o $(OBJ)/drivers/mario.o \ + $(OBJ)/machine/bagman.o $(OBJ)/vidhrdw/bagman.o $(OBJ)/drivers/bagman.o \ + $(OBJ)/vidhrdw/phoenix.o $(OBJ)/sndhrdw/phoenix.o $(OBJ)/drivers/phoenix.o \ + $(OBJ)/sndhrdw/pleiads.o \ + $(OBJ)/vidhrdw/ladybug.o $(OBJ)/drivers/ladybug.o \ + $(OBJ)/vidhrdw/redclash.o $(OBJ)/drivers/redclash.o \ + $(OBJ)/machine/8255ppi.o $(OBJ)/machine/7474.o \ + $(OBJ)/vidhrdw/res_net.o \ + +ifdef ASTEROID +GAMES += astdelux asteroid llander +SOUNDS+=POKEY@ +OBJS += \ + $(OBJ)/machine/atari_vg.o \ + $(OBJ)/machine/asteroid.o $(OBJ)/sndhrdw/asteroid.o \ + $(OBJ)/sndhrdw/llander.o $(OBJ)/drivers/asteroid.o \ + $(OBJ)/vidhrdw/avgdvg.o \ + +ifdef TEMPEST +GAMES += esb starwars tempest +SOUNDS+=TMS5220@ +OBJS += \ + $(OBJ)/machine/mathbox.o \ + $(OBJ)/drivers/tempest.o \ + $(OBJ)/machine/starwars.o \ + $(OBJ)/drivers/starwars.o $(OBJ)/sndhrdw/starwars.o \ + $(OBJ)/machine/slapstic.o \ + +endif +endif + +ifdef GALAGA +GAMES += bosco digdug galaga xevious +SOUNDS+=NAMCO_52XX@ +SOUNDS+=NAMCO_54XX@ +OBJS += \ + $(OBJ)/vidhrdw/bosco.o \ + $(OBJ)/vidhrdw/galaga.o $(OBJ)/drivers/galaga.o \ + $(OBJ)/vidhrdw/digdug.o \ + $(OBJ)/vidhrdw/xevious.o $(OBJ)/machine/xevious.o \ + $(OBJ)/machine/namcoio.o \ + +endif + +ifdef CENTIPED +GAMES += bullsdrt centiped milliped warlords +OBJS += \ + $(OBJ)/vidhrdw/centiped.o $(OBJ)/drivers/centiped.o \ + $(OBJ)/machine/random.o \ + +endif + +ifdef JOUST +GAMES += blaster bubbles colony7 defender inferno jin joust joust2 lottofun mayday mysticm playball robotron sinistar spdball splat stargate tshoot +CPUS+=M6809@ +CPUS+=M6808@ +SOUNDS+=YM2151@ +SOUNDS+=HC55516@ +SOUNDS+=OKIM6295@ +OBJS += \ + $(OBJ)/machine/williams.o $(OBJ)/vidhrdw/williams.o $(OBJ)/sndhrdw/williams.o $(OBJ)/drivers/williams.o \ + $(OBJ)/machine/6821pia.o \ + $(OBJ)/machine/ticket.o \ + +endif + +# MAME specific core objs +COREOBJS += $(OBJ)/tiny.o $(OBJ)/cheat.o diff --git a/packages/xmame/xmame-tiny_0.100.bb b/packages/xmame/xmame-tiny_0.100.bb new file mode 100644 index 0000000000..0aa85533b3 --- /dev/null +++ b/packages/xmame/xmame-tiny_0.100.bb @@ -0,0 +1,9 @@ +include xmame_${PV}.bb + +DESCRIPTION = "Multiple Arcade Machine Emulator based on SDL (tiny version)" +TINY = 1 +SRC_URI += " file://tiny.mak" + +do_compile_prepend () { + cp ${WORKDIR}/tiny.mak ${S}/src/mame.mak +} diff --git a/packages/xmame/xmame_0.100.bb b/packages/xmame/xmame_0.100.bb new file mode 100644 index 0000000000..34090d33a8 --- /dev/null +++ b/packages/xmame/xmame_0.100.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Multiple Arcade Machine Emulator based on SDL" +LICENSE = "xmame" +SECTION = "games" +PRIORITY = "optional" +DEPENDS = "expat virtual/libsdl libsdl-mixer" + +SRC_URI = "http://x.mame.net/download/historic/xmame-${PV}.tar.bz2 file://tiny.mak" +S = "${WORKDIR}/xmame-${PV}" + +inherit flow-lossage + +do_compile() { + test -z "${TINY}" && oe_runmake TARGET="mame" CC="${BUILD_CC}" maketree xmame.obj/cpu/m68000/m68kmake + oe_runmake TARGET="mame" JOY_SDL=1 SOUND_SDL=1 DISPLAY_METHOD=SDL \ + CC="${CC}" CXX="${CXX}" CFLAGS="-I. -Isrc -Isrc/include -Isrc/unix ${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" LD="${CC}" LDFLAGS="${LDFLAGS}" \ + RANLIB="${RANLIB}" MY_CPU="${TARGET_ARCH}" ARCH="${TARGET_OS}" \ + GLLIBS="" STRIP="${STRIP}" AR="${AR}" +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 xmame.SDL ${D}${bindir} +} diff --git a/packages/xmame/xmame_0.86.bb b/packages/xmame/xmame_0.86.bb index e2f343cf26..a5801e73da 100644 --- a/packages/xmame/xmame_0.86.bb +++ b/packages/xmame/xmame_0.86.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Multiple Arcade Machine Emulator based on SDL" LICENSE = "xmame" -SECTION = "opie/games" +SECTION = "games" PRIORITY = "optional" -DEPENDS = "expat libsdl-qpe libsdl-mixer" +DEPENDS = "expat virtual/libsdl libsdl-mixer" -SRC_URI = "http://x.mame.net/download/${P}.tar.bz2 \ +SRC_URI = "http://x.mame.net/download/historic/${P}.tar.bz2 \ file://${FILESDIR}/crosscompile.patch;patch=1" inherit flow-lossage diff --git a/packages/xmame/xmame_0.87.bb b/packages/xmame/xmame_0.87.bb index 0a34cc7721..80924ef0c6 100644 --- a/packages/xmame/xmame_0.87.bb +++ b/packages/xmame/xmame_0.87.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Multiple Arcade Machine Emulator based on SDL" LICENSE = "xmame" -SECTION = "opie/games" +SECTION = "games" PRIORITY = "optional" -DEPENDS = "expat libsdl-qpe libsdl-mixer" +DEPENDS = "expat virtual/libsdl libsdl-mixer" -SRC_URI = "http://x.mame.net/download/${P}.tar.bz2" +SRC_URI = "http://x.mame.net/download/historic/${P}.tar.bz2" inherit flow-lossage diff --git a/packages/xmame/xmame_0.95.bb b/packages/xmame/xmame_0.95.bb index 76f2384dcd..80924ef0c6 100644 --- a/packages/xmame/xmame_0.95.bb +++ b/packages/xmame/xmame_0.95.bb @@ -4,7 +4,7 @@ SECTION = "games" PRIORITY = "optional" DEPENDS = "expat virtual/libsdl libsdl-mixer" -SRC_URI = "http://x.mame.net/download/${P}.tar.bz2" +SRC_URI = "http://x.mame.net/download/historic/${P}.tar.bz2" inherit flow-lossage |