Skip to content

Commit b13d14b

Browse files
gitgjoghgitgjogh
authored
Merge branch 'master' into VAProfileH264High10
2 parents 5957742 + c463f8f commit b13d14b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1954
-434
lines changed

‎.cvsignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/EnterDevShell.ps1‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
param(
2+
[Parameter()]
3+
[String]$architecture
4+
)
5+
6+
function EnterDevShellEnv {
7+
8+
param(
9+
[Parameter()]
10+
[String]$arch
11+
)
12+
13+
$vsw = Get-Command 'vswhere'
14+
$VSFfavors = 'Community','Professional','Enterprise','BuildTools' | %{ "Microsoft.VisualStudio.Product.$_" }
15+
$vs = & $vsw.Path -products $VSFfavors -latest -format json | ConvertFrom-Json
16+
$tools_dir = Join-Path $vs.installationPath 'Common7' 'Tools'
17+
# Try the root tools dir
18+
$devshell = Join-Path $tools_dir 'Microsoft.VisualStudio.DevShell.dll'
19+
# Try finding it under vsdevshell
20+
if (!(Test-Path $devshell -Type Leaf)) {
21+
$devshell = Join-Path $tools_dir 'vsdevshell' 'Microsoft.VisualStudio.DevShell.dll'
22+
}
23+
# Fail if didn't find the DevShell library
24+
if (!(Test-Path $devshell -Type Leaf)) {
25+
throw "error: cannot find Microsoft.VisualStudio.DevShell.dll"
26+
}
27+
Import-Module $devshell
28+
Enter-VsDevShell -VsInstanceId $vs.instanceId -SkipAutomaticLocation -DevCmdArguments "-arch=$arch -no_logo"
29+
}
30+
31+
# Enter VsDevShell, capture the environment difference and export it to github env
32+
$env_before = @{}
33+
Get-ChildItem env: | %{ $env_before.Add($_.Name, $_.Value) }
34+
EnterDevShellEnv -arch "$architecture"
35+
$env_after = @{}
36+
Get-ChildItem env: | %{ $env_after.Add($_.Name, $_.Value) }
37+
$env_diff = $env_after.GetEnumerator() | where { -not $env_before.ContainsKey($_.Name) -or $env_before[$_.Name] -ne $_.Value }
38+
$env_diff | %{ echo "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }

‎.github/workflows/freebsd.yml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
name: freebsd
22

3-
on:
4-
push:
5-
paths-ignore:
6-
- '.github/workflows/**'
7-
- '!.github/workflows/freebsd.yml'
8-
pull_request:
9-
paths-ignore:
10-
- '.github/workflows/**'
11-
- '!.github/workflows/freebsd.yml'
3+
on: [push, pull_request]
124

135
jobs:
146
freebsd:
15-
runs-on: macos-10.15
7+
runs-on: macos-12
168
steps:
17-
- uses: actions/checkout@v2
18-
- name: test
19-
uses: vmactions/[email protected]
9+
- name: 'Checkout'
10+
uses: actions/checkout@v3
11+
- name: 'Install prerequisites and build'
12+
uses: vmactions/freebsd-vm@v0
2013
with:
2114
prepare: |
2215
pkg install -y meson pkgconf libdrm libXext libXfixes wayland
2316
pkg install -y -x '^mesa($|-libs)'
2417
run: |
25-
meson _build
18+
meson setup _build
2619
meson compile -C _build
20+
meson install -C _build

‎.github/workflows/install-clang.sh‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/bash
2+
3+
set -euo pipefail
4+
5+
if (( $# != 1 )); then
6+
echo Script requires one argument - the clang version to be installed
7+
exit 1
8+
fi
9+
10+
if ! which $CC >/dev/null 2>&1; then
11+
case $DISTRO in
12+
"ubuntu-22.04") distro_name=jammy;;
13+
"ubuntu-20.04") distro_name=focal;;
14+
*)
15+
echo "Unknown distribution $DISTRO"
16+
exit 1
17+
esac
18+
case $1 in
19+
"14" | "15") llvm_version=$1;;
20+
*)
21+
echo "Unknown llvm version $1"
22+
exit 1
23+
esac
24+
25+
sources="deb [trusted=yes] http://apt.llvm.org/$distro_name/ llvm-toolchain-$distro_name-$llvm_version main"
26+
27+
echo "clang-$llvm_version missed in the image, installing from llvm"
28+
echo "$sources" | sudo tee -a /etc/apt/sources.list
29+
sudo apt-get update
30+
sudo apt-get install -y --no-install-recommends clang-$llvm_version
31+
fi
32+

