yafox
/
how-lix-os-pkgs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
how-lix-os-pkgs/mesa/default/patch

478 lines
18 KiB
Plaintext
Raw Permalink Blame History

diff -ur 20.1.7/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
--- 20.1.7/src/amd/vulkan/meson.build 2020-09-02 19:53:54.240416500 +0000
+++ b/src/amd/vulkan/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -167,7 +167,7 @@
libvulkan_radeon_link_depends += files('vulkan.sym')
endif
-libvulkan_radeon = shared_library(
+libvulkan_radeon = static_library(
'vulkan_radeon',
[libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h, radv_gfx10_format_table_h],
include_directories : [
diff -ur 20.1.7/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build
--- 20.1.7/src/broadcom/drm-shim/meson.build 2020-09-02 19:53:54.297416400 +0000
+++ b/src/broadcom/drm-shim/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-libv3d_noop_drm_shim = shared_library(
+libv3d_noop_drm_shim = static_library(
['v3d_noop_drm_shim'],
'v3d_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
@@ -47,7 +47,7 @@
)
endforeach
- libv3d_drm_shim = shared_library(
+ libv3d_drm_shim = static_library(
['v3d_drm_shim'],
[
'v3d.c',
diff -ur 20.1.7/src/egl/meson.build b/src/egl/meson.build
--- 20.1.7/src/egl/meson.build 2020-09-02 19:53:54.400416000 +0000
+++ b/src/egl/meson.build 2020-09-24 16:27:54.280000000 +0000
@@ -158,7 +158,7 @@
)
endif
-libegl = shared_library(
+libegl = static_library(
egl_lib_name,
files_egl,
c_args : [
diff -ur 20.1.7/src/etnaviv/drm-shim/meson.build b/src/etnaviv/drm-shim/meson.build
--- 20.1.7/src/etnaviv/drm-shim/meson.build 2020-09-02 19:53:54.401416000 +0000
+++ b/src/etnaviv/drm-shim/meson.build 2020-09-24 16:27:54.280000000 +0000
@@ -20,7 +20,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-libetnaviv_noop_drm_shim = shared_library(
+libetnaviv_noop_drm_shim = static_library(
'etnaviv_noop_drm_shim',
'etnaviv_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
diff -ur 20.1.7/src/freedreno/drm-shim/meson.build b/src/freedreno/drm-shim/meson.build
--- 20.1.7/src/freedreno/drm-shim/meson.build 2020-09-02 19:53:54.497415500 +0000
+++ b/src/freedreno/drm-shim/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -19,7 +19,7 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-libfreedreno_noop_drm_shim = shared_library(
+libfreedreno_noop_drm_shim = static_library(
['freedreno_noop_drm_shim'],
'freedreno_noop.c',
include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
diff -ur 20.1.7/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
--- 20.1.7/src/freedreno/vulkan/meson.build 2020-09-02 19:53:54.513415600 +0000
+++ b/src/freedreno/vulkan/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -97,7 +97,7 @@
tu_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT'
endif
-libvulkan_freedreno = shared_library(
+libvulkan_freedreno = static_library(
'vulkan_freedreno',
[libtu_files, tu_entrypoints, tu_extensions_c, freedreno_xml_header_files],
include_directories : [
diff -ur 20.1.7/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
--- 20.1.7/src/gallium/drivers/swr/meson.build 2020-09-02 19:53:54.878414200 +0000
+++ b/src/gallium/drivers/swr/meson.build 2020-09-24 16:27:54.270000000 +0000
@@ -225,7 +225,7 @@
swr_defines += '-DHAVE_SWR_SKX'
if shared_swr
- swr_arch_libs += shared_library(
+ swr_arch_libs += static_library(
'swrSKX',
[files_swr_common, files_swr_arch],
cpp_args : [
@@ -264,7 +264,7 @@
swr_defines += '-DHAVE_SWR_KNL'
if shared_swr
- swr_arch_libs += shared_library(
+ swr_arch_libs += static_library(
'swrKNL',
[files_swr_common, files_swr_arch],
cpp_args : [
@@ -308,7 +308,7 @@
swr_defines += '-DHAVE_SWR_AVX2'
if shared_swr
- swr_arch_libs += shared_library(
+ swr_arch_libs += static_library(
'swrAVX2',
[files_swr_common, files_swr_arch],
cpp_args : [
@@ -340,7 +340,7 @@
if with_swr_arches.contains('avx')
swr_defines += '-DHAVE_SWR_AVX'
if shared_swr
- swr_arch_libs += shared_library(
+ swr_arch_libs += static_library(
'swrAVX',
[files_swr_common, files_swr_arch],
cpp_args : [
diff -ur 20.1.7/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
--- 20.1.7/src/gallium/targets/d3dadapter9/meson.build 2020-09-02 19:53:55.421412000 +0000
+++ b/src/gallium/targets/d3dadapter9/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -46,7 +46,7 @@
gallium_nine_link_with += libgalliumvl_stub
endif
-libgallium_nine = shared_library(
+libgallium_nine = static_library(
'd3dadapter9',
files('description.c', 'getproc.c', 'drm.c'),
include_directories : [
diff -ur 20.1.7/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
--- 20.1.7/src/gallium/targets/dri/meson.build 2020-09-02 19:53:55.422412000 +0000
+++ b/src/gallium/targets/dri/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -37,7 +37,7 @@
gallium_dri_link_depends += files('../dri-vdpau.dyn')
endif
-libgallium_dri = shared_library(
+libgallium_dri = static_library(
'gallium_dri',
files('target.c'),
include_directories : [
diff -ur 20.1.7/src/gallium/targets/graw-gdi/meson.build b/src/gallium/targets/graw-gdi/meson.build
--- 20.1.7/src/gallium/targets/graw-gdi/meson.build 2020-09-02 19:53:55.422412000 +0000
+++ b/src/gallium/targets/graw-gdi/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-libgraw_gdi = shared_library(
+libgraw_gdi = static_library(
'graw',
'graw_gdi.c',
c_args : [c_vis_args, c_msvc_compat_args],
diff -ur 20.1.7/src/gallium/targets/graw-null/meson.build b/src/gallium/targets/graw-null/meson.build
--- 20.1.7/src/gallium/targets/graw-null/meson.build 2020-09-02 19:53:55.422412000 +0000
+++ b/src/gallium/targets/graw-null/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -25,7 +25,7 @@
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
)
-libgraw_null = shared_library(
+libgraw_null = static_library(
'graw_null',
['graw_null.c'],
c_args : [c_vis_args, c_msvc_compat_args],
diff -ur 20.1.7/src/gallium/targets/graw-xlib/meson.build b/src/gallium/targets/graw-xlib/meson.build
--- 20.1.7/src/gallium/targets/graw-xlib/meson.build 2020-09-02 19:53:55.422412000 +0000
+++ b/src/gallium/targets/graw-xlib/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-libgraw_xlib = shared_library(
+libgraw_xlib = static_library(
'graw_xlib',
['graw_xlib.c'],
c_args : [c_vis_args],
diff -ur 20.1.7/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build
--- 20.1.7/src/gallium/targets/haiku-softpipe/meson.build 2020-09-02 19:53:55.499411600 +0000
+++ b/src/gallium/targets/haiku-softpipe/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-libswpipe = shared_library(
+libswpipe = static_library(
'swpipe',
files('SoftwareRenderer.cpp', 'GalliumContext.cpp'),
include_directories : [
diff -ur 20.1.7/src/gallium/targets/libgl-gdi/meson.build b/src/gallium/targets/libgl-gdi/meson.build
--- 20.1.7/src/gallium/targets/libgl-gdi/meson.build 2020-09-02 19:53:55.499411600 +0000
+++ b/src/gallium/targets/libgl-gdi/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -26,7 +26,7 @@
ogldef = files('../../state_trackers/wgl/opengl32.def')[0]
endif
-libopengl32 = shared_library(
+libopengl32 = static_library(
'opengl32',
['libgl_gdi.c'],
vs_module_defs : ogldef,
diff -ur 20.1.7/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
--- 20.1.7/src/gallium/targets/libgl-xlib/meson.build 2020-09-02 19:53:55.510411700 +0000
+++ b/src/gallium/targets/libgl-xlib/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -37,7 +37,7 @@
gallium_xlib_link_with += libglapi
endif
-libgl = shared_library(
+libgl = static_library(
'GL',
files('xlib.c'),
include_directories : [
diff -ur 20.1.7/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build
--- 20.1.7/src/gallium/targets/omx/meson.build 2020-09-02 19:53:55.512411600 +0000
+++ b/src/gallium/targets/omx/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -30,7 +30,7 @@
omx_link_depends += files('omx.sym')
endif
-libomx_gallium = shared_library(
+libomx_gallium = static_library(
'omx_mesa',
'target.c',
c_args : c_vis_args,
diff -ur 20.1.7/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
--- 20.1.7/src/gallium/targets/opencl/meson.build 2020-09-02 19:53:55.512411600 +0000
+++ b/src/gallium/targets/opencl/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -85,7 +85,7 @@
endif
endif
-libopencl = shared_library(
+libopencl = static_library(
opencl_libname,
[],
link_args : [ld_args_gc_sections, opencl_link_args],
diff -ur 20.1.7/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build
--- 20.1.7/src/gallium/targets/osmesa/meson.build 2020-09-02 19:53:55.512411600 +0000
+++ b/src/gallium/targets/osmesa/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -38,7 +38,7 @@
osmesa_def = 'osmesa.def'
endif
-libosmesa = shared_library(
+libosmesa = static_library(
osmesa_lib_name,
'target.c',
c_args : [c_vis_args],
diff -ur 20.1.7/src/gallium/targets/pipe-loader/meson.build b/src/gallium/targets/pipe-loader/meson.build
--- 20.1.7/src/gallium/targets/pipe-loader/meson.build 2020-09-02 19:53:55.521411700 +0000
+++ b/src/gallium/targets/pipe-loader/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -70,7 +70,7 @@
foreach x : pipe_loaders
if x[0]
- shared_library(
+ static_library(
'pipe_@0@'.format(x[1]),
'pipe_@0@.c'.format(x[1]),
c_args : [pipe_loader_comp_args, c_vis_args],
diff -ur 20.1.7/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build
--- 20.1.7/src/gallium/targets/va/meson.build 2020-09-02 19:53:55.530411500 +0000
+++ b/src/gallium/targets/va/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -31,7 +31,7 @@
va_link_depends += files('va.sym')
endif
-libva_gallium = shared_library(
+libva_gallium = static_library(
'gallium_drv_video',
'target.c',
c_args : c_vis_args,
diff -ur 20.1.7/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build
--- 20.1.7/src/gallium/targets/vdpau/meson.build 2020-09-02 19:53:55.530411500 +0000
+++ b/src/gallium/targets/vdpau/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -36,7 +36,7 @@
endif
-libvdpau_gallium = shared_library(
+libvdpau_gallium = static_library(
'vdpau_gallium',
'target.c',
c_args : c_vis_args,
diff -ur 20.1.7/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build
--- 20.1.7/src/gallium/targets/xa/meson.build 2020-09-02 19:53:55.541411400 +0000
+++ b/src/gallium/targets/xa/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -32,7 +32,7 @@
_xa_version = '.'.join(xa_version)
-libxatracker = shared_library(
+libxatracker = static_library(
'xatracker',
'target.c',
c_args : c_vis_args,
diff -ur 20.1.7/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build
--- 20.1.7/src/gallium/targets/xvmc/meson.build 2020-09-02 19:53:55.541411400 +0000
+++ b/src/gallium/targets/xvmc/meson.build 2020-09-24 16:27:54.260000000 +0000
@@ -31,7 +31,7 @@
xvmc_link_depends += files('xvmc.sym')
endif
-libxvmc_gallium = shared_library(
+libxvmc_gallium = static_library(
'XvMCgallium',
'target.c',
c_args : c_vis_args,
diff -ur 20.1.7/src/gbm/meson.build b/src/gbm/meson.build
--- 20.1.7/src/gbm/meson.build 2020-09-02 19:53:56.183409000 +0000
+++ b/src/gbm/meson.build 2020-09-24 16:27:54.280000000 +0000
@@ -43,7 +43,7 @@
incs_gbm += inc_wayland_drm
endif
-libgbm = shared_library(
+libgbm = static_library(
'gbm',
files_gbm,
include_directories : incs_gbm,
diff -ur 20.1.7/src/glx/meson.build b/src/glx/meson.build
--- 20.1.7/src/glx/meson.build 2020-09-02 19:53:56.209409000 +0000
+++ b/src/glx/meson.build 2020-09-24 16:27:54.280000000 +0000
@@ -149,7 +149,7 @@
],
)
-libgl = shared_library(
+libgl = static_library(
gl_lib_name,
[],
link_with : [libglapi_static, libglapi],
diff -ur 20.1.7/src/hgl/meson.build b/src/hgl/meson.build
--- 20.1.7/src/hgl/meson.build 2020-09-02 19:53:56.242408800 +0000
+++ b/src/hgl/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -18,7 +18,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-libgl = shared_library(
+libgl = static_library(
'GL',
files(
'GLView.cpp', 'GLRenderer.cpp', 'GLRendererRoster.cpp', 'GLDispatcher.cpp',
diff -ur 20.1.7/src/intel/tools/meson.build b/src/intel/tools/meson.build
--- 20.1.7/src/intel/tools/meson.build 2020-09-02 19:53:56.406408000 +0000
+++ b/src/intel/tools/meson.build 2020-09-24 16:27:54.270000000 +0000
@@ -81,7 +81,7 @@
configuration : sanitize_data
)
-libintel_sanitize_gpu = shared_library(
+libintel_sanitize_gpu = static_library(
'intel_sanitize_gpu',
files('intel_sanitize_gpu.c'),
dependencies : [idep_mesautil, dep_dl, dep_thread],
@@ -100,7 +100,7 @@
install : true
)
-libintel_dump_gpu = shared_library(
+libintel_dump_gpu = static_library(
'intel_dump_gpu',
files(
'gen_context.h', 'gen8_context.h', 'gen10_context.h', 'intel_aub.h',
diff -ur 20.1.7/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
--- 20.1.7/src/intel/vulkan/meson.build 2020-09-02 19:53:56.496407700 +0000
+++ b/src/intel/vulkan/meson.build 2020-09-24 16:27:54.270000000 +0000
@@ -187,7 +187,7 @@
dependencies : anv_deps,
)
-libvulkan_intel = shared_library(
+libvulkan_intel = static_library(
'vulkan_intel',
[files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h],
include_directories : [
diff -ur 20.1.7/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
--- 20.1.7/src/mapi/es1api/meson.build 2020-09-02 19:53:56.498407800 +0000
+++ b/src/mapi/es1api/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -32,7 +32,7 @@
_es1_c_args += ['-D_GDI32_', '-DBUILD_GL32']
endif
-libglesv1_cm = shared_library(
+libglesv1_cm = static_library(
'GLESv1_CM' + get_option('gles-lib-suffix'),
['../entry.c', es1_glapi_mapi_tmp_h],
c_args : [
diff -ur 20.1.7/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
--- 20.1.7/src/mapi/es2api/meson.build 2020-09-02 19:53:56.498407800 +0000
+++ b/src/mapi/es2api/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -32,7 +32,7 @@
_es2_c_args += ['-D_GDI32_', '-DBUILD_GL32']
endif
-libgles2 = shared_library(
+libgles2 = static_library(
'GLESv2' + get_option('gles-lib-suffix'),
['../entry.c', es2_glapi_mapi_tmp_h],
c_args : [
diff -ur 20.1.7/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build
--- 20.1.7/src/mapi/shared-glapi/meson.build 2020-09-02 19:53:56.525407600 +0000
+++ b/src/mapi/shared-glapi/meson.build 2020-09-24 16:27:54.250000000 +0000
@@ -41,7 +41,7 @@
_glapi_c_args += ['-D_GLAPI_DLL_EXPORTS']
endif
-libglapi = shared_library(
+libglapi = static_library(
'glapi',
[files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
c_args : [
diff -ur 20.1.7/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
--- 20.1.7/src/mesa/drivers/dri/meson.build 2020-09-02 19:53:56.675407200 +0000
+++ b/src/mesa/drivers/dri/meson.build 2020-09-24 16:27:54.280000000 +0000
@@ -54,7 +54,7 @@
endif
if _dri_drivers != []
- libmesa_dri_drivers = shared_library(
+ libmesa_dri_drivers = static_library(
'mesa_dri_drivers',
[],
link_whole : _dri_drivers,
diff -ur 20.1.7/src/mesa/drivers/osmesa/meson.build b/src/mesa/drivers/osmesa/meson.build
--- 20.1.7/src/mesa/drivers/osmesa/meson.build 2020-09-02 19:53:56.754406700 +0000
+++ b/src/mesa/drivers/osmesa/meson.build 2020-09-24 16:27:54.280000000 +0000
@@ -24,7 +24,7 @@
osmesa_link_with += libglapi
endif
-libosmesa = shared_library(
+libosmesa = static_library(
osmesa_lib_name,
['osmesa.c', glapitable_h, glapitemp_h],
c_args : c_vis_args,
diff -ur 20.1.7/src/mesa/drivers/x11/meson.build b/src/mesa/drivers/x11/meson.build
--- 20.1.7/src/mesa/drivers/x11/meson.build 2020-09-02 19:53:56.758406900 +0000
+++ b/src/mesa/drivers/x11/meson.build 2020-09-24 16:27:54.280000000 +0000
@@ -23,7 +23,7 @@
gl_link_with += libglapi
endif
-libgl = shared_library(
+libgl = static_library(
'GL',
files(
'fakeglx.c', 'glxapi.c', 'xfonts.c', 'xm_api.c', 'xm_buffer.c', 'xm_dd.c',
diff -ur 20.1.7/src/vulkan/device-select-layer/meson.build b/src/vulkan/device-select-layer/meson.build
--- 20.1.7/src/vulkan/device-select-layer/meson.build 2020-09-02 19:53:57.249405000 +0000
+++ b/src/vulkan/device-select-layer/meson.build 2020-09-24 16:27:54.240000000 +0000
@@ -38,7 +38,7 @@
vklayer_flags += '-DVK_USE_PLATFORM_WAYLAND_KHR'
endif
-vklayer_mesa_device_select = shared_library(
+vklayer_mesa_device_select = static_library(
'VkLayer_MESA_device_select',
vklayer_files,
c_args : [c_vis_args, no_override_init_args, vklayer_flags ],
diff -ur 20.1.7/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build
--- 20.1.7/src/vulkan/overlay-layer/meson.build 2020-09-02 19:53:57.252405000 +0000
+++ b/src/vulkan/overlay-layer/meson.build 2020-09-24 16:27:54.240000000 +0000
@@ -36,7 +36,7 @@
'overlay_params.c',
)
-vklayer_mesa_overlay = shared_library(
+vklayer_mesa_overlay = static_library(
'VkLayer_MESA_overlay',
vklayer_files, overlay_spv, sha1_h,
c_args : [c_vis_args, no_override_init_args, vulkan_wsi_args],
Reference in New Issue View Git Blame Copy Permalink