ChangeLog | 63 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 10 +----- debian/changelog | 8 +++++ debian/control | 2 - debian/upstream/signing-key.asc | 60 ++++++++++++++++++++++++++++++++++++++ debian/watch | 1 src/XvMC.c | 11 ------ src/XvMClibint.h | 13 -------- wrapper/XvMCWrapper.c | 10 +++--- 9 files changed, 140 insertions(+), 38 deletions(-)
New commits: commit 58176524a05f548039eb64e1d7da8a09fbd3a2e0 Author: Julien Cristau <[email protected]> Date: Thu Apr 30 22:59:01 2015 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 6357ab6..d86a006 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libxvmc (2:1.0.9-1) UNRELEASED; urgency=medium +libxvmc (2:1.0.9-1) unstable; urgency=medium * New upstream release. * Let uscan verify tarball signatures. * Bump Xlib build-dependency to 1.6. - -- Julien Cristau <[email protected]> Thu, 30 Apr 2015 22:46:47 +0200 + -- Julien Cristau <[email protected]> Thu, 30 Apr 2015 22:54:07 +0200 libxvmc (2:1.0.8-2) unstable; urgency=low commit 86445b5ec69d3ce9d79b7ec1194302efd360f2ee Author: Julien Cristau <[email protected]> Date: Thu Apr 30 22:54:00 2015 +0200 Bump Xlib build-dependency to 1.6. diff --git a/debian/changelog b/debian/changelog index acc3c92..6357ab6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxvmc (2:1.0.9-1) UNRELEASED; urgency=medium * New upstream release. * Let uscan verify tarball signatures. + * Bump Xlib build-dependency to 1.6. -- Julien Cristau <[email protected]> Thu, 30 Apr 2015 22:46:47 +0200 diff --git a/debian/control b/debian/control index 6061bc8..82d96b7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Build-Depends: dpkg-dev (>= 1.16.1), debhelper (>= 8.1.3), - libx11-dev (>= 1:0.99.2), + libx11-dev (>= 2:1.6), libxext-dev (>= 1:0.99.1), x11proto-video-dev, libxv-dev (>= 1:0.99.1), commit f7c0ef22357ebe6e032f17dd075aa88cf6cfad50 Author: Julien Cristau <[email protected]> Date: Thu Apr 30 22:47:27 2015 +0200 Let uscan verify tarball signatures. diff --git a/debian/changelog b/debian/changelog index eca6e19..acc3c92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxvmc (2:1.0.9-1) UNRELEASED; urgency=medium * New upstream release. + * Let uscan verify tarball signatures. -- Julien Cristau <[email protected]> Thu, 30 Apr 2015 22:46:47 +0200 diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..863981f --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,60 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n +Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g +EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE +a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9 +8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV +Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ +xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG +CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE +TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w +ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD +AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP +cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g +Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb +AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO +6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu +QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr +BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY +eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS +Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0 +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 +=tc6G +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index b85fbd1..16b3f5d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/lib/libXvMC version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ http://xorg.freedesktop.org/releases/individual/lib/ libXvMC-(.*)\.tar\.gz commit 2f7f93aec812e7f6d675aa81d262be774c551c3a Author: Julien Cristau <[email protected]> Date: Thu Apr 30 22:47:05 2015 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index d445503..6993e6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,66 @@ +commit ab0d28935987d48e9359023e82f9d56aa7e4bc95 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 14 10:10:05 2015 -0700 + + libXvMC 1.0.9 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0ac79f0132dfd268bc6e9ff2dcdea55e00b65a92 +Author: Alan Coopersmith <[email protected]> +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 <[email protected]> + +commit 4dd267a98790f4404b7607d9362d4346f55f49fb +Author: Yaakov Selkowitz <[email protected]> +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 <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 62bc54e6995618b7134f5cbe3a4290e41a4cb44a +Author: Michael Joost <[email protected]> +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 <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9a39e26871e1f8ddb7086a53aba0b66a6fa6c7a9 +Author: Alan Coopersmith <[email protected]> +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 <[email protected]> + commit 1fb06ecf88155452ece93ac309435106f9569d54 Author: Alan Coopersmith <[email protected]> Date: Thu Jun 13 22:57:03 2013 -0700 diff --git a/debian/changelog b/debian/changelog index 5eb8b99..eca6e19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxvmc (2:1.0.9-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Julien Cristau <[email protected]> Thu, 30 Apr 2015 22:46:47 +0200 + libxvmc (2:1.0.8-2) unstable; urgency=low * Link libXvMCW.so against -ldl (closes: #610592) commit ab0d28935987d48e9359023e82f9d56aa7e4bc95 Author: Alan Coopersmith <[email protected]> Date: Sat Mar 14 10:10:05 2015 -0700 libXvMC 1.0.9 Signed-off-by: Alan Coopersmith <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> 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 <[email protected]> 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 <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
