From 5bb746f99a55e964328ff6161d1fc47fed58190f Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 15 Feb 2020 22:50:12 +0100 Subject: media-libs/gst-plugins-base: Version bump, 1.16.2 compositor moved here from gst-plugins-bad. New overlaycomposition plugin element. Signed-off-by: Haelwenn (lanodan) Monnier Signed-off-by: Mart Raudsepp --- media-libs/gst-plugins-base/Manifest | 1 + .../files/gst-plugins-base-1.16.2-make43.patch | 347 +++++++++++++++++++++ .../gst-plugins-base-1.16.2.ebuild | 185 +++++++++++ 3 files changed, 533 insertions(+) create mode 100644 media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch create mode 100644 media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest index 9427f050dd7f..2a71747dceb7 100644 --- a/media-libs/gst-plugins-base/Manifest +++ b/media-libs/gst-plugins-base/Manifest @@ -1 +1,2 @@ DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc +DIST gst-plugins-base-1.16.2.tar.xz 3939868 BLAKE2B 7313e50dc0842f02cde0113462c8d4b393dafe271da6e2a1af89dc997f2ec77a9f06bc467516c607c8b7b822e49efd1af829440a28a9af8356ef07e7fa899968 SHA512 f28e71bba8ba25d4f18ba3a196f057721151f1ebf1309d808bd6771a3f9a68facfa1970dc4353b6f2fd1e8945edf5272854d328ea11ef399544f8b330f754a42 diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch new file mode 100644 index 000000000000..f8121962918a --- /dev/null +++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.16.2-make43.patch @@ -0,0 +1,347 @@ +--- a/common/glib-gen.mak ++++ b/common/glib-gen.mak +@@ -1,11 +1,13 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_enum_prefix=gst_color_balance + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # these are all the rules generating the relevant files + %-marshal.h: %-marshal.list +--- a/common/gst-glib-gen.mak ++++ b/common/gst-glib-gen.mak +@@ -1,14 +1,16 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include ++#glib_gen_decl_include=$(H)include + +-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # these are all the rules generating the relevant files + $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list +--- a/gst/encoding/Makefile.in ++++ b/gst/encoding/Makefile.in +@@ -17,12 +17,14 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -638,7 +640,7 @@ + gstsmartencoder.h \ + gststreamcombinerpad.h + +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + all: all-am + + .SUFFIXES: +--- a/gst-libs/gst/app/Makefile.in ++++ b/gst-libs/gst/app/Makefile.in +@@ -17,13 +17,15 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include + ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -618,12 +620,12 @@ + glib_gen_prefix = __gst_app + glib_gen_basename = app + glib_gen_decl_banner = GST_APP_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include = $(H)include + glib_enum_headers = gstappsrc.h + built_sources = app-enumtypes.c + built_headers = app-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + libgstapp_@GST_API_VERSION@_la_SOURCES = gstappsrc.c gstappsink.c + nodist_libgstapp_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES) + libgstapp_@GST_API_VERSION@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ +--- a/gst-libs/gst/audio/Makefile.in ++++ b/gst-libs/gst/audio/Makefile.in +@@ -39,13 +39,15 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include + ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -784,7 +786,7 @@ + glib_gen_prefix = gst_audio + glib_gen_basename = audio + glib_gen_decl_banner = GST_AUDIO_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include = $(H)include + built_sources = audio-enumtypes.c + built_headers = audio-enumtypes.h + lib_LTLIBRARIES = \ +@@ -895,7 +897,7 @@ + @HAVE_X86_TRUE@ $(GST_LIB_LDFLAGS) \ + @HAVE_X86_TRUE@ $(GST_ALL_LDFLAGS) + +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + + # Introspection + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstAudio-@GST_API_VERSION@.gir +--- a/gst-libs/gst/pbutils/Makefile.in ++++ b/gst-libs/gst/pbutils/Makefile.in +@@ -17,13 +17,15 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include + ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -664,6 +666,7 @@ + gstdiscoverer.h \ + gstaudiovisualizer.h + ++H := \# + + # variables used for enum/marshal generation + glib_enum_headers = $(headers_pbutils) +@@ -671,7 +674,7 @@ + glib_gen_prefix = pbutils + glib_gen_basename = pbutils + glib_gen_decl_banner = GST_PBUTILS_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include = $(H)include + built_headers_configure = \ + gstpluginsbaseversion.h + +@@ -719,7 +722,7 @@ + + # DISTCLEANFILES is for files generated by configure + DISTCLEANFILES = $(built_headers_configure) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstPbutils-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstpbutils_@GST_API_VERSION@include_HEADERS)) \ +--- a/gst-libs/gst/rtp/Makefile.in ++++ b/gst-libs/gst/rtp/Makefile.in +@@ -17,13 +17,15 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include + ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -675,8 +677,8 @@ + glib_enum_headers = $(libgstrtpinclude_HEADERS) + glib_gen_basename = gstrtp + glib_gen_decl_banner = GST_RTP_API +-glib_gen_decl_include = \#include +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++glib_gen_decl_include = $(H)include ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtp-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstrtpinclude_HEADERS)) \ +--- a/gst-libs/gst/rtsp/Makefile.in ++++ b/gst-libs/gst/rtsp/Makefile.in +@@ -17,13 +17,15 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include + ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -679,8 +681,8 @@ + glib_enum_headers = $(libgstrtspinclude_HEADERS) + glib_gen_basename = gstrtsp + glib_gen_decl_banner = GST_RTSP_API +-glib_gen_decl_include = \#include +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++glib_gen_decl_include = $(H)include ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstRtsp-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstrtspinclude_HEADERS)) \ +--- a/gst-libs/gst/tag/Makefile.in ++++ b/gst-libs/gst/tag/Makefile.in +@@ -17,13 +17,15 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include + ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -680,12 +682,12 @@ + glib_gen_prefix = gst_tag + glib_gen_basename = tag + glib_gen_decl_banner = GST_TAG_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include = $(H)include + glib_enum_headers = tag.h gsttagdemux.h + built_sources = tag-enumtypes.c + built_headers = tag-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + libgsttaginclude_HEADERS = \ + tag.h tag-prelude.h gsttagdemux.h gsttagmux.h xmpwriter.h + +--- a/gst-libs/gst/video/Makefile.in ++++ b/gst-libs/gst/video/Makefile.in +@@ -39,13 +39,15 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include + ++#glib_gen_decl_include=$(H)include + + + VPATH = @srcdir@ +@@ -740,7 +742,7 @@ + glib_gen_prefix = gst_video + glib_gen_basename = video + glib_gen_decl_banner = GST_VIDEO_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include = $(H)include + built_sources = video-enumtypes.c + built_headers = video-enumtypes.h + lib_LTLIBRARIES = libgstvideo-@GST_API_VERSION@.la +@@ -821,7 +823,7 @@ + + libgstvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM) + libgstvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstVideo-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(libgstvideo_@GST_API_VERSION@include_HEADERS)) \ +--- a/gst-libs/gst/gl/Makefile.in ++++ b/gst-libs/gst/gl/Makefile.in +@@ -17,12 +17,14 @@ + # these are the variables your Makefile.am should set + # the example is based on the colorbalance interface + ++H := \# ++ + #glib_enum_headers=$(colorbalance_headers) + #glib_enum_define=GST_COLOR_BALANCE + #glib_gen_prefix=gst_color_balance + #glib_gen_basename=colorbalance + #glib_gen_decl_banner=GST_EXPORT +-#glib_gen_decl_include=\#include ++#glib_gen_decl_include=${H}include + + + +@@ -863,14 +865,14 @@ glib_enum_define = GST_GL + glib_gen_prefix = gst_gl + glib_gen_basename = gl + glib_gen_decl_banner = GST_GL_API +-glib_gen_decl_include = \#include ++glib_gen_decl_include = ${H}include + built_sources = gl-enumtypes.c + built_headers = gl-enumtypes.h + BUILT_SOURCES = $(built_sources) $(built_headers) + CLEANFILES = $(BUILT_SOURCES) $(am__append_27) + nodist_libgstgl_@GST_API_VERSION@include_HEADERS = $(built_headers) + nodist_libgstgl_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES) +-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") ++enum_headers = $(foreach h,$(glib_enum_headers),\n${H}include \"$(h)\") + @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstGL-@GST_API_VERSION@.gir + @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \ + @HAVE_INTROSPECTION_TRUE@ $(gstgl_gir_headers)) $(patsubst \ diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild new file mode 100644 index 000000000000..548dabb5e358 --- /dev/null +++ b/media-libs/gst-plugins-base/gst-plugins-base-1.16.2.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GST_ORG_MODULE="gst-plugins-base" + +inherit flag-o-matic gstreamer + +DESCRIPTION="Basepack of plugins for gstreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/" + +LICENSE="GPL-2+ LGPL-2+" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# For OpenGL we have three separate concepts, with a list of possibilities in each: +# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant +# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams. +# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches +# With the following limitations: +# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl +# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case +# * glx platform requires opengl API +# * wayland, gbm and most other non-glx WSIs require egl platform +# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options; +# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; +# and libpng/jpeg are required for gloverlay element; + +# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad +IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X" +GL_REQUIRED_USE=" + || ( gbm wayland X ) + wayland? ( egl ) + gbm? ( egl ) +" +REQUIRED_USE=" + ivorbis? ( ogg ) + theora? ( ogg ) + vorbis? ( ogg ) + opengl? ( || ( egl X ) ${GL_REQUIRED_USE} ) + gles2? ( egl ${GL_REQUIRED_USE} ) +" + +# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl) +# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options +GL_DEPS=" + >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}] + egl? ( + x11-libs/libdrm + ) + gbm? ( + >=dev-libs/libgudev-147[${MULTILIB_USEDEP}] + >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] + ) + wayland? ( + dev-libs/wayland[${MULTILIB_USEDEP}] + ) + + >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}] + media-libs/libpng:0[${MULTILIB_USEDEP}] + virtual/jpeg:0[${MULTILIB_USEDEP}] +" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element + +RDEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) + ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] ) + ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) + orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] ) + pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] ) + theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] ) + vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + ) + + gles2? ( ${GL_DEPS} ) + opengl? ( ${GL_DEPS} ) + + !