198080 2019-05-21 13:07:12 -0700 webkitgtk 2.24.2 fails to build w/gstreamer 1.12.5 2019-06-22 08:51:08 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Linux RESOLVED FIXED P2 Normal --- 1 mgorse webkit-unassigned berto bugs-noreply commit-queue pnormand oldest_to_newest 1537962 0 mgorse 2019-05-21 13:07:12 -0700 I am trying to build webkitgtk on openSUSE Leap 15.0, which has gstreamer 1.12.5. With USE_GSTREAMER_GL, I get the following error, similar to bug 196178: In file included from Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h:34:0, from Source/WebCore/platform/graphics/texmap/TextureMapperGL.h:31, from Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:41, from Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:26: Source/WebCore/platform/graphics/OpenGLShims.h:259:67: error: expected type-specifier before 'glActiveTexture' #define glActiveTexture LOOKUP_GL_FUNCTION(glActiveTexture) ^ followed by many other errors. Probably related to this commit: https://trac.webkit.org/changeset/245119/webkit 1538130 1 berto 2019-05-22 00:56:24 -0700 This is probably not the cleanest fix, but here's a very quick workaround that I used to make it build in my environment: --- webkitgtk.orig/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h +++ webkitgtk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h @@ -38,6 +38,9 @@ #include <wtf/WeakPtr.h> #if USE(TEXTURE_MAPPER_GL) +#define GST_USE_UNSTABLE_API +#include <gst/gl/gl.h> +#undef GST_USE_UNSTABLE_API #include "TextureMapperGL.h" #if USE(NICOSIA) #include "NicosiaContentLayerTextureMapperImpl.h" 1546233 2 mgorse 2019-06-19 13:49:30 -0700 I'm not super familiar with gstreamer / don't know whether this is the right fix or not, but I just noticed that it wouldn't be the only place where we do this. mediaPlayerPrivateGStreamerBase.cpp has this: #define GST_USE_UNSTABLE_API #include <gst/gl/gl.h> #undef GST_USE_UNSTABLE_API We could also condition it with #if !GST_CHECK_VERSION(1, 14, 0) 1546237 3 pnormand 2019-06-19 14:05:38 -0700 (In reply to Mike Gorse from comment #2) > I'm not super familiar with gstreamer / don't know whether this is the > right fix or not, but I just noticed that it wouldn't be the only place > where we do this. mediaPlayerPrivateGStreamerBase.cpp has this: > #define GST_USE_UNSTABLE_API > #include <gst/gl/gl.h> > #undef GST_USE_UNSTABLE_API > > We could also condition it with #if !GST_CHECK_VERSION(1, 14, 0) That include is already wrapped by #if USE(GSTREAMER_GL). I know the ifdef soup there is already confusing enough. 1546976 4 372646 mgorse 2019-06-21 13:53:23 -0700 Created attachment 372646 Patch. This is the patch that Alberto posted in comment 1, along with a ChangeLog entry. It fixes the build for me. 1547002 5 372646 pnormand 2019-06-21 14:44:02 -0700 Comment on attachment 372646 Patch. Can the same include be removed from the cpp file then? 1547087 6 372676 mgorse 2019-06-22 05:03:20 -0700 Created attachment 372676 Patch. Removed gst/gl/gl.h from the source file. Also moved include of epoxy header, since I think that that needs to be included first. 1547098 7 372676 commit-queue 2019-06-22 08:51:06 -0700 Comment on attachment 372676 Patch. Clearing flags on attachment: 372676 Committed r246710: <https://trac.webkit.org/changeset/246710> 1547099 8 commit-queue 2019-06-22 08:51:08 -0700 All reviewed patches have been landed. Closing bug. 372646 2019-06-21 13:53:23 -0700 2019-06-22 05:03:20 -0700 Patch. build.patch text/plain 1381 mgorse ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNTM0MTZiNDA1Ny4uNzlhMzBlZGMyZDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOS0wNi0yMSAgTWlrZSBHb3JzZSAgPG1nb3JzZUBzdXNlLmNvbT4KKwor ICAgICAgICB3ZWJraXRndGsgMi4yNC4yIGZhaWxzIHRvIGJ1aWxkIHcvZ3N0cmVhbWVyIDEuMTIu NQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MDgw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIChidWlsZCBmaXggb25seSkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oOgorICAgICAgICBEZWZp bmUgR1NUX1VTRV9VTlNUQUJMRV9BUEkgd2hlbiBpbmNsdWRpbmcgZ3N0L2dsL2dsLmguCisKIDIw MTktMDYtMjEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNh ZmFyaSBjcmFzaGVzIGFmdGVyIH4yMDI4IE9mZmxpbmVBdWRpb0NvbnRleHQgb2JqZWN0cyBhcmUg Y3JlYXRlZCAodGhleSBuZXZlciBnZXQgZ2FyYmFnZSBjb2xsZWN0ZWQsIGNvbnN1bWluZyBhIHRo cmVhZCBlYWNoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJCYXNlLmgKaW5kZXggNTlhZmRmY2MwMWIuLjE3M2FiMGJmMWZmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKQEAgLTM4LDYgKzM4LDkg QEAKICNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiAjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dM KQorI2RlZmluZSBHU1RfVVNFX1VOU1RBQkxFX0FQSQorI2luY2x1ZGUgPGdzdC9nbC9nbC5oPgor I3VuZGVmIEdTVF9VU0VfVU5TVEFCTEVfQVBJCiAjaW5jbHVkZSAiVGV4dHVyZU1hcHBlckdMLmgi CiAjaWYgVVNFKE5JQ09TSUEpCiAjaW5jbHVkZSAiTmljb3NpYUNvbnRlbnRMYXllclRleHR1cmVN YXBwZXJJbXBsLmgiCg== 372676 2019-06-22 05:03:20 -0700 2019-06-22 08:51:06 -0700 Patch. build.patch text/plain 2961 mgorse ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4MDg5NmY4ZTlmOC4uZTE0OTkwZDRjMDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxOS0wNi0yMiAgTWlrZSBHb3JzZSAgPG1nb3JzZUBzdXNlLmNvbT4KKwor ICAgICAgICB3ZWJraXRndGsgMi4yNC4yIGZhaWxzIHRvIGJ1aWxkIHcvZ3N0cmVhbWVyIDEuMTIu NQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MDgw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIChidWlsZCBmaXggb25seSkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHA6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJh c2UuaDoKKyAgICAgICAgTW92ZSBpbmNsdWRlcyBvZiBnc3QvZ2wvZ2wuaCBhbmQgZXBveHkvZ2wu aCBpbnRvCisgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaC4KKwogMjAx OS0wNi0yMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAgICAgICBvcGVu RGF0YWJhc2Ugc2hvdWxkIHJldHVybiBhbiBlbXB0eSBvYmplY3Qgd2hlbiBXZWJTUUwgaXMgZGlz YWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJC YXNlLmNwcAppbmRleCAyMDVlZTRiZDI5Ni4uNTEwODk3OTIyODMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXJCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAKQEAgLTY2LDI0ICs2 Niw2IEBACiAKICNpbmNsdWRlIDxnc3QvYXBwL2dzdGFwcHNpbmsuaD4KIAotI2lmIFVTRShMSUJF UE9YWSkKLS8vIEluY2x1ZGUgdGhlIDxlcG94eS9nbC5oPiBoZWFkZXIgYmVmb3JlIDxnc3QvZ2wv Z2wuaD4uCi0jaW5jbHVkZSA8ZXBveHkvZ2wuaD4KLQotLy8gV29ya2Fyb3VuZCBidWlsZCBpc3N1 ZSB3aXRoIFJQaSB1c2VybGFuZCBHTEVTdjIgaGVhZGVycyBhbmQgbGliZXBveHkgPGh0dHBzOi8v d2Via2l0Lm9yZy9iLzE4NTYzOT4KLSNpZiAhR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTQsIDApCi0j aW5jbHVkZSA8Z3N0L2dsL2dzdGdsY29uZmlnLmg+Ci0jaWYgZGVmaW5lZChHU1RfR0xfSEFWRV9X SU5ET1dfRElTUE1BTlgpICYmIEdTVF9HTF9IQVZFX1dJTkRPV19ESVNQTUFOWAotI2RlZmluZSBf X2dsMl9oXwotI3VuZGVmIEdTVF9HTF9IQVZFX0dMU1lOQwotI2RlZmluZSBHU1RfR0xfSEFWRV9H TFNZTkMgMQotI2VuZGlmCi0jZW5kaWYgLy8gIUdTVF9DSEVDS19WRVJTSU9OKDEsIDE0LCAwKQot I2VuZGlmIC8vIFVTRShMSUJFUE9YWSkKLQotI2RlZmluZSBHU1RfVVNFX1VOU1RBQkxFX0FQSQot I2luY2x1ZGUgPGdzdC9nbC9nbC5oPgotI3VuZGVmIEdTVF9VU0VfVU5TVEFCTEVfQVBJCiAKICNp bmNsdWRlICJHTENvbnRleHQuaCIKICNpZiBVU0UoR0xYKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lckJhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKaW5kZXggNTlhZmRmY2MwMWIuLjk4MGVh MTk4NmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXJCYXNlLmgKQEAgLTM3LDYgKzM3LDI1IEBACiAjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KICNp bmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCisjaWYgVVNFKExJQkVQT1hZKQorLy8gSW5jbHVkZSB0 aGUgPGVwb3h5L2dsLmg+IGhlYWRlciBiZWZvcmUgPGdzdC9nbC9nbC5oPi4KKyNpbmNsdWRlIDxl cG94eS9nbC5oPgorCisvLyBXb3JrYXJvdW5kIGJ1aWxkIGlzc3VlIHdpdGggUlBpIHVzZXJsYW5k IEdMRVN2MiBoZWFkZXJzIGFuZCBsaWJlcG94eSA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTg1NjM5 PgorI2lmICFHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxNCwgMCkKKyNpbmNsdWRlIDxnc3QvZ2wvZ3N0 Z2xjb25maWcuaD4KKyNpZiBkZWZpbmVkKEdTVF9HTF9IQVZFX1dJTkRPV19ESVNQTUFOWCkgJiYg R1NUX0dMX0hBVkVfV0lORE9XX0RJU1BNQU5YCisjZGVmaW5lIF9fZ2wyX2hfCisjdW5kZWYgR1NU X0dMX0hBVkVfR0xTWU5DCisjZGVmaW5lIEdTVF9HTF9IQVZFX0dMU1lOQyAxCisjZW5kaWYKKyNl bmRpZiAvLyAhR1NUX0NIRUNLX1ZFUlNJT04oMSwgMTQsIDApCisjZW5kaWYgLy8gVVNFKExJQkVQ T1hZKQorCisjZGVmaW5lIEdTVF9VU0VfVU5TVEFCTEVfQVBJCisjaW5jbHVkZSA8Z3N0L2dsL2ds Lmg+CisjdW5kZWYgR1NUX1VTRV9VTlNUQUJMRV9BUEkKKwogI2lmIFVTRShURVhUVVJFX01BUFBF Ul9HTCkKICNpbmNsdWRlICJUZXh0dXJlTWFwcGVyR0wuaCIKICNpZiBVU0UoTklDT1NJQSkK