[oe] [meta-browser][PATCH 3/3] chromium, cef: Package codecs separately

[Khem Raj]

chromium does not use versioned shared objects so deal with it
Remove the band-aid to pretend to have versioning shared objects
put the ffmpeg plugins in directory of its own in /usr/lib to
avoid namespace conflict with same .so coming from other codec packages

Change-Id: Ia9dceaa84844086fe8918246eb864d91ab4ec6aa
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 recipes-browser/chromium/chromium.inc | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/recipes-browser/chromium/chromium.inc b/recipes-browser/chromium/chromium.inc
index 655cf65..9c34a68 100644
--- a/recipes-browser/chromium/chromium.inc
+++ b/recipes-browser/chromium/chromium.inc
@@ -46,14 +46,17 @@ do_install() {
 		install -m 0644 ${B}/out/${CHROMIUM_BUILD_TYPE}/icudtl.dat ${D}${bindir}
 	fi
 	install -d ${D}${libdir}
-        if [ -f "${B}/out/${CHROMIUM_BUILD_TYPE}/libcef.so" ]; then
+        if [ -f "${B}/out/${CHROMIUM_BUILD_TYPE}/lib/libcef.so" ]; then
 		install -m 0755 ${B}/out/${CHROMIUM_BUILD_TYPE}/lib/libcef.so ${D}${libdir}
         fi
+	if [ -f "${B}/out/${CHROMIUM_BUILD_TYPE}/libpdf.so" ]; then
+		install -Dm 0755 ${B}/out/${CHROMIUM_BUILD_TYPE}/libpdf.so ${D}${libdir}/chrome/libpdf.so
+	fi
 	if [ -f "${B}/out/${CHROMIUM_BUILD_TYPE}/libosmesa.so" ]; then
-		install -m 0755 ${B}/out/${CHROMIUM_BUILD_TYPE}/libosmesa.so ${D}${libdir}
+		install -Dm 0755 ${B}/out/${CHROMIUM_BUILD_TYPE}/libosmesa.so ${D}${libdir}/chrome/libosmesa.so
 	fi
 	if [ -f "${B}/out/${CHROMIUM_BUILD_TYPE}/libffmpegsumo.so" ]; then
-		install -m 0755 ${B}/out/${CHROMIUM_BUILD_TYPE}/libffmpegsumo.so ${D}${libdir}
+		install -Dm 0755 ${B}/out/${CHROMIUM_BUILD_TYPE}/libffmpegsumo.so ${D}${libdir}/chrome/libffmpegsumo.so
 	fi
 	install -d ${D}${bindir}/chrome
 	if [ -f "${B}/out/${CHROMIUM_BUILD_TYPE}/chrome" ]; then
@@ -95,22 +98,12 @@ do_install() {
 	if [ -f "${B}/out/${CHROMIUM_BUILD_TYPE}/chrome_sandbox" ]; then
 		install -m 4755 ${B}/out/${CHROMIUM_BUILD_TYPE}/chrome_sandbox ${D}${sbindir}/chrome-devel-sandbox
 	fi
-
-	# take care of yocto-way libraries naming (versions)
-	cd ${D}${libdir}
-	for library in $(find -type f -name '*.so'); do
-		startDir="$(pwd)"
-		cd "$(dirname "$library")"
-		rm -f "$library.0.0.1"
-		mv "$library" "$library.0.0.1"
-		ln -sf "$library.0.0.1" "$library.0.0"
-		ln -sf "$library.0.0" "$library.0"
-		ln -sf "$library.0" "$library"
-		cd "$startDir"
-	done
-
 }
 
+PACKAGES =+ "${PN}-codecs-ffmpeg ${PN}-plugin-pdf"
+
+FILES_${PN}-codecs-ffmpeg = "${libdir}/chrome/libffmpegsumo.so"
+FILES_${PN}-plugin-pdf = "${libdir}/chrome/libpdf.so"
 
 FILES_${PN} = "${bindir}/chrome/ ${bindir}/google-chrome ${datadir}/applications ${sbindir}/ ${libdir}/chrome/"
 FILES_${PN}-dbg += "${bindir}/chrome/.debug/ ${libdir}/chrome/.debug/"
@@ -118,11 +111,10 @@ FILES_${PN}-dbg += "${bindir}/chrome/.debug/ ${libdir}/chrome/.debug/"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 
 INSANE_SKIP_${PN} = "ldflags"
+SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
 FILES_${PN} += "${bindir} ${bindir}/chrome/ ${libdir}"
 FILES_${PN} += "${bindir}/chrome/*.pak"
 FILES_${PN} += "${bindir}/chrome/locales/*.pak"
 FILES_${PN}-dbg += "${bindir}/chrome/.debug/ ${libdir}/.debug/"
 
-
-
-- 
2.1.4