Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

Commit eefea26

Browse files
gbeauchesnegbeauchesne
committed
New project build rules and files.
1 parent e303e5e commit eefea26

23 files changed

+257
-14
lines changed

‎AUTHORS

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Intel Linux graphics team working on the driver:
2+
Chang Zhou
3+
Gwenole Beauchesne
4+
Haihao Xiang (primary author)
5+
Nanhai Zou
6+
7+
Additional contributors:
8+
Alexander Osin
9+
Damien Lespiau
10+
Edgar Hucek

‎COPYING

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Permission is hereby granted, free of charge, to any person obtaining a
2+
copy of this software and associated documentation files (the
3+
"Software"), to deal in the Software without restriction, including
4+
without limitation the rights to use, copy, modify, merge, publish,
5+
distribute, sub license, and/or sell copies of the Software, and to
6+
permit persons to whom the Software is furnished to do so, subject to
7+
the following conditions:
8+
9+
The above copyright notice and this permission notice (including the
10+
next paragraph) shall be included in all copies or substantial portions
11+
of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
14+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
15+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
16+
IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
17+
ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
18+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
19+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎Makefile.am

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
AUTOMAKE_OPTIONS = foreign
2+
3+
SUBDIRS = src
4+
5+
# Extra clean files so that maintainer-clean removes *everything*
6+
MAINTAINERCLEANFILES = \
7+
aclocal.m4 compile config.guess config.sub \
8+
configure depcomp install-sh ltmain.sh \
9+
Makefile.in missing

