svn commit: r497170 - in head/graphics/gstreamer1-plugins-gl: . files

[Mark Linimon]

Author: linimon
Date: Fri Mar 29 17:21:25 2019
New Revision: 497170
URL: https://svnweb.freebsd.org/changeset/ports/497170

Log:
  Fix compilation on GCC-based architectures including and similar to:
  
    gstgldebug.h:28: error: redefinition of typedef 'GstGLAsyncDebug'
  
  I chose a different approach from the PR.  The trick is that since this
  is a slave port, the patchdir by default is from the masterport.  In my
  fix, I put the patches back into this port's files/ subdir and do some
  Makefile magic to invoke them.
  
  PR:		233788 (based on)
  Submitted by:	Piotr Kubaj
  Approved by:	portmgr (tier-2 blanket)

Added:
  head/graphics/gstreamer1-plugins-gl/files/
  head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstgl__fwd.h   (contents, props changed)
  head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstglcontext.h   (contents, props changed)
  head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstgldebug.h   (contents, props changed)
  head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstglfuncs.h   (contents, props changed)
Modified:
  head/graphics/gstreamer1-plugins-gl/Makefile

Modified: head/graphics/gstreamer1-plugins-gl/Makefile
==============================================================================
--- head/graphics/gstreamer1-plugins-gl/Makefile	Fri Mar 29 17:06:20 2019	(r497169)
+++ head/graphics/gstreamer1-plugins-gl/Makefile	Fri Mar 29 17:21:25 2019	(r497170)
@@ -20,6 +20,12 @@ OPTIONS_SUB=	yes
 WAYLAND_CONFIGURE_ENABLE=	wayland
 WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland
 
+EXTRA_PATCHDIR=	${.CURDIR}/../../graphics/gstreamer1-plugins-gl/files
+EXTRA_PATCHES=	${EXTRA_PATCHDIR}/patch-gst-libs_gst_gl_gstgl__fwd.h \
+		${EXTRA_PATCHDIR}/patch-gst-libs_gst_gl_gstglcontext.h \
+		${EXTRA_PATCHDIR}/patch-gst-libs_gst_gl_gstgldebug.h \
+		${EXTRA_PATCHDIR}/patch-gst-libs_gst_gl_gstglfuncs.h
+
 pre-build:
 .for dir in ${GL_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})

Added: head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstgl__fwd.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstgl__fwd.h	Fri Mar 29 17:21:25 2019	(r497170)
@@ -0,0 +1,11 @@
+--- gst-libs/gst/gl/gstgl_fwd.h.orig	2018-12-05 14:04:58 UTC
++++ gst-libs/gst/gl/gstgl_fwd.h
+@@ -102,8 +102,6 @@ typedef struct _GstGLOverlayCompositorClass GstGLOverl
+ 
+ typedef struct _GstGLQuery GstGLQuery;
+ 
+-typedef struct _GstGLFuncs GstGLFuncs;
+-
+ typedef struct _GstGLAsyncDebug GstGLAsyncDebug;
+ 
+ #include <gst/gl/gstgl_enums.h>

Added: head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstglcontext.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstglcontext.h	Fri Mar 29 17:21:25 2019	(r497170)
@@ -0,0 +1,11 @@
+--- gst-libs/gst/gl/gstglcontext.h.orig	2018-12-05 14:06:09 UTC
++++ gst-libs/gst/gl/gstglcontext.h
+@@ -98,7 +98,7 @@ struct _GstGLContext {
+   GstGLWindow  *window;
+ 
+   /*< public >*/
+-  GstGLFuncs *gl_vtable;
++  struct _GstGLFuncs *gl_vtable;
+ 
+   /*< private >*/
+   GstGLContextPrivate *priv;

Added: head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstgldebug.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstgldebug.h	Fri Mar 29 17:21:25 2019	(r497170)
@@ -0,0 +1,11 @@
+--- gst-libs/gst/gl/gstgldebug.h.orig	2018-12-04 14:57:39 UTC
++++ gst-libs/gst/gl/gstgldebug.h
+@@ -25,8 +25,6 @@
+ 
+ G_BEGIN_DECLS
+ 
+-typedef struct _GstGLAsyncDebug GstGLAsyncDebug;
+-
+ typedef gchar * (*GstGLAsyncDebugLogGetMessage) (gpointer user_data);
+ 
+ /**

Added: head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstglfuncs.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/gstreamer1-plugins-gl/files/patch-gst-libs_gst_gl_gstglfuncs.h	Fri Mar 29 17:21:25 2019	(r497170)
@@ -0,0 +1,27 @@
+--- gst-libs/gst/gl/gstglfuncs.h.orig	2018-03-23 20:44:42 UTC
++++ gst-libs/gst/gl/gstglfuncs.h
+@@ -23,13 +23,6 @@
+ 
+ #include <gst/gl/gstglconfig.h>
+ 
+-/* This mimic GCC behaviour with system headers files even if GL headers may
+- * not be in the system header path. */
+-#ifdef __GNUC__
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wredundant-decls"
+-#endif
+-
+ /* OpenGL 2.0 for Embedded Systems */
+ #if GST_GL_HAVE_GLES2
+ # if GST_GL_HAVE_PLATFORM_EAGL
+@@ -72,10 +65,6 @@
+ # endif
+ #endif
+ 
+-#ifdef __GNUC__
+-#pragma GCC diagnostic pop
+-#endif
+-
+ #if defined(WINAPI)
+ #define GSTGLAPI WINAPI
+ #else