hardware/intel/libva
| 修订版 | adac1a519de44803b0cdfff29829508cdd419a01 (tree) |
|---|---|
| 时间 | 2009-03-26 04:20:31 |
| 作者 | Ren, Zhaohan <zhaohan.ren@inte...> |
| Commiter | Ren, Zhaohan |
patch 108_drivers_path.patch
configure.ac (diff) dummy_drv_video/Makefile.am (diff) libva.pc.in (diff) src/Makefile.am (diff)
src/va.c (diff)| @@ -27,6 +27,13 @@ AM_INIT_AUTOMAKE([dist-bzip2]) | ||
| 27 | 27 | |
| 28 | 28 | AM_CONFIG_HEADER([src/config.h]) |
| 29 | 29 | |
| 30 | +AC_ARG_WITH(drivers-path, | |
| 31 | + [AC_HELP_STRING([--with-drivers-path=[[path]]], [drivers path])],, | |
| 32 | + [with_drivers_path="$libdir/va/drivers"]) | |
| 33 | + | |
| 34 | +LIBVA_DRIVERS_PATH="$with_drivers_path" | |
| 35 | +AC_SUBST(LIBVA_DRIVERS_PATH) | |
| 36 | + | |
| 30 | 37 | AC_DISABLE_STATIC |
| 31 | 38 | AC_PROG_LIBTOOL |
| 32 | 39 | AC_PROG_CC |
| @@ -21,7 +21,7 @@ | ||
| 21 | 21 | # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 22 | 22 | |
| 23 | 23 | dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la |
| 24 | -dummy_drv_video_ladir = /usr/lib/dri | |
| 24 | +dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@ | |
| 25 | 25 | dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined |
| 26 | 26 | dummy_drv_video_la_LIBADD = ../src/libva.la |
| 27 | 27 |
| @@ -2,6 +2,7 @@ prefix=@prefix@ | ||
| 2 | 2 | exec_prefix=@exec_prefix@ |
| 3 | 3 | libdir=@libdir@ |
| 4 | 4 | includedir=@includedir@ |
| 5 | +driverdir=@LIBVA_DRIVERS_PATH@ | |
| 5 | 6 | |
| 6 | 7 | Name: libva |
| 7 | 8 | Description: Userspace Video Acceleration (VA) core interface |
| @@ -22,7 +22,8 @@ | ||
| 22 | 22 | |
| 23 | 23 | INCLUDES = \ |
| 24 | 24 | $(LIBVA_CFLAGS) \ |
| 25 | - -DIN_LIBVA | |
| 25 | + -DIN_LIBVA \ | |
| 26 | + -DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\"" | |
| 26 | 27 | |
| 27 | 28 | libva_la_LTLIBRARIES = libva.la |
| 28 | 29 | libva_ladir = $(libdir) |
| @@ -36,7 +36,7 @@ | ||
| 36 | 36 | #define VA_MINOR_VERSION 30 |
| 37 | 37 | #define DRIVER_INIT_FUNC "__vaDriverInit_0_30" |
| 38 | 38 | |
| 39 | -#define DEFAULT_DRIVER_DIR "/usr/lib/dri/" | |
| 39 | +#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri" | |
| 40 | 40 | #define DRIVER_EXTENSION "_drv_video.so" |
| 41 | 41 | |
| 42 | 42 | #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext) |
| @@ -128,7 +128,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name) | ||
| 128 | 128 | } |
| 129 | 129 | if (!search_path) |
| 130 | 130 | { |
| 131 | - search_path = DEFAULT_DRIVER_DIR; | |
| 131 | + search_path = VA_DRIVERS_PATH; | |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | search_path = strdup(search_path); |
Fork