View | Details | Raw Unified | Return to bug 267100 | Differences between
and this patch

Collapse All | Expand All

(-)gst-libs/gst/gl/meson.build (-11 / +13 lines)
Lines 554-562 Link Here
554
    gl_platform_deps += egl_dep
554
    gl_platform_deps += egl_dep
555
    glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1)
555
    glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1)
556
556
557
    if cc.has_header('libdrm/drm_fourcc.h')
557
    if get_option('allocators').enabled()
558
      gl_misc_deps += allocators_dep
558
      if cc.has_header('libdrm/drm_fourcc.h')
559
      glconf.set('GST_GL_HAVE_DMABUF', 1)
559
        gl_misc_deps += allocators_dep
560
        glconf.set('GST_GL_HAVE_DMABUF', 1)
561
      endif
560
    endif
562
    endif
561
563
562
    egl_includes = '''
564
    egl_includes = '''
Lines 1049-1055 Link Here
1049
    soversion : soversion,
1051
    soversion : soversion,
1050
    darwin_versions : osxversion,
1052
    darwin_versions : osxversion,
1051
    install : true,
1053
    install : true,
1052
    dependencies : [gst_base_dep, video_dep, allocators_dep, gmodule_dep,
1054
    dependencies : [gst_base_dep, dependency('gstreamer-video-1.0'), dependency('gstreamer-allocators-1.0'), gmodule_dep,
1053
                    gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps],
1055
                    gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps],
1054
    # don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems
1056
    # don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems
1055
    implicit_include_directories : false)
1057
    implicit_include_directories : false)
Lines 1060-1069 Link Here
1060
    'gl_apis=' + ' '.join(enabled_gl_apis),
1062
    'gl_apis=' + ' '.join(enabled_gl_apis),
1061
  ]
1063
  ]
1062
1064
1063
  library_def = {'lib': pbutils}
1065
  library_def = {'lib': library('gstpbutils-@0@'.format(api_version))}
1064
  pkg_name = 'gstreamer-gl-1.0'
1066
  pkg_name = 'gstreamer-gl-1.0'
1065
  pkgconfig.generate(gstgl,
1067
  pkgconfig.generate(gstgl,
1066
    libraries : [gstvideo, gst_base_dep, gst_dep],
1068
    libraries : [library('gstvideo-@0@'.format(api_version)), gst_base_dep, gst_dep],
1067
    variables : pkgconfig_variables + pkgconfig_gl_variables,
1069
    variables : pkgconfig_variables + pkgconfig_gl_variables,
1068
    uninstalled_variables : pkgconfig_gl_variables,
1070
    uninstalled_variables : pkgconfig_gl_variables,
1069
    subdirs : pkgconfig_subdirs,
1071
    subdirs : pkgconfig_subdirs,
Lines 1095-1101 Link Here
1095
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1097
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1096
        'install' : true,
1098
        'install' : true,
1097
        'extra_args' : gir_init_section + ['--c-include=gst/gl/gl.h'],
1099
        'extra_args' : gir_init_section + ['--c-include=gst/gl/gl.h'],
1098
        'dependencies' : [video_dep, gst_dep, gst_base_dep],
1100
        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep],
1099
    }
1101
    }
1100
    library_def += {'gir': [gir]}
1102
    library_def += {'gir': [gir]}
1101
    if not static_build
1103
    if not static_build
Lines 1107-1113 Link Here
1107
  gstgl_dep = declare_dependency(link_with : gstgl,
1109
  gstgl_dep = declare_dependency(link_with : gstgl,
1108
    include_directories : [libsinc, compat_includes],
1110
    include_directories : [libsinc, compat_includes],
1109
    sources: gen_sources,
1111
    sources: gen_sources,
1110
    dependencies : [video_dep, gst_base_dep])
1112
    dependencies : [dependency('gstreamer-video-1.0'), gst_base_dep])
1111
  gstglproto_dep = declare_dependency(dependencies : [gstgl_dep] + gl_lib_deps)
1113
  gstglproto_dep = declare_dependency(dependencies : [gstgl_dep] + gl_lib_deps)
1112
  meson.override_dependency('gstreamer-gl-1.0', gstgl_dep)
1114
  meson.override_dependency('gstreamer-gl-1.0', gstgl_dep)
1113
  meson.override_dependency('gstreamer-gl-prototypes-1.0', gstglproto_dep)
1115
  meson.override_dependency('gstreamer-gl-prototypes-1.0', gstglproto_dep)
Lines 1134-1140 Link Here
1134
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1136
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1135
        'install' : true,
1137
        'install' : true,
1136
        'extra_args' : gir_init_section + ['--c-include=gst/gl/x11/x11.h'],
1138
        'extra_args' : gir_init_section + ['--c-include=gst/gl/x11/x11.h'],
1137
        'dependencies' : [video_dep, gst_dep, gst_base_dep]
1139
        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep]
1138
      }
1140
      }
1139
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
1141
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
1140
      libraries += [[pkg_name, {'gir': gir_dict}]]
1142
      libraries += [[pkg_name, {'gir': gir_dict}]]
Lines 1170-1176 Link Here
1170
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1172
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1171
        'install' : true,
1173
        'install' : true,
1172
        'extra_args' : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'],
1174
        'extra_args' : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'],
1173
        'dependencies' : [video_dep, gst_dep, gst_base_dep]
1175
        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep]
1174
      }
1176
      }
1175
1177
1176
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
1178
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
Lines 1206-1212 Link Here
1206
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1208
        'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
1207
        'install' : true,
1209
        'install' : true,
1208
        'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'],
1210
        'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'],
1209
        'dependencies' : [video_dep, gst_dep, gst_base_dep]
1211
        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep]
1210
      }
1212
      }
1211
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
1213
      gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
1212
      libraries += [[pkg_name, {'gir': gir_dict}]]
1214
      libraries += [[pkg_name, {'gir': gir_dict}]]

Return to bug 267100