Merge branch 'master' into fix-lld17-build-1

Author: DimitryAndric

.github/workflows/docs.yml

@@ -1,5 +1,8 @@
 name: docs
 
+permissions:
+  contents: read
+
 on:
   push:
     paths-ignore:

.github/workflows/freebsd.yml

@@ -1,15 +1,18 @@
 name: freebsd
 
+permissions:
+  contents: read
+
 on: [push, pull_request]
 
 jobs:
   freebsd:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     steps:
     - name: 'Checkout'
       uses: actions/checkout@v4
     - name: 'Install prerequisites and build'
-      uses: vmactions/freebsd-vm@v0
+      uses: vmactions/freebsd-vm@v1
       with:
         prepare: |
           pkg install -y meson pkgconf libdrm libXext libXfixes wayland

.github/workflows/ghpages.yml

@@ -47,11 +47,11 @@ jobs:
 
     - name: 'Upload the artifacts'
       if: github.ref_name == env.GIT_LATEST_TAG
-      uses: actions/upload-pages-artifact@v2
+      uses: actions/upload-pages-artifact@v3
       with:
         path: "_build/doc/html-out"
 
     - name: 'Deploy to GitHub Pages'
       if: github.ref_name == env.GIT_LATEST_TAG
       id: deployment
-      uses: actions/deploy-pages@v2
+      uses: actions/deploy-pages@v4

.github/workflows/style.yml

@@ -1,5 +1,8 @@
 name: style
 
+permissions:
+  contents: read
+
 on: [push, pull_request]
 
 jobs:

.github/workflows/ubuntu.yml

@@ -1,5 +1,8 @@
 name: ubuntu
 
+permissions:
+  contents: read
+
 on: [push, pull_request]
 
 env:

.github/workflows/windows.yml

@@ -1,5 +1,8 @@
 name: windows
 
+permissions:
+  contents: read
+
 on: [push, pull_request]
 
 jobs:
@@ -9,7 +12,7 @@ jobs:
     - name: 'Checkout'
       uses: actions/checkout@v4
     - name: 'Setup Python'
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: 'Install Meson'
@@ -24,6 +27,27 @@ jobs:
     - name: 'Install'
       run: meson install -C _build
 
+  windows-msvc-debug:
+    runs-on: windows-2022
+    steps:
+    - name: 'Checkout'
+      uses: actions/checkout@v4
+    - name: 'Setup Python'
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+    - name: 'Install Meson'
+      run: pip install meson
+    - name: 'Enter DevShell'
+      run: '.github\workflows\EnterDevShell.ps1 ${{ inputs.architecture }}'
+      shell: pwsh
+    - name: 'Configure with meson'
+      run: meson setup _build -D werror=true -D buildtype=debug
+    - name: 'Build'
+      run: meson compile -C _build
+    - name: 'Install'
+      run: meson install -C _build
+
   windows-mingw:
     runs-on: windows-2022
     env:

NEWS

@@ -1,5 +1,28 @@
-libva NEWS -- summary of user visible changes.  2023-09-14
-Copyright (C) 2009-2023 Intel Corporation
+libva NEWS -- summary of user visible changes.  2024-03-12
+Copyright (C) 2009-2024 Intel Corporation
+
+version 2.21.0 - 12.Mar.2024
+* va: Add allow_content_tools and force_intger_mv to AV1 enc
+* va: add VASurfaceAttribAlignmentSize
+* va: Re-add drm_state and fd checks to VA_DRM_GetDriverNames
+* va: export symbol vaGetLibFunc for Windows
+* va: Add PRIME3 defination and correct the value
+* va: add driver name map for new intel KMD xe
+* va: export symbol vaMapBuffer2 for Windows
+* va: add new interface vaMapBuffer2 for map operation optimization
+* va: Add VAConfigAttribEncMaxTileRows and VAConfigAttribEncMaxTileCols
+* va: fix handling when all wayland backends fail
+* va_trace:add return value trace for vaPutSurfaces
+* ci: harden permissions for all github workflows
+* ci: update to vmactions/freebsd-vm from v0 to v1
+* ci: windows.yml: Add windows-msvc-debug
+* meson: create dist archives suitable for building with configure, too
+* autogen.sh: successfully detect if the autoreconf program is installed
+* build(deps): bump actions/upload-pages-artifact from 2 to 3
+* build(deps): bump actions/deploy-pages from 3 to 4
+* build(deps): bump actions/setup-python from 4 to 5
+* build(deps): bump actions/deploy-pages from 2 to 3
+* win32: Fix debug build break
 
 version 2.20.0 - 14.Sep.2023
 * va: drop no longer applicable vaGetDriverNames check

autogen.sh

@@ -23,6 +23,13 @@
 
 PROJECT="libva"
 
+# for `meson dist`
+if test -z "$srcdir"; then
+    srcdir="$MESON_PROJECT_DIST_ROOT"
+    test -n "$srcdir" || srcdir="$MESON_DIST_ROOT"
+    test -n "$srcdir" && NOCONFIGURE=1
+fi
+
 test -n "$srcdir" || srcdir="`dirname \"$0\"`"
 test -n "$srcdir" || srcdir=.
 
@@ -36,7 +43,7 @@ cd "$srcdir"
 
 mkdir -p m4
 
-AUTORECONF=`which autoreconf`
+AUTORECONF=`command -v autoreconf`
 if test -z $AUTORECONF; then
     echo "*** No autoreconf found ***"
     exit 1

configure.ac

@@ -27,7 +27,7 @@
 # - reset micro version to zero when minor version is incremented
 # - reset minor version to zero when major version is incremented
 m4_define([va_api_major_version], [1])
-m4_define([va_api_minor_version], [21])
+m4_define([va_api_minor_version], [22])
 m4_define([va_api_micro_version], [0])
 
 m4_define([va_api_version],
@@ -75,7 +75,8 @@ m4_define([libva_lt_age],
           [m4_eval(libva_binary_age - libva_interface_age)])
 
 # libdrm minimun version requirement
-m4_define([libdrm_version], [2.4.60])
+# 2.4.75 for drmGetDevices2
+m4_define([libdrm_version], [2.4.75])
 
 # Wayland minimum version number
 # 1.11.0 for wl_proxy_create_wrapper

meson.build

@@ -7,7 +7,7 @@
 # - reset micro version to zero when VA-API major or minor version is changed
 project(
   'libva', 'c',
-  version : '2.21.0.1',
+  version : '2.22.0.1',
   meson_version : '>= 0.53.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
@@ -19,7 +19,7 @@ project(
 # - reset micro version to zero when minor version is incremented
 # - reset minor version to zero when major version is incremented
 va_api_major_version = 1
-va_api_minor_version = 21
+va_api_minor_version = 22
 va_api_micro_version = 0
 
 va_api_version = '@0@.@1@.@2@'.format(va_api_major_version,
@@ -85,7 +85,7 @@ cc = meson.get_compiler('c')
 dl_dep = cc.find_library('dl', required : false)
 
 WITH_DRM = not get_option('disable_drm') and (host_machine.system() != 'windows')
-libdrm_dep = dependency('libdrm', version : '>= 2.4.60', required : (host_machine.system() != 'windows'))
+libdrm_dep = dependency('libdrm', version : '>= 2.4.75', required : (host_machine.system() != 'windows'))
 
 WITH_X11 = false
 if get_option('with_x11') != 'no'
@@ -157,3 +157,5 @@ doxygen = find_program('doxygen', required: false)
 if get_option('enable_docs') and doxygen.found()
   subdir('doc')
 endif
+
+meson.add_dist_script('./autogen.sh')