Update to videoproto 2.3.0

9 files changed, 192 insertions, 181 deletions

diff --git a/proto/videoproto/ChangeLog b/proto/videoproto/ChangeLog
index c722b519a..422c26503 100644
--- a/proto/videoproto/ChangeLog
+++ b/proto/videoproto/ChangeLog
@@ -1,4 +1,177 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 20dc47bfb9e6627e8335c870a808fdab72e82061
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 27 11:59:40 2009 +1000
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    videoproto 2.3.0
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ed07cce6a0d54bf7ace0e672fe769a34fdac837a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Aug 27 11:55:47 2009 +1000
+
+    Remove RCS tags
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit cca2a3f1230bf21a1b4e4c255406b852c5c030c3
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 27 20:06:28 2009 -0200
+
+    Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 430e61ec31c975963a3495c81c360837584b0ef0
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:39:08 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit 35cde03805a6e6c4665a42e5c1657a88624710e6
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:21 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 82643400f8b91f5bb13313cac5954f3e13455379
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 18:56:36 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit 1d8409f8b92026cf82b3c0356993ca3a5f18a1d1
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:38 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 7811bd17a495be2f42ffa66a399343ed2c54b7bd
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:15 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 8404664358642cd90952acf07957a57b678b54fe
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:39 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit 8a08c1ccf233d725e0a12fc87cb6807f6fbb6fb2
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:57 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit d393967cb43b1050aa520e9fb738f2753f6a18b6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Jul 12 01:22:22 2005 +0000
+
+    Move Xvlib.h and XvMClib.h to the libs.
+
+commit bae658b5c8d091a2deef3251ce07c0dff29af2ac
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat May 21 04:52:54 2005 +0000
+
+    Change version to 2.2 (Xv major version; XvMC is 1.1 still).
+
+commit 7f0c0e550f1e3641bc895061d2ff76a8336fa5e7
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:22:40 2005 +0000
+
+    revert last change, didn't do right thing at all, sorry for the noise
+
+commit 0662a3831996d2db4560c1e154db1a4995b70d14
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:19 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit ff5a5dcd5e2bef26deca4be2d4541e9627544c89
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Tue May 17 22:12:59 2005 +0000
+
+    Add COPYING file for Video.
+
+commit 47f7733ccc2a6deb8576b9d55a3a46c841a5560c
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon May 9 18:20:06 2005 +0000
+
+    Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 60df602bf6f92eaf8f24e5c37cfbfb258ce74a20
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:31 2005 +0000
+
+    Initial build system files for proto module.
+
+commit 4396c32c85286d4da6495b279cb3c8a380302334
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date:   Sat Dec 4 00:42:46 2004 +0000
+
+    Encoding of numerous files changed to UTF-8
+
+commit e57cb44cb47b1a25bcc0cce0dbc19e95abdf4ada
+Author: Thomas Hellstrom <unichrome@shipmail.org>
+Date:   Sat Nov 13 11:09:23 2004 +0000
+
+    lib/XvMC/Imake
+    Added support for automatic loading of the correct hardware XvMC driver.
+        This involves a protocol extension of the XvMC protocol. The XvMC
+        revision number was bumped.
+
+commit 12ef8daf8c850ae41cf3991b6588796b678b8450
+Author: Thomas Hellstrom <unichrome@shipmail.org>
+Date:   Sun Sep 26 11:48:56 2004 +0000
+
+    Added the XvMC wrapper. First support for runtime loading of hardware-
+        specific XvMC libraries.
+
+commit 4be3434b1362478149787efad07ababa75e705f7
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 7e4871d503f1cca137e85880617ed3d10cc7c326
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:36 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit a9dd3e1f6f6e284eb03ec3410ca4eb7d12a9b3c3
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:10:54 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit d5a90e9d4c1dedb73882a4b2283a4810afca67b2
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:11 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 5d3d0504773db5861665e53a8f3fe880034e2d6c
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:28 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 46e734df3ce62bc32a4e755feb4c6352c9db408a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 787e2f945a39415baa117c6fbf9125af0130cf23
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    Initial revision
diff --git a/proto/videoproto/Makefile.am b/proto/videoproto/Makefile.am
index 61c73c6f8..65630ff78 100644
--- a/proto/videoproto/Makefile.am
+++ b/proto/videoproto/Makefile.am
@@ -9,4 +9,14 @@ video_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = videoproto.pc
 
-EXTRA_DIST = autogen.sh videoproto.pc.in
+EXTRA_DIST = videoproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/videoproto/Xv.h b/proto/videoproto/Xv.h
index 4e85fa719..985653c9c 100644
--- a/proto/videoproto/Xv.h
+++ b/proto/videoproto/Xv.h
@@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xv.h,v 1.3 1999/05/23 06:33:22 dawes Exp $ */
 
 #ifndef XV_H
 #define XV_H
diff --git a/proto/videoproto/XvMC.h b/proto/videoproto/XvMC.h
index 3e621f05a..2690be8be 100644
--- a/proto/videoproto/XvMC.h
+++ b/proto/videoproto/XvMC.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/extensions/XvMC.h,v 1.7 2001/11/14 21:54:37 mvojkovi Exp $ */
-
 #ifndef _XVMC_H_
 #define _XVMC_H_
 
diff --git a/proto/videoproto/XvMCproto.h b/proto/videoproto/XvMCproto.h
index cce3bb0a7..8e80f17e7 100644
--- a/proto/videoproto/XvMCproto.h
+++ b/proto/videoproto/XvMCproto.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/include/extensions/XvMCproto.h,v 1.4 2001/04/10 00:28:24 mvojkovi Exp $ */
-
 #ifndef _XVMCPROTO_H_
 #define _XVMCPROTO_H_
 
diff --git a/proto/videoproto/Xvproto.h b/proto/videoproto/Xvproto.h
index 9112f510e..b6b56cf3c 100644
--- a/proto/videoproto/Xvproto.h
+++ b/proto/videoproto/Xvproto.h
@@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xvproto.h,v 1.5 2000/01/25 00:08:07 mvojkovi Exp $ */
 
 #ifndef XVPROTO_H
 #define XVPROTO_H
diff --git a/proto/videoproto/autogen.sh b/proto/videoproto/autogen.sh
deleted file mode 100644
index 904cd6746..000000000
--- a/proto/videoproto/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/proto/videoproto/configure.ac b/proto/videoproto/configure.ac
index 044b5f00a..e0ab234c4 100644
--- a/proto/videoproto/configure.ac
+++ b/proto/videoproto/configure.ac
@@ -1,8 +1,12 @@
 AC_PREREQ([2.57])
-AC_INIT([VideoProto], [2.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([VideoProto], [2.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            videoproto.pc])
diff --git a/proto/videoproto/mkinstalldirs b/proto/videoproto/mkinstalldirs
deleted file mode 100644
index 259dbfcd3..000000000
--- a/proto/videoproto/mkinstalldirs
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End: