From 179e4188a38ccc086f8b23201fa1594ea9ba0c0f Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 17 May 2020 11:09:41 +0200 Subject: apalis-tk1: drop machine The downstream kernel gets to old to be used with the new zeus userspace components. Drop the machine. Related-to: ELB-2733 Signed-off-by: Max Krummenacher (cherry picked from commit d13caaba2d90f856b944ebde44967b679d3eb3a9) --- ...on.m4-prefix-pkgconfig-paths-with-PKG_CON.patch | 42 -- .../files/0001-pkg-config-files-fix-qa-error.patch | 85 ---- .../files/0001-rename-gstegl-to-gstnvegl.patch | 447 --------------------- .../libgstnvegl/libgstnvegl_21.7.0.bb | 46 --- .../libgstomx-1.0/files/gstomx-1.0.patch | 12 - .../files/r21.6.0-sources-gstomx1_src.patch | 90 ----- .../files/r21.7.0-sources-gstomx1_src.patch | 71 ---- .../libgstomx-1.0/libgstomx-1.0_21.7.0.bb | 44 -- recipes-multimedia/libpng/libpng12_1.2.57.bb | 36 -- 9 files changed, 873 deletions(-) delete mode 100644 recipes-multimedia/libgstnvegl/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch delete mode 100644 recipes-multimedia/libgstnvegl/files/0001-pkg-config-files-fix-qa-error.patch delete mode 100644 recipes-multimedia/libgstnvegl/files/0001-rename-gstegl-to-gstnvegl.patch delete mode 100644 recipes-multimedia/libgstnvegl/libgstnvegl_21.7.0.bb delete mode 100644 recipes-multimedia/libgstomx-1.0/files/gstomx-1.0.patch delete mode 100644 recipes-multimedia/libgstomx-1.0/files/r21.6.0-sources-gstomx1_src.patch delete mode 100644 recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch delete mode 100644 recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb delete mode 100644 recipes-multimedia/libpng/libpng12_1.2.57.bb (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/libgstnvegl/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch b/recipes-multimedia/libgstnvegl/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch deleted file mode 100644 index f5f73b4..0000000 --- a/recipes-multimedia/libgstnvegl/files/0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 90916f96262fa7b27a0a99788c69f9fd6df11000 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 24 Nov 2015 16:46:27 +0200 -Subject: [PATCH] introspection.m4: prefix pkgconfig paths with - PKG_CONFIG_SYSROOT_DIR - -We can't use our tweaked introspection.m4 from gobject-introspection tarball -because gstreamer also defines INTROSPECTION_INIT in its introspection.m4, which -is later supplied to g-ir-scanner. - -Upstream-Status: Pending [review on oe-core list] -Signed-off-by: Alexander Kanavin ---- - common/m4/introspection.m4 | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/common/m4/introspection.m4 b/common/m4/introspection.m4 -index 162be57..217a6ae 100644 ---- a/common/m4/introspection.m4 -+++ b/common/m4/introspection.m4 -@@ -54,14 +54,14 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --define-prefix --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --define-prefix --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --define-prefix --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --define-prefix --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) --- -2.6.2 - diff --git a/recipes-multimedia/libgstnvegl/files/0001-pkg-config-files-fix-qa-error.patch b/recipes-multimedia/libgstnvegl/files/0001-pkg-config-files-fix-qa-error.patch deleted file mode 100644 index 8a2d899..0000000 --- a/recipes-multimedia/libgstnvegl/files/0001-pkg-config-files-fix-qa-error.patch +++ /dev/null @@ -1,85 +0,0 @@ -From cf6c5e221c1e1c73bd908bf36d9a09d0fcb02ba8 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Sat, 22 Oct 2016 13:06:09 +0200 -Subject: [PATCH] pkg-config files: fix qa error - -| ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: QA Issue: gstreamer-egl-1.0.pc failed sanity test (tmpdir) in path -| /build/krm/oe-core_V2.6.2/build/tmp-glibc/work/armv7at2hf-neon-angstrom-linux-gnueabi/libgstnvegl/21.5.0-r5/sysroot-destdir/usr/lib/pkgconfig [pkgconfig] -| ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: QA staging was broken by the package built above -| ERROR: libgstnvegl-21.5.0-r5 do_populate_sysroot: Function failed: do_qa_staging - -Signed-off-by: Max Krummenacher ---- - configure.ac | 3 +++ - pkgconfig/Makefile.in | 1 + - pkgconfig/gstreamer-egl-uninstalled.pc.in | 2 +- - pkgconfig/gstreamer-egl.pc.in | 2 +- - 4 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7df8267..62ceb40 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -367,6 +367,7 @@ case "$EGL_WINDOW_SYSTEM" in - HAVE_EGL="yes" - EGL_LIBS="-lEGL" - EGL_CFLAGS="" -+ EGL_CFLAGS_SYSROOT="" - ] - ) - ] -@@ -383,6 +384,8 @@ case "$EGL_WINDOW_SYSTEM" in - else -+ AC_ARG_VAR(PKG_CONFIG_SYSROOT_DIR, "OE path to sysroot") - AC_DEFINE(USE_EGL_X11, [1], [Use X11 EGL window system]) - EGL_CFLAGS="$EGL_CFLAGS $X11_CFLAGS" -+ EGL_CFLAGS_SYSROOT=`echo $EGL_CFLAGS|sed "s;${PKG_CONFIG_SYSROOT_DIR};;"` -- EGL_LIBS="$EGL_LIBS $X11_LIBS" -+ EGL_LIBS=`echo "$EGL_LIBS $X11_LIBS"|sed "s;${PKG_CONFIG_SYSROOT_DIR};;"` - fi - fi -@@ -398,6 +401,7 @@ esac - - AC_SUBST(EGL_LIBS) - AC_SUBST(EGL_CFLAGS) -+AC_SUBST(EGL_CFLAGS_SYSROOT) - AM_CONDITIONAL(HAVE_EGL, test x"$HAVE_EGL" = x"yes") - - dnl *** ext plug-ins *** -diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in -index f420abf..9e25a26 100644 ---- a/pkgconfig/Makefile.in -+++ b/pkgconfig/Makefile.in -@@ -212,6 +212,7 @@ ECHO_T = @ECHO_T@ - EGLGLES_CFLAGS = @EGLGLES_CFLAGS@ - EGLGLES_LIBS = @EGLGLES_LIBS@ - EGL_CFLAGS = @EGL_CFLAGS@ -+EGL_CFLAGS_SYSROOT = @EGL_CFLAGS_SYSROOT@ - EGL_LIBS = @EGL_LIBS@ - EGREP = @EGREP@ - ERROR_CFLAGS = @ERROR_CFLAGS@ -diff --git a/pkgconfig/gstreamer-egl-uninstalled.pc.in b/pkgconfig/gstreamer-egl-uninstalled.pc.in -index ae9d406..271123e 100644 ---- a/pkgconfig/gstreamer-egl-uninstalled.pc.in -+++ b/pkgconfig/gstreamer-egl-uninstalled.pc.in -@@ -8,5 +8,5 @@ Description: GStreamer EGL Library, uninstalled - Requires: gstreamer-@GST_API_VERSION@ - Version: @VERSION@ - Libs: -L${libdir} ${libdir}/libgstnvegl-@GST_API_VERSION@.la @EGL_LIBS@ --Cflags: -I${includedir} @EGL_CFLAGS@ -+Cflags: -I${includedir} @EGL_CFLAGS_SYSROOT@ - -diff --git a/pkgconfig/gstreamer-egl.pc.in b/pkgconfig/gstreamer-egl.pc.in -index bfc7994..eea84af 100644 ---- a/pkgconfig/gstreamer-egl.pc.in -+++ b/pkgconfig/gstreamer-egl.pc.in -@@ -8,5 +8,5 @@ Description: GStreamer EGL library - Requires: gstreamer-@GST_API_VERSION@ - Version: @VERSION@ - Libs: -L${libdir} -lgstegl-@GST_API_VERSION@ @EGL_LIBS@ --Cflags: -I${includedir} @EGL_CFLAGS@ -+Cflags: -I${includedir} @EGL_CFLAGS_SYSROOT@ - --- -2.5.5 - diff --git a/recipes-multimedia/libgstnvegl/files/0001-rename-gstegl-to-gstnvegl.patch b/recipes-multimedia/libgstnvegl/files/0001-rename-gstegl-to-gstnvegl.patch deleted file mode 100644 index 6038aa8..0000000 --- a/recipes-multimedia/libgstnvegl/files/0001-rename-gstegl-to-gstnvegl.patch +++ /dev/null @@ -1,447 +0,0 @@ -From 0c99333b0e38ec48aa704ec18e8b11bcc9ec9ccd Mon Sep 17 00:00:00 2001 -From: Stefano Cordibella -Date: Mon, 2 Nov 2015 16:45:24 +0100 -Subject: [PATCH] rename gstegl to gstnvegl - ---- - ext/eglgles/Makefile.am | 2 +- - ext/eglgles/Makefile.in | 2 +- - ext/eglgles/libgsteglglessink.la | 4 +- - gst-libs/gst/egl/Makefile.am | 34 +++++----- - gst-libs/gst/egl/Makefile.in | 104 +++++++++++++++--------------- - gst-plugins-bad.spec.in | 6 +- - pkgconfig/gstreamer-egl-uninstalled.pc.in | 2 +- - 7 files changed, 77 insertions(+), 77 deletions(-) - -diff --git a/ext/eglgles/Makefile.am b/ext/eglgles/Makefile.am -index afa78a8..87e336d 100644 ---- a/ext/eglgles/Makefile.am -+++ b/ext/eglgles/Makefile.am -@@ -1,7 +1,7 @@ - plugin_LTLIBRARIES = libgstnveglglessink.la - - DISTRO_SRC = gstegladaptation_egl.c video_platform_wrapper.c --GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstegl-$(GST_API_VERSION).la -+GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstnvegl-$(GST_API_VERSION).la - - libgstnveglglessink_la_SOURCES = gsteglglessink.c gstegladaptation.c $(DISTRO_SRC) - -diff --git a/ext/eglgles/Makefile.in b/ext/eglgles/Makefile.in -index 1484b12..9c1ea74 100644 ---- a/ext/eglgles/Makefile.in -+++ b/ext/eglgles/Makefile.in -@@ -517,7 +517,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - plugin_LTLIBRARIES = libgstnveglglessink.la - DISTRO_SRC = gstegladaptation_egl.c video_platform_wrapper.c --GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstegl-$(GST_API_VERSION).la -+GST_EGL_LIBS = $(top_builddir)/gst-libs/gst/egl/libgstnvegl-$(GST_API_VERSION).la - libgstnveglglessink_la_SOURCES = gsteglglessink.c gstegladaptation.c $(DISTRO_SRC) - libgstnveglglessink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ -diff --git a/ext/eglgles/libgsteglglessink.la b/ext/eglgles/libgsteglglessink.la -index 30d14ed..39b6912 100644 ---- a/ext/eglgles/libgsteglglessink.la -+++ b/ext/eglgles/libgsteglglessink.la -@@ -17,7 +17,7 @@ old_library='' - inherited_linker_flags=' -pthread' - - # Libraries that this one depends upon. --dependency_libs=' -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lGLESv2 /home/ubuntu/gst-nveglglessink/gst-libs/gst/egl/libgstegl-1.0.la /usr/lib/libgstvideo-1.0.la -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lEGL -lX11' -+dependency_libs=' -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lGLESv2 /home/ubuntu/gst-nveglglessink/gst-libs/gst/egl/libgstnvegl-1.0.la /usr/lib/libgstvideo-1.0.la -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lEGL -lX11' - - # Names of additional weak libraries provided by this library - weak_library_names='' -@@ -39,4 +39,4 @@ dlpreopen='' - - # Directory that this library needs to be installed in: - libdir='/usr/local/lib/gstreamer-1.0' --relink_command="(cd /home/ubuntu/gst-nveglglessink/ext/eglgles; /bin/bash /home/ubuntu/gst-nveglglessink/libtool --silent --tag CC --tag CC --tag disable-static --mode=relink gcc -std=gnu99 -I../../gst-libs -I../../gst-libs -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DGST_USE_UNSTABLE_API -DG_THREADS_MANDATORY -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -Wall -Wdeclaration-after-statement -Wvla -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wwrite-strings -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wnested-externs -g -I/usr/include/libdrm -I/usr/include/libdrm -DUSE_EGL_TEGRA -g -O2 -module -avoid-version -export-symbols-regex \"^_*gst_plugin_.*\" -no-undefined -o libgsteglglessink.la -rpath /usr/local/lib/gstreamer-1.0 libgsteglglessink_la-gsteglglessink.lo libgsteglglessink_la-gstegladaptation.lo libgsteglglessink_la-gstegladaptation_egl.lo libgsteglglessink_la-video_platform_wrapper.lo -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lX11 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lGLESv2 -lgstvideo-1.0 ../../gst-libs/gst/egl/libgstegl-1.0.la @inst_prefix_dir@)" -+relink_command="(cd /home/ubuntu/gst-nveglglessink/ext/eglgles; /bin/bash /home/ubuntu/gst-nveglglessink/libtool --silent --tag CC --tag CC --tag disable-static --mode=relink gcc -std=gnu99 -I../../gst-libs -I../../gst-libs -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -pthread -I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -DGST_USE_UNSTABLE_API -DG_THREADS_MANDATORY -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -Wall -Wdeclaration-after-statement -Wvla -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wwrite-strings -Wformat-security -Wold-style-definition -Winit-self -Wmissing-include-dirs -Waddress -Wno-multichar -Wnested-externs -g -I/usr/include/libdrm -I/usr/include/libdrm -DUSE_EGL_TEGRA -g -O2 -module -avoid-version -export-symbols-regex \"^_*gst_plugin_.*\" -no-undefined -o libgsteglglessink.la -rpath /usr/local/lib/gstreamer-1.0 libgsteglglessink_la-gsteglglessink.lo libgsteglglessink_la-gstegladaptation.lo libgsteglglessink_la-gstegladaptation_egl.lo libgsteglglessink_la-video_platform_wrapper.lo -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstbase-1.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lX11 -L/usr/lib/arm-linux-gnueabihf/tegra-egl -lEGL -lGLESv2 -lgstvideo-1.0 ../../gst-libs/gst/egl/libgstnvegl-1.0.la @inst_prefix_dir@)" -diff --git a/gst-libs/gst/egl/Makefile.am b/gst-libs/gst/egl/Makefile.am -index 66289c4..a4c33ea 100644 ---- a/gst-libs/gst/egl/Makefile.am -+++ b/gst-libs/gst/egl/Makefile.am -@@ -1,25 +1,25 @@ --lib_LTLIBRARIES = libgstegl-@GST_API_VERSION@.la -+lib_LTLIBRARIES = libgstnvegl-@GST_API_VERSION@.la - --libgstegl_@GST_API_VERSION@_la_SOURCES = egl.c -+libgstnvegl_@GST_API_VERSION@_la_SOURCES = egl.c - --libgstegl_@GST_API_VERSION@includedir = \ -+libgstnvegl_@GST_API_VERSION@includedir = \ - $(includedir)/gstreamer-@GST_API_VERSION@/gst/egl - --libgstegl_@GST_API_VERSION@include_HEADERS = egl.h -+libgstnvegl_@GST_API_VERSION@include_HEADERS = egl.h - --libgstegl_@GST_API_VERSION@_la_CFLAGS = \ -+libgstnvegl_@GST_API_VERSION@_la_CFLAGS = \ - $(GST_PLUGINS_BAD_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - $(EGL_CFLAGS) - --libgstegl_@GST_API_VERSION@_la_LIBADD = \ -+libgstnvegl_@GST_API_VERSION@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_API_VERSION@ \ - $(GST_LIBS) \ - $(EGL_LIBS) - --libgstegl_@GST_API_VERSION@_la_LDFLAGS = \ -+libgstnvegl_@GST_API_VERSION@_la_LDFLAGS = \ - $(GST_LIB_LDFLAGS) \ - $(GST_ALL_LDFLAGS) \ - $(GST_LT_LDFLAGS) -@@ -28,12 +28,12 @@ libgstegl_@GST_API_VERSION@_la_LDFLAGS = \ - if HAVE_INTROSPECTION - BUILT_GIRSOURCES = GstEGL-@GST_API_VERSION@.gir - --gir_headers=$(patsubst %,$(srcdir)/%, $(libgstegl_@GST_API_VERSION@include_HEADERS)) -+gir_headers=$(patsubst %,$(srcdir)/%, $(libgstnvegl_@GST_API_VERSION@include_HEADERS)) - gir_headers+=$(patsubst %,$(builddir)/%, $(built_headers)) --gir_sources=$(patsubst %,$(srcdir)/%, $(libgstegl_@GST_API_VERSION@_la_SOURCES)) -+gir_sources=$(patsubst %,$(srcdir)/%, $(libgstnvegl_@GST_API_VERSION@_la_SOURCES)) - gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources)) - --GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstegl-@GST_API_VERSION@.la -+GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnvegl-@GST_API_VERSION@.la - $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ - GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ - $(INTROSPECTION_SCANNER) -v --namespace GstEGL \ -@@ -45,7 +45,7 @@ GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstegl-@GST_API_VERSIO - -I$(top_builddir)/gst-libs \ - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ -- --library=libgstegl-@GST_API_VERSION@.la \ -+ --library=libgstnvegl-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ - --libtool="$(top_builddir)/libtool" \ - --pkg gstreamer-@GST_API_VERSION@ \ -@@ -79,17 +79,17 @@ CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) - endif - - Android.mk: $(BUILT_SOURCES) Makefile.am -- androgenizer -:PROJECT libgstegl -:STATIC libgstegl-@GST_API_VERSION@ \ -+ androgenizer -:PROJECT libgstnvegl -:STATIC libgstnvegl-@GST_API_VERSION@ \ - -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -- -:SOURCES $(libgstegl_@GST_API_VERSION@_la_SOURCES) \ -+ -:SOURCES $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) \ - $(built_sources) \ -- -:CFLAGS $(DEFS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) \ -- -:LDFLAGS $(libgstegl_@GST_API_VERSION@_la_LDFLAGS) \ -- $(libgstegl@GST_API_VERSION@_la_LIBADD) \ -+ -:CFLAGS $(DEFS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) \ -+ -:LDFLAGS $(libgstnvegl_@GST_API_VERSION@_la_LDFLAGS) \ -+ $(libgstnvegl@GST_API_VERSION@_la_LIBADD) \ - -ldl \ - -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/egl \ -- -:HEADERS $(libgsteglinclude_HEADERS) \ -+ -:HEADERS $(libgstnveglinclude_HEADERS) \ - $(built_headers) \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - > $@ -diff --git a/gst-libs/gst/egl/Makefile.in b/gst-libs/gst/egl/Makefile.in -index dfa0d43..9e2235b 100644 ---- a/gst-libs/gst/egl/Makefile.in -+++ b/gst-libs/gst/egl/Makefile.in -@@ -84,7 +84,7 @@ target_triplet = @target@ - subdir = gst-libs/gst/egl - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp \ -- $(libgstegl_@GST_API_VERSION@include_HEADERS) -+ $(libgstnvegl_@GST_API_VERSION@include_HEADERS) - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ - $(top_srcdir)/common/m4/as-auto-alt.m4 \ -@@ -153,23 +153,23 @@ am__uninstall_files_from_dir = { \ - } - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ - "$(DESTDIR)$(typelibsdir)" \ -- "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)" -+ "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = --libgstegl_@GST_API_VERSION@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+libgstnvegl_@GST_API_VERSION@_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) --am_libgstegl_@GST_API_VERSION@_la_OBJECTS = \ -- libgstegl_@GST_API_VERSION@_la-egl.lo --libgstegl_@GST_API_VERSION@_la_OBJECTS = \ -- $(am_libgstegl_@GST_API_VERSION@_la_OBJECTS) -+am_libgstnvegl_@GST_API_VERSION@_la_OBJECTS = \ -+ libgstnvegl_@GST_API_VERSION@_la-egl.lo -+libgstnvegl_@GST_API_VERSION@_la_OBJECTS = \ -+ $(am_libgstnvegl_@GST_API_VERSION@_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent - am__v_lt_1 = --libgstegl_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -+libgstnvegl_@GST_API_VERSION@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -- $(libgstegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) \ -- $(libgstegl_@GST_API_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) \ -+ $(libgstnvegl_@GST_API_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@ - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -204,15 +204,15 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) - am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) - am__v_CCLD_0 = @echo " CCLD " $@; - am__v_CCLD_1 = --SOURCES = $(libgstegl_@GST_API_VERSION@_la_SOURCES) --DIST_SOURCES = $(libgstegl_@GST_API_VERSION@_la_SOURCES) -+SOURCES = $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) -+DIST_SOURCES = $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) - am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac - DATA = $(gir_DATA) $(typelibs_DATA) --HEADERS = $(libgstegl_@GST_API_VERSION@include_HEADERS) -+HEADERS = $(libgstnvegl_@GST_API_VERSION@include_HEADERS) - am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ -@@ -499,36 +499,36 @@ target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --lib_LTLIBRARIES = libgstegl-@GST_API_VERSION@.la --libgstegl_@GST_API_VERSION@_la_SOURCES = egl.c --libgstegl_@GST_API_VERSION@includedir = \ -+lib_LTLIBRARIES = libgstnvegl-@GST_API_VERSION@.la -+libgstnvegl_@GST_API_VERSION@_la_SOURCES = egl.c -+libgstnvegl_@GST_API_VERSION@includedir = \ - $(includedir)/gstreamer-@GST_API_VERSION@/gst/egl - --libgstegl_@GST_API_VERSION@include_HEADERS = egl.h --libgstegl_@GST_API_VERSION@_la_CFLAGS = \ -+libgstnvegl_@GST_API_VERSION@include_HEADERS = egl.h -+libgstnvegl_@GST_API_VERSION@_la_CFLAGS = \ - $(GST_PLUGINS_BAD_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - $(EGL_CFLAGS) - --libgstegl_@GST_API_VERSION@_la_LIBADD = \ -+libgstnvegl_@GST_API_VERSION@_la_LIBADD = \ - $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_API_VERSION@ \ - $(GST_LIBS) \ - $(EGL_LIBS) - --libgstegl_@GST_API_VERSION@_la_LDFLAGS = \ -+libgstnvegl_@GST_API_VERSION@_la_LDFLAGS = \ - $(GST_LIB_LDFLAGS) \ - $(GST_ALL_LDFLAGS) \ - $(GST_LT_LDFLAGS) - - @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstEGL-@GST_API_VERSION@.gir - @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ --@HAVE_INTROSPECTION_TRUE@ $(libgstegl_@GST_API_VERSION@include_HEADERS)) \ -+@HAVE_INTROSPECTION_TRUE@ $(libgstnvegl_@GST_API_VERSION@include_HEADERS)) \ - @HAVE_INTROSPECTION_TRUE@ $(patsubst %,$(builddir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(built_headers)) - @HAVE_INTROSPECTION_TRUE@gir_sources = $(patsubst %,$(srcdir)/%, \ --@HAVE_INTROSPECTION_TRUE@ $(libgstegl_@GST_API_VERSION@_la_SOURCES)) \ -+@HAVE_INTROSPECTION_TRUE@ $(libgstnvegl_@GST_API_VERSION@_la_SOURCES)) \ - @HAVE_INTROSPECTION_TRUE@ $(patsubst %,$(builddir)/%, \ - @HAVE_INTROSPECTION_TRUE@ $(built_sources)) - -@@ -609,8 +609,8 @@ clean-libLTLIBRARIES: - rm -f $${locs}; \ - } - --libgstegl-@GST_API_VERSION@.la: $(libgstegl_@GST_API_VERSION@_la_OBJECTS) $(libgstegl_@GST_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libgstegl_@GST_API_VERSION@_la_DEPENDENCIES) -- $(AM_V_CCLD)$(libgstegl_@GST_API_VERSION@_la_LINK) -rpath $(libdir) $(libgstegl_@GST_API_VERSION@_la_OBJECTS) $(libgstegl_@GST_API_VERSION@_la_LIBADD) $(LIBS) -+libgstnvegl-@GST_API_VERSION@.la: $(libgstnvegl_@GST_API_VERSION@_la_OBJECTS) $(libgstnvegl_@GST_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libgstnvegl_@GST_API_VERSION@_la_DEPENDENCIES) -+ $(AM_V_CCLD)$(libgstnvegl_@GST_API_VERSION@_la_LINK) -rpath $(libdir) $(libgstnvegl_@GST_API_VERSION@_la_OBJECTS) $(libgstnvegl_@GST_API_VERSION@_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -618,7 +618,7 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@@ -644,12 +644,12 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - --libgstegl_@GST_API_VERSION@_la-egl.lo: egl.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstegl_@GST_API_VERSION@_la-egl.lo -MD -MP -MF $(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Tpo -c -o libgstegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Tpo $(DEPDIR)/libgstegl_@GST_API_VERSION@_la-egl.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='egl.c' object='libgstegl_@GST_API_VERSION@_la-egl.lo' libtool=yes @AMDEPBACKSLASH@ -+libgstnvegl_@GST_API_VERSION@_la-egl.lo: egl.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstnvegl_@GST_API_VERSION@_la-egl.lo -MD -MP -MF $(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Tpo -c -o libgstnvegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Tpo $(DEPDIR)/libgstnvegl_@GST_API_VERSION@_la-egl.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='egl.c' object='libgstnvegl_@GST_API_VERSION@_la-egl.lo' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstnvegl_@GST_API_VERSION@_la-egl.lo `test -f 'egl.c' || echo '$(srcdir)/'`egl.c - - mostlyclean-libtool: - -rm -f *.lo -@@ -698,27 +698,27 @@ uninstall-typelibsDATA: - @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir) --install-libgstegl_@GST_API_VERSION@includeHEADERS: $(libgstegl_@GST_API_VERSION@include_HEADERS) -+install-libgstnvegl_@GST_API_VERSION@includeHEADERS: $(libgstnvegl_@GST_API_VERSION@include_HEADERS) - @$(NORMAL_INSTALL) -- @list='$(libgstegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstegl_@GST_API_VERSION@includedir)" || list=; \ -+ @list='$(libgstnvegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstnvegl_@GST_API_VERSION@includedir)" || list=; \ - if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)" || exit 1; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ -- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)'"; \ -- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)" || exit $$?; \ -+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)'"; \ -+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)" || exit $$?; \ - done - --uninstall-libgstegl_@GST_API_VERSION@includeHEADERS: -+uninstall-libgstnvegl_@GST_API_VERSION@includeHEADERS: - @$(NORMAL_UNINSTALL) -- @list='$(libgstegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstegl_@GST_API_VERSION@includedir)" || list=; \ -+ @list='$(libgstnvegl_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstnvegl_@GST_API_VERSION@includedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)'; $(am__uninstall_files_from_dir) -+ dir='$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)'; $(am__uninstall_files_from_dir) - tags TAGS: - - ctags CTAGS: -@@ -760,7 +760,7 @@ check-am: all-am - check: check-am - all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) - installdirs: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libgstegl_@GST_API_VERSION@includedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(libgstnvegl_@GST_API_VERSION@includedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: install-am -@@ -817,7 +817,7 @@ info: info-am - info-am: - - install-data-am: install-girDATA \ -- install-libgstegl_@GST_API_VERSION@includeHEADERS \ -+ install-libgstnvegl_@GST_API_VERSION@includeHEADERS \ - install-typelibsDATA - - install-dvi: install-dvi-am -@@ -865,7 +865,7 @@ ps: ps-am - ps-am: - - uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ -- uninstall-libgstegl_@GST_API_VERSION@includeHEADERS \ -+ uninstall-libgstnvegl_@GST_API_VERSION@includeHEADERS \ - uninstall-typelibsDATA - - .MAKE: install-am install-strip -@@ -878,7 +878,7 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - install-dvi-am install-exec install-exec-am install-girDATA \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES \ -- install-libgstegl_@GST_API_VERSION@includeHEADERS install-man \ -+ install-libgstnvegl_@GST_API_VERSION@includeHEADERS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-typelibsDATA installcheck \ - installcheck-am installdirs maintainer-clean \ -@@ -886,11 +886,11 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags-am uninstall uninstall-am uninstall-girDATA \ - uninstall-libLTLIBRARIES \ -- uninstall-libgstegl_@GST_API_VERSION@includeHEADERS \ -+ uninstall-libgstnvegl_@GST_API_VERSION@includeHEADERS \ - uninstall-typelibsDATA - - --@HAVE_INTROSPECTION_TRUE@GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstegl-@GST_API_VERSION@.la -+@HAVE_INTROSPECTION_TRUE@GstEGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstnvegl-@GST_API_VERSION@.la - @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \ - @HAVE_INTROSPECTION_TRUE@ GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \ - @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_SCANNER) -v --namespace GstEGL \ -@@ -902,7 +902,7 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir)/gst-libs \ - @HAVE_INTROSPECTION_TRUE@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ - @HAVE_INTROSPECTION_TRUE@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ --@HAVE_INTROSPECTION_TRUE@ --library=libgstegl-@GST_API_VERSION@.la \ -+@HAVE_INTROSPECTION_TRUE@ --library=libgstnvegl-@GST_API_VERSION@.la \ - @HAVE_INTROSPECTION_TRUE@ --include=Gst-@GST_API_VERSION@ \ - @HAVE_INTROSPECTION_TRUE@ --libtool="$(top_builddir)/libtool" \ - @HAVE_INTROSPECTION_TRUE@ --pkg gstreamer-@GST_API_VERSION@ \ -@@ -924,17 +924,17 @@ uninstall-am: uninstall-girDATA uninstall-libLTLIBRARIES \ - @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) - - Android.mk: $(BUILT_SOURCES) Makefile.am -- androgenizer -:PROJECT libgstegl -:STATIC libgstegl-@GST_API_VERSION@ \ -+ androgenizer -:PROJECT libgstnvegl -:STATIC libgstnvegl-@GST_API_VERSION@ \ - -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -- -:SOURCES $(libgstegl_@GST_API_VERSION@_la_SOURCES) \ -+ -:SOURCES $(libgstnvegl_@GST_API_VERSION@_la_SOURCES) \ - $(built_sources) \ -- -:CFLAGS $(DEFS) $(libgstegl_@GST_API_VERSION@_la_CFLAGS) \ -- -:LDFLAGS $(libgstegl_@GST_API_VERSION@_la_LDFLAGS) \ -- $(libgstegl@GST_API_VERSION@_la_LIBADD) \ -+ -:CFLAGS $(DEFS) $(libgstnvegl_@GST_API_VERSION@_la_CFLAGS) \ -+ -:LDFLAGS $(libgstnvegl_@GST_API_VERSION@_la_LDFLAGS) \ -+ $(libgstnvegl@GST_API_VERSION@_la_LIBADD) \ - -ldl \ - -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/egl \ -- -:HEADERS $(libgsteglinclude_HEADERS) \ -+ -:HEADERS $(libgstnveglinclude_HEADERS) \ - $(built_headers) \ - -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ - > $@ -diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in -index 0a4f38d..8d3d0fc 100644 ---- a/gst-plugins-bad.spec.in -+++ b/gst-plugins-bad.spec.in -@@ -278,9 +278,9 @@ make ERROR_CFLAGS='' ERROR_CXXFLAGS='' - %{_libdir}/libgstbasecamerabinsrc-1.0.so - %{_libdir}/libgstbasecamerabinsrc-1.0.so.0 - %{_libdir}/libgstbasecamerabinsrc-1.0.so.0.102.0 --%{_libdir}/libgstegl-1.0.so --%{_libdir}/libgstegl-1.0.so.0 --%{_libdir}/libgstegl-1.0.so.0.102.0 -+%{_libdir}/libgstnvegl-1.0.so -+%{_libdir}/libgstnvegl-1.0.so.0 -+%{_libdir}/libgstnvegl-1.0.so.0.102.0 - %{_libdir}/libgstmpegts-1.0.so - %{_libdir}/libgstmpegts-1.0.so.0 - %{_libdir}/libgstmpegts-1.0.so.0.102.0 -diff --git a/pkgconfig/gstreamer-egl-uninstalled.pc.in b/pkgconfig/gstreamer-egl-uninstalled.pc.in -index 525bda8..ae9d406 100644 ---- a/pkgconfig/gstreamer-egl-uninstalled.pc.in -+++ b/pkgconfig/gstreamer-egl-uninstalled.pc.in -@@ -7,6 +7,6 @@ Name: GStreamer EGL, Uninstalled - Description: GStreamer EGL Library, uninstalled - Requires: gstreamer-@GST_API_VERSION@ - Version: @VERSION@ --Libs: -L${libdir} ${libdir}/libgstegl-@GST_API_VERSION@.la @EGL_LIBS@ -+Libs: -L${libdir} ${libdir}/libgstnvegl-@GST_API_VERSION@.la @EGL_LIBS@ - Cflags: -I${includedir} @EGL_CFLAGS@ - --- -1.9.1 - diff --git a/recipes-multimedia/libgstnvegl/libgstnvegl_21.7.0.bb b/recipes-multimedia/libgstnvegl/libgstnvegl_21.7.0.bb deleted file mode 100644 index 5645510..0000000 --- a/recipes-multimedia/libgstnvegl/libgstnvegl_21.7.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "NVIDIA Linux Driver Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d" - -SRC_URI = " \ - https://developer.download.nvidia.com/embedded/L4T/r21_Release_v7.0/r21.7.0-sources.tbz2 \ - file://0001-rename-gstegl-to-gstnvegl.patch \ - file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://0001-pkg-config-files-fix-qa-error.patch \ -" - -SRC_URI[md5sum] = "620d0979ffbbc8cbe8cb36faacee386b" -SRC_URI[sha256sum] = "4523ce03e18d2507a180a0b67e3ef136d4b73837f48063146c471fe575282440" - -S = "${WORKDIR}/gstegl_src/gst-egl" - -inherit autotools pkgconfig -# gobject-introspection - -EXTRA_OECONF = "--disable-nls --disable-static-plugins --enable-introspection=no" - -DEPENDS += " libffi glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libpcre libxml2 zlib \ - virtual/egl virtual/mesa virtual/libgles2 wayland gdbm drm tar-native" - -nvidia_unpack() { - cd "${WORKDIR}" - # NVIDIA now packages packages in one big package! - tar xjf gstegl_src.tbz2 -} - -do_unpack[postfuncs] += "nvidia_unpack" - -FILES_${PN}-dbg = " \ - /usr/src/debug/* \ - /usr/lib/gstreamer-1.0/.debug/* \ - /usr/lib/.debug/* \ -" - -FILES_${PN} = " \ - /usr/lib/gstreamer-1.0/libgstnveglglessink.so \ - /usr/lib/gstreamer-1.0/libgstnveglglessink.la \ - /usr/lib/libgstnvegl-1.0.so \ - /usr/lib/libgstnvegl-1.0.so.0 \ - /usr/lib/libgstnvegl-1.0.so.0.203.0 \ -" diff --git a/recipes-multimedia/libgstomx-1.0/files/gstomx-1.0.patch b/recipes-multimedia/libgstomx-1.0/files/gstomx-1.0.patch deleted file mode 100644 index 9e5a702..0000000 --- a/recipes-multimedia/libgstomx-1.0/files/gstomx-1.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c ---- a/omx/gstomxvideoenc.c 2016-06-08 06:17:32.000000000 +0200 -+++ b/omx/gstomxvideoenc.c 2017-01-08 23:54:18.217242233 +0100 -@@ -2440,7 +2440,7 @@ - - err = - gst_omx_component_get_index (self->enc, -- NVX_INDEX_CONFIG_VIDEO_ENCODE_TEMPORALTRADEOFF, &eIndex); -+ (char *) NVX_INDEX_CONFIG_VIDEO_ENCODE_TEMPORALTRADEOFF, &eIndex); - if (err != OMX_ErrorNone) { - return FALSE; - } diff --git a/recipes-multimedia/libgstomx-1.0/files/r21.6.0-sources-gstomx1_src.patch b/recipes-multimedia/libgstomx-1.0/files/r21.6.0-sources-gstomx1_src.patch deleted file mode 100644 index f74f278..0000000 --- a/recipes-multimedia/libgstomx-1.0/files/r21.6.0-sources-gstomx1_src.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Naur r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c ---- r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c 2016-06-08 06:17:32.000000000 +0200 -+++ r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.c 2017-10-14 03:23:25.000000000 +0200 -@@ -48,13 +48,15 @@ - { - PROP_0, - PROP_INSERT_SPS_PPS, -- PROP_NO_BFRAMES, -+ PROP_NUM_BFRAMES, - PROP_SLICE_HEADER_SPACING, - PROP_PROFILE - }; - - #define DEFAULT_SLICE_HEADER_SPACING 0 - #define DEFAULT_PROFILE OMX_VIDEO_AVCProfileBaseline -+#define DEFAULT_NUM_B_FRAMES 0 -+#define MAX_NUM_B_FRAMES 2 - - - #define GST_TYPE_OMX_VID_ENC_PROFILE (gst_omx_videnc_profile_get_type ()) -@@ -132,11 +134,12 @@ - "Insert H.264 SPS, PPS at every IDR frame", - FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - -- g_object_class_install_property (gobject_class, PROP_NO_BFRAMES, -- g_param_spec_boolean ("no-B-Frames", -- "Do not encode B Frames", -- "Do not use B Frames while encoding", -- FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | -+ g_object_class_install_property (gobject_class, PROP_NUM_BFRAMES, -+ g_param_spec_uint ("num-B-Frames", -+ "B Frames between two reference frames", -+ "Number of B Frames between two reference frames (not recommended)", -+ 0, MAX_NUM_B_FRAMES, DEFAULT_NUM_B_FRAMES, -+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | - GST_PARAM_MUTABLE_READY)); - - g_object_class_install_property (gobject_class, PROP_PROFILE, -@@ -151,7 +154,7 @@ - gst_omx_h264_enc_init (GstOMXH264Enc * self) - { - self->insert_sps_pps = FALSE; -- self->no_BFrames = FALSE; -+ self->nBFrames = 0; - self->slice_header_spacing = DEFAULT_SLICE_HEADER_SPACING; - self->profile = DEFAULT_PROFILE; - } -@@ -679,8 +682,8 @@ - case PROP_INSERT_SPS_PPS: - self->insert_sps_pps = g_value_get_boolean (value); - break; -- case PROP_NO_BFRAMES: -- self->no_BFrames = g_value_get_boolean (value); -+ case PROP_NUM_BFRAMES: -+ self->nBFrames = g_value_get_uint (value); - break; - case PROP_SLICE_HEADER_SPACING: - self->slice_header_spacing = g_value_get_ulong (value); -@@ -704,8 +707,8 @@ - case PROP_INSERT_SPS_PPS: - g_value_set_boolean (value, self->insert_sps_pps); - break; -- case PROP_NO_BFRAMES: -- g_value_set_boolean (value, self->no_BFrames); -+ case PROP_NUM_BFRAMES: -+ g_value_set_uint (value, self->nBFrames); - break; - case PROP_SLICE_HEADER_SPACING: - g_value_set_ulong (value, self->slice_header_spacing); -@@ -734,7 +737,7 @@ - gst_omx_component_get_parameter (GST_OMX_VIDEO_ENC (self)->enc, - OMX_IndexParamVideoAvc, &oH264Type); - if (eError == OMX_ErrorNone) { -- oH264Type.nBFrames = self->no_BFrames; -+ oH264Type.nBFrames = self->nBFrames; - oH264Type.nSliceHeaderSpacing = self->slice_header_spacing; - oH264Type.eProfile = self->profile; - -diff -Naur r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h ---- r21.5.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h 2016-06-08 06:17:32.000000000 +0200 -+++ r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxh264enc.h 2017-10-14 03:23:25.000000000 +0200 -@@ -56,7 +56,7 @@ - GstOMXVideoEnc parent; - h264_sf stream_format; - gboolean insert_sps_pps; -- gboolean no_BFrames; -+ gboolean nBFrames; - glong slice_header_spacing; - guint profile; - }; diff --git a/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch b/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch deleted file mode 100644 index aa4c6d5..0000000 --- a/recipes-multimedia/libgstomx-1.0/files/r21.7.0-sources-gstomx1_src.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c r21.7.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c ---- r21.6.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c 2017-10-14 03:23:25.000000000 +0200 -+++ r21.7.0-sources-gstomx1_src-gst-omx1/omx/gstomxvideosink.c 2018-05-29 22:13:29.000000000 +0200 -@@ -942,6 +942,32 @@ - return TRUE; - } - -+static OMX_ERRORTYPE -+gst_omx_set_stride_alignment (GstOmxVideoSink * self, -+ guint32 align) -+{ -+ OMX_INDEXTYPE eIndex; -+ OMX_ERRORTYPE eError; -+ -+ eError = gst_omx_component_get_index (self->sink, -+ (char *) NVX_INDEX_CONFIG_VIDEOSTRIDEALIGN, -+ &eIndex); -+ -+ if (eError == OMX_ErrorNone) { -+ NVX_CONFIG_VIDEO_STRIDEALIGN oStride; -+ -+ GST_OMX_INIT_STRUCT (&oStride); -+ -+ eError = gst_omx_component_get_config (self->sink, eIndex, &oStride); -+ -+ if (eError == OMX_ErrorNone) { -+ oStride.nAlign = (unsigned long) align; -+ eError = gst_omx_component_set_config (self->sink, eIndex, &oStride); -+ } -+ } -+ return eError; -+} -+ - static void - gst_omx_video_sink_check_nvfeatures (GstOmxVideoSink * self, GstCaps * caps) - { -@@ -950,6 +976,13 @@ - if (gst_caps_features_contains (feature, "memory:NVMM")) { - self->hw_path = TRUE; - } -+ -+ if (!self->hw_path) { -+ if (gst_omx_set_stride_alignment (self, 4) -+ != OMX_ErrorNone) { -+ g_warning ("Failed to set stride alignment.\n"); -+ } -+ } - } - - static OMX_ERRORTYPE -@@ -1087,6 +1120,20 @@ - min = MAX (port_def.nBufferCountMin, 4); - port_def.nBufferCountActual = min; - -+ switch (info.finfo->format) { -+ case GST_VIDEO_FORMAT_I420: -+ port_def.format.video.eColorFormat = OMX_COLOR_FormatYUV420Planar; -+ break; -+ case GST_VIDEO_FORMAT_NV12: -+ port_def.format.video.eColorFormat = OMX_COLOR_FormatYUV420SemiPlanar; -+ break; -+ default: -+ GST_ERROR_OBJECT (self, "Unsupported format %s", -+ gst_video_format_to_string (info.finfo->format)); -+ return FALSE; -+ break; -+ } -+ - GST_DEBUG_OBJECT (self, "Setting inport port definition"); - - if (gst_omx_port_update_port_definition (self->sink_in_port, diff --git a/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb b/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb deleted file mode 100644 index 0e57dd4..0000000 --- a/recipes-multimedia/libgstomx-1.0/libgstomx-1.0_21.7.0.bb +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION = "NVIDIA Linux Driver Packages" -HOMEPAGE = "https://developer.nvidia.com/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = " \ - http://developer.download.nvidia.com/embedded/L4T/r21_Release_v5.0/source/gstomx1_src.tbz2 \ - file://r21.6.0-sources-gstomx1_src.patch \ - file://r21.7.0-sources-gstomx1_src.patch \ - file://gstomx-1.0.patch \ -" - -SRC_URI[md5sum] = "d5714a9533b210b30ef0e97e28ebc77d" -SRC_URI[sha256sum] = "b1c62a41467f2ff6661a3ba7d0e30e85e7ed126005f67b39ff6ebf2d704fd222" - -DEPENDS += " libgstnvegl libffi glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libpcre libxml2 zlib " -DEPENDS += " virtual/egl virtual/mesa virtual/libgles2 wayland gdbm drm " - -S = "${WORKDIR}/gstomx1_src/gst-omx1" - -inherit autotools pkgconfig - -EXTRA_OECONF = " --with-omx-target=tegra --disable-static-plugins" - -CXXFLAGS += " -I${S}/omx/openmax " -CFLAGS += " -I${S}/omx/openmax " - -do_configure_prepend() { - export NOCONFIGURE="true" - export GST_EGL_LIBS="-lgstnvegl-1.0 -lEGL -lX11 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0" - export GST_EGL_CFLAGS="-I${STAGING_INCDIR}/libdrm " -# export GST_EGL_CFLAGS="-pthread -I${STAGING_INCDIR}/gstreamer-1.0 -I${STAGING_INCDIR}/libdrm -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_LIBDIR}/glib-2.0/include" -} - -FILES_${PN}-dbg = " \ - /usr/src/debug/* \ - /usr/lib/gstreamer-1.0/.debug/* \ - /usr/lib/.debug/* \ -" - -FILES_${PN} = " \ - /usr/lib/gstreamer-1.0/libgstomx.la \ - /usr/lib/gstreamer-1.0/libgstomx.so \ -" diff --git a/recipes-multimedia/libpng/libpng12_1.2.57.bb b/recipes-multimedia/libpng/libpng12_1.2.57.bb deleted file mode 100644 index 9f74f5f..0000000 --- a/recipes-multimedia/libpng/libpng12_1.2.57.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "PNG image format decoding library" -HOMEPAGE = "http://www.libpng.org/" -SECTION = "libs" -LICENSE = "Libpng" -LIC_FILES_CHKSUM = "file://LICENSE;md5=597b8a91994a3e27ae6aa79bf02677d9 \ - file://png.h;beginline=19;endline=109;md5=166406397718925b660f0033f7558ef7" -DEPENDS = "zlib" - -PN = "libpng12" -S = "${WORKDIR}/libpng-${PV}" - -SRC_URI = "${GENTOO_MIRROR}/libpng-${PV}.tar.xz" - -SRC_URI[md5sum] = "307052e5e8af97b82b17b64fb1b3677a" -SRC_URI[sha256sum] = "0f4620e11fa283fedafb474427c8e96bf149511a1804bdc47350963ae5cf54d8" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libpng/files/libpng12/" -UPSTREAM_CHECK_REGEX = "/libpng12/(?P(\d+[\.\-_]*)+)/" - -BINCONFIG_GLOB = "${PN}-config" - -inherit autotools binconfig pkgconfig - -do_install_append() { - # The follow link files link to corresponding png12*.h and libpng12* files - # They conflict with higher verison, so drop them - rm ${D}/${includedir}/png.h - rm ${D}/${includedir}/pngconf.h - - rm ${D}/${libdir}/libpng.la - rm ${D}/${libdir}/libpng.so - rm ${D}/${libdir}/libpng.a || true - rm ${D}/${libdir}/pkgconfig/libpng.pc - - rm ${D}/${bindir}/libpng-config -} -- cgit v1.2.3