From 0b59c605e83d1316e9d92c8a49b24b46ad3d925f Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Wed, 2 Sep 2009 09:33:10 +0000 Subject: Drop references to SDS. --- configure.ac | 6 ------ src/va.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/configure.ac b/configure.ac index b37a438..4be2b56 100644 --- a/configure.ac +++ b/configure.ac @@ -28,9 +28,6 @@ m4_define([libva_micro_version], [0]) m4_define([libva_version], [libva_major_version.libva_minor_version.libva_micro_version]) -# increase this number for each API change -m4_define([libva_sds_version], [2]) - # if the library source code has changed, increment revision m4_define([libva_lt_revision], [0]) # if any interface was added/removed/changed, then inc current, reset revision @@ -55,9 +52,6 @@ AC_SUBST(LIBVA_MINOR_VERSION) AC_SUBST(LIBVA_MICRO_VERSION) AC_SUBST(LIBVA_VERSION) -LIBVA_SDS_VERSION=libva_sds_version -AC_SUBST(LIBVA_SDS_VERSION) - LIBVA_LT_CURRENT=libva_lt_current LIBVA_LT_REV=libva_lt_revision LIBVA_LT_AGE=libva_lt_age diff --git a/src/va.c b/src/va.c index 9a34534..c3f0868 100644 --- a/src/va.c +++ b/src/va.c @@ -40,7 +40,6 @@ #define DRIVER_INIT_FUNC "__vaDriverInit_0_31" -#define DRIVER_INIT_FUNC_SDS "__vaDriverInit_0_31_sds" #define DRIVER_EXTENSION "_drv_video.so" @@ -170,11 +169,6 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name) VADriverInit init_func; init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC); if (!init_func) - { - /* Then try SDS extensions (VDPAU and XvBA backends) */ - init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC_SDS); - } - if (!init_func) { va_errorMessage("%s has no function %s\n", driver_path, DRIVER_INIT_FUNC); dlclose(handle); -- cgit v1.2.1 From c88c6b3673413cbfb09263971b188a86303c0750 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Thu, 27 Aug 2009 15:40:29 +0000 Subject: Add VA_STATUS_ERROR_UNIMPLEMENTATION string representation. --- src/va.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/va.c b/src/va.c index c3f0868..2eaa966 100644 --- a/src/va.c +++ b/src/va.c @@ -311,6 +311,8 @@ const char *vaErrorStr(VAStatus error_status) return "invalid parameter"; case VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED: return "resolution not supported"; + case VA_STATUS_ERROR_UNIMPLEMENTED: + return "the requested function is not implemented"; case VA_STATUS_ERROR_UNKNOWN: return "unknown libva error"; } -- cgit v1.2.1 From 2db5371c30e7636e0d6d8794c2c67187020760d2 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Thu, 13 Aug 2009 14:43:09 +0000 Subject: Fix NVIDIA driver version string parser. --- src/x11/va_nvctrl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/x11/va_nvctrl.c b/src/x11/va_nvctrl.c index 46fcca5..b14db47 100644 --- a/src/x11/va_nvctrl.c +++ b/src/x11/va_nvctrl.c @@ -377,9 +377,16 @@ Bool VA_NVCTRLGetClientDriverName( Display *dpy, int screen, *ddxDriverMajorVersion = v; if (*(str = end) == '.') { v = strtoul(str + 1, &end, 10); - if (end && end != str && *end == '\0') { + if (end && end != str && (*end == '.' || *end == '\0')) { if (ddxDriverMinorVersion) *ddxDriverMinorVersion = v; + if (*(str = end) == '.') { + v = strtoul(str + 1, &end, 10); + if (end && end != str && *end == '\0') { + if (ddxDriverPatchVersion) + *ddxDriverPatchVersion = v; + } + } } } } -- cgit v1.2.1 From 6a72604e46e66b2b7992a362da24c8f5a2c49d0c Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Thu, 13 Aug 2009 14:43:30 +0000 Subject: Fix libva-x11-VERSION.so.* dependencies. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3849e8f..2f4210a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,7 @@ libva_la_LIBADD = $(LIBVA_LIBS) -ldl libva_x11_la_SOURCES = libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) libva_x11_la_LDFLAGS = $(LDADD) -libva_x11_la_DEPENDENCIES = $(libvacorelib) +libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la SUBDIRS = x11 -- cgit v1.2.1 From 4e349bb8e8857435d82fc7cbb3afcf5e36645f95 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Fri, 21 Aug 2009 11:42:53 +0000 Subject: Drop libva_display. Explicitly use libva-x11. --- Makefile.am | 11 +++-------- configure.ac | 3 +-- libva_display.pc.in | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index f2defab..07385e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,17 +30,12 @@ if BUILD_I965_DRIVER SUBDIRS += i965_drv_video endif -pcfiles = \ - libva.pc \ - libva-$(LIBVA_DISPLAY).pc - -# libva-.pc - for display-specific dependencies -libva-$(LIBVA_DISPLAY).pc: libva_display.pc - @cp $< $@ +pcfiles = libva.pc +pcfiles += libva-x11.pc pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = $(pcfiles) -EXTRA_DIST = libva.pc.in libva_display.pc.in +EXTRA_DIST = libva.pc.in libva-x11.pc.in CLEANFILES = $(pcfiles) diff --git a/configure.ac b/configure.ac index 4be2b56..c3aba90 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,6 @@ libvacorelib=libva.la libvabackendlib=libva-$LIBVA_DISPLAY.la AC_SUBST([libvacorelib]) AC_SUBST([libvabackendlib]) -AC_SUBST(LIBVA_DISPLAY) AC_OUTPUT([ Makefile @@ -128,6 +127,6 @@ AC_OUTPUT([ i965_drv_video/shaders/render/Makefile test/Makefile libva.pc - libva_display.pc + libva-x11.pc ]) diff --git a/libva_display.pc.in b/libva_display.pc.in index c9c5cd6..75e4f0b 100644 --- a/libva_display.pc.in +++ b/libva_display.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -display=@LIBVA_DISPLAY@ +display=x11 Name: libva-${display} Description: Userspace Video Acceleration (VA) ${display} interface -- cgit v1.2.1 From 8c14a97b2236eb4faaf40e06de9beb7d95701081 Mon Sep 17 00:00:00 2001 From: Austin Yuan Date: Thu, 3 Sep 2009 11:20:35 +0800 Subject: Mv libva_display.pc.in -> libva-x11.pc.in to fix autogen.sh issue Signed-off-by: Austin Yuan --- libva-x11.pc.in | 11 +++++++++++ libva_display.pc.in | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 libva-x11.pc.in delete mode 100644 libva_display.pc.in diff --git a/libva-x11.pc.in b/libva-x11.pc.in new file mode 100644 index 0000000..75e4f0b --- /dev/null +++ b/libva-x11.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +display=x11 + +Name: libva-${display} +Description: Userspace Video Acceleration (VA) ${display} interface +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lva-${display} +Cflags: -I${includedir} diff --git a/libva_display.pc.in b/libva_display.pc.in deleted file mode 100644 index 75e4f0b..0000000 --- a/libva_display.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -display=x11 - -Name: libva-${display} -Description: Userspace Video Acceleration (VA) ${display} interface -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lva-${display} -Cflags: -I${includedir} -- cgit v1.2.1