merge of '15600ad0d3a82ce2f192b1a9b6e4dde4c8feb9bd'

     and '4de558cb0dc7b78f343b4ed887c11a0758157eb6'

2 files changed, 21 insertions, 18 deletions

diff --git a/classes/package.bbclass b/classes/package.bbclass
index f740906c52..a12bfb0a21 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -21,7 +21,7 @@ def legitimize_package_name(s):
 	# Remaining package name validity fixes
 	return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-')
 
-def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None):
+def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False, aux_files_pattern_verbatim=None, allow_links=False):
 	"""
 	Used in .bb files to split up dynamically generated subpackages of a 
 	given package, usually plugins or modules.
@@ -70,7 +70,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 			continue
 		f = os.path.join(dvar + root, o)
 		mode = os.lstat(f).st_mode
-		if not (stat.S_ISREG(mode) or (allow_dirs and stat.S_ISDIR(mode))):
+		if not (stat.S_ISREG(mode) or (allow_links and stat.S_ISLNK(mode)) or (allow_dirs and stat.S_ISDIR(mode))):
 			continue
 		on = legitimize_package_name(m.group(1))
 		pkg = output_pattern % on
diff --git a/packages/opencv/opencv_1.0.0.bb b/packages/opencv/opencv_1.0.0.bb
index 3c442dd9ec..5b6450eca4 100644
--- a/packages/opencv/opencv_1.0.0.bb
+++ b/packages/opencv/opencv_1.0.0.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
 #RDEPENDS = "python jpeg zlib libpng tiff glib-2.0"
@@ -30,9 +30,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/opencvlibrary/opencv-${PV}.tar.gz \
           file://debian/300_fix_segfault_in_window_gtk.diff;patch=1 \
 "
 
-inherit autotools pkgconfig
+inherit distutils-base autotools pkgconfig
 
-EXTRA_OECONF = "--disable-debug --disable-apps"
+EXTRA_OECONF = "--disable-debug --without-python --disable-apps az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR}"
+
+export BUILD_SYS
+export HOST_SYS
 
 do_configure() {
 	gnu-configize
@@ -40,25 +43,25 @@ do_configure() {
 	oe_runconf
 }	
 
+PACKAGES += "python-opencv"
 
-PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-dbg python-opencv"
-
-FILES_${PN} = "${libdir}/*.so*"
-# ${libdir}/libcv.so* \
-# ${libdir}/libcvaux.so* \
-# ${libdir}/libcxcore.so* \
-# ${libdir}/libhighgui.so* \
-# ${libdir}/libml.so* "
+python populate_packages_prepend () {
+	cv_libdir = bb.data.expand('${libdir}', d)
+	cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
+}
 
-FILES_${PN}-dev += " ${libdir}/*.la "
 FILES_${PN}-doc += "${datadir}/opencv/"
-FILES_${PN}-dbg += "${libdir}/.debug/"
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
 
 DESCRIPTION_python-opencv = "Python bindings to opencv"
 FILES_python-opencv = "${libdir}/*/site-packages/*"
-RDEPENDS_python-opencv = "python-core opencv"
-
-LEAD_SONAME = "libcv.so"
+RDEPENDS_python-opencv = "python-core"
 
 do_stage() {
 	autotools_stage_all