summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-04-06 14:19:10 -0700
committerKeith Packard <keithp@keithp.com>2010-04-06 14:19:10 -0700
commit659f05b2f5f6bbd189b58ea8706760e0e8cfd630 (patch)
treebed2db043fa88f18373717b2b0ce1c1fb2dc5a7e
Add files necessary to merge proto repositories togetherHEADmaster
-rw-r--r--Makefile.am36
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.ac177
-rwxr-xr-xget_versions12
-rwxr-xr-xmerge-proto20
-rw-r--r--repos35
6 files changed, 292 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..c65dfb4
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,36 @@
+SUBDIRS = \
+ applewmproto \
+ bigreqsproto \
+ calibrateproto \
+ compositeproto \
+ damageproto \
+ dmxproto \
+ dri2proto \
+ evieproto \
+ fixesproto \
+ fontcacheproto \
+ fontsproto \
+ glproto \
+ inputproto \
+ kbproto \
+ lg3dproto \
+ pmproto \
+ printproto \
+ randrproto \
+ recordproto \
+ renderproto \
+ resourceproto \
+ scrnsaverproto \
+ trapproto \
+ videoproto \
+ windowswmproto \
+ x11proto \
+ xcmiscproto \
+ xextproto \
+ xf86bigfontproto \
+ xf86dgaproto \
+ xf86driproto \
+ xf86miscproto \
+ xf86rushproto \
+ xf86vidmodeproto \
+ xineramaproto
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,12 @@
+#! /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/configure.ac b/configure.ac
new file mode 100644
index 0000000..0116aea
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,177 @@
+dnl
+dnl Copyright © 2010 Keith Packard
+dnl
+dnl Permission to use, copy, modify, distribute, and sell this software and its
+dnl documentation for any purpose is hereby granted without fee, provided that
+dnl the above copyright notice appear in all copies and that both that
+dnl copyright notice and this permission notice appear in supporting
+dnl documentation, and that the name of Keith Packard not be used in
+dnl advertising or publicity pertaining to distribution of the software without
+dnl specific, written prior permission. Keith Packard makes no
+dnl representations about the suitability of this software for any purpose. It
+dnl is provided "as is" without express or implied warranty.
+dnl
+dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+dnl PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.60])
+AC_INIT([Proto], [0.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# 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
+
+APPLEWMPROTO_VERSION=1.4.1
+AC_SUBST(APPLEWMPROTO_VERSION)
+BIGREQSPROTO_VERSION=1.1.0
+AC_SUBST(BIGREQSPROTO_VERSION)
+CALIBRATEPROTO_VERSION=0.1.0
+AC_SUBST(CALIBRATEPROTO_VERSION)
+COMPOSITEPROTO_VERSION=0.4.1
+AC_SUBST(COMPOSITEPROTO_VERSION)
+DAMAGEPROTO_VERSION=1.2.0
+AC_SUBST(DAMAGEPROTO_VERSION)
+DMXPROTO_VERSION=2.3
+AC_SUBST(DMXPROTO_VERSION)
+DRI2PROTO_VERSION=2.3
+AC_SUBST(DRI2PROTO_VERSION)
+EVIEPROTO_VERSION=1.1.0
+AC_SUBST(EVIEPROTO_VERSION)
+FIXESPROTO_VERSION=4.1.1
+AC_SUBST(FIXESPROTO_VERSION)
+FONTCACHEPROTO_VERSION=0.1.3
+AC_SUBST(FONTCACHEPROTO_VERSION)
+FONTSPROTO_VERSION=2.1.0
+AC_SUBST(FONTSPROTO_VERSION)
+GLPROTO_VERSION=1.4.11
+AC_SUBST(GLPROTO_VERSION)
+INPUTPROTO_VERSION=2.0
+AC_SUBST(INPUTPROTO_VERSION)
+KBPROTO_VERSION=1.0.4
+AC_SUBST(KBPROTO_VERSION)
+LG3DPROTO_VERSION=5.0
+AC_SUBST(LG3DPROTO_VERSION)
+PMPROTO_VERSION=1.0.3
+AC_SUBST(PMPROTO_VERSION)
+PRINTPROTO_VERSION=1.0.4
+AC_SUBST(PRINTPROTO_VERSION)
+RANDRPROTO_VERSION=1.3.1
+AC_SUBST(RANDRPROTO_VERSION)
+RECORDPROTO_VERSION=1.14
+AC_SUBST(RECORDPROTO_VERSION)
+RENDERPROTO_VERSION=0.11
+AC_SUBST(RENDERPROTO_VERSION)
+RESOURCEPROTO_VERSION=1.1.0
+AC_SUBST(RESOURCEPROTO_VERSION)
+SCRNSAVERPROTO_VERSION=1.2.0
+AC_SUBST(SCRNSAVERPROTO_VERSION)
+TRAPPROTO_VERSION=3.4.3
+AC_SUBST(TRAPPROTO_VERSION)
+VIDEOPROTO_VERSION=2.3.0
+AC_SUBST(VIDEOPROTO_VERSION)
+WINDOWSWMPROTO_VERSION=1.0.4
+AC_SUBST(WINDOWSWMPROTO_VERSION)
+X11PROTO_VERSION=7.0.16
+AC_SUBST(X11PROTO_VERSION)
+XCMISCPROTO_VERSION=1.2.0
+AC_SUBST(XCMISCPROTO_VERSION)
+XEXTPROTO_VERSION=7.1.1
+AC_SUBST(XEXTPROTO_VERSION)
+XF86BIGFONTPROTO_VERSION=1.2.0
+AC_SUBST(XF86BIGFONTPROTO_VERSION)
+XF86DGAPROTO_VERSION=2.1
+AC_SUBST(XF86DGAPROTO_VERSION)
+XF86DRIPROTO_VERSION=2.1.0
+AC_SUBST(XF86DRIPROTO_VERSION)
+XF86MISCPROTO_VERSION=0.9.3
+AC_SUBST(XF86MISCPROTO_VERSION)
+XF86RUSHPROTO_VERSION=1.1.2
+AC_SUBST(XF86RUSHPROTO_VERSION)
+XF86VIDMODEPROTO_VERSION=2.3
+AC_SUBST(XF86VIDMODEPROTO_VERSION)
+XINERAMAPROTO_VERSION=1.2
+AC_SUBST(XINERAMAPROTO_VERSION)
+
+AC_OUTPUT([Makefile
+ applewmproto/Makefile
+ applewmproto/applewmproto.pc
+ bigreqsproto/Makefile
+ bigreqsproto/bigreqsproto.pc
+ calibrateproto/Makefile
+ calibrateproto/xcalibrateproto.pc
+ compositeproto/Makefile
+ compositeproto/compositeproto.pc
+ damageproto/Makefile
+ damageproto/damageproto.pc
+ dmxproto/Makefile
+ dmxproto/dmxproto.pc
+ dri2proto/Makefile
+ dri2proto/dri2proto.pc
+ evieproto/Makefile
+ evieproto/evieproto.pc
+ fixesproto/Makefile
+ fixesproto/fixesproto.pc
+ fontcacheproto/Makefile
+ fontcacheproto/fontcacheproto.pc
+ fontsproto/Makefile
+ fontsproto/fontsproto.pc
+ glproto/Makefile
+ glproto/glproto.pc
+ inputproto/Makefile
+ inputproto/inputproto.pc
+ kbproto/Makefile
+ kbproto/kbproto.pc
+ lg3dproto/Makefile
+ lg3dproto/lg3dproto.pc
+ pmproto/Makefile
+ pmproto/xproxymngproto.pc
+ printproto/Makefile
+ printproto/printproto.pc
+ randrproto/Makefile
+ randrproto/randrproto.pc
+ recordproto/Makefile
+ recordproto/recordproto.pc
+ renderproto/Makefile
+ renderproto/renderproto.pc
+ resourceproto/Makefile
+ resourceproto/resourceproto.pc
+ scrnsaverproto/Makefile
+ scrnsaverproto/scrnsaverproto.pc
+ trapproto/Makefile
+ trapproto/trapproto.pc
+ videoproto/Makefile
+ videoproto/videoproto.pc
+ windowswmproto/Makefile
+ windowswmproto/windowswmproto.pc
+ x11proto/Makefile
+ x11proto/xproto.pc
+ xcmiscproto/Makefile
+ xcmiscproto/xcmiscproto.pc
+ xextproto/Makefile
+ xextproto/xextproto.pc
+ xf86bigfontproto/Makefile
+ xf86bigfontproto/xf86bigfontproto.pc
+ xf86dgaproto/Makefile
+ xf86dgaproto/xf86dgaproto.pc
+ xf86driproto/Makefile
+ xf86driproto/xf86driproto.pc
+ xf86miscproto/Makefile
+ xf86miscproto/xf86miscproto.pc
+ xf86rushproto/Makefile
+ xf86rushproto/xf86rushproto.pc
+ xf86vidmodeproto/Makefile
+ xf86vidmodeproto/xf86vidmodeproto.pc
+ xineramaproto/Makefile
+ xineramaproto/xineramaproto.pc])
+
diff --git a/get_versions b/get_versions
new file mode 100755
index 0000000..c5b2346
--- /dev/null
+++ b/get_versions
@@ -0,0 +1,12 @@
+#!/bin/sh
+for i in "$@"; do
+ version=`sed -n '/^AC_INIT *(/s/^[^,]*, *\[//p' $i/configure.ac | sed 's/\].*$//'`
+ name=`echo ${i}_VERSION | tr 'a-z' 'A-Z'`
+ echo "$name=$version"
+ echo "AC_SUBST($name)"
+ for pc in $i/*.pc.in; do
+ if [ -f "$pc" ]; then
+ sed -i "s/PACKAGE_VERSION/$name/g" $pc
+ fi
+ done
+done
diff --git a/merge-proto b/merge-proto
new file mode 100755
index 0000000..6779e8f
--- /dev/null
+++ b/merge-proto
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+mkdir proto && (cd proto && git init) || exit 1
+mkdir oldproto || exit 1
+
+for i in "$@"; do
+ (cd oldproto &&
+ git clone git://anongit.freedesktop.org/git/xorg/proto/$i
+ (cd $i &&
+ mkdir $i &&
+ for j in `git ls-files | sed 's;/.*;;' | sort -u`; do
+ git mv $j $i/$j
+ done &&
+ git commit -s -m"Move $i files to their sub-directory")) &&
+ (cd proto &&
+ git remote add $i ../oldproto/$i &&
+ git fetch $i &&
+ git merge $i/master) || exit 1
+done
+
diff --git a/repos b/repos
new file mode 100644
index 0000000..a0307ff
--- /dev/null
+++ b/repos
@@ -0,0 +1,35 @@
+applewmproto
+bigreqsproto
+calibrateproto
+compositeproto
+damageproto
+dmxproto
+dri2proto
+evieproto
+fixesproto
+fontcacheproto
+fontsproto
+glproto
+inputproto
+kbproto
+lg3dproto
+pmproto
+printproto
+randrproto
+recordproto
+renderproto
+resourceproto
+scrnsaverproto
+trapproto
+videoproto
+windowswmproto
+x11proto
+xcmiscproto
+xextproto
+xf86bigfontproto
+xf86dgaproto
+xf86driproto
+xf86miscproto
+xf86rushproto
+xf86vidmodeproto
+xineramaproto