diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-20 11:12:20 -0300 |
commit | 5c0a5f2b9fa7f1683f279728342aa7f5f0cf90a3 (patch) | |
tree | a55da6178b48e7abe9508505d3e92cf02a03da52 /extra/xf86-video-unichrome | |
parent | c56b2c50f5748090efb9f10f2a021e57a2455764 (diff) | |
parent | 1a136cf48dd7f710f38ff998182508f5a0d41c35 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/comix/PKGBUILD
community/geany/PKGBUILD
community/gnome-do-docklets/PKGBUILD
community/gnome-do-plugins/PKGBUILD
community/gnome-system-tools/PKGBUILD
community/gnustep-make/PKGBUILD
community/gtweakui/PKGBUILD
community/hwinfo/PKGBUILD
community/kungfu/PKGBUILD
community/liboauth/PKGBUILD
community/liboobs/PKGBUILD
community/lua-lzlib/PKGBUILD
community/mcdp/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-runtime/PKGBUILD
community/mplayer2/PKGBUILD
community/pdf2svg/PKGBUILD
community/perl-data-dumper/PKGBUILD
community/perl-digest-md5/PKGBUILD
community/perl-perlio-eol/PKGBUILD
community/perl-xml-libxslt/PKGBUILD
community/python-cherrypy/PKGBUILD
community/python-pexpect/PKGBUILD
community/python-pyro/PKGBUILD
community/python2-cherrypy/PKGBUILD
community/rexima/PKGBUILD
community/shp2svg/PKGBUILD
community/system-tools-backends/PKGBUILD
community/tracker/PKGBUILD
community/virtualbox/PKGBUILD
core/bridge-utils/PKGBUILD
extra/avidemux/PKGBUILD
extra/beagle/PKGBUILD
extra/bug-buddy/PKGBUILD
extra/dssi/PKGBUILD
extra/evolution-sharp/PKGBUILD
extra/evolution-webcal/PKGBUILD
extra/feh/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gnome-mag/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gok/PKGBUILD
extra/gpsd/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/hyphen/PKGBUILD
extra/kdelibs/PKGBUILD
extra/keytouch-editor/PKGBUILD
extra/keytouch/PKGBUILD
extra/koffice/PKGBUILD
extra/krusader/PKGBUILD
extra/libbeagle/PKGBUILD
extra/libffi/PKGBUILD
extra/libgnomeuimm/PKGBUILD
extra/libreoffice/PKGBUILD
extra/m17n-lib/PKGBUILD
extra/mtr/PKGBUILD
extra/openbabel/PKGBUILD
extra/poppler/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/rox/PKGBUILD
extra/transmission/PKGBUILD
extra/xf86-input-synaptics/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xinit/PKGBUILD
kde-unstable/calligra/PKGBUILD
libre/icecat/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-ncurses/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-talloc/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/xf86-video-unichrome')
-rw-r--r-- | extra/xf86-video-unichrome/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/xf86-video-unichrome/drm-include.patch | 11 |
2 files changed, 8 insertions, 24 deletions
diff --git a/extra/xf86-video-unichrome/PKGBUILD b/extra/xf86-video-unichrome/PKGBUILD index 004ca502b..f5812b9fa 100644 --- a/extra/xf86-video-unichrome/PKGBUILD +++ b/extra/xf86-video-unichrome/PKGBUILD @@ -1,31 +1,26 @@ -# $Id: PKGBUILD 115391 2011-03-17 18:24:27Z andyrtr $ +# $Id: PKGBUILD 140292 2011-10-11 21:28:27Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-unichrome pkgver=0.2.7 -pkgrel=5 -_gitversion=cd12cce88ff886031c23c743569fba97eccace4e +pkgrel=6 +_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2 pkgdesc="Unichrome video drivers for X.Org" arch=(i686 x86_64 'mips64el') url="http://unichrome.sf.net/" license=('custom') depends=('glibc' 'unichrome-dri') -makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc') +makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto') options=('!libtool') -conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.10.0') -source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2 - drm-include.patch - LICENSE) -md5sums=('c64332e6c386ed9a580116e131f288f4' - '4a9bf2e3ef338c170a2f58988ebb97dc' - '6ea7d64c87c5c32201a1e38e3336e44a') +conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.10.99.902') +source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2) +md5sums=('f7adef052de08a01af86e245d1932239') build() { cd "${srcdir}/${pkgname}-${_gitversion}" - patch -Np0 -i "${srcdir}/drm-include.patch" ./autogen.sh --prefix=/usr --enable-dri make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xf86-video-unichrome/drm-include.patch b/extra/xf86-video-unichrome/drm-include.patch deleted file mode 100644 index edfe9a8af..000000000 --- a/extra/xf86-video-unichrome/drm-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/via_memory.h.orig 2010-05-09 16:17:00.143352805 +0200 -+++ src/via_memory.h 2010-05-09 16:17:14.433351301 +0200 -@@ -30,7 +30,7 @@ - - /* don't include local via_drm.h when using modular */ - #ifdef HAVE_CONFIG_H --#include "drm/via_drm.h" -+#include <via_drm.h> - #else - #include "via_drm.h" - #endif |