commit c2401e923af9cc022d73599cf9948cd143b8bda7 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Oct 19 18:13:52 2014 +1100 Revert "[notify] libva: 1.3.1 -> 1.4.0 new dependency wayland" This reverts commit 703e890e83b360c3e3fc70a6dec0d71703b384f4. Conflicts: libva/.footprint diff --git a/libva/.footprint b/libva/.footprint index 5b55297..dcfb165 100644 --- a/libva/.footprint +++ b/libva/.footprint @@ -6,17 +6,14 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/mpeg2vaenc -rwxr-xr-x root/root usr/bin/mpeg2vldemo -rwxr-xr-x root/root usr/bin/putsurface --rwxr-xr-x root/root usr/bin/putsurface_wayland -rwxr-xr-x root/root usr/bin/vainfo drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/va/ -rw-r--r-- root/root usr/include/va/va.h -rw-r--r-- root/root usr/include/va/va_backend.h --rw-r--r-- root/root usr/include/va/va_backend_egl.h -rw-r--r-- root/root usr/include/va/va_backend_glx.h -rw-r--r-- root/root usr/include/va/va_backend_tpi.h -rw-r--r-- root/root usr/include/va/va_backend_vpp.h --rw-r--r-- root/root usr/include/va/va_backend_wayland.h -rw-r--r-- root/root usr/include/va/va_compat.h -rw-r--r-- root/root usr/include/va/va_dec_jpeg.h -rw-r--r-- root/root usr/include/va/va_dec_vp8.h @@ -24,53 +21,40 @@ drwxr-xr-x root/root usr/include/va/ -rw-r--r-- root/root usr/include/va/va_dricommon.h -rw-r--r-- root/root usr/include/va/va_drm.h -rw-r--r-- root/root usr/include/va/va_drmcommon.h --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 -rw-r--r-- root/root usr/include/va/va_vpp.h --rw-r--r-- root/root usr/include/va/va_wayland.h -rw-r--r-- root/root usr/include/va/va_x11.h drwxr-xr-x root/root usr/lib/ 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.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.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 +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 -rwxr-xr-x root/root usr/lib/libva-glx.la -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 +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 -rwxr-xr-x root/root usr/lib/libva-tpi.la -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-wayland.la -lrwxrwxrwx root/root usr/lib/libva-wayland.so -> libva-wayland.so.1.3600.0 -lrwxrwxrwx root/root usr/lib/libva-wayland.so.1 -> libva-wayland.so.1.3600.0 --rwxr-xr-x root/root usr/lib/libva-wayland.so.1.3600.0 +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 -rwxr-xr-x root/root usr/lib/libva-x11.la -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 +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 -rwxr-xr-x root/root usr/lib/libva.la -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 +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 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 -rw-r--r-- root/root usr/lib/pkgconfig/libva-glx.pc -rw-r--r-- root/root usr/lib/pkgconfig/libva-tpi.pc --rw-r--r-- root/root usr/lib/pkgconfig/libva-wayland.pc -rw-r--r-- root/root usr/lib/pkgconfig/libva-x11.pc -rw-r--r-- root/root usr/lib/pkgconfig/libva.pc diff --git a/libva/.md5sum b/libva/.md5sum index 1b22ab4..32f1654 100644 --- a/libva/.md5sum +++ b/libva/.md5sum @@ -1 +1,2 @@ -566e68d0a5a7758b2147dd3e60905bf3 libva-1.4.0.tar.bz2 +e564ae7c20962c821ac2b5cb1693e1a2 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch +eb4db967f068854444b597071c66b480 libva-1.3.1.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 new file mode 100644 index 0000000..6c1df31 --- /dev/null +++ b/libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch @@ -0,0 +1,38 @@ +From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001 +From: "Xiang, Haihao" <haihao.xiang@intel.com> +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 <haihao.xiang@intel.com> +--- + 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 86bba01..49f4d32 100644 --- a/libva/Pkgfile +++ b/libva/Pkgfile @@ -2,18 +2,25 @@ # 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 wayland +# Depends on: mesa3d name=libva -version=1.4.0 -release=1 -source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar....) +version=1.3.1 +release=2 +source=(http://www.freedesktop.org/software/vaapi/releases/$name/$name-$version.tar.... + 0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch) 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