[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libxxf86dga][upstream-unstable] 7 commits: Remove fallback for _XEatDataWords, require libX11 1.6 for it

Title: GitLab

Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libxxf86dga

Commits:

  • 7fad1290
    by Michael Joost at 2013-11-22T23:19:31-08:00 
    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>
  • 3d2ceb7b
    by Peter Hutterer at 2017-01-26T11:59:25+10:00 
    autogen.sh: use exec instead of waiting for configure to finish

Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
  • 286a9f9b
    by Emil Velikov at 2017-01-26T11:59:25+10:00 
    autogen.sh: use quoted string variables

Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  • 91f4518a
    by Mihail Konev at 2017-01-26T13:52:49+10:00 
    autogen: add default patch prefix

Signed-off-by: Mihail Konev <k.mvc@ya.ru>
  • 036673d9
    by Alan Coopersmith at 2018-11-19T22:55:54-08:00 
    Update README for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • 975d71ff
    by Alan Coopersmith at 2018-12-07T19:58:09-08:00 
    Update configure.ac bug URL for gitlab migration

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  • e605c540
    by Alan Coopersmith at 2019-03-16T15:20:28-07:00 
    libXxf86dga 1.1.5

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

5 changed files:

Changes:

  • Makefile.am
    ... ... @@ -14,3 +14,5 @@ ChangeLog:
    14 14 
     	$(CHANGELOG_CMD)
    15 15
    16 16 
     dist-hook: ChangeLog INSTALL
    17 
    +
    18 
    +EXTRA_DIST = README.md

  • README → README.md
    1 1 
     libXxf86dga - Client library for the XFree86-DGA extension.
    2 
    +-----------------------------------------------------------
    2 3
    3 4 
     All questions regarding this software should be directed at the
    4 5 
     Xorg mailing list:
    5 6
    6 
    -        http://lists.freedesktop.org/mailman/listinfo/xorg
    7 
    -
    8 
    -Please submit bug reports to the Xorg bugzilla:
    9 
    -
    10 
    -        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
    7 
    +  https://lists.x.org/mailman/listinfo/xorg
    11 8
    12 9 
     The master development code repository can be found at:
    13 10
    14 
    -        git://anongit.freedesktop.org/git/xorg/lib/libXxf86dga
    11 
    +  https://gitlab.freedesktop.org/xorg/lib/libXxf86dga
    15 12
    16 
    -        http://cgit.freedesktop.org/xorg/lib/libXxf86dga
    13 
    +Please submit bug reports and requests to merge patches there.
    17 14
    18 15 
     For patch submission instructions, see:
    19 16
    20 
    -	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
    21 
    -
    22 
    -For more information on the git code manager, see:
    23 
    -
    24 
    -        http://wiki.x.org/wiki/GitPage
    17 
    +  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
    25 18

  • autogen.sh
    1 1 
     #! /bin/sh
    2 2
    3 
    -srcdir=`dirname $0`
    3 
    +srcdir=`dirname "$0"`
    4 4 
     test -z "$srcdir" && srcdir=.
    5 5
    6 6 
     ORIGDIR=`pwd`
    7 
    -cd $srcdir
    7 
    +cd "$srcdir"
    8 8
    9 9 
     autoreconf -v --install || exit 1
    10 
    -cd $ORIGDIR || exit $?
    10 
    +cd "$ORIGDIR" || exit $?
    11 
    +
    12 
    +git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
    13 
    +    git config --local format.subjectPrefix "PATCH libXxf86dga"
    11 14
    12 15 
     if test -z "$NOCONFIGURE"; then
    13 
    -    $srcdir/configure "$@"
    16 
    +    exec "$srcdir"/configure "$@"
    14 17 
     fi

  • configure.ac
    1 1
    2 2 
     # Initialize Autoconf
    3 3 
     AC_PREREQ([2.60])
    4 
    -AC_INIT([libXxf86dga], [1.1.4],
    5 
    -        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXxf86dga])
    4 
    +AC_INIT([libXxf86dga], [1.1.5],
    5 
    +        [https://gitlab.freedesktop.org/xorg/lib/libXxf86dga/issues], [libXxf86dga])
    6 6 
     AC_CONFIG_SRCDIR([Makefile.am])
    7 7 
     AC_CONFIG_HEADERS(src/config.h)
    8 8
    ... ... @@ -20,13 +20,7 @@ XORG_DEFAULT_OPTIONS
    20 20 
     XORG_CHECK_MALLOC_ZERO
    21 21
    22 22 
     # Obtain compiler/linker options for depedencies
    23 
    -PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2])
    24 
    -
    25 
    -# Check for _XEatDataWords function that may be patched into older Xlib release
    26 
    -SAVE_LIBS="$LIBS"
    27 
    -LIBS="$XXF86DGA_LIBS"
    28 
    -AC_CHECK_FUNCS([_XEatDataWords])
    29 
    -LIBS="$SAVE_LIBS"
    23 
    +PKG_CHECK_MODULES(XXF86DGA, xproto [x11 >= 1.6] xextproto xext [xf86dgaproto >= 2.0.99.2])
    30 24
    31 25 
     AC_CONFIG_FILES([Makefile
    32 26 
     		src/Makefile

  • src/XF86DGA2.c
    ... ... @@ -27,17 +27,6 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
    27 27 
     #include <stdint.h>
    28 28 
     #include <limits.h>
    29 29
    30 
    -#ifndef HAVE__XEATDATAWORDS
    31 
    -static inline void _XEatDataWords(Display *dpy, unsigned long n)
    32 
    -{
    33 
    -# ifndef LONG64
    34 
    -    if (n >= (ULONG_MAX >> 2))
    35 
    -        _XIOError(dpy);
    36 
    -# endif
    37 
    -    _XEatData (dpy, n << 2);
    38 
    -}
    39 
    -#endif
    40 
    -
    41 30 
     /* If you change this, change the Bases[] array below as well */
    42 31 
     #define MAX_HEADS 16
    43 32

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: