From 53c613266261ce4e6e9fee197b966ed9cd30f1d5425fb83b6af4a21d252bc158 Mon Sep 17 00:00:00 2001 From: Kshitij Kulshreshtha Date: Mon, 28 Mar 2011 17:25:25 +0000 Subject: [PATCH] - new version 1.0.11 * obsoletes patch - i965_dri_video: don't try to render an invalid surface OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libva?expand=0&rev=4 --- ...ake-VADriverContext.vtable-a-pointer.patch | 115 ------------------ ...on-t-try-to-render-an-invalid-surfac.patch | 26 ---- libva-1.0.10.tar.bz2 | 3 - libva-1.0.11.tar.bz2 | 3 + libva.changes | 7 ++ libva.spec | 2 +- 6 files changed, 11 insertions(+), 145 deletions(-) delete mode 100644 0001-i965_drv_video-make-VADriverContext.vtable-a-pointer.patch delete mode 100644 0002-i965_dri_video-don-t-try-to-render-an-invalid-surfac.patch delete mode 100644 libva-1.0.10.tar.bz2 create mode 100644 libva-1.0.11.tar.bz2 diff --git a/0001-i965_drv_video-make-VADriverContext.vtable-a-pointer.patch b/0001-i965_drv_video-make-VADriverContext.vtable-a-pointer.patch deleted file mode 100644 index 3891221..0000000 --- a/0001-i965_drv_video-make-VADriverContext.vtable-a-pointer.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 2b7850b35a51c59a6692781d5e40e4bb608b6344 Mon Sep 17 00:00:00 2001 -From: Gwenole Beauchesne -Date: Thu, 27 Jan 2011 10:41:24 +0100 -Subject: [PATCH 1/2] i965_drv_video: make VADriverContext.vtable a pointer. - ---- - i965_drv_video/i965_drv_video.c | 85 ++++++++++++++++++++------------------- - 1 files changed, 43 insertions(+), 42 deletions(-) - -diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c -index 303e090..5baa0ff 100644 ---- a/i965_drv_video/i965_drv_video.c -+++ b/i965_drv_video/i965_drv_video.c -@@ -1839,6 +1839,7 @@ i965_Terminate(VADriverContextP ctx) - VAStatus - VA_DRIVER_INIT_FUNC( VADriverContextP ctx ) - { -+ struct VADriverVTable * const vtable = ctx->vtable; - struct i965_driver_data *i965; - int result; - -@@ -1852,48 +1853,48 @@ VA_DRIVER_INIT_FUNC( VADriverContextP ctx ) - ctx->max_display_attributes = I965_MAX_DISPLAY_ATTRIBUTES; - ctx->str_vendor = I965_STR_VENDOR; - -- ctx->vtable.vaTerminate = i965_Terminate; -- ctx->vtable.vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints; -- ctx->vtable.vaQueryConfigProfiles = i965_QueryConfigProfiles; -- ctx->vtable.vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints; -- ctx->vtable.vaQueryConfigAttributes = i965_QueryConfigAttributes; -- ctx->vtable.vaCreateConfig = i965_CreateConfig; -- ctx->vtable.vaDestroyConfig = i965_DestroyConfig; -- ctx->vtable.vaGetConfigAttributes = i965_GetConfigAttributes; -- ctx->vtable.vaCreateSurfaces = i965_CreateSurfaces; -- ctx->vtable.vaDestroySurfaces = i965_DestroySurfaces; -- ctx->vtable.vaCreateContext = i965_CreateContext; -- ctx->vtable.vaDestroyContext = i965_DestroyContext; -- ctx->vtable.vaCreateBuffer = i965_CreateBuffer; -- ctx->vtable.vaBufferSetNumElements = i965_BufferSetNumElements; -- ctx->vtable.vaMapBuffer = i965_MapBuffer; -- ctx->vtable.vaUnmapBuffer = i965_UnmapBuffer; -- ctx->vtable.vaDestroyBuffer = i965_DestroyBuffer; -- ctx->vtable.vaBeginPicture = i965_BeginPicture; -- ctx->vtable.vaRenderPicture = i965_RenderPicture; -- ctx->vtable.vaEndPicture = i965_EndPicture; -- ctx->vtable.vaSyncSurface = i965_SyncSurface; -- ctx->vtable.vaQuerySurfaceStatus = i965_QuerySurfaceStatus; -- ctx->vtable.vaPutSurface = i965_PutSurface; -- ctx->vtable.vaQueryImageFormats = i965_QueryImageFormats; -- ctx->vtable.vaCreateImage = i965_CreateImage; -- ctx->vtable.vaDeriveImage = i965_DeriveImage; -- ctx->vtable.vaDestroyImage = i965_DestroyImage; -- ctx->vtable.vaSetImagePalette = i965_SetImagePalette; -- ctx->vtable.vaGetImage = i965_GetImage; -- ctx->vtable.vaPutImage = i965_PutImage; -- ctx->vtable.vaQuerySubpictureFormats = i965_QuerySubpictureFormats; -- ctx->vtable.vaCreateSubpicture = i965_CreateSubpicture; -- ctx->vtable.vaDestroySubpicture = i965_DestroySubpicture; -- ctx->vtable.vaSetSubpictureImage = i965_SetSubpictureImage; -- ctx->vtable.vaSetSubpictureChromakey = i965_SetSubpictureChromakey; -- ctx->vtable.vaSetSubpictureGlobalAlpha = i965_SetSubpictureGlobalAlpha; -- ctx->vtable.vaAssociateSubpicture = i965_AssociateSubpicture; -- ctx->vtable.vaDeassociateSubpicture = i965_DeassociateSubpicture; -- ctx->vtable.vaQueryDisplayAttributes = i965_QueryDisplayAttributes; -- ctx->vtable.vaGetDisplayAttributes = i965_GetDisplayAttributes; -- ctx->vtable.vaSetDisplayAttributes = i965_SetDisplayAttributes; --// ctx->vtable.vaDbgCopySurfaceToBuffer = i965_DbgCopySurfaceToBuffer; -+ vtable->vaTerminate = i965_Terminate; -+ vtable->vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints; -+ vtable->vaQueryConfigProfiles = i965_QueryConfigProfiles; -+ vtable->vaQueryConfigEntrypoints = i965_QueryConfigEntrypoints; -+ vtable->vaQueryConfigAttributes = i965_QueryConfigAttributes; -+ vtable->vaCreateConfig = i965_CreateConfig; -+ vtable->vaDestroyConfig = i965_DestroyConfig; -+ vtable->vaGetConfigAttributes = i965_GetConfigAttributes; -+ vtable->vaCreateSurfaces = i965_CreateSurfaces; -+ vtable->vaDestroySurfaces = i965_DestroySurfaces; -+ vtable->vaCreateContext = i965_CreateContext; -+ vtable->vaDestroyContext = i965_DestroyContext; -+ vtable->vaCreateBuffer = i965_CreateBuffer; -+ vtable->vaBufferSetNumElements = i965_BufferSetNumElements; -+ vtable->vaMapBuffer = i965_MapBuffer; -+ vtable->vaUnmapBuffer = i965_UnmapBuffer; -+ vtable->vaDestroyBuffer = i965_DestroyBuffer; -+ vtable->vaBeginPicture = i965_BeginPicture; -+ vtable->vaRenderPicture = i965_RenderPicture; -+ vtable->vaEndPicture = i965_EndPicture; -+ vtable->vaSyncSurface = i965_SyncSurface; -+ vtable->vaQuerySurfaceStatus = i965_QuerySurfaceStatus; -+ vtable->vaPutSurface = i965_PutSurface; -+ vtable->vaQueryImageFormats = i965_QueryImageFormats; -+ vtable->vaCreateImage = i965_CreateImage; -+ vtable->vaDeriveImage = i965_DeriveImage; -+ vtable->vaDestroyImage = i965_DestroyImage; -+ vtable->vaSetImagePalette = i965_SetImagePalette; -+ vtable->vaGetImage = i965_GetImage; -+ vtable->vaPutImage = i965_PutImage; -+ vtable->vaQuerySubpictureFormats = i965_QuerySubpictureFormats; -+ vtable->vaCreateSubpicture = i965_CreateSubpicture; -+ vtable->vaDestroySubpicture = i965_DestroySubpicture; -+ vtable->vaSetSubpictureImage = i965_SetSubpictureImage; -+ vtable->vaSetSubpictureChromakey = i965_SetSubpictureChromakey; -+ vtable->vaSetSubpictureGlobalAlpha = i965_SetSubpictureGlobalAlpha; -+ vtable->vaAssociateSubpicture = i965_AssociateSubpicture; -+ vtable->vaDeassociateSubpicture = i965_DeassociateSubpicture; -+ vtable->vaQueryDisplayAttributes = i965_QueryDisplayAttributes; -+ vtable->vaGetDisplayAttributes = i965_GetDisplayAttributes; -+ vtable->vaSetDisplayAttributes = i965_SetDisplayAttributes; -+// vtable->vaDbgCopySurfaceToBuffer = i965_DbgCopySurfaceToBuffer; - - i965 = (struct i965_driver_data *)calloc(1, sizeof(*i965)); - assert(i965); --- -1.7.4.1 - diff --git a/0002-i965_dri_video-don-t-try-to-render-an-invalid-surfac.patch b/0002-i965_dri_video-don-t-try-to-render-an-invalid-surfac.patch deleted file mode 100644 index 508710e..0000000 --- a/0002-i965_dri_video-don-t-try-to-render-an-invalid-surfac.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3739a5e19700f508eac0b874856d08a06ea9ff45 Mon Sep 17 00:00:00 2001 -From: Xiang, Haihao -Date: Thu, 24 Feb 2011 15:22:46 +0800 -Subject: [PATCH 2/2] i965_dri_video: don't try to render an invalid surface - -Signed-off-by: Xiang, Haihao ---- - i965_drv_video/i965_drv_video.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c -index 5baa0ff..0f09d8a 100644 ---- a/i965_drv_video/i965_drv_video.c -+++ b/i965_drv_video/i965_drv_video.c -@@ -1736,7 +1736,7 @@ i965_PutSurface(VADriverContextP ctx, - * will get here - */ - obj_surface = SURFACE(surface); -- if (obj_surface->bo == NULL) -+ if (!obj_surface || !obj_surface->bo) - return VA_STATUS_SUCCESS; - - dri_drawable = dri_get_drawable(ctx, (Drawable)draw); --- -1.7.4.1 - diff --git a/libva-1.0.10.tar.bz2 b/libva-1.0.10.tar.bz2 deleted file mode 100644 index df1a617..0000000 --- a/libva-1.0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71c77a3a2f4f6cd65974932d4acb9b4f9749ed0103fa2495720d48ffdeb50798 -size 459100 diff --git a/libva-1.0.11.tar.bz2 b/libva-1.0.11.tar.bz2 new file mode 100644 index 0000000..dd4acc7 --- /dev/null +++ b/libva-1.0.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3022fa269ac3b8bbef8a88d87abed6d80ce0502bb9b161188a382cf0a97bb2f +size 461478 diff --git a/libva.changes b/libva.changes index 5eff522..fe3ca91 100644 --- a/libva.changes +++ b/libva.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 28 17:23:25 UTC 2011 - kkhere.geo@gmail.com + +- new version 1.0.11 + * obsoletes patch + - i965_dri_video: don't try to render an invalid surface + ------------------------------------------------------------------- Thu Mar 3 15:02:06 UTC 2011 - kkhere.geo@gmail.com diff --git a/libva.spec b/libva.spec index d64c46f..a02ced7 100644 --- a/libva.spec +++ b/libva.spec @@ -1,5 +1,5 @@ Name: libva -Version: 1.0.10 +Version: 1.0.11 Release: 1 License: MIT Summary: Video Acceleration (VA) API for Linux