From b76d254db92d9c08e8d5d41becb2e60178cebb33 Mon Sep 17 00:00:00 2001
From: Drew Moseley <drew_moseley@mentor.com>
Date: Thu, 24 Jul 2014 10:59:10 -0400
Subject: Revert "libomxil-0.9.3: Remove versioning for .so files."

The previous version of this fix was too aggressive and removed
versioning from too many of the .so files in the libomxil package.

This reverts commit 0ef3734c2f279bf463ba4d1aef5241cd4882d483.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb')

diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
index ba3d4911f5..103d789482 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
@@ -12,8 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \
            file://configure-fix.patch \
            file://parallel-make.patch \
            file://makefile-docdir-fix.patch \
-           file://dynamicloader-linking.patch \
-           file://disable-so-versioning.patch"
+           file://dynamicloader-linking.patch"
 
 SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8"
 SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c"
@@ -24,17 +23,13 @@ inherit autotools
 
 EXTRA_OECONF += "--disable-doc --disable-Werror"
 
-#
-# The .so files populated by libomxil are not intended to be versioned and symlinked.
-# Make sure they get packaged in the main package.
-#
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/*.so \
-                ${libdir}/bellagio/*.so \
-                ${libdir}/omxloaders/*.so"
+FILES_${PN} += "${libdir}/bellagio/*${SOLIBS} \
+                ${libdir}/omxloaders/*${SOLIBS}"
 FILES_${PN}-staticdev += "${libdir}/bellagio/*.a \
                           ${libdir}/omxloaders/*.a"
 FILES_${PN}-dev += "${libdir}/bellagio/*.la \
-                    ${libdir}/omxloaders/*.la"
+                    ${libdir}/bellagio/*${SOLIBSDEV} \
+                    ${libdir}/omxloaders/*.la \
+                    ${libdir}/omxloaders/*${SOLIBSDEV}"
 FILES_${PN}-dbg += "${libdir}/bellagio/.debug/ \
                     ${libdir}/omxloaders/.debug/"
-- 
cgit 1.2.3-korg