‎NEWS

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
libva-driver-intel NEWS -- summary of changes. 2011-07-28
2+
Copyright (C) 2009-2011 Intel Corporation
3+
4+
Version 1.0.14 - 28.Jul.2011
5+
* Add H.264 encoding support to Ivy Bridge
6+
* Add support for VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD
7+
* Fix next slice vertical position for MPEG-2 (#38628)
8+
* Fix subpicture scale factor for Y axis
9+
* Fix GPU hang when decoding field coded MPEG-2 picture
10+
* Fix memory leaks (Edgar Hucek)
11+
12+
Version 1.0.13 - 25.May.2011
13+
* Add H.264 encoding support to Sandy Bridge
14+
* Add MPEG-2, VC-1 and H.264 decoding support to Ivy Bridge
15+
* Fix thread safety issues
16+
17+
Version 1.0.11 - 14.Mar.2011
18+
* Add deinterlacing & scaling support to Sandy Bridge
19+
* Add vaDeriveImage() implementation
20+
* Fix VC-1 decoding for Main/Simple profiles
21+
22+
Version 1.0.9 - 27.Jan.2011
23+
* Add VC-1 decoding support to Sandy Bridge
24+
25+
Version 1.0.8 - 21.Jan.2011
26+
* Add support for IA44/AI44 subpicture formats (#32868)
27+
28+
Version 1.0.7 - 17.Dec.2011
29+
* Add MPEG-2 and H.264 decoding support to Sandy Bridge
30+
31+
Version 1.0.5 - 02.Sep.2010
32+
* Add deinterlacing & scaling support to Ironlake
33+
34+
Version 1.0.4 - 13.Jul.2010
35+
* Add vaGetImage() implementation
36+
* Add support for RGBA subpictures
37+
* Fix H.264 decoding on Ironlake
38+
39+
Version 1.0.3 - 10.Jun.2010
40+
* Add H.264 decoding support to Ironlake

‎README

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
libva-driver-intel
3+
VA driver for Intel G45 & HD Graphics family
4+
5+
Copyright (C) 2009-2011 Intel Corporation
6+
7+
8+
License
9+
-------
10+
11+
Please read the COPYING file available in this package.
12+
13+
14+
Overview
15+
--------
16+
17+
libva-driver-intel is the VA-API implementation for Intel G45 chipsets
18+
and Intel HD Graphics for Intel Core processor family.
19+
20+
Platform definitions:
21+
CTG: Cantiga, Intel GMA 4500MHD (GM45)
22+
ILK: Ironlake, Intel HD Graphics for 2010 Intel Core processor family
23+
SNB: Sandybridge, Intel HD Graphics for 2011 Intel Core processor family
24+
IVB: Ivybridge
25+
26+
27+
Codecs
28+
------
29+
30+
H.264 D ILK+
31+
H.264 E SNB+
32+
MPEG-2 D CTG+
33+
VC-1 D SNB+
34+
35+
36+
Requirements
37+
------------
38+
39+
libva >= 1.0.14

‎autogen.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#! /bin/sh
2+
autoreconf -v --install
3+
./configure "$@"

‎configure.ac

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# intel-driver package version number
2+
m4_define([intel_driver_major_version], [1])
3+
m4_define([intel_driver_minor_version], [0])
4+
m4_define([intel_driver_micro_version], [14])
5+
m4_define([intel_driver_pre_version], [0])
6+
m4_define([intel_driver_version],
7+
[intel_driver_major_version.intel_driver_minor_version.intel_driver_micro_version])
8+
m4_if(intel_driver_pre_version, [0], [], [
9+
m4_append([intel_driver_version], intel_driver_pre_version, [.pre])
10+
])
11+
12+
AC_PREREQ([2.57])
13+
AC_INIT([intel_driver], [intel_driver_version], [[email protected]],
14+
[libva-driver-intel])
15+
AC_CONFIG_SRCDIR([Makefile.am])
16+
AM_INIT_AUTOMAKE
17+
18+
AM_CONFIG_HEADER([src/config.h])
19+
20+
INTEL_DRIVER_MAJOR_VERSION=intel_driver_major_version
21+
INTEL_DRIVER_MINOR_VERSION=intel_driver_minor_version
22+
INTEL_DRIVER_MICRO_VERSION=intel_driver_micro_version
23+
AC_DEFINE([INTEL_DRIVER_MAJOR_VERSION], [intel_driver_major_version], [Major version of the driver])
24+
AC_DEFINE([INTEL_DRIVER_MINOR_VERSION], [intel_driver_minor_version], [Minor version of the driver])
25+
AC_DEFINE([INTEL_DRIVER_MICRO_VERSION], [intel_driver_micro_version], [Micro version of the driver])
26+
AC_DEFINE([INTEL_DRIVER_PRE_VERSION], [intel_driver_pre_version], [Preversion of the driver])
27+
28+
INTEL_DRIVER_LT_LDFLAGS="-avoid-version"
29+
AC_SUBST(INTEL_DRIVER_LT_LDFLAGS)
30+
31+
dnl Use pretty build output with automake >= 1.11
32+
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [
33+
AM_DEFAULT_VERBOSITY=1
34+
AC_SUBST(AM_DEFAULT_VERBOSITY)
35+
])
36+
37+
AC_DISABLE_STATIC
38+
AC_PROG_LIBTOOL
39+
AC_PROG_CC
40+
AM_PROG_CC_C_O
41+
42+
AC_C_BIGENDIAN
43+
AC_HEADER_STDC
44+
AC_SYS_LARGEFILE
45+
46+
dnl Check for recent enough DRM
47+
PKG_CHECK_MODULES([DRM], [libdrm >= 2.4.23])
48+
49+
dnl Check for gen4asm
50+
PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no])
51+
AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
52+
53+
dnl Check for VA-API
54+
PKG_CHECK_MODULES(LIBVA_DEPS, [libva])
55+
PKG_CHECK_MODULES(LIBVA_X11_DEPS, [libva-x11])
56+
57+
VA_VERSION=`$PKG_CONFIG --modversion libva`
58+
VA_MAJOR_VERSION=`echo "$VA_VERSION" | cut -d'.' -f1`
59+
VA_MINOR_VERSION=`echo "$VA_VERSION" | cut -d'.' -f2`
60+
VA_MICRO_VERSION=`echo "$VA_VERSION" | cut -d'.' -f3`
61+
VA_VERSION_STR="$VA_VERSION"
62+
63+
va_full_version_int=`expr ${VA_MAJOR_VERSION:-0} "*" 1000000 + \
64+
${VA_MINOR_VERSION:-0} "*" 10000 + \
65+
${VA_MICRO_VERSION:-0} "*" 100 + \
66+
0`
67+
VA_DRIVER_INIT_FUNC="__vaDriverInit_${VA_MAJOR_VERSION}_${VA_MINOR_VERSION}"
68+
AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC],
69+
[Define driver entry-point])
70+
71+
dnl Check for VA-API drivers path
72+
AC_MSG_CHECKING([for VA drivers path])
73+
LIBVA_DRIVERS_PATH=`$PKG_CONFIG libva --variable driverdir`
74+
if test -z "$LIBVA_DRIVERS_PATH"; then
75+
LIBVA_DRIVERS_PATH="/usr/lib/xorg/modules/drivers"
76+
fi
77+
AC_MSG_RESULT([$LIBVA_DRIVERS_PATH])
78+
AC_SUBST(LIBVA_DRIVERS_PATH)
79+
80+
AC_OUTPUT([
81+
Makefile
82+
src/Makefile
83+
src/shaders/Makefile
84+
src/shaders/h264/Makefile
85+
src/shaders/h264/mc/Makefile
86+
src/shaders/mpeg2/Makefile
87+
src/shaders/mpeg2/vld/Makefile
88+
src/shaders/post_processing/Makefile
89+
src/shaders/render/Makefile
90+
src/shaders/vme/Makefile
91+
])
92+
93+
dnl Print summary
94+
echo
95+
echo $PACKAGE configuration summary:
96+
echo
97+
echo VA-API version ................... : $VA_VERSION_STR
98+
echo VA-API drivers path .............. : $LIBVA_DRIVERS_PATH
99+
echo

