summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2014-07-20 16:13:36 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-21 19:05:34 +0100
commit0ef3734c2f279bf463ba4d1aef5241cd4882d483 (patch)
tree6821bdfbbb58b59c00cf2915d2f7bee9d46f3f9c
parent231c7373fb760d777cd29d27129c68374968cbff (diff)
downloadpoky-0ef3734c2f279bf463ba4d1aef5241cd4882d483.tar.gz
libomxil-0.9.3: Remove versioning for .so files.
The so files installed by libomxil are not versioned and should be installed without version-based symlinks so that omxregister-bellagio can properly find and register them. (From OE-Core rev: aa99817ad02c153361b2707d6fc81c09e72f4b8f) Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch69
-rw-r--r--meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb17
2 files changed, 80 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
new file mode 100644
index 0000000000..9c63b4d964
--- /dev/null
+++ b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch
@@ -0,0 +1,69 @@
1Disable so versioning since they are really not a versioned shared lib.
2
3Upstream-Status: Submitted @ https://sourceforge.net/p/omxil/bugs/59/
4
5Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
6
7diff -rub libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am
8--- libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am 2014-07-20 15:22:00.858425234 -0400
9+++ libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am 2014-07-20 15:25:42.687525225 -0400
10@@ -10,4 +10,5 @@
11 libomxaudio_effects_la_CFLAGS = -I$(top_srcdir)/include \
12 -I$(top_srcdir)/src \
13 -I$(top_srcdir)/src/base
14+libomxaudio_effects_la_LDFLAGS = -avoid-version
15
16diff -rub libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am
17--- libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am 2014-07-20 15:22:00.858425234 -0400
18+++ libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am 2014-07-20 15:24:49.151259753 -0400
19@@ -10,4 +10,4 @@
20 -I$(top_srcdir)/include \
21 -I$(top_srcdir)/src \
22 -I$(top_srcdir)/src/base
23-
24+libomxclocksrc_la_LDFLAGS = -avoid-version
25diff -rub libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am
26--- libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:00.862425254 -0400
27+++ libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:36.462601786 -0400
28@@ -6,7 +6,7 @@
29 library_entry_point.c
30
31 libomxvideosched_la_LIBADD = $(top_builddir)/src/libomxil-bellagio.la
32-libomxvideosched_la_LDFLAGS =
33+libomxvideosched_la_LDFLAGS = -avoid-version
34 libomxvideosched_la_CFLAGS = -I$(top_srcdir)/include \
35 -I$(top_srcdir)/src \
36 -I$(top_srcdir)/src/base
37diff -rub libomxil-bellagio-0.9.3-orig/src/dynamic_loader/Makefile.am libomxil-bellagio-0.9.3/src/dynamic_loader/Makefile.am
38--- libomxil-bellagio-0.9.3-orig/src/dynamic_loader/Makefile.am 2014-07-20 15:22:00.862425254 -0400
39+++ libomxil-bellagio-0.9.3/src/dynamic_loader/Makefile.am 2014-07-20 15:22:36.462601786 -0400
40@@ -3,7 +3,7 @@
41 omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
42 libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
43
44-libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs
45+libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs -avoid-version
46 libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
47 -I$(top_srcdir)/src \
48 -I$(top_srcdir)/src/base \
49diff -rub libomxil-bellagio-0.9.3-orig/src/Makefile.am libomxil-bellagio-0.9.3/src/Makefile.am
50--- libomxil-bellagio-0.9.3-orig/src/Makefile.am 2014-07-20 15:22:00.862425254 -0400
51+++ libomxil-bellagio-0.9.3/src/Makefile.am 2014-07-20 15:22:36.462601786 -0400
52@@ -8,7 +8,7 @@
53 omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
54 -I$(top_srcdir)/include
55 omxregister_bellagio_LDADD = $(lib_LTLIBRARIES)
56-omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
57+omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) -avoid-version
58
59 lib_LTLIBRARIES = libomxil-bellagio.la
60 libomxil_bellagio_la_SOURCES = component_loader.h \
61@@ -29,7 +29,7 @@
62 libomxil_bellagio_la_CFLAGS = -I$(top_srcdir)/include -I$(srcdir)/base -I$(srcdir)/core_extensions \
63 -DINSTALL_PATH_STR=\"$(plugindir)\" -DOMX_LOADERS_DIRNAME=\"$(libdir)/omxloaders\/\"
64 libomxil_bellagio_la_LIBADD = base/libomxbase.la core_extensions/libomxcoreext.la -lpthread
65-libomxil_bellagio_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
66+libomxil_bellagio_la_LDFLAGS = -avoid-version
67
68 include_extradir = $(includedir)/bellagio
69
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
index 103d789482..ba3d4911f5 100644
--- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
+++ b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
@@ -12,7 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \
12 file://configure-fix.patch \ 12 file://configure-fix.patch \
13 file://parallel-make.patch \ 13 file://parallel-make.patch \
14 file://makefile-docdir-fix.patch \ 14 file://makefile-docdir-fix.patch \
15 file://dynamicloader-linking.patch" 15 file://dynamicloader-linking.patch \
16 file://disable-so-versioning.patch"
16 17
17SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8" 18SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8"
18SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c" 19SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c"
@@ -23,13 +24,17 @@ inherit autotools
23 24
24EXTRA_OECONF += "--disable-doc --disable-Werror" 25EXTRA_OECONF += "--disable-doc --disable-Werror"
25 26
26FILES_${PN} += "${libdir}/bellagio/*${SOLIBS} \ 27#
27 ${libdir}/omxloaders/*${SOLIBS}" 28# The .so files populated by libomxil are not intended to be versioned and symlinked.
29# Make sure they get packaged in the main package.
30#
31FILES_SOLIBSDEV = ""
32FILES_${PN} += "${libdir}/*.so \
33 ${libdir}/bellagio/*.so \
34 ${libdir}/omxloaders/*.so"
28FILES_${PN}-staticdev += "${libdir}/bellagio/*.a \ 35FILES_${PN}-staticdev += "${libdir}/bellagio/*.a \
29 ${libdir}/omxloaders/*.a" 36 ${libdir}/omxloaders/*.a"
30FILES_${PN}-dev += "${libdir}/bellagio/*.la \ 37FILES_${PN}-dev += "${libdir}/bellagio/*.la \
31 ${libdir}/bellagio/*${SOLIBSDEV} \ 38 ${libdir}/omxloaders/*.la"
32 ${libdir}/omxloaders/*.la \
33 ${libdir}/omxloaders/*${SOLIBSDEV}"
34FILES_${PN}-dbg += "${libdir}/bellagio/.debug/ \ 39FILES_${PN}-dbg += "${libdir}/bellagio/.debug/ \
35 ${libdir}/omxloaders/.debug/" 40 ${libdir}/omxloaders/.debug/"