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

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

Title: GitLab

Timo Aaltonen pushed to branch debian-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>
  • 9eea6181
    by Timo Aaltonen at 2022-09-19T12:40:08+03:00 
    control: Migrate to x11proto-dev.
  • f420e94a
    by Timo Aaltonen at 2022-09-19T12:40:27+03:00 
    Merge branch 'upstream-unstable' into debian-unstable
  • 27c98c3f
    by Timo Aaltonen at 2022-09-19T12:40:51+03:00 
    version bump
  • 00665608
    by Timo Aaltonen at 2022-09-19T12:42:13+03:00 
    control: Migrate to debhelper-compat, bump to 13.
  • eae3e96f
    by Timo Aaltonen at 2022-09-19T12:42:40+03:00 
    control: Bump policy to 4.6.1.
  • a63185fa
    by Timo Aaltonen at 2022-09-19T12:43:01+03:00 
    control: Drop Cyril from uploaders.
  • 53fa95d4
    by Timo Aaltonen at 2022-09-19T12:45:30+03:00 
    Remove obsolete XSFBS section from README.source.
  • 915b3abe
    by Timo Aaltonen at 2022-09-19T12:48:33+03:00 
    Update upstream and packaging URLs.
  • 99893a2b
    by Timo Aaltonen at 2022-09-19T12:54:50+03:00 
    Switch to dh.
  • a18f21c6
    by Timo Aaltonen at 2022-09-19T12:55:58+03:00 
    Switch to -dbgsym packages.
  • a8c95ed7
    by Timo Aaltonen at 2022-09-19T12:57:47+03:00 
    control: Drop obsolete build-deps.
  • 2a3b6bd0
    by Timo Aaltonen at 2022-09-19T13:00:58+03:00 
    rules: Drop more obsoleted stuff
  • 7fc3e3c2
    by Timo Aaltonen at 2022-09-19T13:04:09+03:00 
    readme: more url updates
  • 44826d4e
    by Timo Aaltonen at 2022-09-19T13:04:21+03:00 
    release to sid

