Skip to content

Commit 0a27b18

Browse files
Sherry-Linintel-mediadev
authored andcommitted
Travis: add libva path in build
Add DLIBVA_DRIVERS_PATH and DLIBVA_INSTALL_PATH to make sure driver in docker image use the correct libva lib.
1 parent 5500f4d commit 0a27b18

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

.travis.yml

+17-11
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ script:
3030
-w /opt/src/libva
3131
-e CCACHE_DIR=/opt/ccache
3232
intelmediadriver/media-driver-docker
33-
make -j 8
33+
make -j8
3434
- >
3535
docker run
3636
-v $HOME/.ccache:/opt/ccache
3737
-v ${TRAVIS_BUILD_DIR}/../:/opt/src
3838
-w /opt/src/libva
3939
-e CCACHE_DIR=/opt/ccache
4040
intelmediadriver/media-driver-docker
41-
make install
41+
make install DESTDIR=/opt/src/libva-install
4242
- ccache -s
4343
- ccache -z
4444
- >
@@ -48,17 +48,19 @@ script:
4848
-w /opt/src/build
4949
-e CCACHE_DIR=/opt/ccache
5050
intelmediadriver/media-driver-docker
51-
cmake
51+
cmake ../media-driver
52+
-DCMAKE_INSTALL_PREFIX=/usr
53+
-DLIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
54+
-DLIBVA_INSTALL_PATH=/opt/src/libva-install/usr/include
5255
-DBUILD_TYPE=Release
53-
../media-driver
5456
- >
5557
docker run
5658
-v $HOME/.ccache:/opt/ccache
5759
-v ${TRAVIS_BUILD_DIR}/..:/opt/src
5860
-w /opt/src/build
5961
-e CCACHE_DIR=/opt/ccache
6062
intelmediadriver/media-driver-docker
61-
cmake --build . -- -j 8
63+
make -j8
6264
- ccache -s
6365
- ccache -z
6466
- sudo rm -rf ${TRAVIS_BUILD_DIR}/../build && mkdir ${TRAVIS_BUILD_DIR}/../build
@@ -69,18 +71,20 @@ script:
6971
-w /opt/src/build
7072
-e CCACHE_DIR=/opt/ccache
7173
intelmediadriver/media-driver-docker
72-
cmake
74+
cmake ../media-driver
75+
-DCMAKE_INSTALL_PREFIX=/usr
76+
-DLIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
77+
-DLIBVA_INSTALL_PATH=/opt/src/libva-install/usr/include
7378
-DENABLE_KERNELS=OFF
7479
-DBUILD_TYPE=Release
75-
../media-driver
7680
- >
7781
docker run
7882
-v $HOME/.ccache:/opt/ccache
7983
-v ${TRAVIS_BUILD_DIR}/..:/opt/src
8084
-w /opt/src/build
8185
-e CCACHE_DIR=/opt/ccache
8286
intelmediadriver/media-driver-docker
83-
cmake --build . -- -j 8
87+
make -j8
8488
- ccache -s
8589
- ccache -z
8690
- sudo rm -rf ${TRAVIS_BUILD_DIR}/../build && mkdir ${TRAVIS_BUILD_DIR}/../build
@@ -91,17 +95,19 @@ script:
9195
-w /opt/src/build
9296
-e CCACHE_DIR=/opt/ccache
9397
intelmediadriver/media-driver-docker
94-
cmake
98+
cmake ../media-driver
99+
-DCMAKE_INSTALL_PREFIX=/usr
100+
-DLIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri
101+
-DLIBVA_INSTALL_PATH=/opt/src/libva-install/usr/include
95102
-DENABLE_NONFREE_KERNELS=OFF
96103
-DBUILD_TYPE=Release
97-
../media-driver
98104
- >
99105
docker run
100106
-v $HOME/.ccache:/opt/ccache
101107
-v ${TRAVIS_BUILD_DIR}/..:/opt/src
102108
-w /opt/src/build
103109
-e CCACHE_DIR=/opt/ccache
104110
intelmediadriver/media-driver-docker
105-
cmake --build . -- -j 8
111+
make -j8
106112
- ccache -s
107113
- ccache -z

0 commit comments

Comments
 (0)