diff options
| author | Drew Moseley <drew_moseley@mentor.com> | 2014-07-24 10:59:11 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-25 15:33:32 +0100 |
| commit | 3846b1ec782ba0cc64d389d03116743208e2383f (patch) | |
| tree | 2fc324e16677b5633194d011668230320673799d /meta | |
| parent | b76d254db92d9c08e8d5d41becb2e60178cebb33 (diff) | |
| download | openembedded-core-3846b1ec782ba0cc64d389d03116743208e2383f.tar.gz openembedded-core-3846b1ec782ba0cc64d389d03116743208e2383f.tar.bz2 openembedded-core-3846b1ec782ba0cc64d389d03116743208e2383f.zip | |
libomxil-0.9.3: Remove versioning for bellagio .so files.
The so files installed under ${libdir}/bellagio are not versioned and should
be installed without version-based symlinks so that omxregister-bellagio
can properly find and register them.
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 10 |
2 files changed, 43 insertions, 3 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..f408e4a621 --- /dev/null +++ b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch @@ -0,0 +1,36 @@ +Disable so versioning since they are really not a versioned shared lib. + +Upstream-Status: Submitted @ https://sourceforge.net/p/omxil/bugs/59/ + +Signed-off-by: Drew Moseley <drew_moseley@mentor.com> + +diff -rub libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/components/audio_effects/Makefile.am 2014-07-20 15:22:00.858425234 -0400 ++++ libomxil-bellagio-0.9.3/src/components/audio_effects/Makefile.am 2014-07-20 15:25:42.687525225 -0400 +@@ -10,4 +10,5 @@ + libomxaudio_effects_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base ++libomxaudio_effects_la_LDFLAGS = -avoid-version + +diff -rub libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/components/clocksrc/Makefile.am 2014-07-20 15:22:00.858425234 -0400 ++++ libomxil-bellagio-0.9.3/src/components/clocksrc/Makefile.am 2014-07-20 15:24:49.151259753 -0400 +@@ -10,4 +10,4 @@ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base +- ++libomxclocksrc_la_LDFLAGS = -avoid-version +diff -rub libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am +--- libomxil-bellagio-0.9.3-orig/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:00.862425254 -0400 ++++ libomxil-bellagio-0.9.3/src/components/videoscheduler/Makefile.am 2014-07-20 15:22:36.462601786 -0400 +@@ -6,7 +6,7 @@ + library_entry_point.c + + libomxvideosched_la_LIBADD = $(top_builddir)/src/libomxil-bellagio.la +-libomxvideosched_la_LDFLAGS = ++libomxvideosched_la_LDFLAGS = -avoid-version + libomxvideosched_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb index 103d789482..40d6df8b6a 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 \ file://configure-fix.patch \ file://parallel-make.patch \ file://makefile-docdir-fix.patch \ - file://dynamicloader-linking.patch" + file://dynamicloader-linking.patch \ + file://disable-so-versioning.patch" SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8" SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c" @@ -23,12 +24,15 @@ inherit autotools EXTRA_OECONF += "--disable-doc --disable-Werror" -FILES_${PN} += "${libdir}/bellagio/*${SOLIBS} \ +# +# The .so files under ${libdir}/bellagio are not intended to be versioned and symlinked. +# Make sure they get packaged in the main package. +# +FILES_${PN} += "${libdir}/bellagio/*.so \ ${libdir}/omxloaders/*${SOLIBS}" FILES_${PN}-staticdev += "${libdir}/bellagio/*.a \ ${libdir}/omxloaders/*.a" FILES_${PN}-dev += "${libdir}/bellagio/*.la \ - ${libdir}/bellagio/*${SOLIBSDEV} \ ${libdir}/omxloaders/*.la \ ${libdir}/omxloaders/*${SOLIBSDEV}" FILES_${PN}-dbg += "${libdir}/bellagio/.debug/ \ |