From nobody Tue Nov 01 23:24:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N25hZ5rN0z4gLcj; Tue, 1 Nov 2022 23:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N25hZ5QGBz3mkT; Tue, 1 Nov 2022 23:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667345086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/Z4JafA2K65tnRnI4f/7WJ4hTavYe7bch+O7Gk5wB8=; b=XVwkHxhk+npvZ6hWpY2StSwBGPkFGMk5GTyO9fr1DXga8cPyBWTiZvrUH5uKhnemJwHasg orFQdobN8uj6hng60TBi0Jz6gdPFD2SEl/JV1LRA9q/DrNLlzNxpW959o/nd277eycTxg5 RkS98DkPlS9yQmlEdd3INStObKlVBWj+3a522yNzf7Ke+b+/NtbvvVQtA6i84pIz9qJcIT 9XremvdGXsliRBmI6RYtfqc3SvAnsmm92hDc1zCRy3yssaMDFGsHiJDR8SJuAaS09mJe7R T9ofZ6Wobip85DQm2qNALqki7OYhRV7IGA7zbS3yzR9TkURUwwvauDVX2Q8ePg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N25hZ4XBmzZDZ; Tue, 1 Nov 2022 23:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A1NOkQ2067018; Tue, 1 Nov 2022 23:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1NOkVY067017; Tue, 1 Nov 2022 23:24:46 GMT (envelope-from git) Date: Tue, 1 Nov 2022 23:24:46 GMT Message-Id: <202211012324.2A1NOkVY067017@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: 040e9e09916b - main - multimedia/gstreamer1-plugins: Fix build in the presence of libdrm List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 040e9e09916bc42675bb0d3aa94fee4787bb15c3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667345086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/Z4JafA2K65tnRnI4f/7WJ4hTavYe7bch+O7Gk5wB8=; b=szgO+LFlVoJsdgG/ZnWDJbUTkEsNjC0uV6flx/M+7qM+1V2giXS2vXo+KMPc/ShgqvTIqc mj6vQH4ZSL0YQQWSQA6qmGXUKA+bYJTCKDkLJiK1fnGlMsTojvfg15xNlzWZC98vgLeH0o 5ltxCNlZfHWf9dAQ2tB506XPmyNoOYhPaqE+QyJDmegCpktyS45fwb+ThkiAC9lT4jwgSx YUhqeSQlRJrpi/bUH16C6aAs3dlBASzJC9mvgZ3PWq5W/zzske7YO5SACJDFnhYmwsTxA0 6nSo56MxFvQmtEm9FCPirrRUHHamaWbNzQSga6AYGtMpqOZEFoniwrez5GFKng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667345086; a=rsa-sha256; cv=none; b=iEUBlNkxg2fu52Z02GvZwEBu1zdFWp3hcD+aD4zkzNFAgROkMY8Npwy5R1WlUs2VJav0d2 yLVSMNTR2sKDdSy+nzmsSPhhw+g1S3XEdliHxGsQ6XJgt/fbxEUCJNsLa9p6mHOwwscVk7 Db3M5SdB+Ro3ZNBy9RtNssH642LVQbQQzwOBHDlt1SmVhaMQ2blcS9sXgSLSvuPrtwmkaP N4TuJ7bFii2BqchQKMeebT63zBzo7o6UyGOer2Z/GB992WP+O/ggcDQ6g+ljipIiYadr44 QXC8g9x8AkHSRXyRo9p0ZHZyLMZC/y+qQph2BjgAcc6QXwT2pAQy+DpxWSi4+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=040e9e09916bc42675bb0d3aa94fee4787bb15c3 commit 040e9e09916bc42675bb0d3aa94fee4787bb15c3 Author: Thomas Zander AuthorDate: 2022-11-01 22:36:11 +0000 Commit: Thomas Zander CommitDate: 2022-11-01 23:24:41 +0000 multimedia/gstreamer1-plugins: Fix build in the presence of libdrm PR: 267100 Reported by: rkoberman@gmail.com --- .../files/patch-ext_gl_meson.build | 15 ++++++++++-- .../files/patch-gst-libs_gst_gl_meson.build | 28 +++++++++++++++------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build b/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build index 87e324d065c1..92e0bdc7bd5b 100644 --- a/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build @@ -1,6 +1,17 @@ ---- ext/gl/meson.build.orig 2022-09-09 09:05:31 UTC +--- ext/gl/meson.build.orig 2022-06-15 22:36:22 UTC +++ ext/gl/meson.build -@@ -146,7 +146,7 @@ gstopengl = library('gstopengl', +@@ -116,10 +116,6 @@ if bcm_host_dep.found() + optional_deps += bcm_host_dep + endif + +-if egl_dep.found() and cc.has_header('libdrm/drm_fourcc.h') +- optional_deps += allocators_dep +-endif +- + if ['darwin', 'ios'].contains(host_system) + if not have_objc + error('No ObjC compiler found') +@@ -146,7 +142,7 @@ gstopengl = library('gstopengl', objc_args : gst_plugins_base_args + gl_objc_args + extra_c_args, link_args : noseh_link_args, include_directories : [configinc], diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build index e784c477c858..f8ef9876117d 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build @@ -1,6 +1,18 @@ ---- gst-libs/gst/gl/meson.build.orig 2022-09-08 22:01:19 UTC +--- gst-libs/gst/gl/meson.build.orig 2022-11-01 22:00:52 UTC +++ gst-libs/gst/gl/meson.build -@@ -1049,7 +1049,7 @@ if build_gstgl +@@ -554,11 +554,6 @@ if need_platform_egl != 'no' + gl_platform_deps += egl_dep + glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1) + +- if cc.has_header('libdrm/drm_fourcc.h') +- gl_misc_deps += allocators_dep +- glconf.set('GST_GL_HAVE_DMABUF', 1) +- endif +- + egl_includes = ''' + #include + #include +@@ -1049,7 +1044,7 @@ if build_gstgl soversion : soversion, darwin_versions : osxversion, install : true, @@ -9,7 +21,7 @@ gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps], # don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems implicit_include_directories : false) -@@ -1060,10 +1060,10 @@ if build_gstgl +@@ -1060,10 +1055,10 @@ if build_gstgl 'gl_apis=' + ' '.join(enabled_gl_apis), ] @@ -22,7 +34,7 @@ variables : pkgconfig_variables + pkgconfig_gl_variables, uninstalled_variables : pkgconfig_gl_variables, subdirs : pkgconfig_subdirs, -@@ -1095,7 +1095,7 @@ if build_gstgl +@@ -1095,7 +1090,7 @@ if build_gstgl 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], 'install' : true, 'extra_args' : gir_init_section + ['--c-include=gst/gl/gl.h'], @@ -31,7 +43,7 @@ } library_def += {'gir': [gir]} if not static_build -@@ -1107,7 +1107,7 @@ if build_gstgl +@@ -1107,7 +1102,7 @@ if build_gstgl gstgl_dep = declare_dependency(link_with : gstgl, include_directories : [libsinc, compat_includes], sources: gen_sources, @@ -40,7 +52,7 @@ gstglproto_dep = declare_dependency(dependencies : [gstgl_dep] + gl_lib_deps) meson.override_dependency('gstreamer-gl-1.0', gstgl_dep) meson.override_dependency('gstreamer-gl-prototypes-1.0', gstglproto_dep) -@@ -1134,7 +1134,7 @@ if build_gstgl +@@ -1134,7 +1129,7 @@ if build_gstgl 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], 'install' : true, 'extra_args' : gir_init_section + ['--c-include=gst/gl/x11/x11.h'], @@ -49,7 +61,7 @@ } gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} libraries += [[pkg_name, {'gir': gir_dict}]] -@@ -1170,7 +1170,7 @@ if build_gstgl +@@ -1170,7 +1165,7 @@ if build_gstgl 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], 'install' : true, 'extra_args' : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'], @@ -58,7 +70,7 @@ } gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} -@@ -1206,7 +1206,7 @@ if build_gstgl +@@ -1206,7 +1201,7 @@ if build_gstgl 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], 'install' : true, 'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'],