libxvmc: Changes to 'upstream-unstable'
configure.ac | 16 ++++++++--------
src/XvMC.c | 11 -----------
src/XvMClibint.h | 13 -------------
wrapper/Makefile.am | 2 +-
wrapper/XvMCWrapper.c | 10 +++++-----
5 files changed, 14 insertions(+), 38 deletions(-)
New commits:
commit ab0d28935987d48e9359023e82f9d56aa7e4bc95
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 14 10:10:05 2015 -0700
libXvMC 1.0.9
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 74183a1..01f286f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXvMC], [1.0.8],
+AC_INIT([libXvMC], [1.0.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXvMC])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 0ac79f0132dfd268bc6e9ff2dcdea55e00b65a92
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Dec 14 10:12:10 2013 -0800
Rename local err variable in XW_RSYM macro to avoid shadow warnings
Clears many warnings of the form:
XvMCWrapper.c: In function 'initW':
XvMCWrapper.c:362:5: warning: declaration of 'err' shadows a previous local [-Wshadow]
XvMCWrapper.c:267:11: warning: shadowed declaration is here [-Wshadow]
due to variable declared in macro block sharing "err" name with a
variable declared in the function calling the macro.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/wrapper/XvMCWrapper.c b/wrapper/XvMCWrapper.c
index bff5a8b..9bdf033 100644
--- a/wrapper/XvMCWrapper.c
+++ b/wrapper/XvMCWrapper.c
@@ -178,15 +178,15 @@ static void *handle2;
#define XW_RSYM(base,handle,handle2,pointer, retval) \
do { \
- register char *err; \
+ register char *symerr; \
base.pointer = (pointer##P) dlsym((handle),#pointer); \
- if ((err = dlerror()) != NULL) { \
+ if ((symerr = dlerror()) != NULL) { \
if (!handle2) { \
- fprintf(stderr,"%s\n",err); return retval; \
+ fprintf(stderr,"%s\n",symerr); return retval; \
} \
base.pointer = (pointer##P) dlsym((handle2),#pointer); \
- if ((err = dlerror()) != NULL) { \
- fprintf(stderr,"%s\n",err); return retval; \
+ if ((symerr = dlerror()) != NULL) { \
+ fprintf(stderr,"%s\n",symerr); return retval; \
} \
} \
} while (0);
commit 4dd267a98790f4404b7607d9362d4346f55f49fb
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Oct 24 02:07:56 2012 -0500
Fix linking with -Wl,--no-undefined on Linux
libXvMCW uses dlopen and friends, therefore it must be linked against
libdl on systems where it exists as a separate library.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index ea2de2f..74183a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,12 @@ PKG_CHECK_MODULES(XVMC, [x11 >= 1.6] xext xv xextproto videoproto)
# Checks for library functions.
AC_CHECK_FUNCS([shmat])
+# Check to see if dlopen is in default libraries (like Solaris, which
+# has it in libc), or if libdl is needed to get it.
+AC_CHECK_FUNC([dlopen], [],
+ AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
+AC_SUBST(DLOPEN_LIBS)
+
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
LINT_FLAGS="${LINT_FLAGS} ${XVMC_CFLAGS}"
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index b3a1c21..fbe8cf7 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
libXvMCW_la_SOURCES = XvMCWrapper.c
-libXvMCW_la_LIBADD = $(XVMC_LIBS)
+libXvMCW_la_LIBADD = $(XVMC_LIBS) $(DLOPEN_LIBS)
libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
if LINT
commit 62bc54e6995618b7134f5cbe3a4290e41a4cb44a
Author: Michael Joost <mehl@michael-joost.de>
Date: Mon Nov 18 16:11:26 2013 +0100
Remove fallback for _XEatDataWords, require libX11 1.6 for it
_XEatDataWords was orignally introduced with the May 2013 security
patches, and in order to ease the process of delivering those,
fallback versions of _XEatDataWords were included in the X extension
library patches so they could be applied to older versions that didn't
have libX11 1.6 yet. Now that we're past that hurdle, we can drop
the fallbacks and just require libX11 1.6 for building new versions
of the extension libraries.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 7c2a7e0..ea2de2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,13 +40,7 @@ XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
# Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
-
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XVMC_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
+PKG_CHECK_MODULES(XVMC, [x11 >= 1.6] xext xv xextproto videoproto)
# Checks for library functions.
AC_CHECK_FUNCS([shmat])
diff --git a/src/XvMC.c b/src/XvMC.c
index 00ac760..7336760 100644
--- a/src/XvMC.c
+++ b/src/XvMC.c
@@ -18,17 +18,6 @@
#include <X11/extensions/extutil.h>
#include <limits.h>
-#ifndef HAVE__XEATDATAWORDS
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
- if (n >= (ULONG_MAX >> 2))
- _XIOError(dpy);
-# endif
- _XEatData (dpy, n << 2);
-}
-#endif
-
static XExtensionInfo _xvmc_info_data;
static XExtensionInfo *xvmc_info = &_xvmc_info_data;
static const char *xvmc_extension_name = XvMCName;
commit 9a39e26871e1f8ddb7086a53aba0b66a6fa6c7a9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jun 24 22:39:18 2013 -0700
Require ANSI C89 pre-processor, drop pre-C89 token pasting support
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/XvMClibint.h b/src/XvMClibint.h
index 94c24ad..195a77d 100644
--- a/src/XvMClibint.h
+++ b/src/XvMClibint.h
@@ -10,7 +10,6 @@
XextCheckExtension(dpy, i, xvmc_extension_name, val)
-#if !defined(UNIXCPP)
#define XvMCGetReq(name, req) \
WORD64ALIGN\
if ((dpy->bufptr + sizeof(xvmc##name##Req)) > dpy->bufmax)\
@@ -21,18 +20,6 @@
req->length = sizeof(xvmc##name##Req)>>2;\
dpy->bufptr += sizeof(xvmc##name##Req);\
dpy->request++
-#else
-#define XvMCGetReq(name, req) \
- WORD64ALIGN\
- if ((dpy->bufptr + sizeof(xvmc/**/name/**/Req)) > dpy->bufmax)\
- _XFlush(dpy);\
- req = (xvmc/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
- req->reqType = info->codes->major_opcode;\
- req->xvmcReqType = xvmc_/**/name;\
- req->length = sizeof(xvmc/**/name/**/Req)>>2;\
- dpy->bufptr += sizeof(xvmc/**/name/**/Req);\
- dpy->request++
-#endif
_XFUNCPROTOBEGIN
Reply to: