From 495fb9ff5c3d806706ecc2768cf886a96e8a7553 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sat, 6 Aug 2016 10:57:56 +0000
Subject: Update to videoproto 2.3.3

---
 proto/videoproto/ChangeLog    | 36 ++++++++++++++++++++++++++++++++++++
 proto/videoproto/Xv.h         | 16 ++++++++--------
 proto/videoproto/compile      |  2 +-
 proto/videoproto/configure.ac |  5 +++--
 4 files changed, 48 insertions(+), 11 deletions(-)

(limited to 'proto')

diff --git a/proto/videoproto/ChangeLog b/proto/videoproto/ChangeLog
index ccf461c0c..b050d0cb5 100644
--- a/proto/videoproto/ChangeLog
+++ b/proto/videoproto/ChangeLog
@@ -1,3 +1,39 @@
+commit 65e74494e4d215e7bee64bafbcfa89088562cda4
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Fri Mar 11 13:17:56 2016 -0500
+
+    videoproto 2.3.3
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 723881f31d65353e80660e6d8cd9785e6ec1b430
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Mar 9 09:33:48 2016 -0500
+
+    xv: Build left-shift constants from ints not longs
+    
+    We typically store these in ints in server, leading to warnings like:
+    
+    xwayland-glamor-xv.c: In function ‘xwl_glamor_xv_add_adaptors’:
+    xwayland-glamor-xv.c:339:16: warning: large integer implicitly truncated
+    to unsigned type [-Woverflow]
+         pa->type = XvWindowMask | XvInputMask | XvImageMask;;
+                    ^
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
+
+commit 384150812b93fef48109582bb53e9580f16f9602
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Oct 26 09:42:05 2013 -0400
+
+    config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+    
+    Fix Automake warning: AC_OUTPUT should be used without arguments.
+    www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
 commit 4d26102ace67377e88ba087e52ca894e0ffd2ebf
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Mon Jul 22 21:40:14 2013 -0700
diff --git a/proto/videoproto/Xv.h b/proto/videoproto/Xv.h
index ef3f7862b..f662df6ae 100644
--- a/proto/videoproto/Xv.h
+++ b/proto/videoproto/Xv.h
@@ -59,8 +59,8 @@ typedef XID XvEncodingID;
 #define XvInput          0
 #define XvOutput         1
 
-#define XvInputMask      (1L<<XvInput)
-#define XvOutputMask     (1L<<XvOutput)
+#define XvInputMask      (1<<XvInput)
+#define XvOutputMask     (1<<XvOutput)
 #define XvVideoMask	 0x00000004
 #define XvStillMask	 0x00000008
 #define XvImageMask	 0x00000010
@@ -100,13 +100,13 @@ typedef XID XvEncodingID;
 
 #define XvNumReasons (XvLastReason + 1)
 
-#define XvStartedMask     (1L<<XvStarted)
-#define XvStoppedMask     (1L<<XvStopped)
-#define XvBusyMask        (1L<<XvBusy)
-#define XvPreemptedMask   (1L<<XvPreempted)
-#define XvHardErrorMask   (1L<<XvHardError)
+#define XvStartedMask     (1<<XvStarted)
+#define XvStoppedMask     (1<<XvStopped)
+#define XvBusyMask        (1<<XvBusy)
+#define XvPreemptedMask   (1<<XvPreempted)
+#define XvHardErrorMask   (1<<XvHardError)
 
-#define XvAnyReasonMask   ((1L<<XvNumReasons) - 1)
+#define XvAnyReasonMask   ((1<<XvNumReasons) - 1)
 #define XvNoReasonMask    0
 
 /* Errors */
diff --git a/proto/videoproto/compile b/proto/videoproto/compile
index 531136b06..a85b723c7 100644
--- a/proto/videoproto/compile
+++ b/proto/videoproto/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/proto/videoproto/configure.ac b/proto/videoproto/configure.ac
index cc0c203de..b4bf1f050 100644
--- a/proto/videoproto/configure.ac
+++ b/proto/videoproto/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([VideoProto], [2.3.2],
+AC_INIT([VideoProto], [2.3.3],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AC_CONFIG_SRCDIR([Makefile.am])
 
@@ -16,5 +16,6 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.3)
 XORG_DEFAULT_OPTIONS
 
-AC_OUTPUT([Makefile
+AC_CONFIG_FILES([Makefile
            videoproto.pc])
+AC_OUTPUT
-- 
cgit v1.2.3