Revision: 5335 Author: pebender Date: Fri Aug 21 18:31:42 2009 Log: - Updated package X11/libva.
http://code.google.com/p/minimyth/source/detail?r=5335 Added: /trunk/gar-minimyth/script/X11/libva/files/207_nvidia_drv_version_fix.patch /trunk/gar-minimyth/script/X11/libva/files/208_fix_libva_x11_deps.patch /trunk/gar-minimyth/script/X11/libva/files/209_drop_libva_display_defs.patch /trunk/gar-minimyth/script/X11/libva/files/320_move_vaPutSurface_flags_def.patch /trunk/gar-minimyth/script/X11/libva/files/321_libva_glx.patch Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/X11/libva/Makefile /trunk/gar-minimyth/script/X11/libva/checksums /trunk/gar-minimyth/script/X11/libva/files/300_sds_version.patch ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/X11/libva/files/207_nvidia_drv_version_fix.patch Fri Aug 21 18:31:42 2009 @@ -0,0 +1,28 @@ +commit 9538b7b3f5d6a2bd19eb5a3b061d33e814ce2f28 +Author: Gwenole Beauchesne <[email protected]> +Date: Thu Aug 13 14:43:09 2009 +0000 + + Fix NVIDIA driver version string parser. + +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; ++ } ++ } + } + } + } ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/X11/libva/files/208_fix_libva_x11_deps.patch Fri Aug 21 18:31:42 2009 @@ -0,0 +1,19 @@ +commit feffa09de925ebcccd5e6a4024b2a0a04f2f4f7d +Author: Gwenole Beauchesne <[email protected]> +Date: Thu Aug 13 14:43:30 2009 +0000 + + Fix libva-x11-VERSION.so.* dependencies. + +diff --git a/src/Makefile.am b/src/Makefile.am +index 74fbdb5..2fcd03b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -40,7 +40,7 @@ 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 + ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/X11/libva/files/209_drop_libva_display_defs.patch Fri Aug 21 18:31:42 2009 @@ -0,0 +1,85 @@ +commit dd378418b239685a1d79ae44e3564374db1532e2 +Author: Gwenole Beauchesne <[email protected]> +Date: Fri Aug 21 11:42:53 2009 +0000 + + Drop libva_display. Explicitly use libva-x11. + +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-<display>.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 3591612..4c6bfc5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,7 +119,6 @@ libvacorelib=libva.la + libvabackendlib=libva-$LIBVA_DISPLAY.la + AC_SUBST([libvacorelib]) + AC_SUBST([libvabackendlib]) +-AC_SUBST(LIBVA_DISPLAY) + + AC_OUTPUT([ + Makefile +@@ -134,6 +133,6 @@ AC_OUTPUT([ + i965_drv_video/shaders/render/Makefile + test/Makefile + libva.pc +- libva_display.pc ++ libva-x11.pc + ]) + +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 @@ ++pref...@prefix@ ++exec_pref...@exec_prefix@ ++libd...@libdir@ ++included...@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 c9c5cd6..0000000 +--- a/libva_display.pc.in ++++ /dev/null +@@ -1,11 +0,0 @@ +-pref...@prefix@ +-exec_pref...@exec_prefix@ +-libd...@libdir@ +-included...@includedir@ +-displ...@libva_display@ +- +-Name: libva-${display} +-Description: Userspace Video Acceleration (VA) ${display} interface +-Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lva-${display} +-Cflags: -I${includedir} ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/X11/libva/files/320_move_vaPutSurface_flags_def.patch Fri Aug 21 18:31:42 2009 @@ -0,0 +1,60 @@ +commit c682fb5ebd1964638f90590f66edf49629e7481d +Author: Gwenole Beauchesne <[email protected]> +Date: Fri Aug 21 11:34:50 2009 +0000 + + Move vaPutSurface() flags to <va/va.h> header. + +diff --git a/src/va.h b/src/va.h +index 0519f6f..6b4bbd4 100755 +--- a/src/va.h ++++ b/src/va.h +@@ -127,6 +127,22 @@ typedef int VAStatus; /* Return status type from functions */ + #define VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED 0x00000013 + #define VA_STATUS_ERROR_UNKNOWN 0xFFFFFFFF + ++/* De-interlacing flags for vaPutSurface() */ ++#define VA_FRAME_PICTURE 0x00000000 ++#define VA_TOP_FIELD 0x00000001 ++#define VA_BOTTOM_FIELD 0x00000002 ++ ++/* ++ * Clears the drawable with background color. ++ * for hardware overlay based implementation this flag ++ * can be used to turn off the overlay ++ */ ++#define VA_CLEAR_DRAWABLE 0x00000008 ++ ++/* Color space conversion flags for vaPutSurface() */ ++#define VA_SRC_BT601 0x00000010 ++#define VA_SRC_BT709 0x00000020 ++ + /* + * Returns a short english description of error_status + */ +diff --git a/src/x11/va_x11.h b/src/x11/va_x11.h +index 2171ac6..5ab5200 100644 +--- a/src/x11/va_x11.h ++++ b/src/x11/va_x11.h +@@ -27,22 +27,6 @@ VADisplay vaGetDisplay ( + * color space conversion and scaling to the destination + * rectangle + */ +-/* de-interlacing flags for vaPutSurface */ +-#define VA_FRAME_PICTURE 0x00000000 +-#define VA_TOP_FIELD 0x00000001 +-#define VA_BOTTOM_FIELD 0x00000002 +- +-/* +- * clears the drawable with background color. +- * for hardware overlay based implementation this flag +- * can be used to turn off the overlay +- */ +-#define VA_CLEAR_DRAWABLE 0x00000008 +- +-/* color space conversion flags for vaPutSurface */ +-#define VA_SRC_BT601 0x00000010 +-#define VA_SRC_BT709 0x00000020 +- + VAStatus vaPutSurface ( + VADisplay dpy, + VASurfaceID surface, ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/X11/libva/files/321_libva_glx.patch Fri Aug 21 18:31:42 2009 @@ -0,0 +1,398 @@ +commit b191169d64f4abed13db5aaa759950cd4261655b +Author: Gwenole Beauchesne <[email protected]> +Date: Fri Aug 21 11:58:16 2009 +0000 + + Add initial OpenGL extensions. + +diff --git a/Makefile.am b/Makefile.am +index 07385e6..6fb4cae 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,10 +32,13 @@ endif + + pcfiles = libva.pc + pcfiles += libva-x11.pc ++if USE_GLX ++pcfiles += libva-glx.pc ++endif + + pkgconfigdir = @pkgconfigdir@ + pkgconfig_DATA = $(pcfiles) + +-EXTRA_DIST = libva.pc.in libva-x11.pc.in ++EXTRA_DIST = libva.pc.in libva-x11.pc.in libva-glx.pc.in + + CLEANFILES = $(pcfiles) +diff --git a/configure.ac b/configure.ac +index 4c6bfc5..60275b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -66,6 +66,11 @@ LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION -release $LIBVA_VERSION.$LIBVA + AC_SUBST(LIBVA_LT_VERSION) + AC_SUBST(LIBVA_LT_LDFLAGS) + ++AC_ARG_ENABLE(glx, ++ [AC_HELP_STRING([--enable-glx], ++ [build with OpenGL for X11 support])], ++ [], [enable_glx=yes]) ++ + AC_ARG_ENABLE(dummy-driver, + [AC_HELP_STRING([--enable-dummy-driver], + [build dummy video driver])], +@@ -106,6 +111,23 @@ if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdr + fi + AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes) + ++# Check for OpenGL (X11) ++USE_GLX="no" ++GL_DEPS_CFLAGS="" ++GL_DEPS_LIBS="" ++ ++if test x$enable_glx = xyes; then ++ AC_CHECK_HEADERS([GL/gl.h]) ++ AC_CHECK_HEADERS([GL/glx.h]) ++ AC_CHECK_LIB(GL, glXCreateContext, [ ++ USE_GLX="yes" ++ GL_DEPS_LIBS="-lX11 -lGL" ++ ]) ++fi ++AC_SUBST(GL_DEPS_CFLAGS) ++AC_SUBST(GL_DEPS_LIBS) ++AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes") ++ + # We only need the headers, we don't link against the DRM libraries + LIBVA_CFLAGS="$DRM_CFLAGS" + AC_SUBST(LIBVA_CFLAGS) +@@ -125,6 +147,7 @@ AC_OUTPUT([ + src/Makefile + src/va_version.h + src/x11/Makefile ++ src/glx/Makefile + dummy_drv_video/Makefile + i965_drv_video/Makefile + i965_drv_video/shaders/Makefile +@@ -134,5 +157,6 @@ AC_OUTPUT([ + test/Makefile + libva.pc + libva-x11.pc ++ libva-glx.pc + ]) + +diff --git a/libva-glx.pc.in b/libva-glx.pc.in +new file mode 100644 +index 0000000..20ba20a +--- /dev/null ++++ b/libva-glx.pc.in +@@ -0,0 +1,11 @@ ++pref...@prefix@ ++exec_pref...@exec_prefix@ ++libd...@libdir@ ++included...@includedir@ ++display=glx ++ ++Name: libva-${display} ++Description: Userspace Video Acceleration (VA) ${display} interface ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -lva-${display} ++Cflags: -I${includedir} +diff --git a/src/Makefile.am b/src/Makefile.am +index 2fcd03b..a319f7e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,9 +28,17 @@ INCLUDES = \ + LDADD = \ + $(LIBVA_LT_LDFLAGS) + +-lib_LTLIBRARIES = \ +- libva.la \ +- libva-x11.la ++libva_x11_backend = libva-x11.la ++libva_x11_backenddir = x11 ++if USE_GLX ++libva_glx_backend = libva-glx.la ++libva_glx_backenddir = glx ++else ++libva_glx_backend = ++libva_glx_backenddir = ++endif ++ ++lib_LTLIBRARIES = libva.la $(libva_x11_backend) $(libva_glx_backend) + + libva_ladir = $(libdir) + libva_la_LDFLAGS = $(LDADD) -no-undefined +@@ -42,7 +50,14 @@ libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS + libva_x11_la_LDFLAGS = $(LDADD) + libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la + +-SUBDIRS = x11 ++libva_glx_la_SOURCES = ++libva_glx_la_LIBADD = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS) ++libva_glx_la_LDFLAGS = $(LDADD) ++libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la ++ ++SUBDIRS = $(libva_x11_backenddir) $(libva_glx_backenddir) ++ ++DIST_SUBDIRS = x11 glx + + libva_la_SOURCES = va.c va_compat.c + +diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am +new file mode 100644 +index 0000000..c62e5de +--- /dev/null ++++ b/src/glx/Makefile.am +@@ -0,0 +1,30 @@ ++# Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved. ++# ++# Permission is hereby granted, free of charge, to any person obtaining a ++# copy of this software and associated documentation files (the ++# "Software"), to deal in the Software without restriction, including ++# without limitation the rights to use, copy, modify, merge, publish, ++# distribute, sub license, and/or sell copies of the Software, and to ++# permit persons to whom the Software is furnished to do so, subject to ++# the following conditions: ++# ++# The above copyright notice and this permission notice (including the ++# next paragraph) shall be included in all copies or substantial portions ++# of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ++# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ++# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 ++ ++noinst_LTLIBRARIES = libva_glx.la ++ ++libva_glxincludedir = ${includedir}/va ++libva_glxinclude_HEADERS = va_glx.h ++ ++libva_glx_la_SOURCES = va_glx.c +diff --git a/src/glx/va_glx.c b/src/glx/va_glx.c +new file mode 100644 +index 0000000..68558e4 +--- /dev/null ++++ b/src/glx/va_glx.c +@@ -0,0 +1,107 @@ ++/* ++ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the ++ * "Software"), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sub license, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the ++ * next paragraph) shall be included in all copies or substantial portions ++ * of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ++ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include "config.h" ++#include "va.h" ++#include "va_backend.h" ++#include "va_x11.h" ++#include "va_glx.h" ++ ++typedef struct VADisplayContextGLX *VADisplayContextGLXP; ++ ++struct VADisplayContextGLX { ++ void (*vaDestroy)(VADisplayContextP ctx); ++}; ++ ++static void va_DisplayContextDestroy(VADisplayContextP pDisplayContext) ++{ ++ VADisplayContextGLXP pDisplayContextGLX; ++ ++ if (!pDisplayContext) ++ return; ++ ++ pDisplayContextGLX = pDisplayContext->opaque; ++ if (pDisplayContextGLX) { ++ if (pDisplayContextGLX->vaDestroy) ++ pDisplayContextGLX->vaDestroy(pDisplayContext); ++ free(pDisplayContextGLX); ++ pDisplayContext->opaque = NULL; ++ } ++} ++ ++VADisplay vaGetDisplayGLX(Display *native_dpy) ++{ ++ VADisplay dpy = NULL; ++ VADisplayContextP pDisplayContext = NULL; ++ VADisplayContextGLXP pDisplayContextGLX = NULL; ++ VADriverContextP pDriverContext; ++ ++ dpy = vaGetDisplay(native_dpy); ++ if (!dpy) ++ return NULL; ++ pDisplayContext = (VADisplayContextP)dpy; ++ pDriverContext = pDisplayContext->pDriverContext; ++ ++ pDisplayContextGLX = calloc(1, sizeof(*pDisplayContextGLX)); ++ if (!pDisplayContextGLX) ++ goto error; ++ ++ pDisplayContextGLX->vaDestroy = pDisplayContext->vaDestroy; ++ pDisplayContext->vaDestroy = va_DisplayContextDestroy; ++ pDisplayContext->opaque = pDisplayContextGLX; ++ return dpy; ++ ++error: ++ free(pDisplayContextGLX); ++ pDisplayContext->vaDestroy(pDisplayContext); ++ return NULL; ++} ++ ++VAStatus vaCopySurfaceToTextureGLX( ++ VADisplay dpy, ++ VASurfaceID surface, ++ GLuint tex, ++ unsigned int flags ++) ++{ ++ VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; ++ VADriverContextP ctx; ++ ++ if (!pDisplayContext) ++ return VA_STATUS_ERROR_INVALID_DISPLAY; ++ if (!pDisplayContext->vaIsValid) ++ return VA_STATUS_ERROR_INVALID_DISPLAY; ++ if (!pDisplayContext->vaIsValid(pDisplayContext)) ++ return VA_STATUS_ERROR_INVALID_DISPLAY; ++ ++ ctx = pDisplayContext->pDriverContext; ++ if (!ctx) ++ return VA_STATUS_ERROR_OPERATION_FAILED; ++ ++ if (ctx->vtable.vaCopySurfaceToTextureGLX) ++ return ctx->vtable.vaCopySurfaceToTextureGLX(ctx, surface, tex, flags); ++ ++ /* XXX: implement with the GLX texture-from-pixmap + FBO extension? */ ++ return VA_STATUS_ERROR_OPERATION_FAILED; ++} +diff --git a/src/glx/va_glx.h b/src/glx/va_glx.h +new file mode 100644 +index 0000000..117c7d8 +--- /dev/null ++++ b/src/glx/va_glx.h +@@ -0,0 +1,65 @@ ++/* ++ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the ++ * "Software"), to deal in the Software without restriction, including ++ * without limitation the rights to use, copy, modify, merge, publish, ++ * distribute, sub license, and/or sell copies of the Software, and to ++ * permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the ++ * next paragraph) shall be included in all copies or substantial portions ++ * of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ++ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++#ifndef VA_GLX_H ++#define VA_GLX_H ++ ++#ifdef IN_LIBVA ++#include "va.h" ++#else ++#include <va/va.h> ++#endif ++#include <GL/glx.h> ++ ++/** ++ * Returns a suitable VADisplay for VA API ++ * ++ * @param dpy the X11 display ++ * @return VA_STATUS_SUCCESS if successful ++ */ ++VADisplay vaGetDisplayGLX( ++ Display *dpy ++); ++ ++/** ++ * Copy VA API surface to an OpenGL texture ++ * ++ * The application shall maintain the live GLX context itself. ++ * Implementations are free to use glXGetCurrentContext() and ++ * glXGetCurrentDrawable() functions for internal purposes. ++ * ++ * @param dpy the VA API display ++ * @param surface the VA API surface ++ * @param tex the OpenGL texture ++ * @param flags the PutSurface flags ++ * @return VA_STATUS_SUCCESS if successful ++ */ ++VAStatus vaCopySurfaceToTextureGLX( ++ VADisplay dpy, ++ VASurfaceID surface, ++ GLuint tex, ++ unsigned int flags ++); ++ ++#endif /* VA_GLX_H */ +diff --git a/src/va_backend.h b/src/va_backend.h +index 9d787a9..ec56070 100644 +--- a/src/va_backend.h ++++ b/src/va_backend.h +@@ -403,6 +403,14 @@ struct VADriverVTable + unsigned int *chroma_v_offset, + void **buffer + ); ++ ++ /* Optional: copy surface to an OpenGL texture */ ++ VAStatus (*vaCopySurfaceToTextureGLX) ( ++ VADriverContextP ctx, ++ VASurfaceID surface, ++ unsigned int tex, ++ unsigned int flags ++ ); + }; + + struct VADriverContext +@@ -445,6 +453,8 @@ struct VADisplayContext + VADisplayContextP ctx, + char **driver_name + ); ++ ++ void *opaque; /* opaque for display extensions (e.g. GLX) */ + }; + + typedef VAStatus (*VADriverInit) ( +diff --git a/src/x11/va_x11.c b/src/x11/va_x11.c +index 9de904e..b8c60fa 100644 +--- a/src/x11/va_x11.c ++++ b/src/x11/va_x11.c +@@ -243,6 +243,7 @@ VADisplay vaGetDisplay ( + pDisplayContext->vaIsValid = va_DisplayContextIsValid; + pDisplayContext->vaDestroy = va_DisplayContextDestroy; + pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName; ++ pDisplayContext->opaque = NULL; + pDisplayContexts = pDisplayContext; + pDriverContext->dri_state = dri_state; + dpy = (VADisplay)pDisplayContext; ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Aug 21 17:30:05 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Aug 21 18:31:42 2009 @@ -51,6 +51,7 @@ Updated utils/coreutils. Updated utils/pciutils. Updated utils/usbutils. + Updated X11/libva. Updated xorg-7.4/pixman. Updated xorg-7.4/randr. Updated xorg-7.4/xf86-input-evdev. ======================================= --- /trunk/gar-minimyth/script/X11/libva/Makefile Tue Jul 7 06:34:08 2009 +++ /trunk/gar-minimyth/script/X11/libva/Makefile Fri Aug 21 18:31:42 2009 @@ -2,7 +2,7 @@ GARVERSION = 0.30.4 CATEGORIES = X11 MASTER_SITES = http://www.splitted-desktop.com/~gbeauchesne/$(GARNAME)/ -DISTFILES = $(GARNAME)_$(GARVERSION)-1+sds3.tar.gz +DISTFILES = $(GARNAME)_$(GARVERSION)-1+sds4.tar.gz PATCHFILES = \ 101_fix_build_with_x11.patch \ 102_fix_make_dist.patch \ @@ -26,12 +26,17 @@ 204_version.patch \ 205_nvidia_drv_info.patch \ 206_drop_obsolete_fields.patch \ + 207_nvidia_drv_version_fix.patch \ + 208_fix_libva_x11_deps.patch \ + 209_drop_libva_display_defs.patch \ 300_sds_version.patch \ 301_vdpau_h264.patch \ 302_vdpau_vc1.patch \ 303_xvba_h264.patch \ 304_vc1_skipped_p_frames.patch \ 310_VASliceParameterBufferBase.patch \ + 320_move_vaPutSurface_flags_def.patch \ + 321_libva_glx.patch \ 390_compat.patch LICENSE = MIT ======================================= --- /trunk/gar-minimyth/script/X11/libva/checksums Mon Jul 6 12:34:02 2009 +++ /trunk/gar-minimyth/script/X11/libva/checksums Fri Aug 21 18:31:42 2009 @@ -1,4 +1,4 @@ -0d7d9dafab65eacf820e78be38a0995f download/libva_0.30.4-1+sds3.tar.gz +9b7848c5e514d8a074b84deae256baaf download/libva_0.30.4-1+sds4.tar.gz 9816c1702074823b3bebf36b16eafaee download/101_fix_build_with_x11.patch 38c0386d090ce1006b07849e5ef4c9e8 download/102_fix_make_dist.patch 08a3a9877c88690de3da947b4df1e865 download/103_drop_CFGLAGS_override.patch @@ -21,10 +21,15 @@ 07402ef6303ab2b06a5d4021cb97a3e0 download/204_version.patch 0201b02820ef28836645c079f0beedbd download/205_nvidia_drv_info.patch fd3c8e68ecd2bb51ad616ade621d6aee download/206_drop_obsolete_fields.patch -b784fd16b5fea2a522651fc41db9b091 download/300_sds_version.patch +f28af649dac5a6135fabccd3b9450381 download/207_nvidia_drv_version_fix.patch +d1cad85574582a6be8b1af1c449f0c79 download/208_fix_libva_x11_deps.patch +a6b9e27de33fe4c2cc0747ac8b514425 download/209_drop_libva_display_defs.patch +77f9e51a674af836d034e8dead4effe0 download/300_sds_version.patch 425d243718fa8a06d59a15058afb373f download/301_vdpau_h264.patch 3ac554620ebfbb44af95f5b8d7ee575a download/302_vdpau_vc1.patch 82d6de71319c22690a7b95c1142c6351 download/303_xvba_h264.patch 4feb1ff443fc65a93b405c65eca5158b download/304_vc1_skipped_p_frames.patch 103ff5bb790cab55a214aeedc3b546e7 download/310_VASliceParameterBufferBase.patch +66141102c1bf04536d531a1fb6868e01 download/320_move_vaPutSurface_flags_def.patch +9a763fec0dd2b3bcb4c1e00edc2eb7ec download/321_libva_glx.patch 2a0fe2ad52f9a824f56d5930ce19bf59 download/390_compat.patch ======================================= --- /trunk/gar-minimyth/script/X11/libva/files/300_sds_version.patch Tue Jul 7 06:34:08 2009 +++ /trunk/gar-minimyth/script/X11/libva/files/300_sds_version.patch Fri Aug 21 18:31:42 2009 @@ -13,7 +13,7 @@ [libva_major_version.libva_minor_version.libva_micro_version]) +# increase this number for each API change -+m4_define([libva_sds_version], [2]) ++m4_define([libva_sds_version], [3]) + # if the library source code has changed, increment revision m4_define([libva_lt_revision], [0]) --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
