diff options
author | Drew Moseley <drew_moseley@mentor.com> | 2014-07-24 10:59:10 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-25 15:33:57 +0100 |
commit | c489b13bd98c6f11800280f7b0da4076636b55be (patch) | |
tree | 4d9cebbb0a7ba8c7b8a6ee445819560dc6544cc4 /meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch | |
parent | df214ad1a5f0b1a5579c88127986459887cfe14f (diff) | |
download | poky-c489b13bd98c6f11800280f7b0da4076636b55be.tar.gz |
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.
(From OE-Core rev: b76d254db92d9c08e8d5d41becb2e60178cebb33)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch')
-rw-r--r-- | meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch | 69 |
1 files changed, 0 insertions, 69 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 deleted file mode 100644 index 9c63b4d964..0000000000 --- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | Disable so versioning since they are really not a versioned shared lib. | ||
2 | |||
3 | Upstream-Status: Submitted @ https://sourceforge.net/p/omxil/bugs/59/ | ||
4 | |||
5 | Signed-off-by: Drew Moseley <drew_moseley@mentor.com> | ||
6 | |||
7 | 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 | ||
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 | |||
16 | diff -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 | ||
25 | diff -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 | ||
37 | diff -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 \ | ||
49 | diff -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 | |||