.gitignore | 76 ++++++++++++++---- ChangeLog | 172 +++++++++++++++++++++++++++++++++++++++++ Makefile.am | 9 +- configure.ac | 16 ++- debian/changelog | 12 ++ debian/control | 4 debian/rules | 2 include/X11/extensions/Xvlib.h | 1 man/Makefile.am | 113 +++++++++++--------------- man/XvShmCreateImage.man | 2 man/XvShmPutImage.man | 2 src/Xv.c | 2 src/Xvlibint.h | 3 13 files changed, 313 insertions(+), 101 deletions(-)
New commits: commit f51407e28671444775b3667fda37c4dee346a3a4 Author: Cyril Brulebois <[email protected]> Date: Mon Nov 8 00:41:51 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 23b9edd..df93231 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxv (2:1.0.6-1) UNRELEASED; urgency=low +libxv (2:1.0.6-1) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -12,7 +12,7 @@ libxv (2:1.0.6-1) UNRELEASED; urgency=low * Pass --exclude=libXv.la accordingly. * Add myself to Uploaders. - -- Cyril Brulebois <[email protected]> Mon, 08 Nov 2010 00:35:20 +0100 + -- Cyril Brulebois <[email protected]> Mon, 08 Nov 2010 00:41:47 +0100 libxv (2:1.0.5-1) unstable; urgency=low commit 2bf4618bd7050761a424442ee6187b78d7250e6c Author: Cyril Brulebois <[email protected]> Date: Mon Nov 8 00:41:44 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 58fd3f3..23b9edd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ libxv (2:1.0.6-1) UNRELEASED; urgency=low * Bump xutils-dev build-dep for new macros. * Switch from --list-missing to --fail-missing for additional safety. * Pass --exclude=libXv.la accordingly. + * Add myself to Uploaders. -- Cyril Brulebois <[email protected]> Mon, 08 Nov 2010 00:35:20 +0100 diff --git a/debian/control b/debian/control index 66caec6..87ebbf5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libxv Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Andres Salomon <[email protected]> +Uploaders: David Nusinow <[email protected]>, Andres Salomon <[email protected]>, Cyril Brulebois <[email protected]> Standards-Version: 3.8.3 Build-Depends: debhelper (>= 5.0.0), commit 1950758e1fab88e11e68c36b5e8e8bb622c64fa5 Author: Cyril Brulebois <[email protected]> Date: Mon Nov 8 00:40:48 2010 +0100 Pass --exclude=libXv.la accordingly. diff --git a/debian/changelog b/debian/changelog index 07e0d61..58fd3f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libxv (2:1.0.6-1) UNRELEASED; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. * Switch from --list-missing to --fail-missing for additional safety. + * Pass --exclude=libXv.la accordingly. -- Cyril Brulebois <[email protected]> Mon, 08 Nov 2010 00:35:20 +0100 diff --git a/debian/rules b/debian/rules index 4d3a5e5..bd0de0b 100755 --- a/debian/rules +++ b/debian/rules @@ -75,7 +75,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --fail-missing + dh_install --sourcedir=debian/tmp --fail-missing --exclude=libXv.la dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit 2c946e508865fe62ec6fb2931e7e86374c399b9e Author: Cyril Brulebois <[email protected]> Date: Mon Nov 8 00:39:25 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index 97333f4..07e0d61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libxv (2:1.0.6-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. * Bump xutils-dev build-dep for new macros. + * Switch from --list-missing to --fail-missing for additional safety. -- Cyril Brulebois <[email protected]> Mon, 08 Nov 2010 00:35:20 +0100 diff --git a/debian/rules b/debian/rules index bc8ea3d..4d3a5e5 100755 --- a/debian/rules +++ b/debian/rules @@ -75,7 +75,7 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit 96f3b88276974b53f8f4f1d8e4617394e273921b Author: Cyril Brulebois <[email protected]> Date: Mon Nov 8 00:36:11 2010 +0100 Bump xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index f40b389..97333f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libxv (2:1.0.6-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. + * Bump xutils-dev build-dep for new macros. -- Cyril Brulebois <[email protected]> Mon, 08 Nov 2010 00:35:20 +0100 diff --git a/debian/control b/debian/control index 1ce3375..66caec6 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: quilt, automake, libtool, - xutils-dev (>= 1:7.5~1) + xutils-dev (>= 1:7.5+4), Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxv Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxv.git commit 29d8b39dfeba15afe18294a284807c09f609a382 Author: Cyril Brulebois <[email protected]> Date: Mon Nov 8 00:35:34 2010 +0100 Update changelogs. diff --git a/ChangeLog b/ChangeLog index e5ea9f7..34b370e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,175 @@ +commit e34fff44ebc4f8c258df127f6f80d0a1aa86a25d +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 29 17:52:32 2010 -0700 + + libXv 1.0.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6e0da1da31552faaba26a351be0a4cf2d5964b05 +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 29 17:51:53 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4c2bc9a94ee759423adbc4e7c99b9bf9fea692ec +Author: Jesse Adkins <[email protected]> +Date: Tue Sep 28 13:30:04 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ec92e24e86363fcbc14f8dce9739a430f68b998f +Author: Gaetan Nadon <[email protected]> +Date: Wed Aug 18 17:29:15 2010 -0400 + + man: whitespace management + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 7bb70e6f8f394775d5d7ed7035a6d4b2accd2892 +Author: Gaetan Nadon <[email protected]> +Date: Wed Aug 18 17:23:31 2010 -0400 + + man: remove unrequired local fix for bug 5628 + + Local fix in CVS for bug 5628 is not required + as the problem has been fixed in + util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 14cf5e3d19488f9a36824a01d4aba4a7f5ebc1cd +Author: Alan Coopersmith <[email protected]> +Date: Thu Jul 8 15:21:36 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + Enables use of platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e106f955dfc23798975ef14b3d3400aff39eced9 +Author: Fernando Carrijo <[email protected]> +Date: Thu Jul 1 07:07:12 2010 -0300 + + Purge macro NEED_REPLIES + + Signed-off-by: Fernando Carrijo <[email protected]> + Acked-by: Tiago Vignatti <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + +commit 481033e52111a42ae80c2814a499a068d7dc4771 +Author: Gaetan Nadon <[email protected]> +Date: Mon Mar 29 16:50:34 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit ea333fad90bce73c95a5ac310c127e22d6b41c6c +Author: Gaetan Nadon <[email protected]> +Date: Mon Mar 29 14:53:49 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 917a09fe40630d9ba2ac7f2f48636989f3163580 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jan 14 20:55:17 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit f0225573605729797a0edd00276f4704f9cda3c2 +Author: Gaetan Nadon <[email protected]> +Date: Fri Nov 27 20:56:04 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit f6ab500cf3d00bfa49070007c006e500253b6d84 +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit fec734de503d63bb0abce9088be2e6655e82f800 +Author: Gaetan Nadon <[email protected]> +Date: Tue Oct 27 15:07:26 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit f0b191321146550b88a94233b9677e32044b6c0e +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 22:08:43 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 9ae8551458ee56b7ea19066023da64c7e24ea9f3 +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:19 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 05974c72286a9556ebf5ff541967fa53f75a55a8 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 21 12:47:26 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <[email protected]> + commit 5be9a0099a83d1acf464640e930518a4c46c0920 Author: Alan Coopersmith <[email protected]> Date: Sat Oct 3 02:12:52 2009 -0700 diff --git a/debian/changelog b/debian/changelog index 7759a6f..f40b389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -libxv (2:1.0.5-2) UNRELEASED; urgency=low +libxv (2:1.0.6-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders - -- Julien Cristau <[email protected]> Sat, 16 Jan 2010 16:47:36 +0000 + [ Cyril Brulebois ] + * New upstream release. + + -- Cyril Brulebois <[email protected]> Mon, 08 Nov 2010 00:35:20 +0100 libxv (2:1.0.5-1) unstable; urgency=low commit e34fff44ebc4f8c258df127f6f80d0a1aa86a25d Author: Alan Coopersmith <[email protected]> Date: Fri Oct 29 17:52:32 2010 -0700 libXv 1.0.6 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index 912faff..7e2d8de 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,8 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT(libXv, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXv) +AC_INIT([libXv], [1.0.6], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXv]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 6e0da1da31552faaba26a351be0a4cf2d5964b05 Author: Alan Coopersmith <[email protected]> Date: Fri Oct 29 17:51:53 2010 -0700 Sun's copyrights now belong to Oracle Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am index 58c16cc..e2020c3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -19,7 +19,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -# +# libmandir = $(LIB_MAN_DIR) commit 4c2bc9a94ee759423adbc4e7c99b9bf9fea692ec Author: Jesse Adkins <[email protected]> Date: Tue Sep 28 13:30:04 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/include/X11/extensions/Xvlib.h b/include/X11/extensions/Xvlib.h index b5474aa..0708616 100644 --- a/include/X11/extensions/Xvlib.h +++ b/include/X11/extensions/Xvlib.h @@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/Xvlib.h,v 1.3 1999/12/11 19:28:48 mvojkovi Exp $ */ #ifndef XVLIB_H #define XVLIB_H diff --git a/src/Xv.c b/src/Xv.c index 3c999a1..77378aa 100644 --- a/src/Xv.c +++ b/src/Xv.c @@ -21,8 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xv/Xv.c,v 1.17 2003/04/28 16:56:27 dawes Exp $ */ -/* $XdotOrg: xc/lib/Xv/Xv.c,v 1.2 2004/04/23 18:43:55 eich Exp $ */ /* ** File: ** diff --git a/src/Xvlibint.h b/src/Xvlibint.h index fcc4a61..f08346a 100644 --- a/src/Xvlibint.h +++ b/src/Xvlibint.h @@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.5 2001/07/25 15:04:53 dawes Exp $ */ #ifndef XVLIBINT_H #define XVLIBINT_H commit ec92e24e86363fcbc14f8dce9739a430f68b998f Author: Gaetan Nadon <[email protected]> Date: Wed Aug 18 17:29:15 2010 -0400 man: whitespace management Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am index 2a8cbb6..58c16cc 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -23,33 +23,33 @@ libmandir = $(LIB_MAN_DIR) -libman_PRE = \ - Xv.man \ - XvCreateImage.man \ - XvFreeAdaptorInfo.man \ - XvFreeEncodingInfo.man \ - XvGetPortAttribute.man \ - XvGetStill.man \ - XvGetVideo.man \ - XvGrabPort.man \ - XvListImageFormats.man \ - XvPortNotify.man \ - XvPutImage.man \ - XvPutStill.man \ - XvPutVideo.man \ - XvQueryAdaptors.man \ - XvQueryBestSize.man \ - XvQueryEncodings.man \ - XvQueryExtension.man \ - XvQueryPortAttributes.man \ - XvSelectPortNotify.man \ - XvSelectVideoNotify.man \ - XvSetPortAttribute.man \ - XvShmCreateImage.man \ - XvShmPutImage.man \ - XvStopVideo.man \ - XvUngrabPort.man \ - XvVideoNotify.man +libman_PRE = \ + Xv.man \ + XvCreateImage.man \ + XvFreeAdaptorInfo.man \ + XvFreeEncodingInfo.man \ + XvGetPortAttribute.man \ + XvGetStill.man \ + XvGetVideo.man \ + XvGrabPort.man \ + XvListImageFormats.man \ + XvPortNotify.man \ + XvPutImage.man \ + XvPutStill.man \ + XvPutVideo.man \ + XvQueryAdaptors.man \ + XvQueryBestSize.man \ + XvQueryEncodings.man \ + XvQueryExtension.man \ + XvQueryPortAttributes.man \ + XvSelectPortNotify.man \ + XvSelectVideoNotify.man \ + XvSetPortAttribute.man \ + XvShmCreateImage.man \ + XvShmPutImage.man \ + XvStopVideo.man \ + XvUngrabPort.man \ + XvVideoNotify.man libman_DATA = $(libman_PRE:m...@lib_man_suffix@) commit 7bb70e6f8f394775d5d7ed7035a6d4b2accd2892 Author: Gaetan Nadon <[email protected]> Date: Wed Aug 18 17:23:31 2010 -0400 man: remove unrequired local fix for bug 5628 Local fix in CVS for bug 5628 is not required as the problem has been fixed in util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am index 9d8a9ac..2a8cbb6 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -53,8 +53,6 @@ libman_PRE = \ libman_DATA = $(libman_PRE:m...@lib_man_suffix@) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - EXTRA_DIST = $(libman_PRE) xv-library-v2.2.txt CLEANFILES = $(libman_DATA) @@ -62,8 +60,5 @@ CLEANFILES = $(libman_DATA) SUFFIXES = .$(LIB_MAN_SUFFIX) .man # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -ADDITIONAL_MAN_SUBSTS = \ - -e 's|__libmandirsuffix__|$(LIB_MAN_DIR_SUFFIX)|g' - .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) $(ADDITIONAL_MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/XvShmCreateImage.man b/man/XvShmCreateImage.man index f44dd89..a215080 100644 --- a/man/XvShmCreateImage.man +++ b/man/XvShmCreateImage.man @@ -1 +1 @@ -.so man__libmandirsuffix__/XvCreateImage.__libmandirsuffix__ +.so man__libmansuffix__/XvCreateImage.__libmansuffix__ diff --git a/man/XvShmPutImage.man b/man/XvShmPutImage.man index 3f15682..0cf496f 100644 --- a/man/XvShmPutImage.man +++ b/man/XvShmPutImage.man @@ -1 +1 @@ -.so man__libmandirsuffix__/XvPutImage.__libmandirsuffix__ +.so man__libmansuffix__/XvPutImage.__libmansuffix__ commit 14cf5e3d19488f9a36824a01d4aba4a7f5ebc1cd Author: Alan Coopersmith <[email protected]> Date: Thu Jul 8 15:21:36 2010 -0700 config: upgrade to util-macros 1.8 for additional man page support Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS Enables use of platform appropriate version of sed. Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index b66b502..912faff 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,10 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS # Check for progs diff --git a/man/Makefile.am b/man/Makefile.am index 8b7d8e6..9d8a9ac 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -59,18 +59,11 @@ EXTRA_DIST = $(libman_PRE) xv-library-v2.2.txt CLEANFILES = $(libman_DATA) -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \ - -e 's/__libmandirsuffix__/$(LIB_MAN_DIR_SUFFIX)/g' \ - -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' - SUFFIXES = .$(LIB_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +ADDITIONAL_MAN_SUBSTS = \ + -e 's|__libmandirsuffix__|$(LIB_MAN_DIR_SUFFIX)|g' + .man.$(LIB_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) $(ADDITIONAL_MAN_SUBSTS) < $< > $@ commit e106f955dfc23798975ef14b3d3400aff39eced9 Author: Fernando Carrijo <[email protected]> Date: Thu Jul 1 07:07:12 2010 -0300 Purge macro NEED_REPLIES Signed-off-by: Fernando Carrijo <[email protected]> Acked-by: Tiago Vignatti <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> diff --git a/src/Xvlibint.h b/src/Xvlibint.h index 501a211..fcc4a61 100644 --- a/src/Xvlibint.h +++ b/src/Xvlibint.h @@ -41,8 +41,6 @@ SOFTWARE. ** */ -#define NEED_REPLIES - #include <X11/Xlibint.h> #include <X11/extensions/Xvproto.h> #include <X11/extensions/Xvlib.h> commit 481033e52111a42ae80c2814a499a068d7dc4771 Author: Gaetan Nadon <[email protected]> Date: Mon Mar 29 16:50:34 2010 -0400 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index e9a1147..b66b502 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. -AC_PREREQ([2.57]) +AC_PREREQ([2.60]) AC_INIT(libXv, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXv) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit ea333fad90bce73c95a5ac310c127e22d6b41c6c Author: Gaetan Nadon <[email protected]> Date: Mon Mar 29 14:53:49 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/Makefile.am b/Makefile.am index a65cfd5..eba7178 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xv.pc MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = xv.pc.in .PHONY: ChangeLog INSTALL commit 917a09fe40630d9ba2ac7f2f48636989f3163580 Author: Alan Coopersmith <[email protected]> Date: Thu Jan 14 20:55:17 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am index 9100048..8b7d8e6 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,27 +1,24 @@ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation. -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. # libmandir = $(LIB_MAN_DIR) commit f0225573605729797a0edd00276f4704f9cda3c2 Author: Gaetan Nadon <[email protected]> Date: Fri Nov 27 20:56:04 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index 81ea301..a65cfd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = src man include pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xv.pc +MAINTAINERCLEANFILES = ChangeLog INSTALL EXTRA_DIST = xv.pc.in .PHONY: ChangeLog INSTALL commit f6ab500cf3d00bfa49070007c006e500253b6d84 Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:09:10 2009 -0400 INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. diff --git a/INSTALL b/INSTALL deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile.am b/Makefile.am index 90fe6b3..81ea301 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,12 +26,15 @@ pkgconfig_DATA = xv.pc EXTRA_DIST = xv.pc.in -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL if LINT lint: diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 commit fec734de503d63bb0abce9088be2e6655e82f800 Author: Gaetan Nadon <[email protected]> Date: Tue Oct 27 15:07:26 2009 -0400 Deploy the new XORG_DEFAULT_OPTIONS #24242 This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. diff --git a/configure.ac b/configure.ac index 5a71c98..e9a1147 100644 --- a/configure.ac +++ b/configure.ac @@ -29,14 +29,15 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS # Check for progs AC_PROG_CC AC_PROG_LIBTOOL -XORG_DEFAULT_OPTIONS # Check for dependencies PKG_CHECK_MODULES(XV, x11 xext xextproto videoproto) commit f0b191321146550b88a94233b9677e32044b6c0e Author: Gaetan Nadon <[email protected]> Date: Mon Oct 26 22:08:43 2009 -0400 Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 ChangeLog filename is known to Automake and requires no further coding in the makefile. diff --git a/Makefile.am b/Makefile.am index ee77ced..90fe6b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = src man include pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xv.pc -EXTRA_DIST = xv.pc.in ChangeLog +EXTRA_DIST = xv.pc.in .PHONY: ChangeLog commit 9ae8551458ee56b7ea19066023da64c7e24ea9f3 Author: Gaetan Nadon <[email protected]> Date: Thu Oct 22 12:34:19 2009 -0400 .gitignore: use common defaults with custom section # 24239 Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. diff --git a/.gitignore b/.gitignore index aa57d1a..2cf65b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,78 @@ -.deps -.libs -Makefile -Makefile.in +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ libtool +libtool.m4 ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing mkinstalldirs -stamp-h1 -xv.pc +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ -*.3 -*.o -*.la -*.lo -libXv-*.tar.* -ChangeLog -tags +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
