libxv: Changes to 'upstream-unstable'
.gitignore | 76 ++++++++++++++++++++++-----
Makefile.am | 9 ++-
configure.ac | 16 +++--
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 -
9 files changed, 128 insertions(+), 96 deletions(-)
New commits:
commit e34fff44ebc4f8c258df127f6f80d0a1aa86a25d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 17:52:32 2010 -0700
libXv 1.0.6
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
Date: Fri Oct 29 17:51:53 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:04 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <memsize@videotron.ca>
Date: Wed Aug 18 17:29:15 2010 -0400
man: whitespace management
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
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:man=@LIB_MAN_SUFFIX@)
commit 7bb70e6f8f394775d5d7ed7035a6d4b2accd2892
Author: Gaetan Nadon <memsize@videotron.ca>
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 <memsize@videotron.ca>
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:man=@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 <alan.coopersmith@oracle.com>
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 <alan.coopersmith@oracle.com>
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 <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:07:12 2010 -0300
Purge macro NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <alan.coopersmith@sun.com>
Date: Thu Jan 14 20:55:17 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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 <memsize@videotron.ca>
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
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for libXv
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 05974c72286a9556ebf5ff541967fa53f75a55a8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
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 <jeremyhu@freedesktop.org>
diff --git a/configure.ac b/configure.ac
index 4b01aac..5a71c98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(libXv, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXv)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
Reply to: