From 37a9fc1442f53c519f5c10967b2b018926d1b32e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 16 Oct 2006 13:45:05 +0000 Subject: MAINTAINERS: add myself --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e2efb0ed28..199dc2e8c6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23,6 +23,13 @@ Machines: h3600, h5400 Interests: Kernels, Porting, Distro refinement Recipes: at76c503a, dropbear, handhelds-sa, handhelds-pxa +Person: Graeme Gregory +Mail: dp@xora.org.uk +Website: http://www.xora.org.uk +Interests: Multimedia in gpe and on fbdev, and gtk+ apps on PDA devices. +Recipes: mplayer, xmms, xmms-mad, xmms-tremor, dillo, links, links-x11 +Recipes: epdfview + Person: Holger Hans Peter Freyther Mail: zecke@selfish.org Website: http://www.openembedded.org/~zecke -- cgit v1.2.3 From 7810352ab397b66e7c4f46bddd09bd68e7a0cadf Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Oct 2006 13:57:41 +0000 Subject: conf/machine: remove -common stuff --- conf/machine/blueangel.conf | 2 -- conf/machine/collie.conf | 6 +++--- conf/machine/guinness.conf | 2 +- conf/machine/h3600.conf | 5 ----- conf/machine/h3900.conf | 2 -- conf/machine/include/handheld-common.conf | 23 ----------------------- conf/machine/include/ipaq-common.conf | 7 ------- conf/machine/include/poodle-2.4.conf | 8 ++++---- conf/machine/include/simpad-2.4.conf | 6 +++--- conf/machine/include/smartphone-common.conf | 21 --------------------- conf/machine/include/thinclient-common.conf | 19 ------------------- conf/machine/include/tosa-2.4.conf | 4 ++-- conf/machine/include/zaurus-clamshell-2.4.conf | 4 ++-- conf/machine/ipaq-pxa270.conf | 1 - conf/machine/jornada56x.conf | 1 - conf/machine/netvista.conf | 1 - conf/machine/poodle.conf | 2 -- conf/machine/simpad.conf | 3 +-- conf/machine/tosa.conf | 2 -- 19 files changed, 16 insertions(+), 103 deletions(-) delete mode 100644 conf/machine/include/handheld-common.conf delete mode 100644 conf/machine/include/ipaq-common.conf delete mode 100644 conf/machine/include/smartphone-common.conf delete mode 100644 conf/machine/include/thinclient-common.conf diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf index 251dc8a806..979c002d11 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/blueangel.conf @@ -36,8 +36,6 @@ SERIAL_CONSOLE = "115200 tts/2 vt100" USE_VT = "0" -include conf/machine/include/handheld-common.conf - GUI_MACHINE_CLASS = "smallscreen" ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 0363f05e6b..fcaa2ff046 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,8 +5,9 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ -sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs \ +sharp-sdmmc-support" +BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ altboot" @@ -19,7 +20,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" IMAGE_LINGUAS = "" -include conf/machine/include/handheld-common.conf include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf index 12143edf63..4890f3cecd 100644 --- a/conf/machine/guinness.conf +++ b/conf/machine/guinness.conf @@ -19,5 +19,5 @@ GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_FEATURES = "kernel26 usbhost ext2 pci" -require conf/machine/include/tune-athlonmp.conf +#require conf/machine/include/tune-athlonmp.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index f14b9b24a5..e146860c76 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -15,9 +15,7 @@ ROOT_FLASH_SIZE = "16" H3600_MODULES = "\ h3600-asic \ h3600-micro \ -h3600-microkbd h3600-stowaway \ hwtimer \ -l3-backpaq \ nvrd \ sa1100-cs \ sa1100-ir \ @@ -33,10 +31,7 @@ usb-eth" USE_DEVFS = "1" USE_VT = "0" -IMAGE_LINGUAS = "" -require conf/machine/include/ipaq-common.conf -require conf/machine/include/handheld-common.conf require conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 849cdf8299..8c96ea71b8 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -30,8 +30,6 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_DEVFS_kernel24 = "1" USE_VT = "0" -require conf/machine/include/ipaq-common.conf -require conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf deleted file mode 100644 index d4cd4c1d79..0000000000 --- a/conf/machine/include/handheld-common.conf +++ /dev/null @@ -1,23 +0,0 @@ -HANDHELD_MODULES = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -ide-cs ide-disk ide-probe-mod \ -loop \ -vfat ext2 \ -sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \ -pcnet-cs serial-cs airo-cs \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ -input uinput \ -" - -# Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" - -INHERIT += "linux-kernel-base" diff --git a/conf/machine/include/ipaq-common.conf b/conf/machine/include/ipaq-common.conf deleted file mode 100644 index eb696cf9f9..0000000000 --- a/conf/machine/include/ipaq-common.conf +++ /dev/null @@ -1,7 +0,0 @@ -IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" - -BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" -BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf index 5453fda605..a897f7e174 100644 --- a/conf/machine/include/poodle-2.4.conf +++ b/conf/machine/include/poodle-2.4.conf @@ -1,10 +1,10 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ -kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor \ +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs sharp-sdmmc-support \ hostap-utils prism3-firmware prism3-support" +BOOTSTRAP_EXTRA_RRECOMMENDS = "kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ +kernel-module-usbdcore kernel-module-usbdmonitor" diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf index b5fda186ca..483ead1398 100644 --- a/conf/machine/include/simpad-2.4.conf +++ b/conf/machine/include/simpad-2.4.conf @@ -1,7 +1,7 @@ PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules orinoco-modules \ -orinoco-modules-cs pcmcia-cs apm hostap-utils wpa-supplicant-nossl" +BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules \ + pcmcia-cs apm hostap-utils wpa-supplicant-nossl" diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf deleted file mode 100644 index 70beba2562..0000000000 --- a/conf/machine/include/smartphone-common.conf +++ /dev/null @@ -1,21 +0,0 @@ -HANDHELD_MODULES = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -nls-base nls-cp437 nls-iso8859-1 \ -fat vfat \ -loop \ -rfcomm bnep l2cap sco hci_uart hidp \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ -input uinput \ -" - -# Configuration bits for "generic samrtphone" -BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" - -INHERIT += "linux-kernel-base" diff --git a/conf/machine/include/thinclient-common.conf b/conf/machine/include/thinclient-common.conf deleted file mode 100644 index 16f7702d91..0000000000 --- a/conf/machine/include/thinclient-common.conf +++ /dev/null @@ -1,19 +0,0 @@ -THINCLIENT_MODULES = "ipv6 \ -mip6-mn \ -tun \ -loop \ -vfat \ -sunrpc nfs \ -rfcomm bnep l2cap sco \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty \ -input uinput \ -" - -# Configuration bits for "generic thinclient" -BOOTSTRAP_EXTRA_RDEPENDS += "apm" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}" - -INHERIT += "linux-kernel-base" diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 068d8c4677..dfa24d499b 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -2,14 +2,14 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils keymaps \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ kernel-module-pxa-bi kernel-module-registers \ kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel hostap-modules-cs orinoco-modules-cs \ + kernel hostap-modules-cs \ sharp-sdmmc-support kernel-module-pxa-bi \ kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index 5c8fce4398..3fbe43adbc 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -7,9 +7,9 @@ PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" +PREFERRED_VERSION_ = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ +BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools keymaps irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin " diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index ad2120ef6c..0b2bef338a 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -33,7 +33,6 @@ PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key" SERIAL_CONSOLE = "115200 ttyS0" -include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index c1f918f662..a4a6af1f71 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -12,5 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -include conf/machine/include/handheld-common.conf include conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 2b9b572024..f5787e6448 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -21,4 +21,3 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" #udevdir = "/dev" -include conf/thinclient-common.conf diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 49eaf1ef4b..fc8fb718f2 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -14,8 +14,6 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE EXTRA_IMAGEDEPENDS += "zaurus-updater" -include conf/machine/include/handheld-common.conf - ROOT_FLASH_SIZE = "22" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 2777e688bb..13943bae39 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" BOOTSTRAP_EXTRA_RDEPENDS += "kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs orinoco-modules-cs \ +BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ kernel-module-pcnet-cs kernel-module-8390" @@ -26,6 +26,5 @@ ROOT_FLASH_SIZE = "16" USE_VT = "0" GPE_EXTRA_INSTALL += "suspend-desktop" -require conf/machine/include/handheld-common.conf require conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index a6b4caf6fd..e7f2aa204a 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -18,8 +18,6 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_INSTALL += "gaim" ROOT_FLASH_SIZE = "28" -include conf/machine/include/handheld-common.conf - # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/include/tune-xscale.conf -- cgit v1.2.3 From e20f26d7814ebcfccb5a02cd609bf9892c234c7e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Oct 2006 13:59:14 +0000 Subject: rename xorg-lib to something more appropriate --- .../freedesktop-premodular-xlibs/.mtn2git_empty | 0 .../freedesktop-premodular-xlibs/diet-x11_6.2.1.bb | 10 ++++++ .../freedesktop-premodular-xlibs/libx11_6.2.1.bb | 41 ++++++++++++++++++++++ .../freedesktop-premodular-xlibs/libxau_0.1.1.bb | 18 ++++++++++ .../libxcursor_1.1.2.bb | 18 ++++++++++ .../freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb | 18 ++++++++++ .../freedesktop-premodular-xlibs/libxext_cvs.bb | 18 ++++++++++ .../libxfixes_2.0.1.bb | 16 +++++++++ .../freedesktop-premodular-xlibs/libxft_2.1.6.bb | 28 +++++++++++++++ .../libxrender_0.8.4.bb | 16 +++++++++ .../xextensions_1.0.1.bb | 13 +++++++ .../freedesktop-premodular-xlibs/xtrans_0.1.bb | 15 ++++++++ packages/obsolete/xorg-lib/.mtn2git_empty | 0 packages/obsolete/xorg-lib/diet-x11_6.2.1.bb | 10 ------ packages/obsolete/xorg-lib/libx11_6.2.1.bb | 41 ---------------------- packages/obsolete/xorg-lib/libxau_0.1.1.bb | 18 ---------- packages/obsolete/xorg-lib/libxcursor_1.1.2.bb | 18 ---------- packages/obsolete/xorg-lib/libxdmcp_0.1.3.bb | 18 ---------- packages/obsolete/xorg-lib/libxext_cvs.bb | 18 ---------- packages/obsolete/xorg-lib/libxfixes_2.0.1.bb | 16 --------- packages/obsolete/xorg-lib/libxft_2.1.6.bb | 28 --------------- packages/obsolete/xorg-lib/libxrender_0.8.4.bb | 16 --------- packages/obsolete/xorg-lib/xextensions_1.0.1.bb | 13 ------- packages/obsolete/xorg-lib/xtrans_0.1.bb | 15 -------- 24 files changed, 211 insertions(+), 211 deletions(-) create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb create mode 100644 packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb delete mode 100644 packages/obsolete/xorg-lib/.mtn2git_empty delete mode 100644 packages/obsolete/xorg-lib/diet-x11_6.2.1.bb delete mode 100644 packages/obsolete/xorg-lib/libx11_6.2.1.bb delete mode 100644 packages/obsolete/xorg-lib/libxau_0.1.1.bb delete mode 100644 packages/obsolete/xorg-lib/libxcursor_1.1.2.bb delete mode 100644 packages/obsolete/xorg-lib/libxdmcp_0.1.3.bb delete mode 100644 packages/obsolete/xorg-lib/libxext_cvs.bb delete mode 100644 packages/obsolete/xorg-lib/libxfixes_2.0.1.bb delete mode 100644 packages/obsolete/xorg-lib/libxft_2.1.6.bb delete mode 100644 packages/obsolete/xorg-lib/libxrender_0.8.4.bb delete mode 100644 packages/obsolete/xorg-lib/xextensions_1.0.1.bb delete mode 100644 packages/obsolete/xorg-lib/xtrans_0.1.bb diff --git a/packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty b/packages/obsolete/freedesktop-premodular-xlibs/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb new file mode 100644 index 0000000000..b58c45026c --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/diet-x11_6.2.1.bb @@ -0,0 +1,10 @@ +SECTION = "x11/base" +require libx11_${PV}.bb + +EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" + +SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ + file://xim.patch;patch=1" + + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb new file mode 100644 index 0000000000..4ce6871947 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libx11_6.2.1.bb @@ -0,0 +1,41 @@ +SECTION = "x11/libs" +LICENSE = "XFree86" +PRIORITY = "optional" +DEPENDS = "xproto xextensions libxau xtrans libxdmcp" +PROVIDES = "virtual/libx11" +RPROVIDES = "virtual/libx11" +DESCRIPTION = "Base X libs." +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" +PR = "r4" + +SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ + file://errordb-keysymdb-path-fix.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libX11-${PV}" + +inherit autotools pkgconfig + +do_compile() { + ( + unset CC LD CXX CCLD +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys + ) + oe_runmake +} + +do_stage() { + install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h + install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h + install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h + install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h + install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h + install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h + install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h + install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h + install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h + + oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb new file mode 100644 index 0000000000..00fbc92db6 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxau_0.1.1.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +LICENSE= "MIT" +PRIORITY = "optional" +DEPENDS = "xproto" +PROVIDES = "xau" +DESCRIPTION = "Authorization Protocol for X." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXau-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb new file mode 100644 index 0000000000..8ed426fec3 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxcursor_1.1.2.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +PRIORITY = "optional" +DESCRIPTION = "X Cursor library" +DEPENDS = "libxfixes" +PR = "r2" + +SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXcursor-${PV}" +FILES_${PN} += "${libdir}/libXcursor.so" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb new file mode 100644 index 0000000000..f7ea15ea0c --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxdmcp_0.1.3.bb @@ -0,0 +1,18 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE= "MIT" +DEPENDS = "xproto" +PROVIDES = "xdmcp" +DESCRIPTION = "X Display Manager Control Protocol library." +PR = "r1" +S = "${WORKDIR}/libXdmcp-${PV}" + +SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb new file mode 100644 index 0000000000..3e1ff1ab05 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxext_cvs.bb @@ -0,0 +1,18 @@ +# "+" is missing due to bug in Familiar +PV = "0.0cvs${SRCDATE}" +PR = "r1" +LICENSE= "MIT" +DESCRIPTION = "X Server Extension library" +SECTION = "x11/libs" +PRIORITY = "optional" +DEPENDS = "xproto virtual/libx11 xextensions" +PROVIDES = "xext" + +SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" +S = "${WORKDIR}/Xext" + +inherit autotools pkgconfig +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb new file mode 100644 index 0000000000..14174bf9a1 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxfixes_2.0.1.bb @@ -0,0 +1,16 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +DEPENDS = "virtual/libx11 fixesext" +DESCRIPTION = "X Fixes extension library." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXfixes-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb new file mode 100644 index 0000000000..d6b51ca55d --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxft_2.1.6.bb @@ -0,0 +1,28 @@ +SECTION = "x11/libs" +LICENSE = "MIT-X" +DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" +DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." +PROVIDES = "xft" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXft-${PV}" + +FILES_${PN} = ${libdir}/lib*.so.* +FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir} + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb new file mode 100644 index 0000000000..58d2ab33f6 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/libxrender_0.8.4.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +DEPENDS = "renderext virtual/libx11" +DESCRIPTION = "X Render extension library." +LICENSE = "BSD" +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXrender-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb new file mode 100644 index 0000000000..ab8895e0a5 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/xextensions_1.0.1.bb @@ -0,0 +1,13 @@ +SECTION = "x11/libs" +LICENSE= "BSD-X" +DESCRIPTION = "various extension headers." + +SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2" +S = "${WORKDIR}/xextensions-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb b/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb new file mode 100644 index 0000000000..f6afd506e2 --- /dev/null +++ b/packages/obsolete/freedesktop-premodular-xlibs/xtrans_0.1.bb @@ -0,0 +1,15 @@ +SECTION = "x11/libs" +LICENSE = "MIT" +DESCRIPTION = "network API translation layer to \ +insulate X applications and libraries from OS \ +network vageries." + +SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2" +S = "${WORKDIR}/libXtrans-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/obsolete/xorg-lib/.mtn2git_empty b/packages/obsolete/xorg-lib/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/obsolete/xorg-lib/diet-x11_6.2.1.bb b/packages/obsolete/xorg-lib/diet-x11_6.2.1.bb deleted file mode 100644 index b58c45026c..0000000000 --- a/packages/obsolete/xorg-lib/diet-x11_6.2.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "x11/base" -require libx11_${PV}.bb - -EXTRA_OECONF = "--disable-xcms --disable-xlocale --disable-xkb" -CFLAGS += "-D_GNU_SOURCE" - -SRC_URI += "file://fix-utf8-wrong-define.patch;patch=1 \ - file://xim.patch;patch=1" - - diff --git a/packages/obsolete/xorg-lib/libx11_6.2.1.bb b/packages/obsolete/xorg-lib/libx11_6.2.1.bb deleted file mode 100644 index 4ce6871947..0000000000 --- a/packages/obsolete/xorg-lib/libx11_6.2.1.bb +++ /dev/null @@ -1,41 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "XFree86" -PRIORITY = "optional" -DEPENDS = "xproto xextensions libxau xtrans libxdmcp" -PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" -DESCRIPTION = "Base X libs." -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" -PR = "r4" - -SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ - file://errordb-keysymdb-path-fix.patch;patch=1 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libX11-${PV}" - -inherit autotools pkgconfig - -do_compile() { - ( - unset CC LD CXX CCLD -# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -C src/util 'CFLAGS= -D_GNU_SOURCE' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makekeys - ) - oe_runmake -} - -do_stage() { - install -c -m 644 include/X11/XKBlib.h ${STAGING_INCDIR}/X11/XKBlib.h - install -c -m 644 include/X11/Xcms.h ${STAGING_INCDIR}/X11/Xcms.h - install -c -m 644 include/X11/Xlib.h ${STAGING_INCDIR}/X11/Xlib.h - install -c -m 644 include/X11/Xlibint.h ${STAGING_INCDIR}/X11/Xlibint.h - install -c -m 644 include/X11/Xlocale.h ${STAGING_INCDIR}/X11/Xlocale.h - install -c -m 644 include/X11/Xresource.h ${STAGING_INCDIR}/X11/Xresource.h - install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h - install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h - install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h - - oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR} -} - diff --git a/packages/obsolete/xorg-lib/libxau_0.1.1.bb b/packages/obsolete/xorg-lib/libxau_0.1.1.bb deleted file mode 100644 index 00fbc92db6..0000000000 --- a/packages/obsolete/xorg-lib/libxau_0.1.1.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "MIT" -PRIORITY = "optional" -DEPENDS = "xproto" -PROVIDES = "xau" -DESCRIPTION = "Authorization Protocol for X." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXau-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/xorg-lib/libxcursor_1.1.2.bb b/packages/obsolete/xorg-lib/libxcursor_1.1.2.bb deleted file mode 100644 index 8ed426fec3..0000000000 --- a/packages/obsolete/xorg-lib/libxcursor_1.1.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -PRIORITY = "optional" -DESCRIPTION = "X Cursor library" -DEPENDS = "libxfixes" -PR = "r2" - -SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXcursor-${PV}" -FILES_${PN} += "${libdir}/libXcursor.so" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/xorg-lib/libxdmcp_0.1.3.bb b/packages/obsolete/xorg-lib/libxdmcp_0.1.3.bb deleted file mode 100644 index f7ea15ea0c..0000000000 --- a/packages/obsolete/xorg-lib/libxdmcp_0.1.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/libs" -PRIORITY = "optional" -LICENSE= "MIT" -DEPENDS = "xproto" -PROVIDES = "xdmcp" -DESCRIPTION = "X Display Manager Control Protocol library." -PR = "r1" -S = "${WORKDIR}/libXdmcp-${PV}" - -SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/xorg-lib/libxext_cvs.bb b/packages/obsolete/xorg-lib/libxext_cvs.bb deleted file mode 100644 index 3e1ff1ab05..0000000000 --- a/packages/obsolete/xorg-lib/libxext_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -# "+" is missing due to bug in Familiar -PV = "0.0cvs${SRCDATE}" -PR = "r1" -LICENSE= "MIT" -DESCRIPTION = "X Server Extension library" -SECTION = "x11/libs" -PRIORITY = "optional" -DEPENDS = "xproto virtual/libx11 xextensions" -PROVIDES = "xext" - -SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=Xext" -S = "${WORKDIR}/Xext" - -inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/xorg-lib/libxfixes_2.0.1.bb b/packages/obsolete/xorg-lib/libxfixes_2.0.1.bb deleted file mode 100644 index 14174bf9a1..0000000000 --- a/packages/obsolete/xorg-lib/libxfixes_2.0.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DEPENDS = "virtual/libx11 fixesext" -DESCRIPTION = "X Fixes extension library." -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXfixes-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/xorg-lib/libxft_2.1.6.bb b/packages/obsolete/xorg-lib/libxft_2.1.6.bb deleted file mode 100644 index d6b51ca55d..0000000000 --- a/packages/obsolete/xorg-lib/libxft_2.1.6.bb +++ /dev/null @@ -1,28 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "virtual/libx11 xproto libxrender freetype fontconfig" -DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." -PROVIDES = "xft" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXft-${PV}" - -FILES_${PN} = ${libdir}/lib*.so.* -FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir} - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libxft2', d) - bb.build.exec_func('package_do_package', d) -} - diff --git a/packages/obsolete/xorg-lib/libxrender_0.8.4.bb b/packages/obsolete/xorg-lib/libxrender_0.8.4.bb deleted file mode 100644 index 58d2ab33f6..0000000000 --- a/packages/obsolete/xorg-lib/libxrender_0.8.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -DEPENDS = "renderext virtual/libx11" -DESCRIPTION = "X Render extension library." -LICENSE = "BSD" -PR = "r1" - -SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ - file://autofoo.patch;patch=1" -S = "${WORKDIR}/libXrender-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/xorg-lib/xextensions_1.0.1.bb b/packages/obsolete/xorg-lib/xextensions_1.0.1.bb deleted file mode 100644 index ab8895e0a5..0000000000 --- a/packages/obsolete/xorg-lib/xextensions_1.0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "x11/libs" -LICENSE= "BSD-X" -DESCRIPTION = "various extension headers." - -SRC_URI = "${XLIBS_MIRROR}/xextensions-${PV}.tar.bz2" -S = "${WORKDIR}/xextensions-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - diff --git a/packages/obsolete/xorg-lib/xtrans_0.1.bb b/packages/obsolete/xorg-lib/xtrans_0.1.bb deleted file mode 100644 index f6afd506e2..0000000000 --- a/packages/obsolete/xorg-lib/xtrans_0.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SECTION = "x11/libs" -LICENSE = "MIT" -DESCRIPTION = "network API translation layer to \ -insulate X applications and libraries from OS \ -network vageries." - -SRC_URI = "${XLIBS_MIRROR}/libXtrans-0.1.tar.bz2" -S = "${WORKDIR}/libXtrans-${PV}" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} - -- cgit v1.2.3 From 135a943cc59f3c542b195369716867c55ddecc1c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Oct 2006 14:06:49 +0000 Subject: poodle2.4.conf: remove spurious commit --- conf/machine/include/poodle-2.4.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf index a897f7e174..cbf150f3ec 100644 --- a/conf/machine/include/poodle-2.4.conf +++ b/conf/machine/include/poodle-2.4.conf @@ -1,7 +1,7 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 -PREFERRED_VERSION_ = "0.13e" +PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs sharp-sdmmc-support \ hostap-utils prism3-firmware prism3-support" -- cgit v1.2.3