From 77aa251ccf303dc4e1d727177511bceb21084486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Thu, 31 Oct 2024 10:24:31 +0100 Subject: [PATCH] gstreamer: gl package config since 1.24.9 The gstreamer-gl package config file is now fixed --- subprojects/gstreamer-1.0.wrap | 1 - ...-invalid-include-flag-in-uninstalled.patch | 45 ------------------- 2 files changed, 46 deletions(-) delete mode 100644 subprojects/packagefiles/gstreamer-1.0/0001-Revert-meson-Fix-invalid-include-flag-in-uninstalled.patch diff --git a/subprojects/gstreamer-1.0.wrap b/subprojects/gstreamer-1.0.wrap index a6703f7..f057783 100644 --- a/subprojects/gstreamer-1.0.wrap +++ b/subprojects/gstreamer-1.0.wrap @@ -3,7 +3,6 @@ directory=gstreamer-1.0 url=https://gitlab.freedesktop.org/gstreamer/gstreamer.git push-url=git@gitlab.freedesktop.org:gstreamer/gstreamer.git revision=1.24 -diff_files = gstreamer-1.0/0001-Revert-meson-Fix-invalid-include-flag-in-uninstalled.patch [provide] dependency_names = gstreamer-1.0, gstreamer-base-1.0, gstreamer-sys-1.0, gstreamer-plugins-bad-1.0, gstreamer-video-1.0, gstreamer-player-1.0 gstreamer-gl-1.0 diff --git a/subprojects/packagefiles/gstreamer-1.0/0001-Revert-meson-Fix-invalid-include-flag-in-uninstalled.patch b/subprojects/packagefiles/gstreamer-1.0/0001-Revert-meson-Fix-invalid-include-flag-in-uninstalled.patch deleted file mode 100644 index fbe11ae..0000000 --- a/subprojects/packagefiles/gstreamer-1.0/0001-Revert-meson-Fix-invalid-include-flag-in-uninstalled.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6ce72488face35277643d3781d3da7c4f95d5e1e Mon Sep 17 00:00:00 2001 -From: Nirbheek Chauhan -Date: Fri, 19 Jul 2024 20:14:29 +0530 -Subject: [PATCH] Revert "meson: Fix invalid include flag in uninstalled gl pc - file" - -This reverts commit 9d719b9937e2ef476cf18f800f54ccac1feea8ee. - -The old pkg-config implementation errors out if a variable specified -in the pkgconfig file is not defined, so this actually broke -uninstalled pc files. - -Part-of: ---- - subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build -index 751967be83..57af08ced3 100644 ---- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build -+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build -@@ -1113,18 +1113,15 @@ if build_gstgl - 'gl_winsys=' + ' '.join(enabled_gl_winsys), - 'gl_apis=' + ' '.join(enabled_gl_apis), - ] -- pkgconfig_installed_variables = [ -- 'libinc=-I${libdir}/gstreamer-1.0/include', -- ] - - library_def = {'lib': gstgl} - pkg_name = 'gstreamer-gl-1.0' - pkgconfig.generate(gstgl, - libraries : [gstvideo, gst_base_dep, gst_dep], -- variables : pkgconfig_variables + pkgconfig_gl_variables + pkgconfig_installed_variables, -+ variables : pkgconfig_variables + pkgconfig_gl_variables, - uninstalled_variables : pkgconfig_gl_variables, - subdirs : pkgconfig_subdirs, -- extra_cflags : ['${libinc}'], -+ extra_cflags : ['-I${libdir}/gstreamer-1.0/include'], - name : pkg_name, - description : 'Streaming media framework, OpenGL plugins libraries', - ) --- -2.39.5 (Apple Git-154) -