From 703e890e83b360c3e3fc70a6dec0d71703b384f4 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 19 Oct 2014 05:07:04 +1100 Subject: [PATCH] [notify] libva: 1.3.1 -> 1.4.0 new dependency wayland --- libva/.footprint | 37 +++++++++--------- libva/.md5sum | 3 +- ...playContext-at-the-end-of-vaTerminat.patch | 38 ------------------- libva/Pkgfile | 15 ++------ 4 files changed, 24 insertions(+), 69 deletions(-) delete mode 100644 libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch diff --git a/libva/.footprint b/libva/.footprint index 095f7b61d..9e3ef5498 100644 --- a/libva/.footprint +++ b/libva/.footprint @@ -25,6 +25,7 @@ drwxr-xr-x root/root usr/include/va/ -rw-r--r-- root/root usr/include/va/va_egl.h -rw-r--r-- root/root usr/include/va/va_enc_h264.h -rw-r--r-- root/root usr/include/va/va_enc_mpeg2.h +-rw-r--r-- root/root usr/include/va/va_enc_vp8.h -rw-r--r-- root/root usr/include/va/va_glx.h -rw-r--r-- root/root usr/include/va/va_tpi.h -rw-r--r-- root/root usr/include/va/va_version.h @@ -35,29 +36,29 @@ drwxr-xr-x root/root usr/lib/dri/ -rwxr-xr-x root/root usr/lib/dri/dummy_drv_video.la -rwxr-xr-x root/root usr/lib/dri/dummy_drv_video.so -rwxr-xr-x root/root usr/lib/libva-drm.la -lrwxrwxrwx root/root usr/lib/libva-drm.so -> libva-drm.so.1.3501.0 -lrwxrwxrwx root/root usr/lib/libva-drm.so.1 -> libva-drm.so.1.3501.0 --rwxr-xr-x root/root usr/lib/libva-drm.so.1.3501.0 +lrwxrwxrwx root/root usr/lib/libva-drm.so -> libva-drm.so.1.3600.0 +lrwxrwxrwx root/root usr/lib/libva-drm.so.1 -> libva-drm.so.1.3600.0 +-rwxr-xr-x root/root usr/lib/libva-drm.so.1.3600.0 -rwxr-xr-x root/root usr/lib/libva-egl.la -lrwxrwxrwx root/root usr/lib/libva-egl.so -> libva-egl.so.1.3501.0 -lrwxrwxrwx root/root usr/lib/libva-egl.so.1 -> libva-egl.so.1.3501.0 --rwxr-xr-x root/root usr/lib/libva-egl.so.1.3501.0 +lrwxrwxrwx root/root usr/lib/libva-egl.so -> libva-egl.so.1.3600.0 +lrwxrwxrwx root/root usr/lib/libva-egl.so.1 -> libva-egl.so.1.3600.0 +-rwxr-xr-x root/root usr/lib/libva-egl.so.1.3600.0 -rwxr-xr-x root/root usr/lib/libva-glx.la -lrwxrwxrwx root/root usr/lib/libva-glx.so -> libva-glx.so.1.3501.0 -lrwxrwxrwx root/root usr/lib/libva-glx.so.1 -> libva-glx.so.1.3501.0 --rwxr-xr-x root/root usr/lib/libva-glx.so.1.3501.0 +lrwxrwxrwx root/root usr/lib/libva-glx.so -> libva-glx.so.1.3600.0 +lrwxrwxrwx root/root usr/lib/libva-glx.so.1 -> libva-glx.so.1.3600.0 +-rwxr-xr-x root/root usr/lib/libva-glx.so.1.3600.0 -rwxr-xr-x root/root usr/lib/libva-tpi.la -lrwxrwxrwx root/root usr/lib/libva-tpi.so -> libva-tpi.so.1.3501.0 -lrwxrwxrwx root/root usr/lib/libva-tpi.so.1 -> libva-tpi.so.1.3501.0 --rwxr-xr-x root/root usr/lib/libva-tpi.so.1.3501.0 +lrwxrwxrwx root/root usr/lib/libva-tpi.so -> libva-tpi.so.1.3600.0 +lrwxrwxrwx root/root usr/lib/libva-tpi.so.1 -> libva-tpi.so.1.3600.0 +-rwxr-xr-x root/root usr/lib/libva-tpi.so.1.3600.0 -rwxr-xr-x root/root usr/lib/libva-x11.la -lrwxrwxrwx root/root usr/lib/libva-x11.so -> libva-x11.so.1.3501.0 -lrwxrwxrwx root/root usr/lib/libva-x11.so.1 -> libva-x11.so.1.3501.0 --rwxr-xr-x root/root usr/lib/libva-x11.so.1.3501.0 +lrwxrwxrwx root/root usr/lib/libva-x11.so -> libva-x11.so.1.3600.0 +lrwxrwxrwx root/root usr/lib/libva-x11.so.1 -> libva-x11.so.1.3600.0 +-rwxr-xr-x root/root usr/lib/libva-x11.so.1.3600.0 -rwxr-xr-x root/root usr/lib/libva.la -lrwxrwxrwx root/root usr/lib/libva.so -> libva.so.1.3501.0 -lrwxrwxrwx root/root usr/lib/libva.so.1 -> libva.so.1.3501.0 --rwxr-xr-x root/root usr/lib/libva.so.1.3501.0 +lrwxrwxrwx root/root usr/lib/libva.so -> libva.so.1.3600.0 +lrwxrwxrwx root/root usr/lib/libva.so.1 -> libva.so.1.3600.0 +-rwxr-xr-x root/root usr/lib/libva.so.1.3600.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libva-drm.pc -rw-r--r-- root/root usr/lib/pkgconfig/libva-egl.pc diff --git a/libva/.md5sum b/libva/.md5sum index 32f16542b..1b22ab41c 100644 --- a/libva/.md5sum +++ b/libva/.md5sum @@ -1,2 +1 @@ -e564ae7c20962c821ac2b5cb1693e1a2 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch -eb4db967f068854444b597071c66b480 libva-1.3.1.tar.bz2 +566e68d0a5a7758b2147dd3e60905bf3 libva-1.4.0.tar.bz2 diff --git a/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch b/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch deleted file mode 100644 index 6c1df31f1..000000000 --- a/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001 -From: "Xiang, Haihao" -Date: Thu, 18 Jul 2013 13:13:31 +0800 -Subject: [PATCH] va: release VADisplayContext at the end of vaTerminate() - -Otherwise it will result in invalid reading in va_TraceEnd() - -Signed-off-by: Xiang, Haihao ---- - va/va.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/va/va.c b/va/va.c -index 6cb17ef..0ba595b 100644 ---- a/va/va.c -+++ b/va/va.c -@@ -515,15 +515,15 @@ VAStatus vaTerminate ( - free(old_ctx->vtable_vpp); - old_ctx->vtable_vpp = NULL; - -- if (VA_STATUS_SUCCESS == vaStatus) -- pDisplayContext->vaDestroy(pDisplayContext); -- - VA_TRACE_LOG(va_TraceTerminate, dpy); - - va_TraceEnd(dpy); - - va_FoolEnd(dpy); - -+ if (VA_STATUS_SUCCESS == vaStatus) -+ pDisplayContext->vaDestroy(pDisplayContext); -+ - return vaStatus; - } - --- -2.0.0 - diff --git a/libva/Pkgfile b/libva/Pkgfile index 49f4d3279..86bba01d7 100644 --- a/libva/Pkgfile +++ b/libva/Pkgfile @@ -2,25 +2,18 @@ # URL: http://freedesktop.org/wiki/Software/vaapi # Maintainer: Danny Rawlins, monster dot romster at gmail dot com # Packager: Tilman Sauerbeck, tilman at crux dot nu -# Depends on: mesa3d +# Depends on: mesa3d wayland name=libva -version=1.3.1 -release=2 -source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2 - 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch) +version=1.4.0 +release=1 +source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch - - # --disable-wayland - sed -i -e '17547,17643d' configure - ./configure \ --prefix=/usr \ - --disable-wayland \ --disable-dependency-tracking make