12 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

  • debian/README.source
    ... ... @@ -19,9 +19,9 @@ Guide To The X Strike Force Packages
    19 19 
     ------------------------------------
    20 20
    21 21 
     The X Strike Force team maintains X packages in git repositories on
    22 
    -git.debian.org in the pkg-xorg subdirectory. Most upstream packages
    22 
    +salsa.debian.org in the xorg-team subdirectory. Most upstream packages
    23 23 
     are actually maintained in git repositories as well, so they often
    24 
    -just need to be pulled into git.debian.org in a "upstream-*" branch.
    24 
    +just need to be pulled into salsa.debian.org in a "upstream-*" branch.
    25 25 
     Otherwise, the upstream sources are manually installed in the Debian
    26 26 
     git repository.
    27 27
    ... ... @@ -47,27 +47,3 @@ are involved:
    47 47 
       case, it appears directly in the .diff.gz.
    48 48 
     * Otherwise, the patch is added to debian/patches/ which is managed
    49 49 
       with quilt as documented in /usr/share/doc/quilt/README.source.
    50 
    -
    51 
    -quilt is actually invoked by the Debian X packaging through a larger
    52 
    -set of scripts called XSFBS. XSFBS brings some other X specific
    53 
    -features such as managing dependencies and conflicts due to the video
    54 
    -and input driver ABIs.
    55 
    -XSFBS itself is maintained in a separate repository at
    56 
    -  git://git.debian.org/pkg-xorg/xsfbs.git
    57 
    -and it is pulled inside the other Debian X repositories when needed.
    58 
    -
    59 
    -The XSFBS patching system requires a build dependency on quilt. Also
    60 
    -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
    61 
    -so that the XSFBS patching occurs before the actual build. So the
    62 
    -very first target of the build (likely the one running autoreconf)
    63 
    -should depend on $(STAMP_DIR)/patch. It should also not depend on
    64 
    -anything so that parallel builds are correctly supported (nothing
    65 
    -should probably run while patching is being done). And finally, the
    66 
    -clean target should depend on the xsfclean target so that patches
    67 
    -are unapplied on clean.
    68 
    -
    69 
    -When the upstream sources contain some DFSG-nonfree files, they are
    70 
    -listed in text files in debian/prune/ in the "debian-*" branch of
    71 
    -the Debian repository. XSFBS' scripts then take care of removing
    72 
    -these listed files during the build so as to generate a modified
    73 
    -DFSG-free .orig.tar.gz tarball.

  • debian/changelog
    1 
    +libxxf86dga (2:1.1.5-1) unstable; urgency=medium
    2 
    +
    3 
    +  * New upstream release.
    4 
    +  * control: Migrate to x11proto-dev.
    5 
    +  * control: Migrate to debhelper-compat, bump to 13.
    6 
    +  * control: Bump policy to 4.6.1.
    7 
    +  * control: Drop Cyril from uploaders.
    8 
    +  * Remove obsolete XSFBS section from README.source.
    9 
    +  * Update upstream and packaging URLs.
    10 
    +  * Switch to dh.
    11 
    +  * Switch to -dbgsym packages.
    12 
    +  * control: Drop obsolete build-deps.
    13 
    +
    14 
    + -- Timo Aaltonen <tjaalton@debian.org>  Mon, 19 Sep 2022 13:04:11 +0300
    15 
    +
    1 16 
     libxxf86dga (2:1.1.4-1) unstable; urgency=low
    2 17
    3 18 
       * New upstream release.

  • debian/compat deleted
    1 
    -7

  • debian/control
    ... ... @@ -2,21 +2,17 @@ Source: libxxf86dga
    2 2 
     Section: x11
    3 3 
     Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 
    -Uploaders: Cyril Brulebois <kibi@debian.org>
    6 5 
     Build-Depends:
    7 
    - dpkg-dev (>= 1.16.1),
    8 
    - debhelper (>= 8.1.3),
    6 
    + debhelper-compat (= 13),
    9 7 
      libx11-dev (>= 1:0.99.2),
    10 
    - x11proto-xf86dga-dev (>= 2.0.99.1),
    8 
    + x11proto-dev,
    11 9 
      libxext-dev (>= 1:0.99.1),
    12 10 
      pkg-config,
    13 11 
      quilt,
    14 
    - automake,
    15 
    - libtool,
    16 12 
      xutils-dev (>= 1:7.5+4),
    17 
    -Standards-Version: 3.8.3
    18 
    -Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxxf86dga
    19 
    -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxxf86dga.git
    13 
    +Standards-Version: 4.6.1
    14 
    +Vcs-Git: https://salsa.debian.org/xorg-team/lib/libxxf86dga.git
    15 
    +Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libxxf86dga
    20 16
    21 17 
     Package: libxxf86dga1
    22 18 
     Architecture: any
    ... ... @@ -34,36 +30,10 @@ Description: X11 Direct Graphics Access extension library
    34 30 
      games.
    35 31 
      .
    36 32 
      More information about X.Org can be found at:
    37 
    - <URL:http://www.X.org>
    33 
    + <URL:https://www.X.org>
    38 34 
      .
    39 35 
      This module can be found at
    40 
    - git://anongit.freedesktop.org/git/xorg/lib/libXxf86dga
    41 
    -
    42 
    -Package: libxxf86dga1-dbg
    43 
    -Architecture: any
    44 
    -Multi-Arch: same
    45 
    -Section: debug
    46 
    -Priority: extra
    47 
    -Pre-Depends:
    48 
    - ${misc:Pre-Depends},
    49 
    -Depends:
    50 
    - ${shlibs:Depends},
    51 
    - ${misc:Depends},
    52 
    - libxxf86dga1 (= ${binary:Version}),
    53 
    -Description: X11 Direct Graphics Access extension library (debug package)
    54 
    - libXxf86dga provides the XFree86-DGA extension, which allows direct
    55 
    - graphics access to a framebuffer-like region, and also allows relative
    56 
    - mouse reporting, et al.  It is mainly used by games and emulators for
    57 
    - games.
    58 
    - .
    59 
    - This package contains the debug versions of the library found in libxxf86dga1.
    60 
    - Non-developers likely have little use for this package.
    61 
    - .
    62 
    - More information about X.Org can be found at:
    63 
    - <URL:http://www.X.org>
    64 
    - .
    65 
    - This module can be found at
    66 
    - git://anongit.freedesktop.org/git/xorg/lib/libXxf86dga
    36 
    + https://gitlab.freedesktop.org/xorg/lib/libXxf86dga
    67 37
    68 38 
     Package: libxxf86dga-dev
    69 39 
     Architecture: any
    ... ... @@ -76,9 +46,7 @@ Depends:
    76 46 
      ${misc:Depends},
    77 47 
      libxxf86dga1 (= ${binary:Version}),
    78 48 
      libx11-dev,
    79 
    - x11proto-xf86dga-dev (>= 2.0.99.1),
    80 
    -Replaces:
    81 
    - x11proto-xf86dga-dev (<< 2.0.99.1),
    49 
    + x11proto-dev,
    82 50 
     Description: X11 Direct Graphics Access extension library (development headers)
    83 51 
      libXxf86dga provides the XFree86-DGA extension, which allows direct
    84 52 
      graphics access to a framebuffer-like region, and also allows relative
    ... ... @@ -89,7 +57,7 @@ Description: X11 Direct Graphics Access extension library (development headers)
    89 57 
      libxxf86dga1.  Non-developers likely have little use for this package.
    90 58 
      .
    91 59 
      More information about X.Org can be found at:
    92 
    - <URL:http://www.X.org>
    60 
    + <URL:https://www.X.org>
    93 61 
      .
    94 62 
      This module can be found at
    95 
    - git://anongit.freedesktop.org/git/xorg/lib/libXxf86dga
    63 
    + https://gitlab.freedesktop.org/xorg/lib/libXxf86dga

  • debian/copyright
    1 1 
     This package was downloaded from
    2 
    -http://xorg.freedesktop.org/releases/individual/lib/
    2 
    +https://xorg.freedesktop.org/releases/individual/lib/
    3 3
    4 4 
     Copyright (c) 1995  Jon Tombs
    5 5 
     Copyright (c) 1995, 1996  The XFree86 Project, Inc

  • debian/rules
    ... ... @@ -10,44 +10,11 @@
    10 10 
     # set this to the name of the main shlib's binary package
    11 11 
     PACKAGE = libxxf86dga1
    12 12
    13 
    -include debian/xsfbs/xsfbs.mk
    13 
    +%:
    14 
    +	dh $@ --builddirectory=build
    14 15
    15 
    -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
    16 
    -	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
    17 
    -	MAKEFLAGS += -j$(NUMJOBS)
    18 
    -endif
    19 
    -
    20 
    -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
    21 
    -DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
    22 
    -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
    23 
    -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
    24 
    -	confflags += --build=$(DEB_HOST_GNU_TYPE)
    25 
    -else
    26 
    -	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
    27 
    -endif
    28 
    -
    29 
    -configure: $(STAMP_DIR)/patch
    30 
    -	dh_testdir
    31 
    -	autoreconf -vfi
    32 
    -
    33 
    -build: build-arch
    34 
    -build-indep:
    35 
    -	# Nothing to do
    36 
    -build-arch: build-stamp
    37 
    -build-stamp: configure $(STAMP_DIR)/genscripts
    38 
    -	dh_testdir
    39 
    -	mkdir -p build
    40 
    -	cd build && \
    41 
    -	../configure --prefix=/usr --mandir=\$${prefix}/share/man \
    42 
    -	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
    43 
    -	             --infodir=\$${prefix}/share/info $(confflags) \
    44 
    -		     --disable-silent-rules \
    45 
    -		     $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
    46 
    -	cd build && $(MAKE)
    47 
    -	>$@
    48 
    -
    49 
    -clean: xsfclean
    50 
    -	dh_testdir
    16 
    +override_dh_auto_clean:
    17 
    +	dh_auto_clean
    51 18 
     	rm -f build-stamp
    52 19 
     	rm -f config.cache config.log config.status
    53 20 
     	rm -f */config.cache */config.log */config.status
    ... ... @@ -58,37 +25,7 @@ clean: xsfclean
    58 25 
     	rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
    59 26 
     	rm -f src/config.h.in
    60 27 
     	find -name Makefile.in -delete
    61 
    -	dh_clean
    62 
    -
    63 
    -install: build
    64 
    -	dh_testdir
    65 
    -	dh_testroot
    66 
    -	dh_prep
    67 
    -	dh_installdirs
    68 
    -	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
    69 
    -
    70 
    -# Build architecture-dependent files here.
    71 
    -binary-arch: build install
    72 
    -	dh_testdir
    73 
    -	dh_testroot
    74 
    -	dh_installdocs
    75 
    -	dh_install --fail-missing -XlibXxf86dga.la
    76 
    -	dh_installchangelogs
    77 
    -	dh_link
    78 
    -	dh_strip --dbg-package=$(PACKAGE)-dbg
    79 
    -	dh_compress
    80 
    -	dh_fixperms
    81 
    -	dh_makeshlibs
    82 
    -	dh_shlibdeps
    83 
    -	dh_installdeb
    84 
    -	dh_gencontrol
    85 
    -	dh_md5sums
    86 
    -	dh_builddeb
    87 
    -
    88 
    -# Build architecture-independent files here.
    89 
    -binary-indep: build install
    90 
    -# Nothing to do
    91 28
    92 
    -binary: binary-indep binary-arch
    93 
    -.PHONY: build-indep build-arch build
    94 
    -.PHONY: clean binary-indep binary-arch binary install
    29 
    +override_dh_install:
    30 
    +	find debian/tmp -name '*.la' -delete
    31 
    +	dh_install

  • debian/watch
    1 
    -#git=git://anongit.freedesktop.org/xorg/lib/libXxf86dga
    1 
    +#git=https://gitlab.freedesktop.org/xorg/lib/libXxf86dga
    2 2 
     version=3
    3 
    -http://xorg.freedesktop.org/releases/individual/lib/ libXxf86dga-(.*)\.tar\.gz
    3 
    +https://xorg.freedesktop.org/releases/individual/lib/ libXxf86dga-(.*)\.tar\.gz

  • 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: