From 45094ef30a517e0b6548b2bca543af11815a3682 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sat, 6 Nov 2004 17:45:22 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel into
handhelds.org:/home/ich/programming/oe/oe-packages-exported
2004/11/06 18:44:50+01:00 handhelds.org!zecke
QtE 2.3.7 patches:
-Change tslib.patch to avoid possible (but unlinkely) sample[-1] access
2004/11/06 18:42:29+01:00 handhelds.org!zecke
-Xine 1.0.0 plugins depended on libxine and libxine1 ( >= libxine_1.0.0-rc6a ).
This is due packages.oeclass tries to find the dependencies on if
extra_depends is None (default), but that doesn't work with shlibdeps which renames
the package from libxine to libxine1 automatically.
BKrev: 418d0db2MtD7v-y2zpmbeWIAqTA-lw
---
libxine/libxine_1.0.0-rc6a.oe | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'libxine')
diff --git a/libxine/libxine_1.0.0-rc6a.oe b/libxine/libxine_1.0.0-rc6a.oe
index 0e25dc6f54..754f76872d 100644
--- a/libxine/libxine_1.0.0-rc6a.oe
+++ b/libxine/libxine_1.0.0-rc6a.oe
@@ -96,11 +96,11 @@ do_stage() {
python populate_packages_prepend () {
plugindir = oe.data.expand('${libdir}/xine/plugins/1.0.0', d)
- do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+ do_split_packages(d, plugindir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
postdir = oe.data.expand('${libdir}/xine/plugins/1.0.0/post', d)
- do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s')
+ do_split_packages(d, postdir, '^xineplug_(.*)\.so$', 'libxine-plugin-%s', 'Xine plugin for %s', extra_depends='' )
fontdir = oe.data.expand('${datadir}/xine/libxine1/fonts', d)
- do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s')
+ do_split_packages(d, fontdir, '^(.*).xinefont.gz$', 'libxine-font-%s', 'Xine font %s', extra_depends='' )
}
--
cgit v1.2.3