‎src/Makefile.am

+11-4
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323
SUBDIRS = shaders
2424

2525
INCLUDES = \
26-
-I$(top_srcdir) \
27-
-I$(top_srcdir)/va \
28-
-I$(top_srcdir)/va/x11 \
2926
-DPTHREADS \
3027
$(DRM_CFLAGS) \
28+
$(LIBVA_DEPS_CFLAGS) \
3129
$(NULL)
3230

3331
driver_cflags = \
@@ -39,7 +37,13 @@ driver_ldflags = \
3937
-module -avoid-version \
4038
-no-undefined \
4139
-Wl,--no-undefined \
40+
$(NULL)
41+
42+
driver_libs = \
43+
-lpthread \
4244
$(DRM_LIBS) -ldrm_intel \
45+
$(LIBVA_DEPS_LIBS) \
46+
$(LIBVA_X11_DEPS_LIBS) \
4347
$(NULL)
4448

4549
source_c = \
@@ -94,6 +98,9 @@ i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
9498
i965_drv_video_ladir = $(LIBVA_DRIVERS_PATH)
9599
i965_drv_video_la_CFLAGS = $(driver_cflags)
96100
i965_drv_video_la_LDFLAGS = $(driver_ldflags)
97-
i965_drv_video_la_LIBADD = $(top_builddir)/va/libva-x11.la -lpthread
101+
i965_drv_video_la_LIBADD = $(driver_libs)
98102
i965_drv_video_la_SOURCES = $(source_c)
99103
noinst_HEADERS = $(source_h)
104+
105+
# Extra clean files so that maintainer-clean removes *everything*
106+
MAINTAINERCLEANFILES = Makefile.in config.h.in

‎src/i965_avc_bsd.c

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
#include <string.h>
3131
#include <assert.h>
3232

33-
#include "va_backend.h"
34-
3533
#include "intel_batchbuffer.h"
3634
#include "intel_driver.h"
3735

