[arch-commits] Commit in xf86-video-vesa/repos (5 files)

2012-02-12 Thread andyrtr 
Date: Sunday, February 12, 2012 @ 04:45:56
  Author: andyrtr
Revision: 150084

db-move: moved xf86-video-vesa from [staging] to [testing] (i686)

Added:
  xf86-video-vesa/repos/testing-i686/
  xf86-video-vesa/repos/testing-i686/PKGBUILD
(from rev 149988, xf86-video-vesa/repos/staging-i686/PKGBUILD)
  xf86-video-vesa/repos/testing-i686/git-fixes.patch
(from rev 149988, xf86-video-vesa/repos/staging-i686/git-fixes.patch)
  xf86-video-vesa/repos/testing-i686/revert-kernelcheck.patch
(from rev 149988, 
xf86-video-vesa/repos/staging-i686/revert-kernelcheck.patch)
Deleted:
  xf86-video-vesa/repos/staging-i686/

--+
 PKGBUILD |   40 
 git-fixes.patch  |  444 +
 revert-kernelcheck.patch |   31 +++
 3 files changed, 515 insertions(+)

Copied: xf86-video-vesa/repos/testing-i686/PKGBUILD (from rev 149988, 
xf86-video-vesa/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-02-12 09:45:56 UTC (rev 150084)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-vesa
+pkgver=2.3.0
+pkgrel=8
+_gitver=4ba7306fd0c9533750d389829e2cbf0522e149b3
+pkgdesc=X.org vesa video driver
+arch=(i686 x86_64)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('pkgconfig' 'xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+
http://cgit.freedesktop.org/xorg/driver/xf86-video-vesa/snapshot/xf86-video-vesa-${_gitver}.tar.gz
+#git-fixes.patch
+revert-kernelcheck.patch)
+sha1sums=('52f5bf577038c6fe7819743ceac787bb619b6d47'
+  'c14454521ac91aaa08aad8a6025d7720a613d54b')
+
+build() {
+  #cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}*
+  #patch -Np1 -i ${srcdir}/git-fixes.patch
+  patch -Np1 -R -i ${srcdir}/revert-kernelcheck.patch
+  autoreconf -fi
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  #cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}*
+  make DESTDIR=${pkgdir} install
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-vesa/repos/testing-i686/git-fixes.patch (from rev 149988, 
xf86-video-vesa/repos/staging-i686/git-fixes.patch)
===
--- testing-i686/git-fixes.patch(rev 0)
+++ testing-i686/git-fixes.patch2012-02-12 09:45:56 UTC (rev 150084)
@@ -0,0 +1,444 @@
+diff --git a/COPYING b/COPYING
+index 22b4b13..f101fb8 100644
+--- a/COPYING
 b/COPYING
+@@ -1,4 +1,5 @@
+ Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
++Copyright 2008 Red Hat, Inc.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the Software),
+diff --git a/configure.ac b/configure.ac
+index ff4713d..2e4f542 100644
+--- a/configure.ac
 b/configure.ac
+@@ -20,45 +20,44 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-vesa],
+-2.3.0,
++[2.3.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-xf86-video-vesa)
+-
++[xf86-video-vesa])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+-# 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
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include xorg-server.h])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
+  [ moduledir=$withval ],
+  [ moduledir=$libdir/xorg/modules ])
+ AC_SUBST(moduledir)
+ 
+-
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for pkg-config packages
++# Obtain

[arch-commits] Commit in xf86-video-vesa/repos (5 files)

2012-02-12 Thread andyrtr 
Date: Sunday, February 12, 2012 @ 04:45:57
  Author: andyrtr
Revision: 150085

db-move: moved xf86-video-vesa from [staging] to [testing] (x86_64)

Added:
  xf86-video-vesa/repos/testing-x86_64/
  xf86-video-vesa/repos/testing-x86_64/PKGBUILD
(from rev 149988, xf86-video-vesa/repos/staging-x86_64/PKGBUILD)
  xf86-video-vesa/repos/testing-x86_64/git-fixes.patch
(from rev 149988, xf86-video-vesa/repos/staging-x86_64/git-fixes.patch)
  xf86-video-vesa/repos/testing-x86_64/revert-kernelcheck.patch
(from rev 149988, 
xf86-video-vesa/repos/staging-x86_64/revert-kernelcheck.patch)
Deleted:
  xf86-video-vesa/repos/staging-x86_64/

--+
 PKGBUILD |   40 
 git-fixes.patch  |  444 +
 revert-kernelcheck.patch |   31 +++
 3 files changed, 515 insertions(+)

Copied: xf86-video-vesa/repos/testing-x86_64/PKGBUILD (from rev 149988, 
xf86-video-vesa/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-02-12 09:45:57 UTC (rev 150085)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-vesa
+pkgver=2.3.0
+pkgrel=8
+_gitver=4ba7306fd0c9533750d389829e2cbf0522e149b3
+pkgdesc=X.org vesa video driver
+arch=(i686 x86_64)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('pkgconfig' 'xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+
http://cgit.freedesktop.org/xorg/driver/xf86-video-vesa/snapshot/xf86-video-vesa-${_gitver}.tar.gz
+#git-fixes.patch
+revert-kernelcheck.patch)
+sha1sums=('52f5bf577038c6fe7819743ceac787bb619b6d47'
+  'c14454521ac91aaa08aad8a6025d7720a613d54b')
+
+build() {
+  #cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}*
+  #patch -Np1 -i ${srcdir}/git-fixes.patch
+  patch -Np1 -R -i ${srcdir}/revert-kernelcheck.patch
+  autoreconf -fi
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  #cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}*
+  make DESTDIR=${pkgdir} install
+  install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-vesa/repos/testing-x86_64/git-fixes.patch (from rev 149988, 
xf86-video-vesa/repos/staging-x86_64/git-fixes.patch)
===
--- testing-x86_64/git-fixes.patch  (rev 0)
+++ testing-x86_64/git-fixes.patch  2012-02-12 09:45:57 UTC (rev 150085)
@@ -0,0 +1,444 @@
+diff --git a/COPYING b/COPYING
+index 22b4b13..f101fb8 100644
+--- a/COPYING
 b/COPYING
+@@ -1,4 +1,5 @@
+ Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
++Copyright 2008 Red Hat, Inc.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the Software),
+diff --git a/configure.ac b/configure.ac
+index ff4713d..2e4f542 100644
+--- a/configure.ac
 b/configure.ac
+@@ -20,45 +20,44 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-vesa],
+-2.3.0,
++[2.3.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-xf86-video-vesa)
+-
++[xf86-video-vesa])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+-# 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
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include xorg-server.h])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir, [  --with-xorg-module-dir=DIR ],
+  [ moduledir=$withval ],
+  [ moduledir=$libdir/xorg/modules ])
+ AC_SUBST(moduledir)
+ 
+-
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for