[meego-commits] 5111: Changes to Trunk:Testing/libva
Chris Ferron
chris.e.ferron at linux.intel.com
Wed Jun 30 19:44:47 UTC 2010
Hi,
I have made the following changes to libva in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Chris Ferron
[This message was auto-generated]
---
Request #5111:
submit: home:ceferron:branches:Trunk:Testing/libva(r3)(cleanup) -> Trunk:Testing/libva
Message:
None
State: new 2010-06-30T07:41:13 ceferron
Comment: None
changes files:
--------------
--- libva.changes
+++ libva.changes
@@ -0,0 +1,5 @@
+Fri Jun 25 21:22:51 UTC 2010 - chris.e.ferron at linux.intel.com - 1.0.3
+
+- updated to verion 1.0.3
+- removed patch of all the mrst fixes
+
old:
----
libva-src.1.0.1.tar.bz2
new:
----
libva-src.1.0.3.tar.bz2
spec files:
-----------
--- libva.spec
+++ libva.spec
@@ -9,12 +9,12 @@
Name: libva
Summary: Video Acceleration (VA) API for Linux
-Version: 1.0.1
+Version: 1.0.3
Release: 1
Group: System/Libraries
License: MIT
URL: http://freedesktop.org/wiki/Software/vaapi
-Source0: libva-src.1.0.1.tar.bz2
+Source0: libva-src.1.0.3.tar.bz2
Source100: libva.yaml
Patch0: libva.patch
Requires: xorg-x11-server-Xorg
@@ -59,8 +59,9 @@
%prep
%setup -q -n libva
-# libva.patch
+# # libva.patch
%patch0 -p1
+
# >> setup
# << setup
@@ -99,9 +100,11 @@
%defattr(-,root,root,-)
# >> files
%{_libdir}/libva.so.1
-%{_libdir}/libva.so.1.0.1
+%{_libdir}/libva.so.1.0.3
%{_libdir}/libva-x11.so.1
-%{_libdir}/libva-x11.so.1.0.1
+%{_libdir}/libva-x11.so.1.0.3
+%{_libdir}/libva-tpi.so.1
+%{_libdir}/libva-tpi.so.1.0.3
%{_bindir}/vainfo
%{_bindir}/h264encode
%{_bindir}/mpeg2vldemo
@@ -115,10 +118,10 @@
# >> files devel
%dir %{_includedir}/va
%{_includedir}/va/*
+%{_libdir}/libva-tpi.so
%{_libdir}/libva.so
%{_bindir}/test_*
%{_libdir}/libva-x11.so
%{_libdir}/pkgconfig/libva.pc
%{_libdir}/pkgconfig/libva-x11.pc
# << files devel
-
other changes:
--------------
++++++ libva-src.1.0.1.tar.bz2 -> libva-src.1.0.3.tar.bz2
48187 lines of diff (skipped)
++++++ libva.patch
--- libva.patch
+++ libva.patch
@@ -1,12 +1,96 @@
-diff -Naur libva-0.30.4/libva.pc.in libva-0.31.0/libva.pc.in
---- libva-0.30.4/libva.pc.in 2009-11-08 20:57:32.000000000 -0500
-+++ libva-0.31.0/libva.pc.in 2009-11-09 15:54:10.000000000 -0500
-@@ -1,7 +1,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir=@includedir@
-+includedir=@includedir@/va
- driverdir=@LIBVA_DRIVERS_PATH@
-
- Name: libva
+Only in libva-old: .git
+diff -uBr libva-old/i965_drv_video/i965_avc_bsd.c libva/i965_drv_video/i965_avc_bsd.c
+--- libva-old/i965_drv_video/i965_avc_bsd.c 2010-06-25 13:33:05.000000000 -0700
++++ libva/i965_drv_video/i965_avc_bsd.c 2010-06-16 18:57:00.000000000 -0700
+@@ -177,8 +177,8 @@
+ (height_in_mbs << 16) |
+ (width_in_mbs << 0));
+ OUT_BCS_BATCH(ctx,
+- ((pic_param->second_chroma_qp_index_offset & 0x1f) << 24) |
+- ((pic_param->chroma_qp_index_offset & 0x1f) << 16) |
++ (pic_param->second_chroma_qp_index_offset << 24) |
++ (pic_param->chroma_qp_index_offset << 16) |
+ (SCAN_RASTER_ORDER << 15) | /* AVC ILDB Data */
+ (SCAN_SPECIAL_ORDER << 14) | /* AVC IT Command */
+ (SCAN_RASTER_ORDER << 13) | /* AVC IT Data */
+diff -uBr libva-old/i965_drv_video/shaders/h264/mc/avc_mc.g4b libva/i965_drv_video/shaders/h264/mc/avc_mc.g4b
+--- libva-old/i965_drv_video/shaders/h264/mc/avc_mc.g4b 2010-06-25 13:33:05.000000000 -0700
++++ libva/i965_drv_video/shaders/h264/mc/avc_mc.g4b 2010-06-16 18:57:00.000000000 -0700
+@@ -344,7 +344,7 @@
+ { 0x80800040, 0xd04045b1, 0x00b18840, 0x002c0744 },
+ { 0x80800040, 0xd06045b1, 0x00b18860, 0x002c0746 },
+ { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
+- { 0x02802005, 0x20003da0, 0x00000708, 0x00020002 },
++ { 0x02800005, 0x20003da0, 0x00000708, 0x00020002 },
+ { 0x02600005, 0x20003da0, 0x02000708, 0x00010001 },
+ { 0x009a0001, 0x27200169, 0x00000000, 0x80808080 },
+ { 0x00780001, 0x27400231, 0x028d0724, 0x00000000 },
+@@ -423,7 +423,7 @@
+ { 0x00800040, 0x24003e2c, 0x00b10726, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10725, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10724, 0x00010001 },
+- { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
++ { 0x00800008, 0x25e03d89, 0x00240400, 0x00020002 },
+ { 0x80800040, 0xd0003531, 0x00ad05c0, 0x00b18800 },
+ { 0x80800040, 0xd0203531, 0x00ad05c2, 0x00b18820 },
+ { 0x80800040, 0xd0403531, 0x00ad05c4, 0x00b18840 },
+@@ -434,7 +434,7 @@
+ { 0x00800040, 0x24003e2c, 0x00b10742, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10741, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10740, 0x00010001 },
+- { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
++ { 0x00800008, 0x25e03d89, 0x00240400, 0x00020002 },
+ { 0x00800001, 0x45c10231, 0x00d205e0, 0x00000000 },
+ { 0x80800040, 0xd0003631, 0x004d05c0, 0x00b18800 },
+ { 0x80800040, 0xd0203631, 0x004d05c4, 0x00b18820 },
+diff -uBr libva-old/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5 libva/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5
+--- libva-old/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5 2010-06-25 13:33:05.000000000 -0700
++++ libva/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5 2010-06-16 18:57:00.000000000 -0700
+@@ -344,7 +344,7 @@
+ { 0x80800040, 0xd04045b1, 0x00b18840, 0x002c0744 },
+ { 0x80800040, 0xd06045b1, 0x00b18860, 0x002c0746 },
+ { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
+- { 0x02802005, 0x20003da0, 0x00000708, 0x00020002 },
++ { 0x02800005, 0x20003da0, 0x00000708, 0x00020002 },
+ { 0x02600005, 0x20003da0, 0x02000708, 0x00010001 },
+ { 0x009a0001, 0x27200169, 0x00000000, 0x80808080 },
+ { 0x00780001, 0x27400231, 0x028d0724, 0x00000000 },
+@@ -423,7 +423,7 @@
+ { 0x00800040, 0x24003e2c, 0x00b10726, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10725, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10724, 0x00010001 },
+- { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
++ { 0x00800008, 0x25e03d89, 0x00240400, 0x00020002 },
+ { 0x80800040, 0xd0003531, 0x00ad05c0, 0x00b18800 },
+ { 0x80800040, 0xd0203531, 0x00ad05c2, 0x00b18820 },
+ { 0x80800040, 0xd0403531, 0x00ad05c4, 0x00b18840 },
+@@ -434,7 +434,7 @@
+ { 0x00800040, 0x24003e2c, 0x00b10742, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10741, 0x00020002 },
+ { 0x00800048, 0x24003e2c, 0x00b10740, 0x00010001 },
+- { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
++ { 0x00800008, 0x25e03d89, 0x00240400, 0x00020002 },
+ { 0x00800001, 0x45c10231, 0x00d205e0, 0x00000000 },
+ { 0x80800040, 0xd0003631, 0x004d05c0, 0x00b18800 },
+ { 0x80800040, 0xd0203631, 0x004d05c4, 0x00b18820 },
+diff -uBr libva-old/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm libva/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm
+--- libva-old/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm 2010-06-25 13:33:05.000000000 -0700
++++ libva/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm 2010-06-16 18:57:00.000000000 -0700
+@@ -210,7 +210,7 @@
+ add (16) acc0<1>:w REF_TOP(0,2)REGION(16,1) 2:w // p[x+2]+2
+ mac (16) acc0<1>:w REF_TOP(0,1)REGION(16,1) 2:w // 2*p[x+1]+p[x+2]+2
+ mac (16) acc0<1>:w REF_TOP(0)REGION(16,1) 1:w // p[x]+2*p[x+1]+p[x+2]+2
+- shr (16) PRED_YW(15)<1> acc0<1;8,1>:w 2:w // (p[x]+2*p[x+1]+p[x+2]+2)>>2
++ shr (16) PRED_YW(15)<1> acc0<1>:w 2:w // (p[x]+2*p[x+1]+p[x+2]+2)>>2
+
+ // Add error block
+ $for(0,0; <4; 1,32) {
+@@ -229,7 +229,7 @@
+ add (16) acc0<1>:w REF_LEFT(0,2)REGION(16,1) 2:w // p[y+2]+2
+ mac (16) acc0<1>:w REF_LEFT(0,1)REGION(16,1) 2:w // 2*p[y+1]+p[y+2]+2
+ mac (16) acc0<1>:w REF_LEFT(0)REGION(16,1) 1:w // p[y]+2*p[y+1]+p[y+2]+2
+- shr (16) PRED_YW(15)<1> acc0<1;8,1>:w 2:w // (p[y]+2*p[y+1]+p[y+2]+2)>>2
++ shr (16) PRED_YW(15)<1> acc0<1>:w 2:w // (p[y]+2*p[y+1]+p[y+2]+2)>>2
+
+ // Merge even/odd pixels
+ // The predicted data need to be stored in byte type (22 bytes are required)
++++++ libva.yaml
--- libva.yaml
+++ libva.yaml
@@ -1,14 +1,14 @@
Name: libva
Summary: Video Acceleration (VA) API for Linux
-Version: 1.0.1
+Version: 1.0.3
Release: 1
Group: System/Libraries
License: MIT
URL: http://freedesktop.org/wiki/Software/vaapi
Sources:
- - libva-src.1.0.1.tar.bz2
-Patches:
- - libva.patch
+ - libva-src.1.0.3.tar.bz2
+Patches:
+ - libva.patch
Description: |
The libva library implements the Video Acceleration (VA) API for Linux.
The library loads a hardware dependendent driver.
More information about the MeeGo-commits
mailing list