‎src/i965_avc_hw_scoreboard.c

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
#include <string.h>
3131
#include <assert.h>
3232

33-
#include "va_backend.h"
34-
3533
#include "intel_batchbuffer.h"
3634
#include "intel_driver.h"
3735

‎src/i965_avc_ildb.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include <string.h>
3131
#include <assert.h>
3232

33-
#include "va_backend.h"
3433

3534
#include "intel_batchbuffer.h"
3635
#include "intel_driver.h"

‎src/i965_drv_video.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <string.h>
3333
#include <assert.h>
3434

35-
#include "va/x11/va_dricommon.h"
35+
#include <va/va_dricommon.h>
3636

3737
#include "intel_driver.h"
3838
#include "intel_memman.h"

‎src/i965_media_h264.c

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <string.h>
44
#include <assert.h>
55

6-
#include "va_backend.h"
76

87
#include "intel_batchbuffer.h"
98
#include "intel_driver.h"

‎src/i965_render.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <assert.h>
3838

3939
#include <va/va_backend.h>
40-
#include "va/x11/va_dricommon.h"
40+
#include <va/va_dricommon.h>
4141

4242
#include "intel_batchbuffer.h"
4343
#include "intel_driver.h"

‎src/intel_driver.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include <assert.h>
3131

32-
#include "va_dricommon.h"
32+
#include <va/va_dricommon.h>
3333

3434
#include "intel_batchbuffer.h"
3535
#include "intel_memman.h"

‎src/shaders/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
SUBDIRS = h264 mpeg2 render post_processing vme
2+
3+
# Extra clean files so that maintainer-clean removes *everything*
4+
MAINTAINERCLEANFILES = Makefile.in

‎src/shaders/h264/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
SUBDIRS = mc
2+
3+
# Extra clean files so that maintainer-clean removes *everything*
4+
MAINTAINERCLEANFILES = Makefile.in

‎src/shaders/h264/mc/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,6 @@ clean-local:
182182
-rm -f $(INTEL_G4B_GEN5)
183183
-rm -f $(INTEL_MC_G4B_GEN5) $(INTEL_MC_EXPORT_GEN5)
184184
endif
185+
186+
# Extra clean files so that maintainer-clean removes *everything*
187+
MAINTAINERCLEANFILES = Makefile.in

‎src/shaders/mpeg2/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
SUBDIRS = vld
2+
3+
# Extra clean files so that maintainer-clean removes *everything*
4+
MAINTAINERCLEANFILES = Makefile.in

‎src/shaders/mpeg2/vld/Makefile.am

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
INTEL_G4I = addidct.g4i \
32
do_iq_intra.g4i \
43
do_iq_non_intra.g4i \
@@ -88,3 +87,6 @@ clean-local:
8887
-rm -f $(INTEL_G4B)
8988
-rm -f $(INTEL_G4B_GEN5)
9089
endif
90+
91+
# Extra clean files so that maintainer-clean removes *everything*
92+
MAINTAINERCLEANFILES = Makefile.in

‎src/shaders/post_processing/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,6 @@ clean-local:
140140
-rm -f $(INTEL_PP_G6B)
141141

142142
endif
143+
144+
# Extra clean files so that maintainer-clean removes *everything*
145+
MAINTAINERCLEANFILES = Makefile.in

‎src/shaders/render/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,6 @@ clean-local:
8787
-rm -f $(INTEL_G6B)
8888
-rm -f $(INTEL_G7B)
8989
endif
90+
91+
# Extra clean files so that maintainer-clean removes *everything*
92+
MAINTAINERCLEANFILES = Makefile.in

‎src/shaders/vme/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ clean-local:
3535
-rm -f $(INTEL_G7B)
3636

3737
endif
38+
39+
# Extra clean files so that maintainer-clean removes *everything*
40+
MAINTAINERCLEANFILES = Makefile.in

0 commit comments

Comments
 (0)