libxvmc: Changes to 'upstream-unstable'
.gitignore | 72 ++++++++++++++++++++++++++++++++-------
COPYING | 24 ++++++++-----
Makefile.am | 12 +++---
configure.ac | 19 +++++-----
include/X11/extensions/XvMClib.h | 3 -
src/XvMC.c | 4 --
src/XvMCWrapper.c | 2 +
src/XvMClibint.h | 3 -
8 files changed, 95 insertions(+), 44 deletions(-)
New commits:
commit 97d0572191368f47854c795e524610e529787c85
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Aug 13 22:00:11 2010 -0700
libXvMC 1.0.6
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index b8bc676..6a904dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,10 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT(libXvMC, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXvMC)
+AC_INIT([libXvMC],
+ [1.0.6],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXvMC])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 9d2e636fa0fe21bfa483c18fa7ca63368a05ef35
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Aug 13 22:01:39 2010 -0700
Remove unnecessary statements from configure.ac
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index daa6f1b..b8bc676 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,13 +34,10 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Check for dependencies
PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
-AC_SUBST(XVMC_CFLAGS)
-AC_SUBST(XVMC_LIBS)
AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
commit 4d78d748cbf4a393ef12222c44b5f7adb2d3539f
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Mon Jul 12 20:04:46 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/XvMClib.h b/include/X11/extensions/XvMClib.h
index b97ae22..b479d96 100644
--- a/include/X11/extensions/XvMClib.h
+++ b/include/X11/extensions/XvMClib.h
@@ -1,6 +1,3 @@
-/* $XdotOrg: xc/include/extensions/XvMClib.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */
-/* $XFree86: xc/include/extensions/XvMClib.h,v 1.6 2001/11/14 21:54:37 mvojkovi Exp $ */
-
#ifndef _XVMCLIB_H_
#define _XVMCLIB_H_
diff --git a/src/XvMC.c b/src/XvMC.c
index a850dc7..3bf5a43 100644
--- a/src/XvMC.c
+++ b/src/XvMC.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.4 2001/11/14 21:54:38 mvojkovi Exp $ */
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/XvMClibint.h b/src/XvMClibint.h
index 408051f..94c24ad 100644
--- a/src/XvMClibint.h
+++ b/src/XvMClibint.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/lib/XvMC/XvMClibint.h,v 1.4 2001/07/25 15:04:54 dawes Exp $ */
-
#ifndef _XVMCLIBINT_H
#define _XVMCLIBINT_H
commit e003c948a51af2d89a23fb697ec44aab970ce853
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Thu Jul 1 07:06:17 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/XvMC.c b/src/XvMC.c
index 3d9b7b0..a850dc7 100644
--- a/src/XvMC.c
+++ b/src/XvMC.c
@@ -1,7 +1,5 @@
/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.4 2001/11/14 21:54:38 mvojkovi Exp $ */
-#define NEED_REPLIES
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/XvMClibint.h b/src/XvMClibint.h
index 3bbd788..408051f 100644
--- a/src/XvMClibint.h
+++ b/src/XvMClibint.h
@@ -2,7 +2,6 @@
#ifndef _XVMCLIBINT_H
#define _XVMCLIBINT_H
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xvproto.h>
commit bea7d18c45b8d09c27a7e8c181b6efd27c4a36d7
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 84de33c..a733b52 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ pkgconfig_DATA = xvmc.pc
dist_doc_DATA = XvMC_API.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xvmc.pc.in
.PHONY: ChangeLog INSTALL
commit 92e902daab4eeb0acddd4e0def2d6009459e3220
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 14 10:06:05 2010 -0500
COPYING: replace stub with actual copyright notices
Refer to: XvMCWrapper.c
Copyright (c) 2004 The Unichrome project.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..0b161ed 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,20 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2004 The Unichrome project. All rights reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+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:
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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
+AUTHOR(S) OR COPYRIGHT HOLDER(S) 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.
commit 52c17bfbe2a50c9117ad92843f34e94be4f09c5e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 11 12:54:03 2009 -0800
Bug 25592: Use $(docdir) for XvMC_API.txt install path
Bumps minimum autoconf version required to 2.60 for $(docdir)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index eaf85d1..84de33c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = src include
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xvmc.pc
-xvmcdocdir = $(datadir)/doc/$(PACKAGE)
-dist_xvmcdoc_DATA = XvMC_API.txt
+dist_doc_DATA = XvMC_API.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xvmc.pc.in
diff --git a/configure.ac b/configure.ac
index 1a029a8..daa6f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,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(libXvMC, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXvMC)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit c53bfd6679f842a5a061904740d86932bbbda6c6
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 20ddc9a..eaf85d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ pkgconfig_DATA = xvmc.pc
xvmcdocdir = $(datadir)/doc/$(PACKAGE)
dist_xvmcdoc_DATA = XvMC_API.txt
+MAINTAINERCLEANFILES = ChangeLog INSTALL
EXTRA_DIST = xvmc.pc.in
.PHONY: ChangeLog INSTALL
commit a75f52662c22048dc80a9f8d310364c458da470c
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/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile.am b/Makefile.am
index d32b649..20ddc9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,12 +29,15 @@ dist_xvmcdoc_DATA = XvMC_API.txt
EXTRA_DIST = xvmc.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 9c441d4a5438caa37dd413ab2acbb4a117125e44
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 8049bac..1a029a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,15 +26,16 @@ AC_INIT(libXvMC, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# 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
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
commit 3a75ec2dda5f065e4d3eca15653c652690f4aa38
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 56dffbd..d32b649 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ pkgconfig_DATA = xvmc.pc
xvmcdocdir = $(datadir)/doc/$(PACKAGE)
dist_xvmcdoc_DATA = XvMC_API.txt
-EXTRA_DIST = xvmc.pc.in ChangeLog
+EXTRA_DIST = xvmc.pc.in
.PHONY: ChangeLog
commit 5eccd90ff407b9f780b4a0d6d1e48e0891f56594
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 f3c8925..1053884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,78 @@
-.deps
-.libs
+#
+# 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
-MakeOut
+mdate-sh
missing
mkinstalldirs
-stamp-h1
-xvmc.pc
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-*.o
-*.la
-*.lo
-libXvMC-*.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 libXvMC
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
commit 276759b34432cea1f6c7eda995d65140b72169c0
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 33c102a..8049bac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(libXvMC, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXvMC)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
commit efaafb5e74c7484f7e1c0f6f0fc34d75a0f7c14d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 20 14:42:03 2009 -0700
Include XvMClib.h
This fixes compilation breakage after 9190399907610486001f3676945958dbab4b837a in videoproto
Found by tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
diff --git a/src/XvMCWrapper.c b/src/XvMCWrapper.c
index b9f97b2..d3800e7 100644
--- a/src/XvMCWrapper.c
+++ b/src/XvMCWrapper.c
@@ -44,7 +44,9 @@
#include "config.h"
#endif
+#include <X11/Xlib.h>
#include <X11/extensions/XvMC.h>
+#include <X11/extensions/XvMClib.h>
#include <X11/extensions/vldXvMC.h>
#include <dlfcn.h>
#include <stdio.h>
Reply to: