summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meson.build20
-rw-r--r--meson_options.txt2
-rw-r--r--packaging/mesa.spec35
-rw-r--r--src/egl/meson.build8
-rw-r--r--src/gallium/winsys/v3d/drm/meson.build1
-rw-r--r--src/mesa/meson.build2
6 files changed, 41 insertions, 27 deletions
diff --git a/meson.build b/meson.build
index 9272590201d..1ac942c50d4 100644
--- a/meson.build
+++ b/meson.build
@@ -232,7 +232,7 @@ endif
_platforms = get_option('platforms')
if _platforms.contains('auto')
if system_has_kms_drm
- _platforms = ['x11', 'wayland', 'drm', 'surfaceless']
+ _platforms = ['x11', 'wayland', 'drm', 'surfaceless', 'tizen']
elif ['darwin', 'windows', 'cygwin'].contains(host_machine.system())
_platforms = ['x11', 'surfaceless']
elif ['haiku'].contains(host_machine.system())
@@ -246,6 +246,7 @@ endif
with_platform_android = _platforms.contains('android')
with_platform_x11 = _platforms.contains('x11')
with_platform_wayland = _platforms.contains('wayland')
+with_platform_tizen = _platforms.contains('tizen')
with_platform_drm = _platforms.contains('drm')
with_platform_haiku = _platforms.contains('haiku')
with_platform_surfaceless = _platforms.contains('surfaceless')
@@ -1322,11 +1323,6 @@ if with_platform_wayland
dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8')
dep_wayland_client = dependency('wayland-client', version : '>=1.11')
dep_wayland_server = dependency('wayland-server', version : '>=1.11')
- if with_egl
- dep_wayland_egl = dependency('wayland-egl-backend', version : '>= 3')
- dep_wayland_egl_headers = declare_dependency(
- compile_args : run_command(prog_pkgconfig, ['wayland-egl-backend', '--cflags']).stdout().split())
- endif
wayland_dmabuf_xml = join_paths(
dep_wl_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
@@ -1334,6 +1330,18 @@ if with_platform_wayland
pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
endif
+if with_platform_tizen
+ dep_tpl_egl = dependency('tpl-egl')
+ dep_libtbm = dependency('libtbm')
+ dep_libtdm = dependency('libtdm')
+ dep_wayland_client = dependency('wayland-client')
+ dep_dlog = dependency('dlog')
+ dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8')
+ dep_wayland_client = dependency('wayland-client', version : '>=1.11')
+ dep_wayland_server = dependency('wayland-server', version : '>=1.11')
+ pre_args += ['-DHAVE_TIZEN_PLATFORM']
+endif
+
dep_x11 = null_dep
dep_xext = null_dep
dep_xdamage = null_dep
diff --git a/meson_options.txt b/meson_options.txt
index ccf70659ff7..c3729b3c138 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,7 +23,7 @@ option(
type : 'array',
value : ['auto'],
choices : [
- '', 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android',
+ '', 'auto', 'x11', 'wayland', 'drm', 'surfaceless', 'haiku', 'android', 'tizen',
],
description : 'window systems to support. If this is set to `auto`, all platforms applicable will be enabled.'
)
diff --git a/packaging/mesa.spec b/packaging/mesa.spec
index b345ae5d162..dce8b151624 100644
--- a/packaging/mesa.spec
+++ b/packaging/mesa.spec
@@ -34,6 +34,9 @@ BuildRequires: pkgconfig(libtbm)
BuildRequires: pkgconfig(libtdm)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(dlog)
+BuildRequires: meson
+BuildRequires: python3
+BuildRequires: python3-mako
%ifarch x86_64 %ix86
BuildRequires: pkgconfig(libdrm_intel) >= 2.4.24
%endif
@@ -64,28 +67,26 @@ cp %{SOURCE1002} .
%build
%{?asan:/usr/bin/gcc-unforce-options}
-./autogen.sh --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --disable-glx \
- --disable-dri3 \
- --enable-gles2 \
- --enable-shared-glapi \
- --enable-gbm \
- --with-platforms=tizen,wayland,drm \
- --enable-autotools\
+mkdir build
+meson --prefix %{_prefix} build/ \
+ -Dlibdir=%{_libdir} \
+ -Dgallium-va=false \
+ -Dgallium-vdpau=false \
+ -Dgallium-xa=false \
+ -Dgallium-xvmc=false \
+ -Dglx=disabled \
+ -Ddri3=false \
+ -Dgbm=true \
+ -Dplatforms="tizen,wayland,drm" \
%ifarch %ix86 x86_64
- --with-dri-drivers="i915,swrast" \
- --with-gallium-drivers="i915,swrast"
+ -Dgallium-drivers="i915,swrast" \
%else
- --with-dri-drivers="swrast" \
- --with-gallium-drivers="vc4,v3d,kmsro,swrast"
+ -Dgallium-drivers="vc4,v3d,kmsro,swrast"
%endif
-
-make %{?jobs:-j%jobs}
+ninja -C build/
%install
-%make_install
-
+DESTDIR=%{buildroot} ninja -C build/ install
mkdir -p %{buildroot}%{_libdir}/driver
cp -a %{buildroot}%{_libdir}/libEGL* %{buildroot}%{_libdir}/driver
cp -a %{buildroot}%{_libdir}/libGLES* %{buildroot}%{_libdir}/driver
diff --git a/src/egl/meson.build b/src/egl/meson.build
index b7ff09e9fed..40ffac0ee40 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -114,7 +114,7 @@ if with_dri2
files_egl += files('drivers/dri2/platform_surfaceless.c')
endif
if with_platform_wayland
- deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers]
+ deps_for_egl += [dep_wayland_client, dep_wayland_server]
link_for_egl += libwayland_drm
files_egl += files('drivers/dri2/platform_wayland.c')
files_egl += [
@@ -122,7 +122,11 @@ if with_dri2
linux_dmabuf_unstable_v1_client_protocol_h,
wayland_drm_client_protocol_h,
]
- incs_for_egl += include_directories('wayland/wayland-drm')
+ incs_for_egl += [include_directories('wayland/wayland-drm'), include_directories('wayland/wayland-egl')]
+ endif
+ if with_platform_tizen
+ files_egl += files('drivers/dri2/platform_tizen.c')
+ deps_for_egl += [dep_libdrm, dep_tpl_egl, dep_libtbm, dep_libtdm, dep_wayland_client, dep_dlog]
endif
if with_platform_android
deps_for_egl += dep_android
diff --git a/src/gallium/winsys/v3d/drm/meson.build b/src/gallium/winsys/v3d/drm/meson.build
index e5d7b12d1df..2bc6671172c 100644
--- a/src/gallium/winsys/v3d/drm/meson.build
+++ b/src/gallium/winsys/v3d/drm/meson.build
@@ -26,4 +26,5 @@ libv3dwinsys = static_library(
inc_gallium, inc_gallium_aux, inc_gallium_drivers,
],
c_args : [c_vis_args],
+ dependencies: dep_libdrm,
)
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 27c8c401c4d..caa31998091 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -738,7 +738,7 @@ libmesa_gallium = static_library(
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common, inc_libmesa_asm, include_directories('main')],
link_with : [libglsl, libmesa_sse41],
- dependencies : [idep_nir_headers, dep_vdpau],
+ dependencies : [idep_nir_headers, dep_vdpau, dep_dlog],
build_by_default : false,
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 21:10:42 +0000