diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2024-05-27 20:12:14 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-30 09:04:14 +0100 |
| commit | b29ae5ebe98cb0f16c6fb5e1598a5414bff8ef3f (patch) | |
| tree | 7ad8188803d755db6056ed54a08de63b7a7ff50a | |
| parent | 46a8430b9efe2db1862d5bfeb66dbd64d975bb8b (diff) | |
| download | poky-b29ae5ebe98cb0f16c6fb5e1598a5414bff8ef3f.tar.gz | |
libomxil: remove the recipe
Now-removed gstreamer omx plugin was the only consumer, and it's all very obsolete and
hasn't seen development in years.
(From OE-Core rev: 63535ce55141e7d4184a1f19efc3f49946f506ae)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8 files changed, 0 insertions, 198 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 2b579339b2..ccbc1d1969 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
| @@ -151,7 +151,6 @@ DISTRO_PN_ALIAS:pn-libnewt = "Debian=libnewt0.52 Fedora=newt" | |||
| 151 | DISTRO_PN_ALIAS:pn-libnewt-python = "Ubuntu=python-newt Fedora=newt-python" | 151 | DISTRO_PN_ALIAS:pn-libnewt-python = "Ubuntu=python-newt Fedora=newt-python" |
| 152 | DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" | 152 | DISTRO_PN_ALIAS:pn-libnl = "Mandriva=libnl Fedora=libnl" |
| 153 | DISTRO_PN_ALIAS:pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" | 153 | DISTRO_PN_ALIAS:pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" |
| 154 | DISTRO_PN_ALIAS:pn-libomxil = "OSPDT upstream=http://omxil.sourceforge.net/" | ||
| 155 | DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" | 154 | DISTRO_PN_ALIAS:pn-libowl = "Debian=owl OpenedHand" |
| 156 | DISTRO_PN_ALIAS:pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" | 155 | DISTRO_PN_ALIAS:pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" |
| 157 | DISTRO_PN_ALIAS:pn-libpcre = "Mandriva=libpcre0 Fedora=pcre" | 156 | DISTRO_PN_ALIAS:pn-libpcre = "Mandriva=libpcre0 Fedora=pcre" |
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 2951277b7f..5028a507eb 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
| @@ -365,7 +365,6 @@ RECIPE_MAINTAINER:pn-libnsl2 = "Khem Raj <raj.khem@gmail.com>" | |||
| 365 | RECIPE_MAINTAINER:pn-libnss-mdns = "Alexander Kanavin <alex.kanavin@gmail.com>" | 365 | RECIPE_MAINTAINER:pn-libnss-mdns = "Alexander Kanavin <alex.kanavin@gmail.com>" |
| 366 | RECIPE_MAINTAINER:pn-libnss-nis = "Khem Raj <raj.khem@gmail.com>" | 366 | RECIPE_MAINTAINER:pn-libnss-nis = "Khem Raj <raj.khem@gmail.com>" |
| 367 | RECIPE_MAINTAINER:pn-libogg = "Anuj Mittal <anuj.mittal@intel.com>" | 367 | RECIPE_MAINTAINER:pn-libogg = "Anuj Mittal <anuj.mittal@intel.com>" |
| 368 | RECIPE_MAINTAINER:pn-libomxil = "Anuj Mittal <anuj.mittal@intel.com>" | ||
| 369 | RECIPE_MAINTAINER:pn-libpam = "Anuj Mittal <anuj.mittal@intel.com>" | 368 | RECIPE_MAINTAINER:pn-libpam = "Anuj Mittal <anuj.mittal@intel.com>" |
| 370 | RECIPE_MAINTAINER:pn-libpcap = "Anuj Mittal <anuj.mittal@intel.com>" | 369 | RECIPE_MAINTAINER:pn-libpcap = "Anuj Mittal <anuj.mittal@intel.com>" |
| 371 | RECIPE_MAINTAINER:pn-libpciaccess = "Wang Mingyu <wangmy@fujitsu.com>" | 370 | RECIPE_MAINTAINER:pn-libpciaccess = "Wang Mingyu <wangmy@fujitsu.com>" |
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch deleted file mode 100644 index 876e80ef76..0000000000 --- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/configure-fix.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | To enable --disable-Werror for libomxil to avoid some compilers which check code strictly. | ||
| 2 | |||
| 3 | For example, at least the following errors happened to some compilers: | ||
| 4 | |||
| 5 | 1) OMX_INDEXTYPE in include/OMX_Index.h IS NOT OMX_INDEXVENDORTYPE in src/base/omx_base_component.h | ||
| 6 | | i586-poky-linux-libtool: compile: i586-poky-linux-gcc -m32 -march=i586 --sysroot=/home/yocto-build5/poky/build/tmp/sysroots/qemux86 -DHAVE_Climinate-unused-debug-types -Wall -Werror -DCONFIG_DEBUG_LEVEL=0 -c OMXComponentRMExt.c -fPIC -DPIC -o .libs/libomxbase_la-OMXComponentRMExt.o | ||
| 7 | | omx_base_component.c: In function 'omx_base_component_GetParameter': | ||
| 8 | | omx_base_component.c:991:3: error: case value '2130706435' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch] | ||
| 9 | | omx_base_component.c:918:3: error: case value '2130706436' not in enumerated type 'OMX_INDEXTYPE' [-Werror=switch] | ||
| 10 | |||
| 11 | 2) | ||
| 12 | | i586-poky-linux-gcc -m32 -march=i586 --sysroot=/home/yocto-build5/poky/build/tmp/sysroots/qemux86 -DHAVE_CONFIG_H -I. -I.. -DOMXILCOMPOminate-unused-debug-types -Wall -Werror -DCONFIG_DEBUG_LEVEL=0 -c -o omxregister_bellagio-omxregister.o `test -f 'omxregister.c' || echo './'`o | ||
| 13 | | omxregister.c: In function 'buildComponentsList': | ||
| 14 | | omxregister.c:175:7: error: variable 'err' set but not used [-Werror=unused-but-set-variable] | ||
| 15 | | cc1: all warnings being treated as errors | ||
| 16 | |||
| 17 | Upstream-Status: Inappropriate [configuration] | ||
| 18 | |||
| 19 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
| 20 | |||
| 21 | diff -r 82d742d3ea90 configure.ac | ||
| 22 | --- a/configure.ac Tue Dec 27 15:30:35 2011 +0800 | ||
| 23 | +++ b/configure.ac Tue Dec 27 16:26:03 2011 +0800 | ||
| 24 | @@ -5,7 +5,7 @@ | ||
| 25 | AC_PREREQ([2.59]) | ||
| 26 | |||
| 27 | AC_CONFIG_HEADERS([config.h]) | ||
| 28 | -CFLAGS="${CFLAGS} -Wall -Werror" | ||
| 29 | +CFLAGS="${CFLAGS} -Wall" | ||
| 30 | |||
| 31 | ################################################################################ | ||
| 32 | # Set the shared versioning info, according to section 6.3 of the libtool info # | ||
| 33 | @@ -122,6 +122,14 @@ | ||
| 34 | [with_android=$enableval], | ||
| 35 | [with_android=no]) | ||
| 36 | |||
| 37 | +AC_ARG_ENABLE( | ||
| 38 | + [Werror], | ||
| 39 | + [AC_HELP_STRING( | ||
| 40 | + [--disable-Werror], | ||
| 41 | + [whether to diable treating gcc warnings as errors])], | ||
| 42 | + [with_Werror=$enableval], | ||
| 43 | + [with_Werror=yes]) | ||
| 44 | + | ||
| 45 | ################################################################################ | ||
| 46 | # Check for programs # | ||
| 47 | ################################################################################ | ||
| 48 | @@ -193,6 +201,10 @@ | ||
| 49 | CFG_DEBUG_LEVEL=255 | ||
| 50 | fi | ||
| 51 | |||
| 52 | +if test "x$with_Werror" = "xyes"; then | ||
| 53 | + CFLAGS="${CFLAGS} -Werror" | ||
| 54 | +fi | ||
| 55 | + | ||
| 56 | AC_SUBST(CFG_DEBUG_LEVEL) | ||
| 57 | CFLAGS="${CFLAGS} -DCONFIG_DEBUG_LEVEL=$CFG_DEBUG_LEVEL" | ||
| 58 | |||
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 f408e4a621..0000000000 --- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/disable-so-versioning.patch +++ /dev/null | |||
| @@ -1,36 +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 | ||
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch deleted file mode 100644 index 787953a99b..0000000000 --- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/dynamicloader-linking.patch +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | This patch fixes link issue when libomxdynamicloader.so is loaded : | ||
| 2 | Missing symbol RM_Deinit. | ||
| 3 | |||
| 4 | This patch comes from "http://pkgs.fedoraproject.org/cgit/libomxil-bellagio.git/commit/?h=f17&id=4996a95828943d345e51ded6876c3103653eecf8" | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Sébastien Mennetrier <s.mennetrier@innotis.org> | ||
| 9 | |||
| 10 | --- a/src/dynamic_loader/Makefile.am 2014-02-25 15:29:10.128549636 +0100 | ||
| 11 | +++ b/src/dynamic_loader/Makefile.am 2014-02-25 15:30:15.756548808 +0100 | ||
| 12 | @@ -3,7 +3,7 @@ | ||
| 13 | omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la | ||
| 14 | libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h | ||
| 15 | |||
| 16 | -libomxdynamicloader_la_LDFLAGS = | ||
| 17 | +libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(top_builddir)/src/.libs | ||
| 18 | libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ | ||
| 19 | -I$(top_srcdir)/src \ | ||
| 20 | -I$(top_srcdir)/src/base \ | ||
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch deleted file mode 100644 index dbe8c41f74..0000000000 --- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/makefile-docdir-fix.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | This patch is to remove DESTDIR in docdir. | ||
| 2 | Otherwise, when users install by running `make install DESTDIR=/alternate/directory' specified in the file INSTALL, the doc will go into /alternate/directory/alternate/directory, which is not expected. | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | |||
| 6 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
| 7 | |||
| 8 | diff -r 30b597e4e70d Makefile.am | ||
| 9 | --- a/Makefile.am Wed Dec 28 15:38:35 2011 +0800 | ||
| 10 | +++ b/Makefile.am Wed Dec 28 15:39:25 2011 +0800 | ||
| 11 | @@ -7,7 +7,7 @@ | ||
| 12 | pkgconfigdir = $(libdir)/pkgconfig | ||
| 13 | pkgconfig_DATA = libomxil-bellagio.pc | ||
| 14 | |||
| 15 | -docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ | ||
| 16 | +docdir = $(prefix)/share/doc/@PACKAGE@ | ||
| 17 | doc_DATA = README \ | ||
| 18 | ChangeLog \ | ||
| 19 | TODO | ||
diff --git a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch b/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch deleted file mode 100644 index 483ca1328b..0000000000 --- a/meta/recipes-multimedia/libomxil/libomxil-0.9.3/parallel-make.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | This patch is to make libomxil Makefile support "make -jN". | ||
| 2 | The omxregister_bellagio stuffs depend on libomxil_bellagio library. | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | |||
| 6 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
| 7 | |||
| 8 | diff -r f59d077d3dd5 Makefile.am | ||
| 9 | --- a/src/Makefile.am Wed Dec 28 10:54:36 2011 +0800 | ||
| 10 | +++ b/src/Makefile.am Wed Dec 28 10:55:46 2011 +0800 | ||
| 11 | @@ -7,6 +7,7 @@ | ||
| 12 | omxregister_bellagio_SOURCES = omxregister.c common.c common.h | ||
| 13 | omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ | ||
| 14 | -I$(top_srcdir)/include | ||
| 15 | +omxregister_bellagio_LDADD = $(lib_LTLIBRARIES) | ||
| 16 | omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) | ||
| 17 | |||
| 18 | lib_LTLIBRARIES = libomxil-bellagio.la | ||
diff --git a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb b/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb deleted file mode 100644 index 4564d619ae..0000000000 --- a/meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb +++ /dev/null | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | SUMMARY = "Bellagio OpenMAX Integration Layer (IL)" | ||
| 2 | DESCRIPTION = "Bellagio is an opensource implementation of the Khronos OpenMAX \ | ||
| 3 | Integration Layer API to access multimedia components." | ||
| 4 | HOMEPAGE = "http://omxil.sourceforge.net/" | ||
| 5 | |||
| 6 | LICENSE = "LGPL-2.1-or-later" | ||
| 7 | LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'amr', 'commercial', '', d)}" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \ | ||
| 9 | file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90" | ||
| 10 | |||
| 11 | SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-bellagio-${PV}.tar.gz \ | ||
| 12 | file://configure-fix.patch \ | ||
| 13 | file://parallel-make.patch \ | ||
| 14 | file://makefile-docdir-fix.patch \ | ||
| 15 | file://dynamicloader-linking.patch \ | ||
| 16 | file://disable-so-versioning.patch" | ||
| 17 | |||
| 18 | SRC_URI[md5sum] = "a1de827fdb75c02c84e55f740ca27cb8" | ||
| 19 | SRC_URI[sha256sum] = "593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c" | ||
| 20 | |||
| 21 | S = "${WORKDIR}/${BPN}-bellagio-${PV}" | ||
| 22 | |||
| 23 | inherit autotools | ||
| 24 | |||
| 25 | EXTRA_OECONF += "--disable-doc --disable-Werror" | ||
| 26 | |||
| 27 | PROVIDES += "virtual/libomxil" | ||
| 28 | |||
| 29 | CFLAGS += "-fcommon" | ||
| 30 | |||
| 31 | PACKAGECONFIG ??= "" | ||
| 32 | |||
| 33 | PACKAGECONFIG[amr] = "--enable-amr,," | ||
| 34 | |||
| 35 | # | ||
| 36 | # The .so files under ${libdir}/bellagio are not intended to be versioned and symlinked. | ||
| 37 | # Make sure they get packaged in the main package. | ||
| 38 | # | ||
| 39 | FILES:${PN} += "${libdir}/bellagio/*.so \ | ||
| 40 | ${libdir}/omxloaders/*${SOLIBS}" | ||
| 41 | FILES:${PN}-staticdev += "${libdir}/bellagio/*.a \ | ||
| 42 | ${libdir}/omxloaders/*.a" | ||
| 43 | FILES:${PN}-dev += "${libdir}/bellagio/*.la \ | ||
| 44 | ${libdir}/omxloaders/*.la \ | ||
| 45 | ${libdir}/omxloaders/*${SOLIBSDEV}" | ||
