Commit d8618bcd authored by Austin Yuan's avatar Austin Yuan

Revert "patch 108_drivers_path.patch"

This reverts commit adac1a51.
parent 8d3eb707
......@@ -27,13 +27,6 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_CONFIG_HEADER([src/config.h])
AC_ARG_WITH(drivers-path,
[AC_HELP_STRING([--with-drivers-path=[[path]]], [drivers path])],,
[with_drivers_path="$libdir/va/drivers"])
LIBVA_DRIVERS_PATH="$with_drivers_path"
AC_SUBST(LIBVA_DRIVERS_PATH)
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
......
......@@ -21,7 +21,7 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
dummy_drv_video_ladir = /usr/lib/dri
dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
dummy_drv_video_la_LIBADD = ../src/libva.la
......
......@@ -2,7 +2,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
driverdir=@LIBVA_DRIVERS_PATH@
Name: libva
Description: Userspace Video Acceleration (VA) core interface
......
......@@ -22,8 +22,7 @@
INCLUDES = \
$(LIBVA_CFLAGS) \
-DIN_LIBVA \
-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
-DIN_LIBVA
libva_la_LTLIBRARIES = libva.la
libva_ladir = $(libdir)
......
......@@ -36,7 +36,7 @@
#define VA_MINOR_VERSION 30
#define DRIVER_INIT_FUNC "__vaDriverInit_0_30"
#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri"
#define DEFAULT_DRIVER_DIR "/usr/lib/dri/"
#define DRIVER_EXTENSION "_drv_video.so"
#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
......@@ -128,7 +128,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
}
if (!search_path)
{
search_path = VA_DRIVERS_PATH;
search_path = DEFAULT_DRIVER_DIR;
}
search_path = strdup(search_path);
......
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