ChangeLog | 36 ++++++++++++++++
Xv.h | 16 +++----
configure.ac | 5 +-
debian/changelog | 12 +++++
debian/compat | 2
debian/control | 10 ++--
debian/rules | 90 +++-------------------------------------
debian/upstream/signing-key.asc | 41 ++++++++++++++++++
debian/watch | 1
9 files changed, 114 insertions(+), 99 deletions(-)
New commits:
commit 3cf23dce9e5267bdb0c17faf23cb92d65595e987
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 14:39:57 2016 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 6cdb37e..ccaa570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-x11proto-video (2.3.3-1) UNRELEASED; urgency=medium
+x11proto-video (2.3.3-1) unstable; urgency=medium
+ * Team upload.
* Let uscan verify tarball signatures.
* New upstream release.
* Remove Cyril from Uploaders.
@@ -7,7 +8,7 @@ x11proto-video (2.3.3-1) UNRELEASED; urgency=medium
* Update Vcs-* control fields.
* Switch to dh with dh-autoreconf and compat level 9.
- -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:21:49 +0200
+ -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:39:31 +0200
x11proto-video (2.3.2-1) unstable; urgency=low
commit 4cb6017772792d038f44d3ba1eff03115b857854
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 14:39:11 2016 +0200
Switch to dh with dh-autoreconf and compat level 9.
diff --git a/debian/changelog b/debian/changelog
index d7820e3..6cdb37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-video (2.3.3-1) UNRELEASED; urgency=medium
* Remove Cyril from Uploaders.
* Bump Standards-Version to 3.9.8 (no changes needed).
* Update Vcs-* control fields.
+ * Switch to dh with dh-autoreconf and compat level 9.
-- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:21:49 +0200
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 50ffb77..4203167 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 9),
+ dh-autoreconf,
automake,
xutils-dev (>= 1:7.5~1),
pkg-config,
diff --git a/debian/rules b/debian/rules
index ca5107e..c2294cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,90 +1,14 @@
#!/usr/bin/make -f
# debian/rules for the Debian x11proto-video-dev package.
-# Copyright © 2004 Scott James Remnant <sc...@netsplit.com>
-# Copyright © 2005 Daniel Stone <dan...@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusi...@debian.org>
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --with autoreconf --builddirectory=build
-PACKAGE = x11proto-video-dev
+override_dh_auto_configure:
+ dh_auto_configure -- --libdir=/usr/lib
-include debian/xsfbs/xsfbs.mk
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/tmp
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-
-build: build-stamp
-build-stamp:
- dh_testdir
- autoreconf -vfi
- mkdir -p build
- cd build && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- $(confflags) CFLAGS="$(CFLAGS)"
- cd build && $(MAKE)
- >$@
-
-clean:
- dh_testdir
- rm -f build-stamp
- rm -f compile config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build
- rm -f aclocal.m4 configure install-sh missing mkinstalldirs
- rm -f config.guess config.sub
- find -name Makefile.in -delete
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installman
+override_dh_install:
dh_install --fail-missing
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
commit 6595819b189b297dca60a225d96944bebde83dbe
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 14:26:45 2016 +0200
Update Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index a9f3703..d7820e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11proto-video (2.3.3-1) UNRELEASED; urgency=medium
* New upstream release.
* Remove Cyril from Uploaders.
* Bump Standards-Version to 3.9.8 (no changes needed).
+ * Update Vcs-* control fields.
-- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:21:49 +0200
diff --git a/debian/control b/debian/control
index c4869a8..50ffb77 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends:
xutils-dev (>= 1:7.5~1),
pkg-config,
Standards-Version: 3.9.8
-Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-video
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-video.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-video.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/proto/x11proto-video.git
Package: x11proto-video-dev
Architecture: all
commit ec5ab42a378098d5cdf775ec4716661ddd6fb1c3
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 14:26:16 2016 +0200
Bump Standards-Version to 3.9.8 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index d934a86..a9f3703 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11proto-video (2.3.3-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
* Remove Cyril from Uploaders.
+ * Bump Standards-Version to 3.9.8 (no changes needed).
-- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:21:49 +0200
diff --git a/debian/control b/debian/control
index a60b0cb..c4869a8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
automake,
xutils-dev (>= 1:7.5~1),
pkg-config,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-video
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-video.git
commit ea0df41eccea079038115a6560f4a099f0b3e9c0
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 14:25:47 2016 +0200
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 14bf4f4..d934a86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-video (2.3.3-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
+ * Remove Cyril from Uploaders.
-- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:21:49 +0200
diff --git a/debian/control b/debian/control
index f4e5eab..a60b0cb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: x11proto-video
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 7),
automake,
commit 959265bc27955ebd8b20bafb2d75ecd34f1eae03
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 14:22:07 2016 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index ccf461c..b050d0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+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>
+
+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>
+
+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>
+
commit 4d26102ace67377e88ba087e52ca894e0ffd2ebf
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Mon Jul 22 21:40:14 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index 4ada3dd..14bf4f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-x11proto-video (2.3.2-2) UNRELEASED; urgency=medium
+x11proto-video (2.3.3-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
+ * New upstream release.
- -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:18:18 +0200
+ -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:21:49 +0200
x11proto-video (2.3.2-1) unstable; urgency=low
commit a4af0f04bb5d1de1f61f1b4b61480f8c995ccb43
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 14:18:55 2016 +0200
Let uscan verify tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index ff157f2..4ada3dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-video (2.3.2-2) UNRELEASED; urgency=medium
+
+ * Let uscan verify tarball signatures.
+
+ -- Julien Cristau <jcris...@debian.org> Fri, 13 May 2016 14:18:18 +0200
+
x11proto-video (2.3.2-1) unstable; urgency=low
* New upstream release
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..6349a78
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQGiBEDLnMIRBACNlsJkPRfH7RMOn7nirvYN5StKVvwdJa2MFUM3sjoaA11nW+Zw
+Yxion4GkbIOtz25R29TcwuAaK1UWhy1Rz6aIOOMOzBeUNGGCvRXF76rKHBHOdSJw
+AXEvNa/9rKOIaPL7PBN7Lb4CmrjEbA9gKYtZQD9qQSKcAwyyxszkW1e7TwCg7MbV
+Bq5MWlATjOAzXLoSpgyENwMD/jPz53KmwUobbqri2pFhozacl5N93cy7b3pwpTZY
+fM50cXVSSshYpqdCr5AoWG/DXNGRixv1DnBKOI2Cv6YAQLntcATHxR8ssemOZHRv
+7D0hvWwC3o6GSKdg0rSOtRHfDhEL4IFVmPLZaXIRDZ0/ancrCuQPdZ9mzCi/LQmV
+noTeA/kB73zJMYH7Z0TSKv490AMWQHbKVvos8+tXxATlq0Otib+s55LXQocSPjgp
+GR5qKzqTn9elg2dyo4GYeAYvGBmhQtBdeYo1rVq2pC6HCzMG79zozL9O25SnDLpj
+WoqJB6qHBAd9tlTHzkRxv1Fqr4jfIupNborXbhR25tiYOm72irQcQWRhbSBKYWNr
+c29uIDxhamF4QG53bmsubmV0PohhBBMRAgAhAhsDBgsJCAcDAgMVAgMDFgIBAh4B
+AheABQJEZNYGAhkBAAoJEFuKLVCg7NDTlj8AoL9RgTs++HaD5w5lYARcE+OB+0Jg
+AKDZBhJhVgOsEjeg7atMglFR7s36mrQeQWRhbSBKYWNrc29uIDxhamF4QHJlZGhh
+dC5jb20+iGAEExECACAFAkfENSICGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAK
+CRBbii1QoOzQ0x6CAJ0fevUkaaBcTzKa0lTgfNFQ0E+JwgCfaWy44eNKttn4WWEZ
+CTGF+e+zraS0IEFkYW0gSmFja3NvbiA8YWpheEBlbmdyLnNnaS5jb20+iF4EExEC
+AB4FAkHB1gECGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQW4otUKDs0NNTOgCg
+lu1MOCbysvn68WReXz+v02+y2VkAoL12gktA0TFZnPBk3cweEAwCkUlXtCZBZGFt
+IEphY2tzb24gPGFqYXhAd2lsZG9wZW5zb3VyY2UuY29tPoheBBMRAgAeBQJBriSn
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEFuKLVCg7NDTOe4AnRUJ6FqQLaoY
+XWCToQdl/Gry4UNZAJ97YYHMt1FIo1TLCWWozSiG+VtTq7QnQWRhbSBKYWNrc29u
+IDxhamF4QGJlbnplZHJpbmUubnduay5uZXQ+iF4EExECAB4FAkRk1eACGwMGCwkI
+BwMCAxUCAwMWAgECHgECF4AACgkQW4otUKDs0NN+fwCg2cPLDbAb07gMWBETKTRm
+sj34FsAAn0SQ4kuqs9Ms0ZRKDqNQ1YTMwyEHuQINBEDLnNAQCACrbu13VZsigsM6
+8MzfdGQ4x/acO4Vd+Dg/aFj3EhPfXZHRauuJ7gQtWc9Mk2ghTjbqEXj0JILbif95
+IyShdC/fxEYiFybRODR6FHlXj6BFCxZFfqi4mOuaGQ4BeB57g/gW+FSoIPzYU4IY
+85KD62qeS37zQEBAAK+mCEboUGfPT0wHrkFtkTObjOg7UTjpBp5/HknUREYo8mLo
+WBv7CDlApicmXoqnKfAcFaNY2YLMjklwFHh2i2+6dPbkdWSEpuZhkxIQ/8JlYS6A
+2g5DMKcNdmqr4Z6xjk8Fj1SO7ILc9EtR+ACqkqkmlU3m4AUHjdR/4kk7tEJ5DytP
+c95JcuJnAAMFB/9KWUqJbdeHs47LJBksZ6tnHArcSG653e9uejtNt5xquJIz2wxb
+exMV9Bkzwu9v/A8Vo7px7Bkhh++sBrgpGD4z5Jr+PaWOsw5qrO9OVVgzXkUf2QoD
+gw4Hh8m9jpx1s6tNasPsy12OGMJ4a5a1GCGg8F7sPlWLBd491viavDyOWYkKozLH
+hXwKlGOec0sCRGeHTiqPinxs29PXaTE7Dl/f2dYgiNzTSWetSx7Sv1H9EX4qxPgc
+smdRuGV7k7dIw/J02rcI/Ol4OUORRMY2cgJnb5mNxIxTgTGJysm+MjfPrZnOeDVK
+TroAYtas/uirqiNzk7fdIdUdgbOhsAl9n3QZiEYEGBECAAYFAkDLnNAACgkQW4ot
+UKDs0NP3CACfS1DKwgN/rB7Ib+RJiuK0F/BQoEYAoOhr0VXCT5dP0Yr1kIad7njC
+GBF1
+=bYOv
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index a8013a2..f28f47e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/proto/videoproto
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/proto/ videoproto-(.*)\.tar\.gz
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
