Xv.h | 16 ++++++++-------- configure.ac | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-)
New commits: commit 65e74494e4d215e7bee64bafbcfa89088562cda4 Author: Adam Jackson <a...@redhat.com> Date: Fri Mar 11 13:17:56 2016 -0500 videoproto 2.3.3 Signed-off-by: Adam Jackson <a...@redhat.com> diff --git a/configure.ac b/configure.ac index f464917..b4bf1f0 100644 --- a/configure.ac +++ b/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]) commit 723881f31d65353e80660e6d8cd9785e6ec1b430 Author: Adam Jackson <a...@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 <a...@redhat.com> Reviewed-by: Olivier Fourdan <ofour...@redhat.com> diff --git a/Xv.h b/Xv.h index ef3f786..f662df6 100644 --- a/Xv.h +++ b/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 */ commit 384150812b93fef48109582bb53e9580f16f9602 Author: Gaetan Nadon <mems...@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 <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index cc0c203..f464917 100644 --- a/configure.ac +++ b/configure.ac @@ -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