Refine VA_FOOL, and delete the hard coded clip va_fool_264.h

    Move test/vainfo into test/vainfo/*
    Add prototype of vaCreateSurfacesForUserPtr for V4L2 user pointer support
    Fix klocwork critical issues. Use strnlen and snprintf instead of strlen and sprintf.
    New interface vaQuerySrufaceError for decode error report and concealment
    Encode data structure change (long term reference picture interface)
    Add h264 constrained baseline profile support.

Signed-off-by: Elaine Wang <elaine.wang@intel.com>
Signed-off-by: Bignlin Chen <binglin.chen.wang@intel.com>
Signed-off-by: Yan Zhuang <yanx.zhunag@intel.com>
Signed-off-by: Guoliang Ji <guoliangx.ji@intel.com>

1 files changed, 10 insertions, 43 deletions

diff --git a/libva.spec b/libva.spec
index c150576..5d45216 100644
--- a/libva.spec
+++ b/libva.spec
@@ -1,13 +1,11 @@
 #%define moduledir %(pkg-config xorg-server --variable=moduledir)
-%define driverdir %{_libdir}/
-
-%define reldate 04282009
 
 Name:           libva
 Version:        1.0.6
 Release:        0.0
-License:        MIT
+License:        MIT license
 Source:         %{name}-%{version}.tar.bz2
+NoSource:	0
 Group:          Development/Libraries
 Summary:        Video Acceleration (VA) API for Linux
 URL:            http://freedesktop.org/wiki/Software/vaapi
@@ -44,37 +42,7 @@ unset LD_AS_NEEDED
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %make_install
-mkdir -p $RPM_BUILD_ROOT%{driverdir}
-install -m 755 ./dummy_drv_video/.libs/dummy_drv_video.so $RPM_BUILD_ROOT%{driverdir}/dummy_drv_video.so
-install -m 755 ./va/.libs/libva.so.1 $RPM_BUILD_ROOT%{driverdir}/libva.so.1
-install -m 755 ./va/.libs/libva.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva.so.1.0.6
-install -m 755 ./va/.libs/libva-tpi.so.1 $RPM_BUILD_ROOT%{driverdir}/libva-tpi.so.1
-install -m 755 ./va/.libs/libva-tpi.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva-tpi.so.1.0.6
-install -m 755 ./va/.libs/libva-x11.so.1 $RPM_BUILD_ROOT%{driverdir}/libva-x11.so.1
-install -m 755 ./va/.libs/libva-x11.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva-x11.so.1.0.6
-install -m 755 ./va/.libs/libva-glx.so.1 $RPM_BUILD_ROOT%{driverdir}/libva-glx.so.1
-install -m 755 ./va/.libs/libva-glx.so.1.0.6 $RPM_BUILD_ROOT%{driverdir}/libva-glx.so.1.0.6
-
-install -m 555 ./test/vainfo $RPM_BUILD_ROOT%{_bindir}/vainfo
-install -m 555 ./test/basic/test_* $RPM_BUILD_ROOT%{_bindir}/
-install -m 555 ./test/decode/mpeg2vldemo $RPM_BUILD_ROOT%{_bindir}/mpeg4vldemo
-install -m 555 ./test/encode/h264encode $RPM_BUILD_ROOT%{_bindir}/h264encode
-install -m 555 ./test/putsurface/putsurface $RPM_BUILD_ROOT%{_bindir}/putsurface
-
-install -m 666 ./va/va_tpi.h $RPM_BUILD_ROOT%{_includedir}/va/va_tpi.h
-install -m 666 ./va/va_x11.h $RPM_BUILD_ROOT%{_includedir}/va/va_x11.h
-install -m 666 ./va/va_version.h $RPM_BUILD_ROOT%{_includedir}/va/va_version.h
-install -m 666 ./va/va_backend.h $RPM_BUILD_ROOT%{_includedir}/va/va_backend.h
-install -m 666 ./va/x11/va_dri2.h $RPM_BUILD_ROOT%{_includedir}/va/x11/va_dri2.h
-install -m 666 ./va/va_dummy.h $RPM_BUILD_ROOT%{_includedir}/va/va_dummy.h
-install -m 666 ./va/va_backend_tpi.h $RPM_BUILD_ROOT%{_includedir}/va/va_backend_tpi.h
-install -m 666 ./va/va.h $RPM_BUILD_ROOT%{_includedir}/va/va.h
-install -m 666 ./va/x11/va_dricommon.h $RPM_BUILD_ROOT%{_includedir}/va/va_dricommon.h
-install -m 666 ./va/x11/va_dri.h $RPM_BUILD_ROOT%{_includedir}/va/va_dri.h
-install -m 666 ./va/glx/va_glx.h $RPM_BUILD_ROOT%{_includedir}/va/va_glx.h
-install -m 666 ./va/glx/va_backend_glx.h $RPM_BUILD_ROOT%{_includedir}/va/va_backend_glx.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,33 +53,31 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libva.so.1
-%{_libdir}/libva.so.1.0.6
+%{_libdir}/libva.so.%{version}
 %{_libdir}/libva-tpi.so.1
-%{_libdir}/libva-tpi.so.1.0.6
+%{_libdir}/libva-tpi.so.%{version}
 %{_libdir}/libva-x11.so.1
-%{_libdir}/libva-x11.so.1.0.6
+%{_libdir}/libva-x11.so.%{version}
 %{_libdir}/libva-glx.so.1
-%{_libdir}/libva-glx.so.1.0.6
+%{_libdir}/libva-glx.so.%{version}
 %{_bindir}/vainfo
 %{_bindir}/test_*
 %{_bindir}/h264encode
 %{_bindir}/mpeg2vldemo
 %{_bindir}/putsurface
 
-%{driverdir}/dummy_drv_video.so
+%{_libdir}/dri/dummy_drv_video.so
 
 %{_includedir}/va/va_tpi.h
 %{_includedir}/va/va_x11.h
 %{_includedir}/va/va_version.h
 %{_includedir}/va/va_backend.h
-%{_includedir}/va/x11/va_dri2.h
+%{_includedir}/va/va_dri2.h
 %{_includedir}/va/va_dummy.h
 %{_includedir}/va/va_backend_tpi.h
 %{_includedir}/va/va.h
 %{_includedir}/va/va_dricommon.h
 %{_includedir}/va/va_dri.h
-%{_includedir}/va/va_glx.h
-%{_includedir}/va/va_backend_glx.h
 
 %files devel
 %defattr(-,root,root,-)
@@ -120,9 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libva.so
 %{_libdir}/libva-tpi.so
 %{_libdir}/libva-x11.so
-%{_libdir}/libva-glx.so
 %{_libdir}/pkgconfig/libva.pc
+%{_libdir}/pkgconfig/libva-tpi.pc
 %{_libdir}/pkgconfig/libva-x11.pc
+%{_libdir}/pkgconfig/libva-glx.pc
 
 %changelog
 * Wed Dec 23 2009 Prajwal Mohan <prajwal.karur.mohan@intel.com> 1.0.1