Update libva to pick up updated license headers.

(no material change, just allow removing checklicenses.py exceptions)

Updated via:
cd /tmp
git clone git://anongit.freedesktop.org/git/libva
cd ~/src/chromium/src/third_party/libva
for f in $(find va/ -type f); do cp /tmp/libva/$f $f; done

TBR=thestig@chromium.org
BUG=126466
TEST=SUCCESS according to: ./tools/checklicenses/checklicenses.py third_party/libva


Review URL: https://chromiumcodereview.appspot.com/10694038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145243 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 139 insertions, 34 deletions

diff --git a/third_party/libva/README.chromium b/third_party/libva/README.chromium
index 36274e6..48858fb 100644
--- a/third_party/libva/README.chromium
+++ b/third_party/libva/README.chromium
@@ -2,7 +2,7 @@ Name: libva
 URL: http://freedesktop.org/wiki/Software/vaapi
 Source: git clone git://anongit.freedesktop.org/git/libva
 Version: unknown
-RealVersion: git tip-of-tree as of 20120507
+RealVersion: git tip-of-tree as of 20120629
 License File: COPYING
 Security Critical: no
 
diff --git a/third_party/libva/va/egl/va_egl_impl.h b/third_party/libva/va/egl/va_egl_impl.h
index 7d4b6f5..8b6fb91 100644
--- a/third_party/libva/va/egl/va_egl_impl.h
+++ b/third_party/libva/va/egl/va_egl_impl.h
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _VA_EGL_IMPL_H_
 #define _VA_EGL_IMPL_H_
 
diff --git a/third_party/libva/va/egl/va_egl_private.h b/third_party/libva/va/egl/va_egl_private.h
index 5934e36..7c2ba65 100644
--- a/third_party/libva/va/egl/va_egl_private.h
+++ b/third_party/libva/va/egl/va_egl_private.h
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _VA_EGL_PRIVATE_H_
 #define _VA_EGL_PRIVATE_H_
 
diff --git a/third_party/libva/va/va_android.h b/third_party/libva/va/va_android.h
index 7b98949..ca73b84 100644
--- a/third_party/libva/va/va_android.h
+++ b/third_party/libva/va/va_android.h
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _VA_ANDROID_H_
 #define _VA_ANDROID_H_
 
diff --git a/third_party/libva/va/va_egl.h b/third_party/libva/va/va_egl.h
index c9bd16f..06afe21 100644
--- a/third_party/libva/va/va_egl.h
+++ b/third_party/libva/va/va_egl.h
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _VA_EGL_H_
 #define _VA_EGL_H_
 
diff --git a/third_party/libva/va/va_x11.h b/third_party/libva/va/va_x11.h
index c6f9670..c9be38d 100644
--- a/third_party/libva/va/va_x11.h
+++ b/third_party/libva/va/va_x11.h
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _VA_X11_H_
 #define _VA_X11_H_
 
diff --git a/third_party/libva/va/x11/va_dricommon.h b/third_party/libva/va/x11/va_dricommon.h
index f863004..4d6e3aa 100644
--- a/third_party/libva/va/x11/va_dricommon.h
+++ b/third_party/libva/va/x11/va_dricommon.h
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _VA_DRICOMMON_H_
 #define _VA_DRICOMMON_H_
 
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index c46b817..07e1d9a 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -263,39 +263,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
         'UNKNOWN',
     ],
 
-    # The package has a compatible COPYING file and most source files conform,
-    # but there are several exceptions.
-    # TODO(posciak,fischman): remove this exception once upstream makes all
-    # their files conform.  https://bugs.freedesktop.org/show_bug.cgi?id=49588
-    # http://crbug.com/126466
-    'third_party/libva/va/va_x11.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/va_android.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/x11/va_dricommon.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/x11/va_dri2tokens.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/x11/va_dri2str.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/x11/va_dri2.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/va_egl.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/egl/va_egl_impl.h': [
-        'UNKNOWN',
-    ],
-    'third_party/libva/va/egl/va_egl_private.h': [
-        'UNKNOWN',
-    ],
-
     'third_party/libvpx/source': [  # http://crbug.com/98319
         'UNKNOWN',
     ],