commit 5da892d21cb31f5546b74021026d43f5a6eb5ec2 · pyrox.dev/nixpkgs

+1 -1

doc/packages/opengl.section.md

···

       10
        
       

     

       11
        
       ## Nix on GNU/Linux {#nix-on-gnulinux}

     

       12
        
       

     

       13
       -
       If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa.drivers` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs.

     

       14
        
       

     

       15
        
       For proprietary video drivers, you might have luck with also adding the corresponding video driver package.

···

       10
        
       

     

       11
        
       ## Nix on GNU/Linux {#nix-on-gnulinux}

     

       12
        
       

     

       13
       +
       If you are using a non-NixOS GNU/Linux/X11 desktop with free software video drivers, consider launching OpenGL-dependent programs from Nixpkgs with Nixpkgs versions of `libglvnd` and `mesa` in `LD_LIBRARY_PATH`. For Mesa drivers, the Linux kernel version doesn't have to match nixpkgs.

     

       14
        
       

     

       15
        
       For proprietary video drivers, you might have luck with also adding the corresponding video driver package.

+2 -2

nixos/modules/hardware/graphics.nix

···

       120
        
                 { "r" = {}; };

     

       121
        
           };

     

       122
        
       

     

       123
       -
           hardware.graphics.package = lib.mkDefault pkgs.mesa.drivers;

     

       124
       -
           hardware.graphics.package32 = lib.mkDefault pkgs.pkgsi686Linux.mesa.drivers;

     

       125
        
         };

     

       126
        
       }

···

       120
        
                 { "r" = {}; };

     

       121
        
           };

     

       122
        
       

     

       123
       +
           hardware.graphics.package = lib.mkDefault pkgs.mesa;

     

       124
       +
           hardware.graphics.package32 = lib.mkDefault pkgs.pkgsi686Linux.mesa;

     

       125
        
         };

     

       126
        
       }

+34 -83

pkgs/development/libraries/mesa/default.nix

···

       13
        
       , intltool

     

       14
        
       , jdupes

     

       15
        
       , libdrm

     

       0
        
       
     

       16
        
       , libglvnd

     

       17
        
       , libunwind

     

       18
        
       , libva-minimal

     
···

       139
        
       

     

       140
        
         patches = [

     

       141
        
           ./opencl.patch

     

       0
        
       
     

       142
        
         ];

     

       143
        
       

     

       144
        
         postPatch = ''

     

       145
        
           patchShebangs .

     

       146
        
       

     

       147
       -
           # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency:

     

       148
       -
           substituteInPlace src/util/xmlconfig.c --replace \

     

       149
       -
             'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"'

     

       150
       -
           substituteInPlace src/util/meson.build --replace \

     

       151
       -
             "get_option('datadir')" "'${placeholder "out"}/share'"

     

       152
       -
           substituteInPlace src/amd/vulkan/meson.build --replace \

     

       153
       -
             "get_option('datadir')" "'${placeholder "out"}/share'"

     

       154
       -
       

     

       155
        
           for header in ${toString mesa-gl-headers.headers}; do

     

       156
        
             if ! diff -q $header ${mesa-gl-headers}/$header; then

     

       157
        
               echo "File $header does not match between mesa and mesa-gl-headers, please update mesa-gl-headers first!"

     
···

       163
        
         '';

     

       164
        
       

     

       165
        
         outputs = [

     

       166
       -
           "out" "dev"

     

       167
       -
           "drivers"

     

       168
        
           # OpenCL drivers pull in ~1G of extra LLVM stuff, so don't install them

     

       169
        
           # if the user didn't explicitly ask for it

     

       170
        
           "opencl"

     
···

       193
        
       

     

       194
        
         mesonFlags = [

     

       195
        
           "--sysconfdir=/etc"

     

       196
       -
           "--datadir=${placeholder "drivers"}/share"

     

       197
        
       

     

       198
        
           # What to build

     

       199
        
           (lib.mesonOption "platforms" (lib.concatStringsSep "," eglPlatforms))

     
···

       201
        
           (lib.mesonOption "vulkan-drivers" (lib.concatStringsSep "," vulkanDrivers))

     

       202
        
           (lib.mesonOption "vulkan-layers" (lib.concatStringsSep "," vulkanLayers))

     

       203
        
       

     

       204
       -
           # Make sure we know where to put all the drivers

     

       205
       -
           (lib.mesonOption "dri-drivers-path" "${placeholder "drivers"}/lib/dri")

     

       206
       -
           (lib.mesonOption "vdpau-libs-path" "${placeholder "drivers"}/lib/vdpau")

     

       207
       -
           (lib.mesonOption "va-libs-path" "${placeholder "drivers"}/lib/dri")

     

       208
       -
           (lib.mesonOption "d3d-drivers-path" "${placeholder "drivers"}/lib/d3d")

     

       209
       -
       

     

       210
       -
           # Set search paths for non-Mesa drivers (e.g. Nvidia)

     

       211
       -
           (lib.mesonOption "gbm-backends-path" "${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm")

     

       212
       -
       

     

       213
        
           # Enable glvnd for dynamic libGL dispatch

     

       214
        
           (lib.mesonEnable "glvnd" true)

     

       0
        
       
     

       0
        
       
     

       215
        
       

     

       216
        
           (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK

     

       217
        
           (lib.mesonBool "osmesa" false) # deprecated upstream

     
···

       260
        
           elfutils

     

       261
        
           expat

     

       262
        
           spirv-tools

     

       0
        
       
     

       0
        
       
     

       263
        
           libglvnd

     

       264
        
           libunwind

     

       265
        
           libva-minimal

     
···

       326
        
           (buildPackages.mesa.cross_tools or null)

     

       327
        
         ];

     

       328
        
       

     

       329
       -
         propagatedBuildInputs = [ libdrm ];

     

       330
       -
       

     

       331
        
         doCheck = false;

     

       332
        
       

     

       333
        
         postInstall = ''

     

       334
       -
           # Move driver-related bits to $drivers

     

       335
       -
           moveToOutput "lib/gallium-pipe" $drivers

     

       336
       -
           moveToOutput "lib/gbm" $drivers

     

       337
       -
           moveToOutput "lib/lib*_mesa*" $drivers

     

       338
       -
           moveToOutput "lib/libgallium*" $drivers

     

       339
       -
           moveToOutput "lib/libglapi*" $drivers

     

       340
       -
           moveToOutput "lib/libpowervr_rogue*" $drivers

     

       341
       -
           moveToOutput "lib/libvulkan_*" $drivers

     

       342
       -
           moveToOutput "lib/libteflon.so" $drivers

     

       343
        
       

     

       344
       -
           # Update search path used by glvnd (it's pointing to $out but drivers are in $drivers)

     

       345
       -
           for js in $drivers/share/glvnd/egl_vendor.d/*.json; do

     

       346
       -
             substituteInPlace "$js" --replace-fail '"libEGL_' '"'"$drivers/lib/libEGL_"

     

       347
       -
           done

     

       348
       -
       

     

       349
       -
           # And same for Vulkan

     

       350
       -
           for js in $drivers/share/vulkan/icd.d/*.json; do

     

       351
       -
             substituteInPlace "$js" --replace-fail "$out" "$drivers"

     

       352
       -
           done

     

       353
       -
       

     

       354
       -
           # Move Vulkan layers to $drivers and update manifests

     

       355
       -
           moveToOutput "lib/libVkLayer*" $drivers

     

       356
       -
           for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do

     

       357
       -
             substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_"

     

       358
       -
           done

     

       359
       -
       

     

       360
        
           # Construct our own .icd files that contain absolute paths.

     

       361
        
           mkdir -p $opencl/etc/OpenCL/vendors/

     

       362
        
           echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd

     

       363
        
           echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd

     

       364
        
       

     

       365
       -
           moveToOutput bin/intel_clc $cross_tools

     

       366
       -
           moveToOutput bin/mesa_clc $cross_tools

     

       367
       -
           moveToOutput bin/vtn_bindgen $cross_tools

     

       368
       -
       

     

       369
       -
           moveToOutput "lib/lib*OpenCL*" $opencl

     

       370
       -
       

     

       371
        
           moveToOutput bin/spirv2dxil $spirv2dxil

     

       372
        
           moveToOutput "lib/libspirv_to_dxil*" $spirv2dxil

     

       373
        
         '';

     

       374
        
       

     

       375
        
         postFixup = ''

     

       376
       -
           # set the default search path for DRI drivers; used e.g. by X server

     

       377
       -
           for pc in lib/pkgconfig/{dri,d3d}.pc; do

     

       378
       -
             [ -f "$dev/$pc" ] && substituteInPlace "$dev/$pc" --replace "$drivers" "${libglvnd.driverLink}"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       379
        
           done

     

       380
        
       

     

       381
       -
           # remove pkgconfig files for GL/EGL; they are provided by libGL.

     

       382
       -
           rm -f $dev/lib/pkgconfig/{gl,egl}.pc

     

       383
        
       

     

       384
        
           # remove headers moved to mesa-gl-headers

     

       385
        
           for header in ${toString mesa-gl-headers.headers}; do

     

       386
       -
             rm -f $dev/$header

     

       387
        
           done

     

       388
        
       

     

       389
       -
           # update symlinks pointing to libgallium in $out

     

       390
       -
           for link in $drivers/lib/dri/*_drv_video.so $drivers/lib/vdpau/*.so.1.0.0; do

     

       391
       -
             ln -sf $drivers/lib/libgallium*.so $link

     

       392
       -
           done

     

       393
        
       

     

       394
        
           # Don't depend on build python

     

       395
        
           patchShebangs --host --update $out/bin/*

     

       396
        
       

     

       397
        
           # NAR doesn't support hard links, so convert them to symlinks to save space.

     

       398
       -
           jdupes --hard-links --link-soft --recurse "$drivers"

     

       399
       -
       

     

       400
       -
           # add RPATH so the drivers can find the moved libgallium and libdricore9

     

       401
       -
           # moved here to avoid problems with stripping patchelfed files

     

       402
       -
           for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do

     

       403
       -
             if [[ ! -L "$lib" ]]; then

     

       404
       -
               patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib"

     

       405
       -
             fi

     

       406
       -
           done

     

       407
        
       

     

       408
        
           # add RPATH here so Zink can find libvulkan.so

     

       409
       -
           patchelf --add-rpath ${vulkan-loader}/lib $drivers/lib/libgallium*.so

     

       410
        
         '';

     

       411
        
       

     

       412
       -
         env.NIX_CFLAGS_COMPILE = toString ([

     

       413
       -
           "-UPIPE_SEARCH_DIR"

     

       414
       -
           "-DPIPE_SEARCH_DIR=\"${placeholder "drivers"}/lib/gallium-pipe\""

     

       415
       -
         ]);

     

       416
       -
       

     

       417
        
         passthru = {

     

       418
        
           inherit (libglvnd) driverLink;

     

       419
        
           inherit llvmPackages;

     

       420
        
       

     

       421
       -
           tests.devDoesNotDependOnLLVM = stdenv.mkDerivation {

     

       422
       -
             name = "mesa-dev-does-not-depend-on-llvm";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       423
        
             buildCommand = ''

     

       424
       -
               echo ${mesa.dev} >>$out

     

       425
        
             '';

     

       426
       -
             disallowedRequisites = [ llvmPackages.llvm mesa.drivers ];

     

       427
        
           };

     

       428
        
       

     

       429
        
           llvmpipeHook = makeSetupHook {

     

       430
        
             name = "llvmpipe-hook";

     

       431
       -
             substitutions.drivers = mesa.drivers;

     

       432
        
           } ./llvmpipe-hook.sh;

     

       433
        
         };

     

       434
        
       }

···

       13
        
       , intltool

     

       14
        
       , jdupes

     

       15
        
       , libdrm

     

       16
       +
       , libgbm

     

       17
        
       , libglvnd

     

       18
        
       , libunwind

     

       19
        
       , libva-minimal

     
···

       140
        
       

     

       141
        
         patches = [

     

       142
        
           ./opencl.patch

     

       143
       +
           ./system-gbm.patch

     

       144
        
         ];

     

       145
        
       

     

       146
        
         postPatch = ''

     

       147
        
           patchShebangs .

     

       148
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       149
        
           for header in ${toString mesa-gl-headers.headers}; do

     

       150
        
             if ! diff -q $header ${mesa-gl-headers}/$header; then

     

       151
        
               echo "File $header does not match between mesa and mesa-gl-headers, please update mesa-gl-headers first!"

     
···

       157
        
         '';

     

       158
        
       

     

       159
        
         outputs = [

     

       160
       +
           "out"

     

       0
        
       
     

       161
        
           # OpenCL drivers pull in ~1G of extra LLVM stuff, so don't install them

     

       162
        
           # if the user didn't explicitly ask for it

     

       163
        
           "opencl"

     
···

       186
        
       

     

       187
        
         mesonFlags = [

     

       188
        
           "--sysconfdir=/etc"

     

       0
        
       
     

       189
        
       

     

       190
        
           # What to build

     

       191
        
           (lib.mesonOption "platforms" (lib.concatStringsSep "," eglPlatforms))

     
···

       193
        
           (lib.mesonOption "vulkan-drivers" (lib.concatStringsSep "," vulkanDrivers))

     

       194
        
           (lib.mesonOption "vulkan-layers" (lib.concatStringsSep "," vulkanLayers))

     

       195
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       196
        
           # Enable glvnd for dynamic libGL dispatch

     

       197
        
           (lib.mesonEnable "glvnd" true)

     

       198
       +
           (lib.mesonEnable "gbm" true)

     

       199
       +
           (lib.mesonBool "libgbm-external" true)

     

       200
        
       

     

       201
        
           (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK

     

       202
        
           (lib.mesonBool "osmesa" false) # deprecated upstream

     
···

       245
        
           elfutils

     

       246
        
           expat

     

       247
        
           spirv-tools

     

       248
       +
           libdrm

     

       249
       +
           libgbm

     

       250
        
           libglvnd

     

       251
        
           libunwind

     

       252
        
           libva-minimal

     
···

       313
        
           (buildPackages.mesa.cross_tools or null)

     

       314
        
         ];

     

       315
        
       

     

       0
        
       
     

       0
        
       
     

       316
        
         doCheck = false;

     

       317
        
       

     

       318
        
         postInstall = ''

     

       319
       +
           moveToOutput bin/intel_clc $cross_tools

     

       320
       +
           moveToOutput bin/mesa_clc $cross_tools

     

       321
       +
           moveToOutput bin/vtn_bindgen $cross_tools

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       322
        
       

     

       323
       +
           moveToOutput "lib/lib*OpenCL*" $opencl

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       324
        
           # Construct our own .icd files that contain absolute paths.

     

       325
        
           mkdir -p $opencl/etc/OpenCL/vendors/

     

       326
        
           echo $opencl/lib/libMesaOpenCL.so > $opencl/etc/OpenCL/vendors/mesa.icd

     

       327
        
           echo $opencl/lib/libRusticlOpenCL.so > $opencl/etc/OpenCL/vendors/rusticl.icd

     

       328
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       329
        
           moveToOutput bin/spirv2dxil $spirv2dxil

     

       330
        
           moveToOutput "lib/libspirv_to_dxil*" $spirv2dxil

     

       331
        
         '';

     

       332
        
       

     

       333
        
         postFixup = ''

     

       334
       +
           # set full path in EGL driver manifest

     

       335
       +
           for js in $out/share/glvnd/egl_vendor.d/*.json; do

     

       336
       +
             substituteInPlace "$js" --replace-fail '"libEGL_' '"'"$out/lib/libEGL_"

     

       337
       +
           done

     

       338
       +
       

     

       339
       +
           # and in Vulkan layer manifests

     

       340
       +
           for js in $out/share/vulkan/{im,ex}plicit_layer.d/*.json; do

     

       341
       +
             substituteInPlace "$js" --replace '"libVkLayer_' '"'"$out/lib/libVkLayer_"

     

       342
        
           done

     

       343
        
       

     

       344
       +
           # remove DRI pkg-config file, provided by dri-pkgconfig-stub

     

       345
       +
           rm -f $out/lib/pkgconfig/dri.pc

     

       346
        
       

     

       347
        
           # remove headers moved to mesa-gl-headers

     

       348
        
           for header in ${toString mesa-gl-headers.headers}; do

     

       349
       +
             rm -f $out/$header

     

       350
        
           done

     

       351
        
       

     

       352
       +
           # clean up after removing stuff

     

       353
       +
           find $out -type d -empty -delete

     

       0
        
       
     

       0
        
       
     

       354
        
       

     

       355
        
           # Don't depend on build python

     

       356
        
           patchShebangs --host --update $out/bin/*

     

       357
        
       

     

       358
        
           # NAR doesn't support hard links, so convert them to symlinks to save space.

     

       359
       +
           jdupes --hard-links --link-soft --recurse "$out"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       360
        
       

     

       361
        
           # add RPATH here so Zink can find libvulkan.so

     

       362
       +
           patchelf --add-rpath ${vulkan-loader}/lib $out/lib/libgallium*.so

     

       363
        
         '';

     

       364
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       365
        
         passthru = {

     

       366
        
           inherit (libglvnd) driverLink;

     

       367
        
           inherit llvmPackages;

     

       368
        
       

     

       369
       +
           # for compatibility

     

       370
       +
           drivers = lib.warn "`mesa.drivers` is deprecated, use `mesa` instead" mesa;

     

       371
       +
       

     

       372
       +
           tests.outDoesNotDependOnLLVM = stdenv.mkDerivation {

     

       373
       +
             name = "mesa-does-not-depend-on-llvm";

     

       374
        
             buildCommand = ''

     

       375
       +
               echo ${mesa} >>$out

     

       376
        
             '';

     

       377
       +
             disallowedRequisites = [ llvmPackages.llvm ];

     

       378
        
           };

     

       379
        
       

     

       380
        
           llvmpipeHook = makeSetupHook {

     

       381
        
             name = "llvmpipe-hook";

     

       382
       +
             substitutions.mesa = mesa;

     

       383
        
           } ./llvmpipe-hook.sh;

     

       384
        
         };

     

       385
        
       }

+3 -3

pkgs/development/libraries/mesa/llvmpipe-hook.sh

···

       2
        
       

     

       3
        
       # https://docs.mesa3d.org/envvars.html

     

       4
        
       export LIBGL_ALWAYS_SOFTWARE=true

     

       5
       -
       export LIBGL_DRIVERS_PATH=@drivers@/lib/dri

     

       6
        
       

     

       7
        
       # https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md

     

       8
       -
       export __EGL_VENDOR_LIBRARY_FILENAMES=@drivers@/share/glvnd/egl_vendor.d/50_mesa.json

     

       9
        
       

     

       10
        
       # https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md

     

       11
        
       # glob because the filenames contain an architecture suffix

     

       12
        
       # echo is needed to force-expand the glob

     

       13
       -
       VK_DRIVER_FILES="$(echo @drivers@/share/vulkan/icd.d/lvp_icd.*.json)"

     

       14
        
       export VK_DRIVER_FILES

···

       2
        
       

     

       3
        
       # https://docs.mesa3d.org/envvars.html

     

       4
        
       export LIBGL_ALWAYS_SOFTWARE=true

     

       5
       +
       export LIBGL_DRIVERS_PATH=@mesa@/lib/dri

     

       6
        
       

     

       7
        
       # https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md

     

       8
       +
       export __EGL_VENDOR_LIBRARY_FILENAMES=@mesa@/share/glvnd/egl_vendor.d/50_mesa.json

     

       9
        
       

     

       10
        
       # https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderInterfaceArchitecture.md

     

       11
        
       # glob because the filenames contain an architecture suffix

     

       12
        
       # echo is needed to force-expand the glob

     

       13
       +
       VK_DRIVER_FILES="$(echo @mesa@/share/vulkan/icd.d/lvp_icd.*.json)"

     

       14
        
       export VK_DRIVER_FILES

+195

pkgs/development/libraries/mesa/system-gbm.patch

···

       1
       +
       commit 69914d79c3d86b0aee80665c51074cf8cc55f660

     

       2
       +
       Author: K900 <me@0upti.me>

     

       3
       +
       Date:   2025-03-05 13:14:02 +0300

     

       4
       +
       

     

       5
       +
           meson: support building with system libgbm

     

       6
       +
           

     

       7
       +
           This is the next step towards making libgbm just a loader.

     

       8
       +
       

     

       9
       +
       diff --git a/meson.build b/meson.build

     

       10
       +
       index 4766ce838ba..300a6bb0cc8 100644

     

       11
       +
       --- a/meson.build

     

       12
       +
       +++ b/meson.build

     

       13
       +
       @@ -2377,7 +2377,7 @@ summary(egl_summary, section: 'EGL', bool_yn: true, list_sep: ' ')

     

       14
       +
        

     

       15
       +
        gbm_summary = {'Enabled': with_gbm}

     

       16
       +
        if with_gbm

     

       17
       +
       -  gbm_summary += {'Backends path': gbm_backends_path}

     

       18
       +
       +  gbm_summary += {'External libgbm': get_option('libgbm-external'), 'Backends path': gbm_backends_path}

     

       19
       +
        endif

     

       20
       +
        summary(gbm_summary, section: 'GBM', bool_yn: true, list_sep: ' ')

     

       21
       +
        

     

       22
       +
       diff --git a/meson_options.txt b/meson_options.txt

     

       23
       +
       index 2622cf1d235..7bf8ae8a1c5 100644

     

       24
       +
       --- a/meson_options.txt

     

       25
       +
       +++ b/meson_options.txt

     

       26
       +
       @@ -329,6 +329,13 @@ option(

     

       27
       +
          description : 'Build support for gbm platform'

     

       28
       +
        )

     

       29
       +
        

     

       30
       +
       +option(

     

       31
       +
       +  'libgbm-external',

     

       32
       +
       +  type: 'boolean',

     

       33
       +
       +  value: false,

     

       34
       +
       +  description: 'Whether to use external libgbm (default: use in-tree copy)'

     

       35
       +
       +)

     

       36
       +
       +

     

       37
       +
        option(

     

       38
       +
          'gbm-backends-path',

     

       39
       +
          type : 'string',

     

       40
       +
       diff --git a/src/egl/meson.build b/src/egl/meson.build

     

       41
       +
       index a02b83419c4..ae4b0c5e063 100644

     

       42
       +
       --- a/src/egl/meson.build

     

       43
       +
       +++ b/src/egl/meson.build

     

       44
       +
       @@ -108,9 +108,8 @@ if with_dri

     

       45
       +
          endif

     

       46
       +
          if with_gbm and not with_platform_android

     

       47
       +
            files_egl += files('drivers/dri2/platform_drm.c')

     

       48
       +
       -    link_for_egl += libgbm

     

       49
       +
       -    incs_for_egl += [inc_gbm, include_directories('../gbm/main')]

     

       50
       +
       -    deps_for_egl += dep_libdrm

     

       51
       +
       +    incs_for_egl += [include_directories('../gbm/backends/dri')]

     

       52
       +
       +    deps_for_egl += [dep_libdrm, dep_gbm]

     

       53
       +
          endif

     

       54
       +
          if with_platform_wayland

     

       55
       +
            deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers]

     

       56
       +
       diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c

     

       57
       +
       index 339e9376c3d..f1a0bb18ed8 100644

     

       58
       +
       --- a/src/gallium/targets/dril/dril_target.c

     

       59
       +
       +++ b/src/gallium/targets/dril/dril_target.c

     

       60
       +
       @@ -25,7 +25,7 @@

     

       61
       +
        #include <dlfcn.h>

     

       62
       +
        #include <EGL/egl.h>

     

       63
       +
        #include <EGL/eglext.h>

     

       64
       +
       -#include "gbm/main/gbm.h"

     

       65
       +
       +#include <gbm.h>

     

       66
       +
        #include "drm-uapi/drm_fourcc.h"

     

       67
       +
        

     

       68
       +
        #define EGL_PLATFORM_GBM_MESA             0x31D7

     

       69
       +
       diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build

     

       70
       +
       index 7cfa982ffe1..22b955b9074 100644

     

       71
       +
       --- a/src/gallium/targets/dril/meson.build

     

       72
       +
       +++ b/src/gallium/targets/dril/meson.build

     

       73
       +
       @@ -51,10 +51,10 @@ dril_dri = shared_library(

     

       74
       +
          link_depends : dril_link_depends,

     

       75
       +
          link_with : [

     

       76
       +
            libgallium,

     

       77
       +
       -    libgbm,

     

       78
       +
          ],

     

       79
       +
          dependencies : [

     

       80
       +
            idep_mesautil,

     

       81
       +
       +    dep_gbm,

     

       82
       +
          ],

     

       83
       +
          # Will be deleted during installation, see install_megadrivers.py

     

       84
       +
          install : true,

     

       85
       +
       diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c

     

       86
       +
       index a51e3cb3b8d..f1a5e0f7649 100644

     

       87
       +
       --- a/src/gbm/backends/dri/gbm_dri.c

     

       88
       +
       +++ b/src/gbm/backends/dri/gbm_dri.c

     

       89
       +
       @@ -43,7 +43,7 @@

     

       90
       +
        

     

       91
       +
        #include "mesa_interface.h"

     

       92
       +
        #include "gbm_driint.h"

     

       93
       +
       -#include "gbmint.h"

     

       94
       +
       +#include <gbm_backend_abi.h>

     

       95
       +
        #include "loader_dri_helper.h"

     

       96
       +
        #include "kopper_interface.h"

     

       97
       +
        #include "loader.h"

     

       98
       +
       diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h

     

       99
       +
       index 9b324aeaf12..9c7588e5726 100644

     

       100
       +
       --- a/src/gbm/backends/dri/gbm_driint.h

     

       101
       +
       +++ b/src/gbm/backends/dri/gbm_driint.h

     

       102
       +
       @@ -31,7 +31,7 @@

     

       103
       +
        #include <xf86drm.h>

     

       104
       +
        #include <string.h>

     

       105
       +
        #include <sys/mman.h>

     

       106
       +
       -#include "gbmint.h"

     

       107
       +
       +#include <gbm_backend_abi.h>

     

       108
       +
        #include "c11/threads.h"

     

       109
       +
        

     

       110
       +
        #include <GL/gl.h> /* mesa_interface needs GL types */

     

       111
       +
       diff --git a/src/gbm/backends/dri/meson.build b/src/gbm/backends/dri/meson.build

     

       112
       +
       index 9b5d13e9db8..84a40656980 100644

     

       113
       +
       --- a/src/gbm/backends/dri/meson.build

     

       114
       +
       +++ b/src/gbm/backends/dri/meson.build

     

       115
       +
       @@ -11,10 +11,10 @@ endif

     

       116
       +
        shared_library(

     

       117
       +
          'dri_gbm',

     

       118
       +
          files('gbm_dri.c', 'gbm_driint.h'),

     

       119
       +
       -  include_directories : [incs_gbm, incs_gbm_dri, inc_st_dri, inc_gallium_aux],

     

       120
       +
       +  include_directories : [inc_gallium, incs_gbm_dri, inc_loader, inc_st_dri, inc_gallium_aux],

     

       121
       +
          link_args : [ld_args_gc_sections],

     

       122
       +
          link_with : [libloader, libgallium_dri],

     

       123
       +
       -  dependencies : [deps_gbm_dri, dep_dl, dep_libdrm, idep_mesautil, idep_xmlconfig],

     

       124
       +
       +  dependencies : [deps_gbm_dri, dep_dl, dep_gbm, dep_libdrm, idep_mesautil, idep_xmlconfig],

     

       125
       +
          gnu_symbol_visibility : 'hidden',

     

       126
       +
          install : true,

     

       127
       +
          install_dir: join_paths(get_option('libdir'), 'gbm'),

     

       128
       +
       diff --git a/src/gbm/meson.build b/src/gbm/meson.build

     

       129
       +
       index eaed028d049..97e8d5fa044 100644

     

       130
       +
       --- a/src/gbm/meson.build

     

       131
       +
       +++ b/src/gbm/meson.build

     

       132
       +
       @@ -15,10 +15,6 @@ args_gbm = [

     

       133
       +
        ]

     

       134
       +
        incs_gbm = [include_directories('main'), inc_loader, inc_gallium]

     

       135
       +
        

     

       136
       +
       -if with_dri2

     

       137
       +
       -  subdir('backends/dri')

     

       138
       +
       -endif

     

       139
       +
       -

     

       140
       +
        libgbm_name = 'gbm'

     

       141
       +
        

     

       142
       +
        if with_platform_android and get_option('platform-sdk-version') >= 30

     

       143
       +
       @@ -43,7 +39,7 @@ if with_tests

     

       144
       +
          test('gbm-abi-check', abi_check, suite : ['gbm'])

     

       145
       +
        endif

     

       146
       +
        

     

       147
       +
       -install_headers('main/gbm.h')

     

       148
       +
       +install_headers('main/gbm.h', 'main/gbm_backend_abi.h')

     

       149
       +
        

     

       150
       +
        pkg.generate(

     

       151
       +
          name : 'gbm',

     

       152
       +
       @@ -67,3 +63,8 @@ if with_symbols_check

     

       153
       +
            suite : ['gbm'],

     

       154
       +
          )

     

       155
       +
        endif

     

       156
       +
       +

     

       157
       +
       +dep_gbm = declare_dependency(

     

       158
       +
       +  link_with : libgbm,

     

       159
       +
       +  include_directories : inc_gbm,

     

       160
       +
       +)

     

       161
       +
       diff --git a/src/meson.build b/src/meson.build

     

       162
       +
       index d443d2b41bb..74250ed2148 100644

     

       163
       +
       --- a/src/meson.build

     

       164
       +
       +++ b/src/meson.build

     

       165
       +
       @@ -127,11 +127,17 @@ endif

     

       166
       +
        if with_glx == 'dri'

     

       167
       +
          subdir('glx')

     

       168
       +
        endif

     

       169
       +
       +

     

       170
       +
        if with_gbm

     

       171
       +
       -  subdir('gbm')

     

       172
       +
       +  if get_option('libgbm-external')

     

       173
       +
       +    dep_gbm = dependency('gbm')

     

       174
       +
       +  else

     

       175
       +
       +    subdir('gbm')

     

       176
       +
       +  endif

     

       177
       +
        else

     

       178
       +
       -  inc_gbm = []

     

       179
       +
       +  dep_gbm = null_dep

     

       180
       +
        endif

     

       181
       +
       +

     

       182
       +
        if with_egl

     

       183
       +
          subdir('egl')

     

       184
       +
        endif

     

       185
       +
       @@ -141,6 +147,10 @@ if with_gallium and with_gbm

     

       186
       +
          endif

     

       187
       +
        endif

     

       188
       +
        

     

       189
       +
       +if with_gbm and with_dri2

     

       190
       +
       +  subdir('gbm/backends/dri')

     

       191
       +
       +endif

     

       192
       +
       +

     

       193
       +
        # This must be after at least mesa, glx, and gallium, since libgl will be

     

       194
       +
        # defined in one of those subdirs depending on the glx provider.

     

       195
       +
        if with_glx != 'disabled' and not with_glvnd

+1 -1

pkgs/top-level/aliases.nix

···

       990
        
         mutter43 = throw "'mutter43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22

     

       991
        
         mysql-client = hiPrio mariadb.client;

     

       992
        
         mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17

     

       993
       -
         mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' or 'pkgs.mesa.drivers' depending on target use case."; # Converted to throw 2024-07-11

     

       994
        
       

     

       995
        
         ### N ###

     

       996

···

       990
        
         mutter43 = throw "'mutter43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22

     

       991
        
         mysql-client = hiPrio mariadb.client;

     

       992
        
         mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17

     

       993
       +
         mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' instead."; # Converted to throw 2024-07-11

     

       994
        
       

     

       995
        
         ### N ###

     

       996