‎.github/workflows/style.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
modified_lines=$(git status --short -uno | wc -l)
6+
(( modified_lines == 0 )) && exit 0
7+
8+
echo >&2
9+
echo >&2 "ERROR: Style changes detected"
10+
echo >&2
11+
12+
git diff
13+
14+
echo >&2
15+
echo >&2 "ERROR: Squash the above changes as needed"
16+
echo >&2
17+
18+
exit 1

‎.github/workflows/style.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: style
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
style-check:
7+
runs-on: ubuntu-22.04
8+
steps:
9+
- name: 'Checkout'
10+
uses: actions/checkout@v3
11+
- name: 'Install prerequisites'
12+
run: |
13+
sudo apt-get update
14+
sudo apt-get install -y \
15+
astyle
16+
- name: 'Check for style changes'
17+
run: ./style_unify && .github/workflows/style.sh
18+

‎.github/workflows/ubuntu.yml‎

Lines changed: 41 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,59 @@
11
name: ubuntu
22

3-
on:
4-
push:
5-
paths-ignore:
6-
- '.github/workflows/**'
7-
- '!.github/workflows/ubuntu.yml'
8-
pull_request:
9-
paths-ignore:
10-
- '.github/workflows/**'
11-
- '!.github/workflows/ubuntu.yml'
3+
on: [push, pull_request]
124

13-
jobs:
14-
ubuntu-latest:
15-
runs-on: ubuntu-latest
16-
steps:
17-
- uses: actions/checkout@v2
18-
- name: install prerequisites
19-
run: |
20-
sudo apt-get update
21-
sudo apt-get install -y \
22-
libdrm-dev \
23-
libegl1-mesa-dev \
24-
libgl1-mesa-dev \
25-
libx11-dev \
26-
libxext-dev \
27-
libxfixes-dev \
28-
libwayland-dev
29-
- name: configure
30-
run: ./autogen.sh --prefix=/usr
31-
- name: build
32-
run: make
33-
- name: check
34-
run: make check
35-
- name: install
36-
run: sudo make install
5+
env:
6+
CFLAGS: -Wall -Werror
377

38-
ubuntu-20-04:
39-
runs-on: ubuntu-20.04
8+
jobs:
9+
test:
10+
strategy:
11+
matrix:
12+
compiler: [clang-15, gcc]
13+
os: [ubuntu-22.04, ubuntu-20.04]
14+
build: [meson, autotools]
15+
runs-on: ${{ matrix.os }}
16+
env:
17+
CC: ${{ matrix.compiler }}
18+
DISTRO: ${{ matrix.os }}
4019
steps:
41-
- uses: actions/checkout@v2
42-
- name: install prerequisites
20+
- name: 'Checkout'
21+
uses: actions/checkout@v3
22+
- name: 'Install toolchain'
23+
if: ${{ (matrix.compiler == 'clang-15') }}
24+
run: .github/workflows/install-clang.sh 15
25+
- name: 'Install prerequisites'
4326
run: |
4427
sudo apt-get update
4528
sudo apt-get install -y \
4629
libdrm-dev \
4730
libegl1-mesa-dev \
4831
libgl1-mesa-dev \
4932
libx11-dev \
33+
libx11-xcb-dev \
34+
libxcb-dri3-dev \
5035
libxext-dev \
5136
libxfixes-dev \
52-
libwayland-dev
53-
- name: configure
54-
run: ./autogen.sh --prefix=/usr
55-
- name: build
56-
run: make
57-
- name: check
58-
run: make check
59-
- name: install
60-
run: sudo make install
37+
libwayland-dev \
38+
meson
39+
- name: 'Print compiler version'
40+
run: ${{ matrix.compiler }} --version
41+
- name: 'Configure (meson)'
42+
if: ${{ (matrix.build == 'meson') }}
43+
run: meson setup ./builddir --prefix=/usr
44+
- name: 'Build (meson)'
45+
if: ${{ (matrix.build == 'meson') }}
46+
run: meson compile -C ./builddir || ninja -C ./builddir
47+
- name: 'Install (meson)'
48+
if: ${{ (matrix.build == 'meson') }}
49+
run: sudo meson install -C ./builddir
6150

