From 3e3e8b967a0d6a1c15dabd4b6c6c85d80b5737ad Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 2 Aug 2006 20:22:16 +0000 Subject: python-pyxml 0.8.4 remove bogus PV override --- packages/python/python-pyxml_0.8.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb index b5d277916d..edf1d21542 100644 --- a/packages/python/python-pyxml_0.8.4.bb +++ b/packages/python/python-pyxml_0.8.4.bb @@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "PSF" RDEPENDS = "python-core python-xml python-netclient" SRCNAME = "pyxml" -PV = "0.8.3" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" S = "${WORKDIR}/PyXML-${PV}" -- cgit v1.2.3 From de2f7350cfcbe11d0861d0cf23719e918f164475 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 2 Aug 2006 21:27:46 +0000 Subject: python 2.4.3 manifest fixes. closes #1268 and #1269 --- packages/python/python-2.4.3-manifest.inc | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index 92db34115b..82c886658c 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Sat Jul 8 12:48:43 2006 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer ] on Wed Aug 2 23:25:58 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,9 +8,14 @@ ######################################################################################################################## -PROVIDES+="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-profile " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " + +DESCRIPTION_python-profile="Python Basic Profiling Support" +PR_python-profile="ml0" +RDEPENDS_python-profile="python-core" +FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " DESCRIPTION_python-threading="Python Threading & Synchronization Support" PR_python-threading="ml0" @@ -130,7 +135,7 @@ FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" PR_python-netclient="ml1" RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" -FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* ${libdir}/python2.4/Cookie.*" +FILES_python-netclient="${libdir}/python2.4/*Cookie*.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" PR_python-pprint="ml0" @@ -162,6 +167,11 @@ PR_python-readline="ml0" RDEPENDS_python-readline="python-core libreadline4" FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " +DESCRIPTION_python-subprocess="Python Subprocess Support" +PR_python-subprocess="ml0" +RDEPENDS_python-subprocess="python-core python-io python-re" +FILES_python-subprocess="${libdir}/python2.4/subprocess.* " + DESCRIPTION_python-pydoc="Python Interactive Help Support" PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" @@ -228,8 +238,8 @@ RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml0" -RDEPENDS_python-zlib="python-core libz1" +PR_python-zlib="ml1" +RDEPENDS_python-zlib="python-core" FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" @@ -258,9 +268,4 @@ RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so " -DESCRIPTION_python-profile="Python Profiler Support" -PR_python-profile="ml0" -RDEPENDS_python-profile="python-core" -FILES_python-profile="${libdir}/python2.4/profile.* ${libdir}/python2.4/pstats.* " - -- cgit v1.2.3 From 3798ea72cf90aff1caea5db9f4af1f0e1fe93c55 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:36:34 +0000 Subject: kbproto: update to 1.0.3, needed for kdrive-git --- packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb diff --git a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..8501865871 --- /dev/null +++ b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb @@ -0,0 +1,8 @@ +include xorg-proto-common.inc + +SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-1.0.3" + +#DESCRIPTION = "" + +#DEPENDS += " " -- cgit v1.2.3 From fcc8b4aabe5c8e0d0624d283e5bab5a8af0854ad Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:44:39 +0000 Subject: xserver-kdrive git: fix PV --- packages/xorg-xserver/xserver-kdrive_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index e667e36f2c..0bcb06a6b1 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,4 +1,4 @@ -PV = "0.0+git" +PV = "1.1.0+git" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" @@ -26,7 +26,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ +# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://enable-tslib.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" -- cgit v1.2.3 From b29c3b65131054a4a7f2c3351f94044a65958a9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:48:24 +0000 Subject: xserver-xorg R7.1: fix configure brokenness by telling the ents.def file isn't there --- packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb index 674f1e5e64..42b5bb918d 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -2,6 +2,8 @@ include xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + #DESCRIPTION = "" #DEPENDS += " " -- cgit v1.2.3 From 56be22422d39b604e898f8d19907a849cf63239d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:57:20 +0000 Subject: xserver-kdrive git: include SRCDATE in PV, even if it doesn't make sense for git trees --- packages/xorg-xserver/xserver-kdrive_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 0bcb06a6b1..491e486b3d 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,4 +1,4 @@ -PV = "1.1.0+git" +PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" @@ -43,5 +43,6 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx \ --with-default-font-path=built-ins \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -- cgit v1.2.3 From 2fe6cda0ec331dc71c2b428638b0b0d51f91985a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 11:05:33 +0000 Subject: xserver-kdrive X11R7.1-1.1.0: disable non-compiling dmx --- packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index a7c92dcb83..cfb1294c09 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -39,6 +39,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ --disable-xorg --disable-xorgcfg \ + --disable-dmx \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ --with-default-font-path=built-ins \ -- cgit v1.2.3 From c17c2a421c7e2872dd7465e9e18372da064ffe52 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 11:12:56 +0000 Subject: angstrom-2006.9: prefer a kdrive that actually work :) --- conf/distro/angstrom-2006.9.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index a6354319ca..ef1113659d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -46,6 +46,7 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" +PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" -- cgit v1.2.3 From c17c4f5380bd0a53048c33724b4516a07e3de365 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 11:36:33 +0000 Subject: libsoup: fix #1275 --- packages/gnome/libsoup_2.2.93.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb index 7ee1a1877e..9ee030d5c9 100644 --- a/packages/gnome/libsoup_2.2.93.bb +++ b/packages/gnome/libsoup_2.2.93.bb @@ -13,5 +13,5 @@ FILES_${PN}-doc = "${datadir}" do_stage() { autotools_stage_all - install -m 0644 ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc } -- cgit v1.2.3 From c41e3f4c26b1af6f75f3d6e7ffd5002b03209ac4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 12:27:51 +0000 Subject: angstrom-2006.9: use a newer srcdate for gconf-dbus --- conf/distro/angstrom-2006.9.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index ef1113659d..ce52336a16 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -29,6 +29,7 @@ FEED_URIS += " \ #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" +SRCDATE_gconf-dbus = "20060719" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ -- cgit v1.2.3 From dee9e6650e7b7a6dcdcf048b8d4181439cf89b20 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 12:50:35 +0000 Subject: rgb _X11R7.1-1.0.1: ship rgb.txt --- packages/xorg-app/rgb_X11R7.1-1.0.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb index 4077c44cfb..87194c44b8 100644 --- a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb @@ -1,7 +1,10 @@ include xorg-app-common.inc +PR = "r1" #DESCRIPTION = "" DEPENDS += " xproto util-macros" +FILES_${PN} += "${datadir}/X11" + -- cgit v1.2.3 From 0f59b162e942bbaf773885abb835d5ce7b693ad9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 14:12:14 +0000 Subject: xfwm4.inc: RDEPEND on the default theme --- packages/xfwm4/xfwm4.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 1b137c4261..79c5b59820 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -9,6 +9,7 @@ inherit xfce FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" DEPENDS = "startup-notification virtual/libx11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +RDEPENDS = "xfwm4-theme-default" EXTRA_OECONF += " --enable-startup-notification" -- cgit v1.2.3 From 1e999b4e74fd481ebd8bf6e9d5425c61ce6f451e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 14:18:36 +0000 Subject: xfwm4.inc: sed out pointers to host includes --- packages/xfwm4/xfwm4.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 79c5b59820..fb85b4d9eb 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -14,6 +14,10 @@ RDEPENDS = "xfwm4-theme-default" EXTRA_OECONF += " --enable-startup-notification" +do_configure_append() { + sed -i s:/usr/include/xfce4::g mcs-plugin/Makefile +} + PACKAGES_DYNAMIC = "xfwm4-theme-*" python populate_packages_prepend () { -- cgit v1.2.3 From a9186be867a630194aa070d2bf567b8de80804ad Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 3 Aug 2006 17:26:30 +0000 Subject: preferred-gpe-versions 2.[67] diet-x11 6.2.1 needs setting PREFERRED_PROVIDER_xextensions = "xextensions" as well --- conf/distro/include/preferred-gpe-versions-2.6.inc | 1 + conf/distro/include/preferred-gpe-versions-2.7.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/distro/include/preferred-gpe-versions-2.6.inc b/conf/distro/include/preferred-gpe-versions-2.6.inc index 1d09ae6051..ae3bc70d9b 100644 --- a/conf/distro/include/preferred-gpe-versions-2.6.inc +++ b/conf/distro/include/preferred-gpe-versions-2.6.inc @@ -32,6 +32,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.14" +PREFERRED_PROVIDER_xextensions = "xextensions" #PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 933195977d..7c45b27342 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -37,6 +37,7 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.15" +PREFERRED_PROVIDER_xextensions = "xextensions" PREFERRED_VERSION_xextensions ?= "1.0.1" PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" -- cgit v1.2.3 From 880e8dba4d2efead6cced6e57f6b99735f904f9b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 3 Aug 2006 17:28:03 +0000 Subject: generic.conf: require preferred-gpe-versions-2.7.inc --- conf/distro/generic.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 9ecdf7de7e..788619a964 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -67,7 +67,7 @@ PREFERRED_PROVIDER_tslib ?= tslib # # GPE # -require conf/distro/include/preferred-gpe-versions.inc +require conf/distro/include/preferred-gpe-versions-2.7.inc # # Opie -- cgit v1.2.3 From 18385db35fe7730b00ed1f0f530749f83948c133 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 3 Aug 2006 18:05:58 +0000 Subject: emacs: Add dated CVS emacs version, make default emacs not use x11, add emacs-x11 --- packages/emacs/emacs-x11_20060801.bb | 3 +++ packages/emacs/emacs-x11_cvs.bb | 5 +++++ packages/emacs/emacs_20060801.bb | 3 +++ packages/emacs/emacs_cvs.bb | 10 ++++++---- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 packages/emacs/emacs-x11_20060801.bb create mode 100644 packages/emacs/emacs-x11_cvs.bb create mode 100644 packages/emacs/emacs_20060801.bb diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb new file mode 100644 index 0000000000..003857e139 --- /dev/null +++ b/packages/emacs/emacs-x11_20060801.bb @@ -0,0 +1,3 @@ +include emacs-x11_cvs.bb +SRCDATE = "${PV}" +DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb new file mode 100644 index 0000000000..874aacae4c --- /dev/null +++ b/packages/emacs/emacs-x11_cvs.bb @@ -0,0 +1,5 @@ +include emacs_cvs.bb +# full X (non-diet) is needed for X support +DEPENDS += "libx11" +EXTRA_OECONF = "" +RREPLACES = "emacs" diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb new file mode 100644 index 0000000000..642ede82fe --- /dev/null +++ b/packages/emacs/emacs_20060801.bb @@ -0,0 +1,3 @@ +include emacs_cvs.bb +SRCDATE = "${PV}" +DEFAULT_PREFERENCE = "0" diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb index 8322e8f512..7e59cb23a0 100644 --- a/packages/emacs/emacs_cvs.bb +++ b/packages/emacs/emacs_cvs.bb @@ -3,14 +3,14 @@ HOMEPAGE = "http://www.gnu.org/software/emacs/" LICENSE = "GPLv2" MAINTAINER = "Justin Patrin " SECTION = "editor" -# full X (non-diet) is needed for X support -DEPENDS = "libx11" # and it needs to run some generated binaries.. DEPENDS += "qemu-native" #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2 # the build gets hung up on compiling certain .el files -PR = "r5" +PR = "r6" + +DEFAULT_PREFERENCE = "-1" SRC_URI = "cvs://anoncvs:anonymous@cvs.savannah.gnu.org/sources/emacs;module=emacs \ file://use-qemu.patch;patch=1" @@ -27,6 +27,8 @@ QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}" LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib" +EXTRA_OECONF = "--without-x" + do_bootstrap() { cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" @@ -45,4 +47,4 @@ do_compile_prepend() { cp "${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}" export QEMU="${QEMU}" -} \ No newline at end of file +} -- cgit v1.2.3 From da38252d950654804f0bdef28550a56db8af0c11 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 3 Aug 2006 18:30:54 +0000 Subject: generic.conf: require preferred-x-versions-pre-X11R7.inc --- conf/distro/generic.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 788619a964..d416842d9d 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -62,7 +62,7 @@ require conf/distro/include/sane-srcdates.inc # PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_tslib ?= tslib - +require conf/distro/include/preferred-x-versions-pre-X11R7.inc # # GPE -- cgit v1.2.3 From 2742ee7881b941263a051424cdacfd06a46da513 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Aug 2006 20:40:08 +0000 Subject: linux-openzaurus: updated pcmcia-ids patch - added one more CF card - patch acked by Alan Cox and added into -mm --- .../hrw-pcmcia-ids-r3.patch | 31 -------------- .../hrw-pcmcia-ids-r4.patch | 48 ++++++++++++++++++++++ .../hrw-pcmcia-ids-r3.patch | 31 -------------- .../hrw-pcmcia-ids-r4.patch | 48 ++++++++++++++++++++++ .../hrw-pcmcia-ids-r3.patch | 31 -------------- .../hrw-pcmcia-ids-r4.patch | 48 ++++++++++++++++++++++ packages/linux/linux-openzaurus_2.6.16.bb | 4 +- packages/linux/linux-openzaurus_2.6.17+git.bb | 4 +- packages/linux/linux-openzaurus_2.6.17.bb | 4 +- 9 files changed, 150 insertions(+), 99 deletions(-) delete mode 100644 packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch create mode 100644 packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch delete mode 100644 packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch create mode 100644 packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch delete mode 100644 packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch create mode 100644 packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch deleted file mode 100644 index b27fd09068..0000000000 --- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch +++ /dev/null @@ -1,31 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -CF card: - product info: "SAMSUNG", "04/05/06", "", "" - manfid : 0x0000, 0x0000 - function 4 (fixed disk) - - -Signed-off-by: Marcin Juszkiewicz - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.17/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200 -@@ -402,6 +402,9 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ -+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), -+ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch new file mode 100644 index 0000000000..5e3a5eaa20 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r4.patch @@ -0,0 +1,48 @@ +From: Marcin Juszkiewicz + +Few cards informations submitted by OpenZaurus users. + +Seagate 8GB microdrive: + product info: "SEAGATE", "ST1" + manfid 0x0111, 0x0000 + +One CF card: + product info: "SAMSUNG", "04/05/06", "", "" + manfid : 0x0000, 0x0000 + +Ridata 8GB Pro 150X Compact Flash Card: + product info: "SMI VENDOR", "SMI PRODUCT", "" + manfid: 0x000a, 0x0000 + + product info: "M-Systems", "CF500", "" + manfid: 0x000a, 0x0000 + +Signed-off-by: Marcin Juszkiewicz + +--- +Patch follow kernel version 2.6.17 + +Please Cc: me - I'm not subscribed to linux-pcmcia or linux-kernel + + ide-cs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux.orig/drivers/ide/legacy/ide-cs.c 2006-07-10 23:25:59.479162976 +0200 ++++ linux/drivers/ide/legacy/ide-cs.c 2006-08-02 23:02:22.997684384 +0200 +@@ -398,10 +398,14 @@ + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDE", 0x547e66dc, 0x5c5ab149), + PCMCIA_DEVICE_PROD_ID12("IO DATA", "PCIDEII", 0x547e66dc, 0xb3662674), + PCMCIA_DEVICE_PROD_ID12("LOOKMEET", "CBIDE2 ", 0xe37be2b5, 0x8671043b), ++ PCMCIA_DEVICE_PROD_ID12("M-Systems", "CF500", 0x7ed2ad87, 0x7a13045c), + PCMCIA_DEVICE_PROD_ID2("NinjaATA-", 0xebe0bd79), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), ++ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d), ++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6), + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 270d6d7060..4a667b895f 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r41" +PR = "r42" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -87,7 +87,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ file://locomo-kbd-hotkeys.patch;patch=1 \ file://locomo-sysrq+keyrepeat.patch;patch=1 \ file://locomo-lcd-def-bightness.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb index 56b79952ac..49e188860e 100644 --- a/packages/linux/linux-openzaurus_2.6.17+git.bb +++ b/packages/linux/linux-openzaurus_2.6.17+git.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r7" +PR = "r8" DEFAULT_PREFERENCE = "-1" @@ -38,7 +38,7 @@ SRC_URI = "git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gi ${RPSRC}/poodle_audio-r0.patch;patch=1 \ ${RPSRC}/nand_sharpsl_fix-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb index 822cfca0bf..09855ef5c6 100644 --- a/packages/linux/linux-openzaurus_2.6.17.bb +++ b/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r14" +PR = "r15" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -48,7 +48,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ ${RPSRC}/poodle_audio-r1.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ - file://hrw-pcmcia-ids-r3.patch;patch=1 \ + file://hrw-pcmcia-ids-r4.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ -- cgit v1.2.3 From 266090bb5ffc806d4ca83f18d56f89d949cce7df Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 4 Aug 2006 01:36:54 +0000 Subject: efl, e17: update to newest versions, remove e as the src/lib dir seems to be gone --- packages/e17/e-wm_0.16.999.027.bb | 40 ------------------------- packages/e17/e-wm_0.16.999.032.bb | 40 +++++++++++++++++++++++++ packages/e17/engage_20060128.bb | 2 +- packages/efl/e_0.16.999.027.bb | 30 ------------------- packages/efl/ecore-fb_0.9.9.027.bb | 27 ----------------- packages/efl/ecore-fb_0.9.9.032.bb | 27 +++++++++++++++++ packages/efl/ecore-native_0.9.9.027.bb | 6 ---- packages/efl/ecore-native_0.9.9.032.bb | 6 ++++ packages/efl/ecore-x11_0.9.9.027.bb | 27 ----------------- packages/efl/ecore-x11_0.9.9.032.bb | 27 +++++++++++++++++ packages/efl/ecore/configure.patch | 15 +++++----- packages/efl/edje-native_0.5.0.027.bb | 25 ---------------- packages/efl/edje-native_0.5.0.032.bb | 25 ++++++++++++++++ packages/efl/edje-utils_0.5.0.027.bb | 23 --------------- packages/efl/edje-utils_0.5.0.032.bb | 23 +++++++++++++++ packages/efl/edje_0.5.0.027.bb | 32 -------------------- packages/efl/edje_0.5.0.032.bb | 32 ++++++++++++++++++++ packages/efl/eet-native_0.9.10.027.bb | 7 ----- packages/efl/eet-native_0.9.10.032.bb | 7 +++++ packages/efl/eet_0.9.10.027.bb | 9 ------ packages/efl/eet_0.9.10.032.bb | 9 ++++++ packages/efl/embryo-native_0.9.1.027.bb | 7 ----- packages/efl/embryo-native_0.9.1.032.bb | 7 +++++ packages/efl/embryo-utils_0.9.1.027.bb | 18 ------------ packages/efl/embryo-utils_0.9.1.032.bb | 18 ++++++++++++ packages/efl/embryo_0.9.1.027.bb | 11 ------- packages/efl/embryo_0.9.1.032.bb | 11 +++++++ packages/efl/evas-fb_0.9.9.027.bb | 47 ----------------------------- packages/efl/evas-fb_0.9.9.032.bb | 47 +++++++++++++++++++++++++++++ packages/efl/evas-native_0.9.9.027.bb | 5 ---- packages/efl/evas-native_0.9.9.032.bb | 5 ++++ packages/efl/evas-x11_0.9.9.027.bb | 52 --------------------------------- packages/efl/evas-x11_0.9.9.032.bb | 52 +++++++++++++++++++++++++++++++++ 33 files changed, 345 insertions(+), 374 deletions(-) delete mode 100644 packages/e17/e-wm_0.16.999.027.bb create mode 100644 packages/e17/e-wm_0.16.999.032.bb delete mode 100644 packages/efl/e_0.16.999.027.bb delete mode 100644 packages/efl/ecore-fb_0.9.9.027.bb create mode 100644 packages/efl/ecore-fb_0.9.9.032.bb delete mode 100644 packages/efl/ecore-native_0.9.9.027.bb create mode 100644 packages/efl/ecore-native_0.9.9.032.bb delete mode 100644 packages/efl/ecore-x11_0.9.9.027.bb create mode 100644 packages/efl/ecore-x11_0.9.9.032.bb delete mode 100644 packages/efl/edje-native_0.5.0.027.bb create mode 100644 packages/efl/edje-native_0.5.0.032.bb delete mode 100644 packages/efl/edje-utils_0.5.0.027.bb create mode 100644 packages/efl/edje-utils_0.5.0.032.bb delete mode 100644 packages/efl/edje_0.5.0.027.bb create mode 100644 packages/efl/edje_0.5.0.032.bb delete mode 100644 packages/efl/eet-native_0.9.10.027.bb create mode 100644 packages/efl/eet-native_0.9.10.032.bb delete mode 100644 packages/efl/eet_0.9.10.027.bb create mode 100644 packages/efl/eet_0.9.10.032.bb delete mode 100644 packages/efl/embryo-native_0.9.1.027.bb create mode 100644 packages/efl/embryo-native_0.9.1.032.bb delete mode 100644 packages/efl/embryo-utils_0.9.1.027.bb create mode 100644 packages/efl/embryo-utils_0.9.1.032.bb delete mode 100644 packages/efl/embryo_0.9.1.027.bb create mode 100644 packages/efl/embryo_0.9.1.032.bb delete mode 100644 packages/efl/evas-fb_0.9.9.027.bb create mode 100644 packages/efl/evas-fb_0.9.9.032.bb delete mode 100644 packages/efl/evas-native_0.9.9.027.bb create mode 100644 packages/efl/evas-native_0.9.9.032.bb delete mode 100644 packages/efl/evas-x11_0.9.9.027.bb create mode 100644 packages/efl/evas-x11_0.9.9.032.bb diff --git a/packages/e17/e-wm_0.16.999.027.bb b/packages/e17/e-wm_0.16.999.027.bb deleted file mode 100644 index 5089ce23a4..0000000000 --- a/packages/e17/e-wm_0.16.999.027.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "E17 - the Enlightenment Window Mananger" -DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" -LICENSE = "MIT" -PR = "r3" - -inherit e update-alternatives - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ - file://fix-configure.patch;patch=1 \ - file://Xsession.d/98enlightenment" - -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -} - -ALTERNATIVE_PATH = "${bindir}/enlightenment" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/e-wm_0.16.999.032.bb b/packages/e17/e-wm_0.16.999.032.bb new file mode 100644 index 0000000000..fd8814a8ee --- /dev/null +++ b/packages/e17/e-wm_0.16.999.032.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "E17 - the Enlightenment Window Mananger" +DEPENDS = "evas-x11 ecore-x11 edje eet embryo" +LICENSE = "MIT" +PR = "r3" + +inherit e update-alternatives + +SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ + file://fix-configure.patch;patch=1 \ + file://Xsession.d/98enlightenment" + +S = "${WORKDIR}/enlightenment-${PV}" + +PROFILE = "LOWRES_PDA" +PROFILE_c7x0 = "HIRES_PDA" +PROFILE_tosa = "HIRES_PDA" +PROFILE_spitz = "HIRES_PDA" +PROFILE_akita = "HIRES_PDA" + +EXTRA_OECONF = "--with-profile=${PROFILE} \ + --with-edje-cc=${STAGING_BINDIR}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR}" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" + +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' +} + +do_install_append() { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d +} + +ALTERNATIVE_PATH = "${bindir}/enlightenment" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb index 0bf9f80895..d181d57ffd 100644 --- a/packages/e17/engage_20060128.bb +++ b/packages/e17/engage_20060128.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Engage is the E17 icon dock" -DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e" +DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e-wm" LICENSE = "MIT" PR = "r2" diff --git a/packages/efl/e_0.16.999.027.bb b/packages/efl/e_0.16.999.027.bb deleted file mode 100644 index 5078c71365..0000000000 --- a/packages/efl/e_0.16.999.027.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "Enlightenment Window Mananger Library" -DEPENDS = "virtual/evas virtual/ecore edje eet embryo" -LICENSE = "MIT" -PR = "r2" - -inherit efl - -SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz" -S = "${WORKDIR}/enlightenment-${PV}" - -PROFILE = "LOWRES_PDA" -PROFILE_c7x0 = "HIRES_PDA" -PROFILE_tosa = "HIRES_PDA" -PROFILE_spitz = "HIRES_PDA" -PROFILE_akita = "HIRES_PDA" - -EXTRA_OECONF = "--with-profile=${PROFILE} \ - --with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR}" - -do_compile() { - oe_runmake -C src/lib -} - -headers = "E_Lib.h ../bin/e*.h" - -do_install() { - oe_runmake -C src/lib install DESTDIR=${D} -} diff --git a/packages/efl/ecore-fb_0.9.9.027.bb b/packages/efl/ecore-fb_0.9.9.027.bb deleted file mode 100644 index a957c5dd8c..0000000000 --- a/packages/efl/ecore-fb_0.9.9.027.bb +++ /dev/null @@ -1,27 +0,0 @@ -include ecore.inc -PR = "r2" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-poll \ - --enable-ecore-dbus \ - --enable-ecore-evas \ - --enable-ecore-evas-buffer \ - --enable-ecore-evas-fb \ - --disable-ecore-evas-x \ - --disable-ecore-evas-xrender \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-config \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --disable-ecore-x \ - --disable-curl \ - --without-curl-config \ - --enable-ecore-config \ - --disable-openssl" - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config" diff --git a/packages/efl/ecore-fb_0.9.9.032.bb b/packages/efl/ecore-fb_0.9.9.032.bb new file mode 100644 index 0000000000..a957c5dd8c --- /dev/null +++ b/packages/efl/ecore-fb_0.9.9.032.bb @@ -0,0 +1,27 @@ +include ecore.inc +PR = "r2" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-poll \ + --enable-ecore-dbus \ + --enable-ecore-evas \ + --enable-ecore-evas-buffer \ + --enable-ecore-evas-fb \ + --disable-ecore-evas-x \ + --disable-ecore-evas-xrender \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-config \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --disable-ecore-x \ + --disable-curl \ + --without-curl-config \ + --enable-ecore-config \ + --disable-openssl" + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config" diff --git a/packages/efl/ecore-native_0.9.9.027.bb b/packages/efl/ecore-native_0.9.9.027.bb deleted file mode 100644 index 299470841c..0000000000 --- a/packages/efl/ecore-native_0.9.9.027.bb +++ /dev/null @@ -1,6 +0,0 @@ -include ecore-fb_${PV}.bb -inherit native -# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it -# DEPENDS = "curl-native eet-native evas-native" -DEPENDS = "eet-native evas-native" -PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-native_0.9.9.032.bb b/packages/efl/ecore-native_0.9.9.032.bb new file mode 100644 index 0000000000..299470841c --- /dev/null +++ b/packages/efl/ecore-native_0.9.9.032.bb @@ -0,0 +1,6 @@ +include ecore-fb_${PV}.bb +inherit native +# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it +# DEPENDS = "curl-native eet-native evas-native" +DEPENDS = "eet-native evas-native" +PROVIDES = "ecore-native" \ No newline at end of file diff --git a/packages/efl/ecore-x11_0.9.9.027.bb b/packages/efl/ecore-x11_0.9.9.027.bb deleted file mode 100644 index 3a88ad229b..0000000000 --- a/packages/efl/ecore-x11_0.9.9.027.bb +++ /dev/null @@ -1,27 +0,0 @@ -include ecore.inc -DEPENDS += "evas-x11" -PR = "r3" - -SRC_URI += "file://evas-x11-include.patch;patch=1" - -EXTRA_OECONF = "--enable-ecore-fb \ - --enable-ecore-job \ - --enable-ecore-file \ - --enable-ecore-dbus \ - --enable-ecore-evas-fb \ - --enable-ecore-evas-x \ - --enable-ecore-evas-buffer \ - --disable-ecore-evas-gl \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-txt \ - --enable-ecore-x \ - --enable-ecore-config \ - --disable-openssl \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} " - -parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ - Ecore_Txt Ecore_Fb Ecore_Con \ - Ecore_Ipc Ecore_Evas Ecore_Config \ - Ecore_X" diff --git a/packages/efl/ecore-x11_0.9.9.032.bb b/packages/efl/ecore-x11_0.9.9.032.bb new file mode 100644 index 0000000000..3a88ad229b --- /dev/null +++ b/packages/efl/ecore-x11_0.9.9.032.bb @@ -0,0 +1,27 @@ +include ecore.inc +DEPENDS += "evas-x11" +PR = "r3" + +SRC_URI += "file://evas-x11-include.patch;patch=1" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-ecore-dbus \ + --enable-ecore-evas-fb \ + --enable-ecore-evas-x \ + --enable-ecore-evas-buffer \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --enable-ecore-x \ + --enable-ecore-config \ + --disable-openssl \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} " + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config \ + Ecore_X" diff --git a/packages/efl/ecore/configure.patch b/packages/efl/ecore/configure.patch index cd38cb7218..1e4ec58f56 100644 --- a/packages/efl/ecore/configure.patch +++ b/packages/efl/ecore/configure.patch @@ -1,15 +1,15 @@ -diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in ---- ecore-0.9.9.015~/configure.in 2005-09-26 16:59:23.000000000 -0700 -+++ ecore-0.9.9.015/configure.in 2005-09-26 17:01:02.000000000 -0700 +diff -Nur ecore-0.9.9.032~/configure.in ecore-0.9.9.032/configure.in +--- ecore-0.9.9.032~/configure.in 2006-08-03 12:12:43.000000000 -0700 ++++ ecore-0.9.9.032/configure.in 2006-08-03 12:13:30.000000000 -0700 @@ -16,7 +16,6 @@ AC_CHECK_SIZEOF(long, 4) AM_ENABLE_SHARED AM_PROG_LIBTOOL -AC_C___ATTRIBUTE__ - - if test "x${bindir}" = 'x${exec_prefix}/bin'; then - if test "x${exec_prefix}" = "xNONE"; then -@@ -262,9 +261,7 @@ + + dnl Set PACKAGE_DATA_DIR in config.h. + if test "x${prefix}" = "xNONE"; then +@@ -205,10 +204,8 @@ AM_CONDITIONAL(BUILD_ECORE_X, true) AC_DEFINE(BUILD_ECORE_X, 1, [Build Ecore_X Module]) have_ecore_x="yes" @@ -20,3 +20,4 @@ diff -Nur ecore-0.9.9.015~/configure.in ecore-0.9.9.015/configure.in + x_libs="-lX11 -lXext" ecore_x_libs="-lecore_x"; ],[ + AM_CONDITIONAL(BUILD_ECORE_X, false) diff --git a/packages/efl/edje-native_0.5.0.027.bb b/packages/efl/edje-native_0.5.0.027.bb deleted file mode 100644 index 5eb077922a..0000000000 --- a/packages/efl/edje-native_0.5.0.027.bb +++ /dev/null @@ -1,25 +0,0 @@ -include edje_${PV}.bb -PR = "r3" - -inherit native - -DEPENDS = "evas-native ecore-native eet-native embryo-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" - -EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \ - --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ - --with-eet-config=${STAGING_BINDIR}/eet-config-native \ - --with-embryo-config=${STAGING_BINDIR}/embryo-config-native" - -do_configure_prepend() { - sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c - sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c -} - -do_stage_append() { - edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` - # could also use ${STAGING_DATADIR}/edje/include - install -d $edje_data_dir/include - install -m 0644 data/include/edje.inc $edje_data_dir/include -} diff --git a/packages/efl/edje-native_0.5.0.032.bb b/packages/efl/edje-native_0.5.0.032.bb new file mode 100644 index 0000000000..5eb077922a --- /dev/null +++ b/packages/efl/edje-native_0.5.0.032.bb @@ -0,0 +1,25 @@ +include edje_${PV}.bb +PR = "r3" + +inherit native + +DEPENDS = "evas-native ecore-native eet-native embryo-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" + +EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \ + --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ + --with-eet-config=${STAGING_BINDIR}/eet-config-native \ + --with-embryo-config=${STAGING_BINDIR}/embryo-config-native" + +do_configure_prepend() { + sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c + sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c +} + +do_stage_append() { + edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + # could also use ${STAGING_DATADIR}/edje/include + install -d $edje_data_dir/include + install -m 0644 data/include/edje.inc $edje_data_dir/include +} diff --git a/packages/efl/edje-utils_0.5.0.027.bb b/packages/efl/edje-utils_0.5.0.027.bb deleted file mode 100644 index f8eb917e4d..0000000000 --- a/packages/efl/edje-utils_0.5.0.027.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -DEPENDS = "edje embryo-utils gcc" -LICENSE = "MIT" -PR = "r6" - -inherit efl - -PACKAGES = "edje-utils" -FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ - ${E_CVS};module=e17/libs/edje/m4;date=20060101" -S = "${WORKDIR}/edje-${PV}" - -libraries = "" -headers = "" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} diff --git a/packages/efl/edje-utils_0.5.0.032.bb b/packages/efl/edje-utils_0.5.0.032.bb new file mode 100644 index 0000000000..f8eb917e4d --- /dev/null +++ b/packages/efl/edje-utils_0.5.0.032.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +DEPENDS = "edje embryo-utils gcc" +LICENSE = "MIT" +PR = "r6" + +inherit efl + +PACKAGES = "edje-utils" +FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" + +SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ + ${E_CVS};module=e17/libs/edje/m4;date=20060101" +S = "${WORKDIR}/edje-${PV}" + +libraries = "" +headers = "" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} diff --git a/packages/efl/edje_0.5.0.027.bb b/packages/efl/edje_0.5.0.027.bb deleted file mode 100644 index d51dd119e4..0000000000 --- a/packages/efl/edje_0.5.0.027.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "Edje is a complex graphical design & layout library." -# can also install vim data files -DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native" -LICENSE = "MIT" -PR = "r7" - -## package.bbclass kills packages when there are duplicates, this means -## that efl.bbclass can't have PACKAGES += and so the FILES for previous -## packages take precedence over -utils -#PACKAGES = "edje-utils" -#RPROVIDES_edje-utils += "libedje-utils" -#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" -#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" - -inherit efl - -SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" - -do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 -} - -LEAD_SONAME = "libedje.so" - -FILES_${PN}-examples = "${datadir}/edje/data/images \ - ${datadir}/edje/data/src \ - ${datadir}/edje/data/test \ - ${datadir}/edje/data/*.sh" - -FILES_${SRCNAME}-themes = "" diff --git a/packages/efl/edje_0.5.0.032.bb b/packages/efl/edje_0.5.0.032.bb new file mode 100644 index 0000000000..d51dd119e4 --- /dev/null +++ b/packages/efl/edje_0.5.0.032.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +# can also install vim data files +DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native" +LICENSE = "MIT" +PR = "r7" + +## package.bbclass kills packages when there are duplicates, this means +## that efl.bbclass can't have PACKAGES += and so the FILES for previous +## packages take precedence over -utils +#PACKAGES = "edje-utils" +#RPROVIDES_edje-utils += "libedje-utils" +#FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" +#RDEPENDS_edje-utils += "libembryo-utils cpp cpp-symlinks gcc gcc-symlinks" + +inherit efl + +SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" + +do_configure_prepend() { + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 +} + +LEAD_SONAME = "libedje.so" + +FILES_${PN}-examples = "${datadir}/edje/data/images \ + ${datadir}/edje/data/src \ + ${datadir}/edje/data/test \ + ${datadir}/edje/data/*.sh" + +FILES_${SRCNAME}-themes = "" diff --git a/packages/efl/eet-native_0.9.10.027.bb b/packages/efl/eet-native_0.9.10.027.bb deleted file mode 100644 index fa20c9fb30..0000000000 --- a/packages/efl/eet-native_0.9.10.027.bb +++ /dev/null @@ -1,7 +0,0 @@ -include eet_${PV}.bb -inherit native -DEPENDS = "zlib-native jpeg-native" - -do_stage_append() { - install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR} -} diff --git a/packages/efl/eet-native_0.9.10.032.bb b/packages/efl/eet-native_0.9.10.032.bb new file mode 100644 index 0000000000..fa20c9fb30 --- /dev/null +++ b/packages/efl/eet-native_0.9.10.032.bb @@ -0,0 +1,7 @@ +include eet_${PV}.bb +inherit native +DEPENDS = "zlib-native jpeg-native" + +do_stage_append() { + install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR} +} diff --git a/packages/efl/eet_0.9.10.027.bb b/packages/efl/eet_0.9.10.027.bb deleted file mode 100644 index 6e6032e098..0000000000 --- a/packages/efl/eet_0.9.10.027.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "EET is a tiny library designed to write an \ -arbitary set of chunks of data to a file and optionally compress \ -each chunk (very much like a zip file) and allow fast \ -random-access reading of the file later on." -DEPENDS = "zlib jpeg" -LICENSE = "BSD" -PR = "r2" - -inherit efl diff --git a/packages/efl/eet_0.9.10.032.bb b/packages/efl/eet_0.9.10.032.bb new file mode 100644 index 0000000000..6e6032e098 --- /dev/null +++ b/packages/efl/eet_0.9.10.032.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "EET is a tiny library designed to write an \ +arbitary set of chunks of data to a file and optionally compress \ +each chunk (very much like a zip file) and allow fast \ +random-access reading of the file later on." +DEPENDS = "zlib jpeg" +LICENSE = "BSD" +PR = "r2" + +inherit efl diff --git a/packages/efl/embryo-native_0.9.1.027.bb b/packages/efl/embryo-native_0.9.1.027.bb deleted file mode 100644 index a33adb7bd2..0000000000 --- a/packages/efl/embryo-native_0.9.1.027.bb +++ /dev/null @@ -1,7 +0,0 @@ -include embryo_${PV}.bb -inherit native - -do_stage_append() { - install -d ${STAGING_DATADIR}/embryo/include - install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include -} \ No newline at end of file diff --git a/packages/efl/embryo-native_0.9.1.032.bb b/packages/efl/embryo-native_0.9.1.032.bb new file mode 100644 index 0000000000..a33adb7bd2 --- /dev/null +++ b/packages/efl/embryo-native_0.9.1.032.bb @@ -0,0 +1,7 @@ +include embryo_${PV}.bb +inherit native + +do_stage_append() { + install -d ${STAGING_DATADIR}/embryo/include + install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include +} \ No newline at end of file diff --git a/packages/efl/embryo-utils_0.9.1.027.bb b/packages/efl/embryo-utils_0.9.1.027.bb deleted file mode 100644 index d507c53cce..0000000000 --- a/packages/efl/embryo-utils_0.9.1.027.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." -LICENSE = "MIT" -PR = "r4" - -inherit efl - -SRC_URI = "${E_URI}/embryo-${PV}.tar.gz" -S = "${WORKDIR}/embryo-${PV}" - -PACKAGES = "embryo-utils" -FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" - -libraries = "" -headers = "" diff --git a/packages/efl/embryo-utils_0.9.1.032.bb b/packages/efl/embryo-utils_0.9.1.032.bb new file mode 100644 index 0000000000..d507c53cce --- /dev/null +++ b/packages/efl/embryo-utils_0.9.1.032.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ +of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ +CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ +Embryo allows scripting capabilities in places that otherwise wouldn't support \ +basic programming structures such as in Edje EDCs." +LICENSE = "MIT" +PR = "r4" + +inherit efl + +SRC_URI = "${E_URI}/embryo-${PV}.tar.gz" +S = "${WORKDIR}/embryo-${PV}" + +PACKAGES = "embryo-utils" +FILES_${PN} = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include" + +libraries = "" +headers = "" diff --git a/packages/efl/embryo_0.9.1.027.bb b/packages/efl/embryo_0.9.1.027.bb deleted file mode 100644 index 0009c0a149..0000000000 --- a/packages/efl/embryo_0.9.1.027.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ -of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ -CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ -Embryo allows scripting capabilities in places that otherwise wouldn't support \ -basic programming structures such as in Edje EDCs." -LICENSE = "MIT" -PR = "r4" - -inherit efl - -FILES_${PN}-examples = "${datadir}/${PN}/examples" \ No newline at end of file diff --git a/packages/efl/embryo_0.9.1.032.bb b/packages/efl/embryo_0.9.1.032.bb new file mode 100644 index 0000000000..0009c0a149 --- /dev/null +++ b/packages/efl/embryo_0.9.1.032.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ +of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ +CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ +Embryo allows scripting capabilities in places that otherwise wouldn't support \ +basic programming structures such as in Edje EDCs." +LICENSE = "MIT" +PR = "r4" + +inherit efl + +FILES_${PN}-examples = "${datadir}/${PN}/examples" \ No newline at end of file diff --git a/packages/efl/evas-fb_0.9.9.027.bb b/packages/efl/evas-fb_0.9.9.027.bb deleted file mode 100644 index 3f7847874c..0000000000 --- a/packages/efl/evas-fb_0.9.9.027.bb +++ /dev/null @@ -1,47 +0,0 @@ -include evas.inc -PR = "r5" - -EXTRA_OECONF = "--enable-fb \ - --disable-directfb \ - --enable-buffer \ - --disable-software-qtopia \ - --disable-software-x11 \ - --disable-gl-x11 \ - --disable-xrender-x11 \ - --enable-image-loader-eet \ - --disable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --enable-convert-8-rgb-332 \ - --enable-convert-8-rgb-666 \ - --enable-convert-8-rgb-232 \ - --enable-convert-8-rgb-222 \ - --enable-convert-8-rgb-221 \ - --enable-convert-8-rgb-121 \ - --enable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --enable-convert-16-rgb-555 \ - --enable-convert-16-rgb-444 \ - --enable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --enable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --enable-convert-24-rgb-888 \ - --enable-convert-24-bgr-888 \ - --enable-convert-32-rgb-8888 \ - --enable-convert-32-rgbx-8888 \ - --enable-convert-32-bgr-8888 \ - --enable-convert-32-bgrx-8888 \ - --enable-convert-32-rgb-rot-0 \ - --enable-convert-32-rgb-rot-90 \ - --enable-convert-32-rgb-rot-270" - -headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \ - ../modules/engines/fb/Evas_Engine_FB.h \ - Evas.h" diff --git a/packages/efl/evas-fb_0.9.9.032.bb b/packages/efl/evas-fb_0.9.9.032.bb new file mode 100644 index 0000000000..3f7847874c --- /dev/null +++ b/packages/efl/evas-fb_0.9.9.032.bb @@ -0,0 +1,47 @@ +include evas.inc +PR = "r5" + +EXTRA_OECONF = "--enable-fb \ + --disable-directfb \ + --enable-buffer \ + --disable-software-qtopia \ + --disable-software-x11 \ + --disable-gl-x11 \ + --disable-xrender-x11 \ + --enable-image-loader-eet \ + --disable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --enable-convert-8-rgb-332 \ + --enable-convert-8-rgb-666 \ + --enable-convert-8-rgb-232 \ + --enable-convert-8-rgb-222 \ + --enable-convert-8-rgb-221 \ + --enable-convert-8-rgb-121 \ + --enable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --enable-convert-16-rgb-555 \ + --enable-convert-16-rgb-444 \ + --enable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --enable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --enable-convert-24-rgb-888 \ + --enable-convert-24-bgr-888 \ + --enable-convert-32-rgb-8888 \ + --enable-convert-32-rgbx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ + --enable-convert-32-rgb-rot-0 \ + --enable-convert-32-rgb-rot-90 \ + --enable-convert-32-rgb-rot-270" + +headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \ + ../modules/engines/fb/Evas_Engine_FB.h \ + Evas.h" diff --git a/packages/efl/evas-native_0.9.9.027.bb b/packages/efl/evas-native_0.9.9.027.bb deleted file mode 100644 index cbcbe304e9..0000000000 --- a/packages/efl/evas-native_0.9.9.027.bb +++ /dev/null @@ -1,5 +0,0 @@ -include evas-fb_${PV}.bb -inherit native -DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PROVIDES = "evas-native" - diff --git a/packages/efl/evas-native_0.9.9.032.bb b/packages/efl/evas-native_0.9.9.032.bb new file mode 100644 index 0000000000..cbcbe304e9 --- /dev/null +++ b/packages/efl/evas-native_0.9.9.032.bb @@ -0,0 +1,5 @@ +include evas-fb_${PV}.bb +inherit native +DEPENDS = "freetype-native libpng-native jpeg-native eet-native" +PROVIDES = "evas-native" + diff --git a/packages/efl/evas-x11_0.9.9.027.bb b/packages/efl/evas-x11_0.9.9.027.bb deleted file mode 100644 index da163d31ad..0000000000 --- a/packages/efl/evas-x11_0.9.9.027.bb +++ /dev/null @@ -1,52 +0,0 @@ -include evas.inc -DEPENDS += "edb virtual/libx11 libxext freetype" -PR = "r7" - -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-fb \ - --disable-directfb \ - --enable-buffer \ - --disable-software-qtopia \ - --enable-software-x11 \ - --disable-gl-x11 \ - --enable-image-loader-eet \ - --enable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --disable-convert-24-rgb-888 \ - --disable-convert-24-bgr-888 \ - --disable-convert-32-rgb-8888 \ - --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ - --disable-convert-32-rgb-rot-0 \ - --disable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-270" - -headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ - ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ - ../modules/engines/buffer/Evas_Engine_Buffer.h \ - ../modules/engines/fb/Evas_Engine_FB.h \ - Evas.h" - diff --git a/packages/efl/evas-x11_0.9.9.032.bb b/packages/efl/evas-x11_0.9.9.032.bb new file mode 100644 index 0000000000..da163d31ad --- /dev/null +++ b/packages/efl/evas-x11_0.9.9.032.bb @@ -0,0 +1,52 @@ +include evas.inc +DEPENDS += "edb virtual/libx11 libxext freetype" +PR = "r7" + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-fb \ + --disable-directfb \ + --enable-buffer \ + --disable-software-qtopia \ + --enable-software-x11 \ + --disable-gl-x11 \ + --enable-image-loader-eet \ + --enable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --disable-convert-16-rgb-555 \ + --disable-convert-16-rgb-444 \ + --disable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --disable-convert-24-rgb-888 \ + --disable-convert-24-bgr-888 \ + --disable-convert-32-rgb-8888 \ + --disable-convert-32-rgbx-8888 \ + --disable-convert-32-bgr-8888 \ + --disable-convert-32-bgrx-8888 \ + --disable-convert-32-rgb-rot-0 \ + --disable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-270" + +headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ + ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ + ../modules/engines/buffer/Evas_Engine_Buffer.h \ + ../modules/engines/fb/Evas_Engine_FB.h \ + Evas.h" + -- cgit v1.2.3 From 379d79d212350d5cfb3f4793058032a237c7a9a3 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 4 Aug 2006 01:46:00 +0000 Subject: esmart-fb: fix patch and build, bug #1261, thanks to Cyril Romain --- packages/efl/esmart-fb_0.9.0.007.bb | 4 ++-- packages/efl/esmart/disable-x-only-features.patch | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/efl/esmart-fb_0.9.0.007.bb b/packages/efl/esmart-fb_0.9.0.007.bb index 35bef239ee..f0565c6a71 100644 --- a/packages/efl/esmart-fb_0.9.0.007.bb +++ b/packages/efl/esmart-fb_0.9.0.007.bb @@ -7,12 +7,12 @@ myheaders = "esmart_container/Esmart_Container.h \ esmart_draggies/Esmart_Draggies.h \ esmart_file_dialog/Esmart_File_Dialog.h \ esmart_text_entry/Esmart_Text_Entry.h \ - esmart_textarea/Esmart_Textarea.h \ +# esmart_textarea/Esmart_Textarea.h esmart_thumb/Esmart_Thumb.h" mylibraries = "esmart_container \ esmart_draggies \ esmart_file_dialog \ esmart_text_entry \ - esmart_textarea \ +# esmart_textarea esmart_thumb" diff --git a/packages/efl/esmart/disable-x-only-features.patch b/packages/efl/esmart/disable-x-only-features.patch index 54638841ee..68dd363f74 100644 --- a/packages/efl/esmart/disable-x-only-features.patch +++ b/packages/efl/esmart/disable-x-only-features.patch @@ -3,20 +3,21 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- esmart-0.9.0.004/src/lib/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.004/src/lib/Makefile.am -@@ -1,8 +1,5 @@ +--- esmart-0.9.0.007/src/lib/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.007/src/lib/Makefile.am +@@ -1,9 +1,7 @@ SUBDIRS = \ esmart_container \ - esmart_draggies \ esmart_text_entry \ esmart_file_dialog \ - esmart_thumb \ -- esmart_trans_x11 \ -- esmart_textarea +- esmart_trans_x11 + esmart_thumb ---- esmart-0.9.0.004/src/Makefile.am~disable-x-only-features.patch -+++ esmart-0.9.0.004/src/Makefile.am + + # esmart_textarea +--- esmart-0.9.0.007/src/Makefile.am~disable-x-only-features.patch ++++ esmart-0.9.0.007/src/Makefile.am @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -- cgit v1.2.3 From 784208cccd9f1758ce8e1b8d2b2e8102c0151f6f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Aug 2006 07:31:15 +0000 Subject: preferred xorg versions X11R7.1: make everything overridable --- .../include/preferred-xorg-versions-X11R7.1.inc | 364 ++++++++++----------- 1 file changed, 182 insertions(+), 182 deletions(-) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 43353dcdcd..3e4b581353 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -1,185 +1,185 @@ -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_libxext = "libxext" -PREFERRED_PROVIDER_xext = "libxext" -PREFERRED_PROVIDER_libxi = "libxi" -PREFERRED_PROVIDER_libxft = "libxft" -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_libxpm = "libxpm" -PREFERRED_PROVIDER_xpm = "libxpm" -PREFERRED_PROVIDER_libxt = "libxt" -PREFERRED_PROVIDER_libxaw = "libxaw" -PREFERRED_PROVIDER_libice = "libice" -PREFERRED_PROVIDER_libxrender = "libxrender" -PREFERRED_PROVIDER_libxcursor = "libxcursor" -PREFERRED_PROVIDER_xextensions = "xextensions" -PREFERRED_PROVIDER_xproto = "xproto" -PREFERRED_PROVIDER_x11 = "libx11" -PREFERRED_PROVIDER_libxv = "libxv" -PREFERRED_PROVIDER_xft = "libxft" -PREFERRED_PROVIDER_libxrandr = "libxrandr" -PREFERRED_PROVIDER_libxdamage = "libxdamage" -PREFERRED_PROVIDER_libxcomposite = "libxcomposite" -PREFERRED_PROVIDER_libxfixes = "libxfixes" -PREFERRED_PROVIDER_libxinerama = "libxinerama" -PREFERRED_PROVIDER_libxxf86vm = "libxxf86vm" -PREFERRED_PROVIDER_libxmu = "libxmu" -PREFERRED_PROVIDER_libsm = "libsm" -PREFERRED_PROVIDER_xrandr = "xrandr" -PREFERRED_PROVIDER_xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/xorg = "xserver-xorg" +PREFERRED_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_libxpm ?= "libxpm" +PREFERRED_PROVIDER_xpm ?= "libxpm" +PREFERRED_PROVIDER_libxt ?= "libxt" +PREFERRED_PROVIDER_libxaw ?= "libxaw" +PREFERRED_PROVIDER_libice ?= "libice" +PREFERRED_PROVIDER_libxrender ?= "libxrender" +PREFERRED_PROVIDER_libxcursor ?= "libxcursor" +PREFERRED_PROVIDER_xextensions ?= "xextensions" +PREFERRED_PROVIDER_xproto ?= "xproto" +PREFERRED_PROVIDER_x11 ?= "libx11" +PREFERRED_PROVIDER_libxv ?= "libxv" +PREFERRED_PROVIDER_xft ?= "libxft" +PREFERRED_PROVIDER_libxrandr ?= "libxrandr" +PREFERRED_PROVIDER_libxdamage ?= "libxdamage" +PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite" +PREFERRED_PROVIDER_libxfixes ?= "libxfixes" +PREFERRED_PROVIDER_libxinerama ?= "libxinerama" +PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm" +PREFERRED_PROVIDER_libxmu ?= "libxmu" +PREFERRED_PROVIDER_libsm ?= "libsm" +PREFERRED_PROVIDER_xrandr ?= "xrandr" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" -PREFERRED_VERSION_task-xorg = "X11R7.1" +PREFERRED_VERSION_task-xorg ?= "X11R7.1" -PREFERRED_VERSION_bitmap = "X11R7.1-1.0.2" -PREFERRED_VERSION_fstobdf = "X11R7.1-1.0.2" -PREFERRED_VERSION_mkfontdir-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_mkfontdir = "X11R7.1-1.0.2" -PREFERRED_VERSION_rgb = "X11R7.1-1.0.1" -PREFERRED_VERSION_rstart = "X11R7.1-1.0.2" -PREFERRED_VERSION_setxkbmap = "X11R7.1-1.0.2" -PREFERRED_VERSION_smproxy = "X11R7.1-1.0.2" -PREFERRED_VERSION_x11perf = "X11R7.1-1.4.1" -PREFERRED_VERSION_xclock = "X11R7.1-1.0.2" -PREFERRED_VERSION_xconsole = "X11R7.1-1.0.2" -PREFERRED_VERSION_xcursorgen = "X11R7.1-1.0.1" -PREFERRED_VERSION_xdm = "X11R7.1-1.0.4" -PREFERRED_VERSION_xdriinfo = "X11R7.1-1.0.1" -PREFERRED_VERSION_xedit = "X11R7.1-1.0.2" -PREFERRED_VERSION_xfs = "X11R7.1-1.0.2" -PREFERRED_VERSION_xhost = "X11R7.1-1.0.1" -PREFERRED_VERSION_xinit = "X11R7.1-1.0.2" -PREFERRED_VERSION_xkbcomp = "X11R7.1-1.0.2" -PREFERRED_VERSION_xkbevd = "X11R7.1-1.0.2" -PREFERRED_VERSION_xman = "X11R7.1-1.0.2" -PREFERRED_VERSION_xmodmap = "X11R7.1-1.0.1" -PREFERRED_VERSION_xrandr = "X11R7.1-1.0.2" -PREFERRED_VERSION_xrdb = "X11R7.1-1.0.2" -PREFERRED_VERSION_xrefresh = "X11R7.1-1.0.2" -PREFERRED_VERSION_xset = "X11R7.1-1.0.2" -PREFERRED_VERSION_xtrap = "X11R7.1-1.0.2" -PREFERRED_VERSION_xwininfo = "X11R7.1-1.0.2" -PREFERRED_VERSION_xorg-docs = "X11R7.1-1.2" -PREFERRED_VERSION_xorg-sgml-doctools = "X11R7.1-1.1" -PREFERRED_VERSION_xf86-input-acecad = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-aiptek = "X11R7.1-1.0.1" -PREFERRED_VERSION_xf86-input-calcomp = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-citron = "X11R7.1-2.2.0" -PREFERRED_VERSION_xf86-input-digitaledge = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dmc = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-dynapro = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-elo2300 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-evdev = "X11R7.1-1.1.2" -PREFERRED_VERSION_xf86-input-fpit = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-hyperpen = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-jamstudio = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-joystick = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-keyboard = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-magellan = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-magictouch = "X11R7.1-1.0.0.5" -PREFERRED_VERSION_xf86-input-microtouch = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-mouse = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-mutouch = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-palmax = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-penmount = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-spaceorb = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-summa = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-tek4957 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-ur98 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-input-vmmouse = "X11R7.1-12.4.0" -PREFERRED_VERSION_xf86-input-void = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-apm = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-ark = "X11R7.1-0.6.0" -PREFERRED_VERSION_xf86-video-ast = "X11R7.1-0.81.0" -PREFERRED_VERSION_xf86-video-ati = "X11R7.1-6.6.0" -PREFERRED_VERSION_xf86-video-chips = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-cirrus = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-cyrix = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-dummy = "X11R7.1-0.2.0" -PREFERRED_VERSION_xf86-video-fbdev = "X11R7.1-0.3.0" -PREFERRED_VERSION_xf86-video-glint = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-i128 = "X11R7.1-1.1.0.5" -PREFERRED_VERSION_xf86-video-i740 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-i810 = "X11R7.1-1.6.0" -PREFERRED_VERSION_xf86-video-imstt = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-mga = "X11R7.1-1.4.1" -PREFERRED_VERSION_xf86-video-neomagic = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-newport = "X11R7.1-0.2.0" -PREFERRED_VERSION_xf86-video-nsc = "X11R7.1-2.8.1" -PREFERRED_VERSION_xf86-video-nv = "X11R7.1-1.1.1" -PREFERRED_VERSION_xf86-video-rendition = "X11R7.1-4.1.0" -PREFERRED_VERSION_xf86-video-s3 = "X11R7.1-0.4.1" -PREFERRED_VERSION_xf86-video-s3virge = "X11R7.1-1.9.1" -PREFERRED_VERSION_xf86-video-savage = "X11R7.1-2.1.1" -PREFERRED_VERSION_xf86-video-siliconmotion = "X11R7.1-1.4.1" -PREFERRED_VERSION_xf86-video-sis = "X11R7.1-0.9.1" -PREFERRED_VERSION_xf86-video-sisusb = "X11R7.1-0.8.1" -PREFERRED_VERSION_xf86-video-sunbw2 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg14 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg3 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suncg6 = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunffb = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-sunleo = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-suntcx = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-tdfx = "X11R7.1-1.2.1" -PREFERRED_VERSION_xf86-video-tga = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-trident = "X11R7.1-1.2.1" -PREFERRED_VERSION_xf86-video-tseng = "X11R7.1-1.1.0" -PREFERRED_VERSION_xf86-video-v4l = "X11R7.1-0.1.1" -PREFERRED_VERSION_xf86-video-vesa = "X11R7.1-1.2.0" -PREFERRED_VERSION_xf86-video-vga = "X11R7.1-4.1.0" -PREFERRED_VERSION_xf86-video-via = "X11R7.1-0.2.1" -PREFERRED_VERSION_xf86-video-vmware = "X11R7.1-10.13.0" -PREFERRED_VERSION_xf86-video-voodoo = "X11R7.1-1.1.0" -PREFERRED_VERSION_font-util-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_font-util = "X11R7.1-1.0.1" -PREFERRED_VERSION_diet-x11 = "X11R7.1-1.0.1" -PREFERRED_VERSION_libdmx = "X11R7.1-1.0.2" -PREFERRED_VERSION_libfontenc-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_libfontenc = "X11R7.1-1.0.2" -PREFERRED_VERSION_libice = "X11R7.1-1.0.1" -PREFERRED_VERSION_liblbxutil = "X11R7.1-1.0.1" -PREFERRED_VERSION_libsm = "X11R7.1-1.0.1" -PREFERRED_VERSION_libx11-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libx11 = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxau-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxau = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxaw = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxcomposite = "X11R7.1-0.3" -PREFERRED_VERSION_libxcursor = "X11R7.1-1.1.6" -PREFERRED_VERSION_libxdamage = "X11R7.1-1.0.3" -PREFERRED_VERSION_libxdmcp-native = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxdmcp = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxevie = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxext = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxfixes = "X11R7.1-4.0.1" -PREFERRED_VERSION_libxfont-native = "X11R7.1-1.1.0" -PREFERRED_VERSION_libxfont = "X11R7.1-1.1.0" -PREFERRED_VERSION_libxfontcache = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxi = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxkbfile = "X11R7.1-1.0.3" -PREFERRED_VERSION_libxkbui = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxmu = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxpm = "X11R7.1-3.5.5" -PREFERRED_VERSION_libxrandr = "X11R7.1-1.1.1" -PREFERRED_VERSION_libxrender = "X11R7.1-0.9.1" -PREFERRED_VERSION_libxres = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxscrnsaver = "X11R7.1-1.1.0" -PREFERRED_VERSION_libxt = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxvmc = "X11R7.1-1.0.2" -PREFERRED_VERSION_libxxf86dga = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxxf86misc = "X11R7.1-1.0.1" -PREFERRED_VERSION_libxxf86vm = "X11R7.1-1.0.1" -PREFERRED_VERSION_compositeproto = "X11R7.1-0.3.1" -PREFERRED_VERSION_fixesproto = "X11R7.1-4.0" -PREFERRED_VERSION_glproto = "X11R7.1-1.4.7" -PREFERRED_VERSION_scrnsaverproto = "X11R7.1-1.1.0" -PREFERRED_VERSION_xproto-native = "X11R7.1-7.0.5" -PREFERRED_VERSION_xproto = "X11R7.1-7.0.5" -PREFERRED_VERSION_gccmakedep = "X11R7.1-1.0.2" -PREFERRED_VERSION_imake = "X11R7.1-1.0.2" -PREFERRED_VERSION_util-macros-native = "X11R7.1-1.0.2" -PREFERRED_VERSION_util-macros = "X11R7.1-1.0.2" -PREFERRED_VERSION_xorg-cf-files = "X11R7.1-1.0.2" -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_xserver-xorg = "X11R7.1-1.1.0" +PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_setxkbmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xdm ?= "X11R7.1-1.0.4" +PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xfs ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xinit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbcomp ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xmodmap ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2" +PREFERRED_VERSION_xorg-sgml-doctools ?= "X11R7.1-1.1" +PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0" +PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2" +PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0" +PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "X11R7.1-6.6.0" +PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "X11R7.1-0.3.0" +PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "X11R7.1-1.1.0.5" +PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "X11R7.1-1.6.0" +PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-mga ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-nsc ?= "X11R7.1-2.8.1" +PREFERRED_VERSION_xf86-video-nv ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-rendition ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-s3 ?= "X11R7.1-0.4.1" +PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "X11R7.1-2.1.1" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xf86-video-sis ?= "X11R7.1-0.9.1" +PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "X11R7.1-1.2.1" +PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "X11R7.1-1.2.1" +PREFERRED_VERSION_xf86-video-tseng ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-vesa ?= "X11R7.1-1.2.0" +PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "X11R7.1-0.2.1" +PREFERRED_VERSION_xf86-video-vmware ?= "X11R7.1-10.13.0" +PREFERRED_VERSION_xf86-video-voodoo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_diet-x11 ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libsm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libx11 ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxau ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite ?= "X11R7.1-0.3" +PREFERRED_VERSION_libxcursor ?= "X11R7.1-1.1.6" +PREFERRED_VERSION_libxdamage ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_libxdmcp-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" +PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxkbfile ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxpm ?= "X11R7.1-3.5.5" +PREFERRED_VERSION_libxrandr ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_libxrender ?= "X11R7.1-0.9.1" +PREFERRED_VERSION_libxres ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxscrnsaver ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxt ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxvmc ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1" +PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0" +PREFERRED_VERSION_glproto ?= "X11R7.1-1.4.7" +PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xproto-native ?= "X11R7.1-7.0.5" +PREFERRED_VERSION_xproto ?= "X11R7.1-7.0.5" +PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0" -- cgit v1.2.3 From 7e46fede90e31209865fd58e04e72107a2787166 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Aug 2006 07:32:25 +0000 Subject: angstrom 2006.9: use xorg 7.1 versions --- conf/distro/angstrom-2006.9.conf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index ce52336a16..020e3f98a3 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -30,6 +30,7 @@ FEED_URIS += " \ #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" SRCDATE_gconf-dbus = "20060719" +SRCDATE_gnome-vfs-dbus = "20060803" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ @@ -47,7 +48,13 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" + +#Small machines prefer kdrive, but we might ship full Xorg in other images +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" +PREFERRED_PROVIDER_xserver ?= "xserver-drive" + +require conf/distro/include/preferred-xorg-versions-X11R7.1.inc + #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" @@ -78,7 +85,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive # Others: PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= gconf-dbus -PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus +PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs PREFERRED_PROVIDER_tslib ?= tslib #EABI stuff -- cgit v1.2.3 From e09578d22ab64c421ae3cc0c14b58e48a3699829 Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 4 Aug 2006 07:48:35 +0000 Subject: madwifi-ng r1692: Add madwifi snapshot 1692, which is the same as the 0.9.2 madwifi release (apart from the version number). This brings in a lot of fixes and makes it far more stable on my sh4 based device. I've decided not to use the actual 0.9.2 release .tar files for now since the snapshot and release version number are not really compatible and some solution for that would be needed first. --- packages/madwifi/madwifi-ng_r.inc | 49 +++++++++++++++++++++++++++ packages/madwifi/madwifi-ng_r1527-20060425.bb | 49 +-------------------------- packages/madwifi/madwifi-ng_r1692-20060723.bb | 2 ++ 3 files changed, 52 insertions(+), 48 deletions(-) create mode 100644 packages/madwifi/madwifi-ng_r.inc create mode 100644 packages/madwifi/madwifi-ng_r1692-20060723.bb diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc new file mode 100644 index 0000000000..488d9aefa4 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux " +LICENSE = "GPL" +RDEPENDS = "kernel (${KERNEL_VERSION})" +DEPENDS = "virtual/kernel" +PR="r0" + +SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ + file://10-xscale-be-elf-copts.patch;patch=1 \ + file://10-xscale-le-elf-copts.patch;patch=1 \ + file://10-sh4-le-elf-copts.patch;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module-base + +EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" + +EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " + +do_compile() { + oe_runmake all +} + +do_stage() { + install -d ${STAGING_INCDIR}/${PN}/include + install -d ${STAGING_INCDIR}/${PN}/net80211 + cp --dereference include/compat.h ${STAGING_INCDIR}/${PN}/include/ + cp --dereference net80211/*.h ${STAGING_INCDIR}/${PN}/net80211/ +} + +do_install() { + install -d ${D}${sbindir} + oe_runmake DESTDIR=${D} BINDIR=${sbindir} install +} + +pkg_postinst() { +if test "x$D" != "x"; then + exit 1 +else + depmod -ae +fi +} + +PACKAGES = "${PN}-modules ${PN}-tools" +FILES_${PN}-modules = "/lib/modules/" +FILES_${PN}-tools = "/usr/" diff --git a/packages/madwifi/madwifi-ng_r1527-20060425.bb b/packages/madwifi/madwifi-ng_r1527-20060425.bb index 488d9aefa4..78966bdb40 100644 --- a/packages/madwifi/madwifi-ng_r1527-20060425.bb +++ b/packages/madwifi/madwifi-ng_r1527-20060425.bb @@ -1,49 +1,2 @@ -DESCRIPTION = "Linux driver for 802.11a/b/g universal NIC cards using Atheros chip sets" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "NSLU2 Linux " -LICENSE = "GPL" -RDEPENDS = "kernel (${KERNEL_VERSION})" -DEPENDS = "virtual/kernel" +include madwifi-ng_r.inc PR="r0" - -SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ - file://10-xscale-be-elf-copts.patch;patch=1 \ - file://10-xscale-le-elf-copts.patch;patch=1 \ - file://10-sh4-le-elf-copts.patch;patch=1" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit module-base - -EXTRA_OEMAKE = "LDFLAGS= KERNELPATH=${STAGING_KERNEL_DIR} KERNELRELEASE=${KERNEL_VERSION} TOOLPREFIX=${TARGET_PREFIX}" - -EXTRA_OEMAKE_prepend_slugos = "TARGET=xscale-${ARCH_BYTE_SEX}-elf " - -do_compile() { - oe_runmake all -} - -do_stage() { - install -d ${STAGING_INCDIR}/${PN}/include - install -d ${STAGING_INCDIR}/${PN}/net80211 - cp --dereference include/compat.h ${STAGING_INCDIR}/${PN}/include/ - cp --dereference net80211/*.h ${STAGING_INCDIR}/${PN}/net80211/ -} - -do_install() { - install -d ${D}${sbindir} - oe_runmake DESTDIR=${D} BINDIR=${sbindir} install -} - -pkg_postinst() { -if test "x$D" != "x"; then - exit 1 -else - depmod -ae -fi -} - -PACKAGES = "${PN}-modules ${PN}-tools" -FILES_${PN}-modules = "/lib/modules/" -FILES_${PN}-tools = "/usr/" diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb new file mode 100644 index 0000000000..78966bdb40 --- /dev/null +++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb @@ -0,0 +1,2 @@ +include madwifi-ng_r.inc +PR="r0" -- cgit v1.2.3 From 8c3e32ec34b4c11506456f62f1591585ca964ef7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Aug 2006 08:06:01 +0000 Subject: sane-srcdates: add date for xcalibrate --- conf/distro/include/sane-srcdates.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9a88449e07..11b32e55d5 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -1,6 +1,6 @@ # Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version -SRCDATE_gconf-dbus ?= "20060119" +SRCDATE_gconf-dbus ?= "20060719" SRCDATE_gnome-vfs-dbus ?= "20060119" SRCDATE_contacts ?= "20060707" SRCDATE_dates ?= "20060707" @@ -26,4 +26,5 @@ SRCDATE_tslib ?= "20051101" SRCDATE_libfakekey ?= "20051101" SRCDATE_qemu-native ?= "20060526" SRCDATE_oprofile ?= "20060214" +SRCDATE_xcalibrate ?= "20060804" SRCDATE_zaurusd ?= "20060628" -- cgit v1.2.3 From c4360507dcb1565771284232d73dfa3eabe670d0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Aug 2006 08:27:46 +0000 Subject: sane-srcdates: add date for rosetta --- conf/distro/include/sane-srcdates.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 11b32e55d5..4c17800b7a 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -26,5 +26,6 @@ SRCDATE_tslib ?= "20051101" SRCDATE_libfakekey ?= "20051101" SRCDATE_qemu-native ?= "20060526" SRCDATE_oprofile ?= "20060214" +SRCDATE_rosetta ?= "20060804" SRCDATE_xcalibrate ?= "20060804" SRCDATE_zaurusd ?= "20060628" -- cgit v1.2.3 From 6de5064faea13f0cb4b8bfeaa4352740aeba4bea Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 4 Aug 2006 08:33:30 +0000 Subject: acct: add 6.4pre1, closes #1276 --- packages/acct/.mtn2git_empty | 0 packages/acct/acct_6.3.99+6.4pre1.bb | 9 +++++++++ packages/acct/files/.mtn2git_empty | 0 packages/acct/files/cross-compile.patch | 34 +++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 packages/acct/.mtn2git_empty create mode 100644 packages/acct/acct_6.3.99+6.4pre1.bb create mode 100644 packages/acct/files/.mtn2git_empty create mode 100644 packages/acct/files/cross-compile.patch diff --git a/packages/acct/.mtn2git_empty b/packages/acct/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/acct/acct_6.3.99+6.4pre1.bb b/packages/acct/acct_6.3.99+6.4pre1.bb new file mode 100644 index 0000000000..078013c39b --- /dev/null +++ b/packages/acct/acct_6.3.99+6.4pre1.bb @@ -0,0 +1,9 @@ +LICENSE = "GPL" +DESCRIPTION = "GNU Accounting Utilities - user and process accounting." + +SRC_URI = "http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/acct-6.4-pre1.tar.gz \ + file://cross-compile.patch;patch=1" + +S = "${WORKDIR}/acct-6.4-pre1" + +inherit autotools diff --git a/packages/acct/files/.mtn2git_empty b/packages/acct/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/acct/files/cross-compile.patch b/packages/acct/files/cross-compile.patch new file mode 100644 index 0000000000..78b57104c7 --- /dev/null +++ b/packages/acct/files/cross-compile.patch @@ -0,0 +1,34 @@ +diff -ur acct-6.4-pre1.org/configure.in acct-6.4-pre1/configure.in +--- acct-6.4-pre1.org/configure.in 2006-01-07 23:56:46.000000000 +0200 ++++ acct-6.4-pre1/configure.in 2006-08-03 21:16:17.000000000 +0300 +@@ -87,6 +87,10 @@ + ACCTON_MAN=accton.8 + LASTCOMM_MAN=lastcomm.1 + SA_MAN=sa.8 ++ WTMP_FILE_LOC=/var/log/wtmp ++ ACCT_FILE_LOC=/var/account/pacct ++ SAVACCT_FILE_LOC=/var/account/savacct ++ USRACCT_FILE_LOC=/var/account/usracct + AC_DEFINE(HAVE_ACUTIME, , + [Define if has the AC_UTIME field.]) + AC_DEFINE(ACUTIME_COMPT, , +@@ -130,6 +134,10 @@ + ACCTON_MAN=accton.8 + LASTCOMM_MAN=lastcomm.1 + SA_MAN=sa.8 ++ WTMP_FILE_LOC=/var/log/wtmp ++ ACCT_FILE_LOC=/var/account/pacct ++ SAVACCT_FILE_LOC=/var/account/savacct ++ USRACCT_FILE_LOC=/var/account/usracct + AC_HEADER_EGREP(ac_utime, sys/acct.h, + AC_DEFINE(HAVE_ACUTIME, , + [Define if has the AC_UTIME field.]) +@@ -277,7 +285,7 @@ + } + ], . ./locs; rm locs, + echo "Error -- could not locate your wtmp and acct files."; exit 1, +- echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ) ++ echo "Cross-compiling - cannot find out accounting file locations - using Linux defaults."; ) + AC_TYPE_PID_T dnl for sys/acct.h + AC_TYPE_UID_T dnl same as above + AC_TYPE_SIZE_T -- cgit v1.2.3 From a6f0e34d4d90d6d40920ee7b00fa9dd734e8f011 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 4 Aug 2006 08:37:05 +0000 Subject: bootchart: This is revamp of the bb, pulling official tarball, and patching it with setting which make it more seamless and easier to use with OE-based distribution. --- packages/bootchart/bootchart_0.9.bb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb index b9b4029590..abbdda4488 100644 --- a/packages/bootchart/bootchart_0.9.bb +++ b/packages/bootchart/bootchart_0.9.bb @@ -2,28 +2,27 @@ DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of LICENSE = "GPLv2" HOMEPAGE = "http://www.bootchart.org/" MAINTAINER = "Koen Kooi " - +PR = "r1" #this only installs the loggers, you will need to run the renderers on your workstation #boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging #needed for a real /bin/sh and /bin/sleep -DEPENDS = "bash coreutils" -RDEPENDS = "bash coreutils" +DEPENDS = "bash coreutils acct" +RDEPENDS = "bash coreutils acct" #this is a plain shell script PACKAGE_ARCH = "all" -SRC_URI = "file://bootchart \ - file://bootchartd \ - file://bootchartd.conf" +SRC_URI = "${SOURCEFORGE_MIRROR}/bootchart/bootchart-${PV}.tar.bz2\ + file://handheld.patch;patch=1" do_install() { install -d ${D}/sbin install -d ${D}/etc - install -m 755 ${WORKDIR}/bootchart ${D}/sbin - install -m 755 ${WORKDIR}/bootchartd ${D}/sbin - install -m 644 ${WORKDIR}/bootchart ${D}/etc + install -d ${D}/bootchart + install -m 755 ${S}/script/bootchartd ${D}/sbin + install -m 644 ${S}/script/bootchartd.conf ${D}/etc } -- cgit v1.2.3 From a9d2ae3255a984e3c3c9f8b46af2f2ade83464e4 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 4 Aug 2006 08:39:43 +0000 Subject: bootstrap-image-bootchart: add an image target for making bootcharts --- packages/images/bootstrap-image-bootchart.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/images/bootstrap-image-bootchart.bb diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb new file mode 100644 index 0000000000..0cee079550 --- /dev/null +++ b/packages/images/bootstrap-image-bootchart.bb @@ -0,0 +1,20 @@ +# +# old_revision [bbd3a2811e13a3b99224c1a846af2a244d292c41] +# +# add_file "packages/images/bootstrap-image-bootchart.bb" +# content [c85210cae1668b832e717ed0f45cba34e24fd811] +# +============================================================ +--- packages/images/bootstrap-image-bootchart.bb c85210cae1668b832e717ed0f45cba34e24fd811 ++++ packages/images/bootstrap-image-bootchart.bb c85210cae1668b832e717ed0f45cba34e24fd811 +@@ -0,0 +1,10 @@ ++export IMAGE_BASENAME = "bootstrap-image-bootchart" ++export IMAGE_LINGUAS = "" ++export IPKG_INSTALL = "task-bootstrap bootchart acct" ++ ++DEPENDS = "task-bootstrap bootchart" ++RDEPENDS = "acct" ++ ++inherit image_ipk ++ ++LICENSE = MIT -- cgit v1.2.3 From 8d3e323382f62f14fc9f482cd402ab9b3daa7531 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Aug 2006 10:50:15 +0000 Subject: preferred xorg: use a non-broken xfont --- conf/distro/include/preferred-xorg-versions-X11R7.1.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 3e4b581353..27a6164e54 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -154,7 +154,7 @@ PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" -PREFERRED_VERSION_libxfont ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxkbfile ?= "X11R7.1-1.0.3" -- cgit v1.2.3 From 3f59dd4dea40bf32a207763fcabd5e72a8a93553 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 4 Aug 2006 11:38:25 +0000 Subject: bootstrap-image-bootchart.bb: apply patch instead of renaming it --- packages/images/bootstrap-image-bootchart.bb | 30 ++++++++++------------------ 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb index 0cee079550..68cfac7490 100644 --- a/packages/images/bootstrap-image-bootchart.bb +++ b/packages/images/bootstrap-image-bootchart.bb @@ -1,20 +1,10 @@ -# -# old_revision [bbd3a2811e13a3b99224c1a846af2a244d292c41] -# -# add_file "packages/images/bootstrap-image-bootchart.bb" -# content [c85210cae1668b832e717ed0f45cba34e24fd811] -# -============================================================ ---- packages/images/bootstrap-image-bootchart.bb c85210cae1668b832e717ed0f45cba34e24fd811 -+++ packages/images/bootstrap-image-bootchart.bb c85210cae1668b832e717ed0f45cba34e24fd811 -@@ -0,0 +1,10 @@ -+export IMAGE_BASENAME = "bootstrap-image-bootchart" -+export IMAGE_LINGUAS = "" -+export IPKG_INSTALL = "task-bootstrap bootchart acct" -+ -+DEPENDS = "task-bootstrap bootchart" -+RDEPENDS = "acct" -+ -+inherit image_ipk -+ -+LICENSE = MIT +export IMAGE_BASENAME = "bootstrap-image-bootchart" +export IMAGE_LINGUAS = "" +export IPKG_INSTALL = "task-bootstrap bootchart acct" + +DEPENDS = "task-bootstrap bootchart" +RDEPENDS = "acct" + +inherit image_ipk + +LICENSE = MIT -- cgit v1.2.3