mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

libomxil-0.9.3: Remove versioning for .so files.

Browse Source 
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>
This commit is contained in:
Drew Moseley
2014-07-20 16:13:36 -04:00
committed by Richard Purdie
parent 231c7373fb
commit 0ef3734c2f
2 changed files with 80 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch Normal file
View File

@@ -0,0 +1,69 @@
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 -rub libomxil-bellagio-0.9.3-orig/src/dynamic_loader/Makefile.am libomxil-bellagio-0.9.3/src/dynamic_loader/Makefile.am
--- libomxil-bellagio-0.9.3-orig/src/dynamic_loader/Makefile.am 2014-07-20 15:22:00.862425254 -0400
+++ libomxil-bellagio-0.9.3/src/dynamic_loader/Makefile.am 2014-07-20 15:22:36.462601786 -0400
@@ -3,7 +3,7 @@
omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la
libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h
-libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs
+libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs -avoid-version
libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/base \
diff -rub libomxil-bellagio-0.9.3-orig/src/Makefile.am libomxil-bellagio-0.9.3/src/Makefile.am
--- libomxil-bellagio-0.9.3-orig/src/Makefile.am 2014-07-20 15:22:00.862425254 -0400
+++ libomxil-bellagio-0.9.3/src/Makefile.am 2014-07-20 15:22:36.462601786 -0400
@@ -8,7 +8,7 @@
omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \
-I$(top_srcdir)/include
omxregister_bellagio_LDADD = $(lib_LTLIBRARIES)
-omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir)
+omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) -avoid-version
lib_LTLIBRARIES = libomxil-bellagio.la
libomxil_bellagio_la_SOURCES = component_loader.h \
@@ -29,7 +29,7 @@
libomxil_bellagio_la_CFLAGS = -I$(top_srcdir)/include -I$(srcdir)/base -I$(srcdir)/core_extensions \
-DINSTALL_PATH_STR=\"$(plugindir)\" -DOMX_LOADERS_DIRNAME=\"$(libdir)/omxloaders\/\"
libomxil_bellagio_la_LIBADD = base/libomxbase.la core_extensions/libomxcoreext.la -lpthread
-libomxil_bellagio_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
+libomxil_bellagio_la_LDFLAGS = -avoid-version
include_extradir = $(includedir)/bellagio

17
meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb
View File

@@ -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,13 +24,17 @@ inherit autotools
EXTRA_OECONF += "--disable-doc --disable-Werror"
FILES_${PN} += "${libdir}/bellagio/*${SOLIBS} \
${libdir}/omxloaders/*${SOLIBS}"
#
# 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}-staticdev += "${libdir}/bellagio/*.a \
${libdir}/omxloaders/*.a"
FILES_${PN}-dev += "${libdir}/bellagio/*.la \
${libdir}/bellagio/*${SOLIBSDEV} \
${libdir}/omxloaders/*.la \
${libdir}/omxloaders/*${SOLIBSDEV}"
${libdir}/omxloaders/*.la"
FILES_${PN}-dbg += "${libdir}/bellagio/.debug/ \
${libdir}/omxloaders/.debug/"