62-
ubuntu-18-04:
63-
runs-on: ubuntu-18.04
64-
steps:
65-
- uses: actions/checkout@v2
66-
- name: install prerequisites
67-
run: |
68-
sudo apt-get update
69-
sudo apt-get install -y \
70-
libdrm-dev \
71-
libegl1-mesa-dev \
72-
libgl1-mesa-dev \
73-
libx11-dev \
74-
libxext-dev \
75-
libxfixes-dev \
76-
libwayland-dev
77-
- name: configure
51+
- name: 'Configure (autotools)'
52+
if: ${{ (matrix.build == 'autotools') }}
7853
run: ./autogen.sh --prefix=/usr
79-
- name: build
54+
- name: 'Build (autotools)'
55+
if: ${{ (matrix.build == 'autotools') }}
8056
run: make
81-
- name: check
82-
run: make check
83-
- name: install
57+
- name: 'Build and Install (autotools)'
58+
if: ${{ (matrix.build == 'autotools') }}
8459
run: sudo make install

‎.github/workflows/windows.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: windows
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
windows-msvc:
7+
runs-on: windows-2022
8+
steps:
9+
- name: 'Checkout'
10+
uses: actions/checkout@v3
11+
- name: 'Setup Python'
12+
uses: actions/setup-python@v4
13+
with:
14+
python-version: '3.x'
15+
- name: 'Install Meson'
16+
run: pip install meson
17+
- name: 'Enter DevShell'
18+
run: '.github\workflows\EnterDevShell.ps1 ${{ inputs.architecture }}'
19+
shell: pwsh
20+
- name: 'Configure with meson'
21+
run: meson setup _build
22+
- name: 'Build'
23+
run: meson compile -C _build
24+
- name: 'Install'
25+
run: meson install -C _build
26+
27+
windows-mingw:
28+
runs-on: windows-2022
29+
env:
30+
CC: gcc
31+
defaults:
32+
run:
33+
shell: msys2 {0}
34+
steps:
35+
- name: 'Checkout'
36+
uses: actions/checkout@v3
37+
- name: 'Setup MSYS2'
38+
uses: msys2/setup-msys2@v2
39+
with:
40+
msystem: mingw64
41+
update: false
42+
pacboy: >-
43+
toolchain:p
44+
meson:p
45+
- name: 'Enter DevShell'
46+
run: '.github\workflows\EnterDevShell.ps1 ${{ inputs.architecture }}'
47+
shell: pwsh
48+
- name: 'Configure'
49+
run: meson setup _build
50+
- name: 'Build'
51+
run: meson compile -C _build
52+
- name: 'Install'
53+
run: meson install -C _build

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ ltmain.sh
3030
missing
3131
stamp-h1
3232
/va/va_version.h
33-
/va/wayland/wayland-drm-client-protocol-export.c
3433
/va/wayland/wayland-drm-client-protocol.*
3534
/doc/Doxyfile
3635
/doc/html-out

‎NEWS‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1-
libva NEWS -- summary of user visible changes. 2022-06-28
1+
libva NEWS -- summary of user visible changes. 2022-09-27
22
Copyright (C) 2009-2022 Intel Corporation
33

4+
version 2.16.0 - 27.Sep.2022
5+
* add: Add HierarchicalFlag & hierarchical_level_plus1 for AV1e.
6+
* dep: Update README.md to remove badge links
7+
* dep: Removed waffle-io badge from README to fix broken link
8+
* dep: Drop mailing list, IRC and Slack
9+
* autotools: use wayland-scanner private-code
10+
* autotools: use the wayland-scanner.pc to locate the prog
11+
* meson: use wayland-scanner private-code
12+
* meson: request native wayland-scanner
13+
* meson: use the wayland-scanner.pc to locate the prog
14+
* meson: set HAVE_VA_X11 when applicable
15+
* style:Correct slight coding style in several new commits
16+
* trace: add Linux ftrace mode for va trace
17+
* trace: Add missing pthread_mutex_destroy
18+
* drm: remove no-longer needed X == X mappings
19+
* drm: fallback to drm driver name == va driver name
20+
* drm: simplify the mapping table
21+
* x11: simplify the mapping table
22+
* android: open() with O_CLOEXEC for device fd
23+
* android: remove convoluted open_device() helper
24+
* android: drop va_fool references
25+
* ci: strengthen ci with -Werror
26+
* ci: va/x11/nvctl: fix Wdeprecated-non-prototype on close_display
27+
* ci: add clang-15 coverage and rearrange runners
28+
* ci: upgrade FreeBSD to 13.1
29+
430
version 2.15.0 - 28.Jun.2022
531
* Add: new display HW attribute to report PCI ID
632
* Add: sample depth related parameters for AV1e

0 commit comments

Comments
 (0)