|
Lines 1-6
Link Here
|
| 1 |
--- gst-libs/gst/gl/meson.build.orig 2023-02-23 18:23:11 UTC |
1 |
--- gst-libs/gst/gl/meson.build.orig 2023-01-23 19:29:34 UTC |
| 2 |
+++ gst-libs/gst/gl/meson.build |
2 |
+++ gst-libs/gst/gl/meson.build |
| 3 |
@@ -554,11 +554,6 @@ if need_platform_egl != 'no' |
3 |
@@ -555,11 +555,6 @@ if need_platform_egl != 'no' |
| 4 |
gl_platform_deps += egl_dep |
4 |
gl_platform_deps += egl_dep |
| 5 |
glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1) |
5 |
glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1) |
| 6 |
|
6 |
|
|
Lines 12-18
Link Here
|
| 12 |
egl_includes = ''' |
12 |
egl_includes = ''' |
| 13 |
#include <EGL/egl.h> |
13 |
#include <EGL/egl.h> |
| 14 |
#include <EGL/eglext.h> |
14 |
#include <EGL/eglext.h> |
| 15 |
@@ -1058,7 +1053,7 @@ if build_gstgl |
15 |
@@ -1060,7 +1055,7 @@ if build_gstgl |
| 16 |
soversion : soversion, |
16 |
soversion : soversion, |
| 17 |
darwin_versions : osxversion, |
17 |
darwin_versions : osxversion, |
| 18 |
install : true, |
18 |
install : true, |
|
Lines 21-32
Link Here
|
| 21 |
gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps], |
21 |
gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps], |
| 22 |
# don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems |
22 |
# don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems |
| 23 |
implicit_include_directories : false) |
23 |
implicit_include_directories : false) |
| 24 |
@@ -1069,10 +1064,10 @@ if build_gstgl |
24 |
@@ -1074,7 +1069,7 @@ if build_gstgl |
| 25 |
'gl_apis=' + ' '.join(enabled_gl_apis), |
25 |
library_def = {'lib': gstgl} |
| 26 |
] |
|
|
| 27 |
|
| 28 |
- library_def = {'lib': pbutils} |
| 29 |
+ library_def = {'lib': library('gstpbutils-@0@'.format(api_version))} |
| 30 |
pkg_name = 'gstreamer-gl-1.0' |
26 |
pkg_name = 'gstreamer-gl-1.0' |
| 31 |
pkgconfig.generate(gstgl, |
27 |
pkgconfig.generate(gstgl, |
| 32 |
- libraries : [gstvideo, gst_base_dep, gst_dep], |
28 |
- libraries : [gstvideo, gst_base_dep, gst_dep], |
|
Lines 34-40
Link Here
|
| 34 |
variables : pkgconfig_variables + pkgconfig_gl_variables, |
30 |
variables : pkgconfig_variables + pkgconfig_gl_variables, |
| 35 |
uninstalled_variables : pkgconfig_gl_variables, |
31 |
uninstalled_variables : pkgconfig_gl_variables, |
| 36 |
subdirs : pkgconfig_subdirs, |
32 |
subdirs : pkgconfig_subdirs, |
| 37 |
@@ -1104,7 +1099,7 @@ if build_gstgl |
33 |
@@ -1106,7 +1101,7 @@ if build_gstgl |
| 38 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
34 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
| 39 |
'install' : true, |
35 |
'install' : true, |
| 40 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/gl.h'], |
36 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/gl.h'], |
|
Lines 43-58
Link Here
|
| 43 |
} |
39 |
} |
| 44 |
library_def += {'gir': [gir]} |
40 |
library_def += {'gir': [gir]} |
| 45 |
if not static_build |
41 |
if not static_build |
| 46 |
@@ -1116,7 +1111,7 @@ if build_gstgl |
42 |
@@ -1118,7 +1113,7 @@ if build_gstgl |
| 47 |
gstgl_dep = declare_dependency(link_with : gstgl, |
43 |
gstgl_dep = declare_dependency(link_with : gstgl, |
| 48 |
include_directories : [libsinc, compat_includes], |
44 |
include_directories : [libsinc, compat_includes], |
| 49 |
sources: gen_sources, |
45 |
sources: gen_sources, |
| 50 |
- dependencies : [video_dep, gst_base_dep, gl_winsys_deps], |
46 |
- dependencies : [video_dep, gst_base_dep, gl_winsys_deps], |
| 51 |
+ dependencies : [dependency('gstreamer-video-1.0'), gst_base_dep, gl_winsys_deps], |
47 |
+ dependencies : [dependency('gstreamer-video-1.0'), gst_base_dep, gl_winsys_deps], |
| 52 |
variables: pkgconfig_gl_variables) |
48 |
variables: pkgconfig_gl_variables) |
| 53 |
gstglproto_dep = declare_dependency(dependencies : [gstgl_dep] + gl_lib_deps) |
49 |
gstglproto_dep = declare_dependency( |
| 54 |
meson.override_dependency('gstreamer-gl-1.0', gstgl_dep) |
50 |
dependencies : [gstgl_dep] + gl_lib_deps, |
| 55 |
@@ -1144,7 +1139,7 @@ if build_gstgl |
51 |
@@ -1149,7 +1144,7 @@ if build_gstgl |
| 56 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
52 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
| 57 |
'install' : true, |
53 |
'install' : true, |
| 58 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/x11/x11.h'], |
54 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/x11/x11.h'], |
|
Lines 60-67
Link Here
|
| 60 |
+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep] |
56 |
+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep] |
| 61 |
} |
57 |
} |
| 62 |
gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} |
58 |
gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} |
| 63 |
libraries += [[pkg_name, {'gir': gir_dict}]] |
59 |
gst_libraries += [[pkg_name, {'gir': gir_dict}]] |
| 64 |
@@ -1180,7 +1175,7 @@ if build_gstgl |
60 |
@@ -1185,7 +1180,7 @@ if build_gstgl |
| 65 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
61 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
| 66 |
'install' : true, |
62 |
'install' : true, |
| 67 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'], |
63 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'], |
|
Lines 70-76
Link Here
|
| 70 |
} |
66 |
} |
| 71 |
|
67 |
|
| 72 |
gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} |
68 |
gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} |
| 73 |
@@ -1216,7 +1211,7 @@ if build_gstgl |
69 |
@@ -1221,7 +1216,7 @@ if build_gstgl |
| 74 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
70 |
'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], |
| 75 |
'install' : true, |
71 |
'install' : true, |
| 76 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'], |
72 |
'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'], |
|
Lines 78-81
Link Here
|
| 78 |
+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep] |
74 |
+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep] |
| 79 |
} |
75 |
} |
| 80 |
gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} |
76 |
gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} |
| 81 |
libraries += [[pkg_name, {'gir': gir_dict}]] |
77 |
gst_libraries += [[pkg_name, {'gir': gir_dict}]] |