diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-08 22:20:37 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-08 22:20:37 -0300 |
commit | fccf9769e2c26f577f6214ed9d0dbb30cb8c51bd (patch) | |
tree | cc5312eeed95e18d8e2c6009c568f3d32501bc01 /extra/xf86-video-savage | |
parent | 69962c022fb4ed68b9163e60183fff714308e4e3 (diff) | |
parent | 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/abe/PKGBUILD
community/account-plugins/PKGBUILD
community/adesklets/PKGBUILD
community/aircrack-ng/PKGBUILD
community/audit/PKGBUILD
community/bchunk/PKGBUILD
community/bibutils/PKGBUILD
community/cantata/PKGBUILD
community/cdck/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/clusterssh/PKGBUILD
community/consonance/PKGBUILD
community/credentials-preferences/PKGBUILD
community/dee/PKGBUILD
community/dosbox/PKGBUILD
community/drbd/PKGBUILD
community/dvdisaster/PKGBUILD
community/ekg/PKGBUILD
community/ekg2/PKGBUILD
community/emelfm2/PKGBUILD
community/erlang/PKGBUILD
community/ettercap/PKGBUILD
community/evilwm/PKGBUILD
community/fatrat/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/fcrackzip/PKGBUILD
community/ffmpegsource/PKGBUILD
community/fssos-nsvs/PKGBUILD
community/geda-gaf/PKGBUILD
community/gnome-applets/PKGBUILD
community/gnome-panel/PKGBUILD
community/gnustep-make/PKGBUILD
community/gwibber/PKGBUILD
community/html2text/PKGBUILD
community/intellij-idea-libs/PKGBUILD
community/libcgns2/PKGBUILD
community/libmatio/PKGBUILD
community/librcc/PKGBUILD
community/libsignon-glib/PKGBUILD
community/linux-tools/PKGBUILD
community/minitube/PKGBUILD
community/mpdscribble/PKGBUILD
community/mplayer2/PKGBUILD
community/musepack-tools/PKGBUILD
community/nginx/PKGBUILD
community/pam_pwcheck/PKGBUILD
community/portaudio/PKGBUILD
community/portaudio_cpp/PKGBUILD
community/prelink/PKGBUILD
community/projectm/PKGBUILD
community/prosody/PKGBUILD
community/python-basemap/PKGBUILD
community/qgit/PKGBUILD
community/raptor1/PKGBUILD
community/sensors-applet/PKGBUILD
community/signon-keyring-extension/PKGBUILD
community/signon-plugin-oauth2/PKGBUILD
community/signon-ui/PKGBUILD
community/sshguard/PKGBUILD
community/tea/PKGBUILD
community/tint2/PKGBUILD
community/tremulous/PKGBUILD
community/vobcopy/PKGBUILD
community/windowlab/PKGBUILD
community/xdelta/PKGBUILD
community/xmms2/PKGBUILD
community/xosd/PKGBUILD
core/gdbm/PKGBUILD
core/heirloom-mailx/PKGBUILD
core/libffi/PKGBUILD
core/procps-ng/PKGBUILD
core/systemd/PKGBUILD
core/tar/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/arj/PKGBUILD
extra/audacity/PKGBUILD
extra/cdparanoia/PKGBUILD
extra/elfutils/PKGBUILD
extra/fltk/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gstreamer/PKGBUILD
extra/gtk2/PKGBUILD
extra/gvfs/PKGBUILD
extra/imagemagick/PKGBUILD
extra/indent/PKGBUILD
extra/kdepim/PKGBUILD
extra/lcms/PKGBUILD
extra/lesstif/PKGBUILD
extra/libchewing/PKGBUILD
extra/libdrm/PKGBUILD
extra/libmodplug/PKGBUILD
extra/libnotify/PKGBUILD
extra/libsm/PKGBUILD
extra/libxmu/PKGBUILD
extra/libxpm/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/neon/PKGBUILD
extra/ocaml/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/php-xcache/PKGBUILD
extra/polkit/PKGBUILD
extra/pycups/PKGBUILD
extra/python-cairo/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
extra/sqlite/PKGBUILD
extra/talloc/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/totem/PKGBUILD
extra/vinagre/PKGBUILD
extra/vino/PKGBUILD
extra/vlc/PKGBUILD
extra/wget/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-twm/PKGBUILD
extra/xorg-xclipboard/PKGBUILD
extra/xorg-xclock/PKGBUILD
extra/xorg-xkill/PKGBUILD
extra/xorg-xlsclients/PKGBUILD
extra/xorg-xman/PKGBUILD
extra/xorg-xrdb/PKGBUILD
extra/xpdf/PKGBUILD
extra/xvidcore/PKGBUILD
extra/yelp/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/python2-reportlab-libre/PKGBUILD
Diffstat (limited to 'extra/xf86-video-savage')
-rw-r--r-- | extra/xf86-video-savage/PKGBUILD | 18 | ||||
-rw-r--r-- | extra/xf86-video-savage/git_fixes.diff | 64 |
2 files changed, 7 insertions, 75 deletions
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index d5f9a2eea..08158f8fc 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $ +# $Id: PKGBUILD 195146 2013-09-25 17:11:53Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-savage -pkgver=2.3.6 -pkgrel=4 +pkgver=2.3.7 +pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,21 +14,17 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('savage-dri: DRI1 support from community repo') options=(!libtool) groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git_fixes.diff) -sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6' - 'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff deleted file mode 100644 index 8d5ef49b0..000000000 --- a/extra/xf86-video-savage/git_fixes.diff +++ /dev/null @@ -1,64 +0,0 @@ -From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@gmail.com> -Date: Wed, 18 Jul 2012 08:52:38 +0000 -Subject: savage: move compat-api.h down to proper place. - -This screws up when DRI isn't enabled. - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/savage_driver.h b/src/savage_driver.h -index b604292..ec4b1ea 100644 ---- a/src/savage_driver.h -+++ b/src/savage_driver.h -@@ -85,8 +85,6 @@ - #include "GL/glxint.h" - #include "xf86drm.h" - --#include "compat-api.h" -- - /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up - * to 32 clients. */ - #define SAVAGE_NUM_BUFFERS 32 -@@ -153,6 +151,8 @@ typedef struct _server{ - - #endif - -+#include "compat-api.h" -+ - typedef enum { - MT_NONE, - MT_CRT, --- -cgit v0.9.0.2-2-gbebe -From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@gmail.com> -Date: Sat, 22 Dec 2012 10:00:00 +0000 -Subject: savage: fix default accel arch when built with no XAA - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/savage_driver.c b/src/savage_driver.c -index 026bf5c..5b49e60 100644 ---- a/src/savage_driver.c -+++ b/src/savage_driver.c -@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) - from = X_DEFAULT; - char *strptr; - if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { -+#ifdef HAVE_XAA_H - if(!xf86NameCmp(strptr,"XAA")) { - from = X_CONFIG; - psav->useEXA = FALSE; -@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) - from = X_CONFIG; - psav->useEXA = TRUE; - } -+#else -+ psav->useEXA = TRUE; -+#endif - } - xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", - psav->useEXA ? "EXA" : "XAA"); --- -cgit v0.9.0.2-2-gbebe |