Commit 899c0571 authored by Austin Yuan's avatar Austin Yuan

Fix build issue

Signed-off-by: default avatarAustin Yuan <shengquan.yuan@gmail.com>
parent 45987380
...@@ -30,12 +30,16 @@ if BUILD_I965_DRIVER ...@@ -30,12 +30,16 @@ if BUILD_I965_DRIVER
SUBDIRS += i965_drv_video SUBDIRS += i965_drv_video
endif endif
pcfiles = libva.pc libva-tpi.pc libva-egl.pc pcfiles = libva.pc libva-tpi.pc
pcfiles += libva-x11.pc pcfiles += libva-x11.pc
if USE_GLX if USE_GLX
pcfiles += libva-glx.pc pcfiles += libva-glx.pc
endif endif
if USE_EGL
pcfiles += libva-egl.pc
endif
pkgconfigdir = @pkgconfigdir@ pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = $(pcfiles) pkgconfig_DATA = $(pcfiles)
......
...@@ -134,6 +134,11 @@ fi ...@@ -134,6 +134,11 @@ fi
AC_SUBST(GL_DEPS_CFLAGS) AC_SUBST(GL_DEPS_CFLAGS)
AC_SUBST(GL_DEPS_LIBS) AC_SUBST(GL_DEPS_LIBS)
AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes") AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes")
AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
# TBD: Check for EGL
USE_EGL="yes"
# Make sure drivers use the correctly versioned __vaDriverInit*() function name # Make sure drivers use the correctly versioned __vaDriverInit*() function name
VA_DRIVER_INIT_FUNC="__vaDriverInit_${LIBVA_MAJOR_VERSION}_${LIBVA_MINOR_VERSION}" VA_DRIVER_INIT_FUNC="__vaDriverInit_${LIBVA_MAJOR_VERSION}_${LIBVA_MINOR_VERSION}"
...@@ -202,6 +207,8 @@ AS_IF([test x$enable_dummy_driver = xyes], [DRIVERS="dummy $DRIVERS"]) ...@@ -202,6 +207,8 @@ AS_IF([test x$enable_dummy_driver = xyes], [DRIVERS="dummy $DRIVERS"])
echo " Drivers: ${DRIVERS}" echo " Drivers: ${DRIVERS}"
AS_IF([test x$USE_GLX = xyes], [BACKENDS="glx $BACKENDS"]) AS_IF([test x$USE_GLX = xyes], [BACKENDS="glx $BACKENDS"])
AS_IF([test x$USE_EGL = xyes], [BACKENDS="egl $BACKENDS"])
BACKENDS="x11 $BACKENDS" BACKENDS="x11 $BACKENDS"
AS_IF([test x$enable_dummy_backend = xyes], [BACKENDS="dummy AS_IF([test x$enable_dummy_backend = xyes], [BACKENDS="dummy
$BACKENDS"]) $BACKENDS"])
......
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
display=egl
Name: libva-${display}
Description: Userspace Video Acceleration (VA) ${display} interface
Requires: libva
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lva-${display}
Cflags: -I${includedir}
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%define libversion 1.0.8 %define libversion 1.0.8
Name: libva Name: libva
Version: %{libversion} Version: %{libversion}MFLD
Release: 0.0 Release: 0.0
License: MIT License: MIT
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
......
...@@ -74,13 +74,17 @@ libva_glx_backend = ...@@ -74,13 +74,17 @@ libva_glx_backend =
libva_glx_backenddir = libva_glx_backenddir =
endif endif
# tbd: make it configurable? if USE_EGL
libva_egl_backend = libva-egl.la libva_egl_backend = libva-egl.la
libva_egl_backenddir = egl libva_egl_backenddir = egl
libva_egl_la_SOURCES = libva_egl_la_SOURCES =
libva_egl_la_LIBADD = $(libvacorelib) egl/libva_egl.la libva-x11.la $(GL_DEPS_LIBS) -ldl libva_egl_la_LIBADD = $(libvacorelib) egl/libva_egl.la libva-x11.la $(GL_DEPS_LIBS) -ldl
libva_egl_la_LDFLAGS = $(LDADD) libva_egl_la_LDFLAGS = $(LDADD)
libva_egl_la_DEPENDENCIES = $(libvacorelib) egl/libva_egl.la libva-x11.la libva_egl_la_DEPENDENCIES = $(libvacorelib) egl/libva_egl.la libva-x11.la
else
libva_egl_backend =
libva_egl_backenddir =
endif
lib_LTLIBRARIES = libva.la libva-tpi.la $(libva_x11_backend) $(libva_dummy_backend) $(libva_glx_backend) $(libva_egl_backend) lib_LTLIBRARIES = libva.la libva-tpi.la $(libva_x11_backend) $(libva_dummy_backend) $(libva_glx_backend) $(libva_egl_backend)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment