diff options
| author | Philip Balister <philip@balister.org> | 2007-01-18 15:15:25 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-01-18 15:15:25 +0000 |
| commit | 585f4e7c27219d784cbed507eab188b91d9ad0f1 (patch) | |
| tree | 77c2025f3ebdbac1c07e17bc923a4efb8fde9a5c /classes | |
| parent | 4e96c29dc9b9ea5f6652ed63bcfd82d912ab41b8 (diff) | |
| parent | 419ef2d081af1db73844871ce0858abda1bf7ec9 (diff) | |
merge of '16141cfb7ddd939f1759a94546b737b35c0ece43'
and 'c77de7a09c5852f1bfe63afbd011ef701c76bdf6'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qt3x11.bbclass | 4 | ||||
| -rw-r--r-- | classes/xfce.bbclass | 8 | ||||
| -rw-r--r-- | classes/xorg-module.bbclass | 31 |
3 files changed, 40 insertions, 3 deletions
diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 24e824d06f..95ed4f538a 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -11,5 +11,5 @@ export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" - - +export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu" +export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu" diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index 793348597f..8124dc877c 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -7,7 +7,13 @@ HOMEPAGE = "http://www.xfce.org" LICENSE = "LGPL-2" -SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz" +def xfce_extension(ver): + ext = "gz" + if ver == "4.3.99.2": + ext = "bz2" + return ext + +SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.${@xfce_extension("${PV}")}" inherit autotools diff --git a/classes/xorg-module.bbclass b/classes/xorg-module.bbclass new file mode 100644 index 0000000000..135ca31c16 --- /dev/null +++ b/classes/xorg-module.bbclass @@ -0,0 +1,31 @@ +python populate_packages_prepend () { + import re, os.path + + new_packages = [] + + def the_hook(file, pkg, pattern, format, basename): + new_packages.append(pkg) + + do_split_packages(d, root=bb.data.expand('${libdir}/xorg/modules/drivers', d), file_regex='(.*)_drv\.so', output_pattern='xorg-driver-%s', description='xorg %s driver', extra_depends='xserver-xorg', hook=the_hook) + + packages = bb.data.getVar('PACKAGES', d, 1).split() + + so_to_la_re = "\.so$" + + # fish out any debug or devel files corresponding to the new packages + for p in new_packages: + packages.append("%s-dbg" % p) + packages.append("%s-dev" % p) + + files = bb.data.getVar("FILES_%s" % p, d).split() + dev_files = [] + dbg_files = [] + for f in files: + dev_files.append(re.sub(so_to_la_re, ".la", f)) + (dir, file) = os.path.split(f) + dbg_files.append(os.path.join(dir, ".debug", file)) + bb.data.setVar("FILES_%s-dbg" % p, " ".join(dbg_files), d) + bb.data.setVar("FILES_%s-dev" % p, " ".join(dev_files), d) + + bb.data.setVar('PACKAGES', ' '.join(packages), d) +} |