diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-01-12 19:19:50 (GMT) |
| commit | 6c619a60fd89b5e75a93cff06977c552ddf1e621 (patch) | |
| tree | 630ca50ea1c128c4be85ce920ecf034c561bf7fe /abs/core-testing/xf86-video-mga/PKGBUILD | |
| parent | 0b2b9b97e95f8f8bfda1d1fe09136d121cd0750d (diff) | |
| parent | 634dff8fdd0a9c866c92f0020f282c23d1a438d8 (diff) | |
| download | linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.zip linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.gz linhes_pkgbuild-6c619a60fd89b5e75a93cff06977c552ddf1e621.tar.bz2 | |
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git
Conflicts:
abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/xf86-video-mga/PKGBUILD')
| -rw-r--r-- | abs/core-testing/xf86-video-mga/PKGBUILD | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/abs/core-testing/xf86-video-mga/PKGBUILD b/abs/core-testing/xf86-video-mga/PKGBUILD index 1d07b1f..5681868 100644 --- a/abs/core-testing/xf86-video-mga/PKGBUILD +++ b/abs/core-testing/xf86-video-mga/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 4390 2008-07-06 20:07:05Z jgc $ +# $Id: PKGBUILD 13014 2008-09-25 18:53:21Z jgc $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mga pkgver=1.4.9 -pkgrel=1 +pkgrel=3 pkgdesc="X.org mga video driver" -mesaver="7.0.3" +_mesaver="7.2" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" -depends=('libdrm' 'expat>=2.0') -makedepends=('pkgconfig' 'xorg-server>=1.4.2' 'imake' 'mesa>=7.0.3' \ +depends=('libgl>=7.2' 'expat>=2.0.1') +makedepends=('pkgconfig' 'xorg-server>=1.5.1' 'imake' 'mesa>=7.2' 'xf86driproto' 'glproto>=1.4.9') +conflicts=('xorg-server<1.5.1') options=('!libtool' 'force') groups=('xorg-video-drivers') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${mesaver}.tar.bz2) + http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2 + mesa-7.1-link-shared.patch) md5sums=('11066b84b949cd04300ec819c9c51532' - 'e6e6379d7793af40a6bc3ce1bace572e') + '04d379292e023df0b0266825cb0dbde5' + 'f0baa948d9810f268413111ee439d24b') build() { cd ${startdir}/src/${pkgname}-${pkgver} @@ -24,26 +27,22 @@ build() { --enable-dri || return 1 make || return 1 make DESTDIR=${startdir}/pkg install || return 1 - - cd ${startdir}/src/Mesa-${mesaver}/configs - - CONFIG="linux-dri-x86" - [ "$CARCH" = "x86_64" ] && CONFIG="linux-dri-x86-64" - echo "EXTRA_LIB_PATH =" >> ${CONFIG} - echo "OPT_FLAGS = ${CFLAGS}" >> ${CONFIG} - echo "SRC_DIRS = glx/x11 mesa" >> ${CONFIG} - echo "USING_EGL = 0" >> ${CONFIG} - echo "PROGRAM_DIRS =" >> ${CONFIG} - echo "MKDEP = makedepend" >> ${CONFIG} - echo "DRI_DIRS = mga" >> ${CONFIG} - echo "DRI_DRIVER_SEARCH_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG} - echo "DRI_DRIVER_INSTALL_DIR = /usr/lib/xorg/modules/dri" >> ${CONFIG} - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${CONFIG} - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${CONFIG} - - ln -s ${CONFIG} current - cd ${startdir}/src/Mesa-${mesaver}/src/mesa - make linux-solo || return 1 - cd drivers/dri - make DESTDIR=${startdir}/pkg install || return 1 + cd ${srcdir}/Mesa-${_mesaver} + patch -Np1 -i ${srcdir}/mesa-7.1-link-shared.patch || return 1 + ./configure --prefix=/usr \ + --with-dri-driverdir=/usr/lib/xorg/modules/dri \ + --with-dri-drivers=mga \ + --enable-glx-tls \ + --disable-ttm-api \ + --with-driver=dri \ + --enable-xcb \ + --disable-glu \ + --disable-glut \ + --disable-glw || return 1 + make || return 1 + cd src/mesa/drivers/dri || return 1 + make DESTDIR=${pkgdir} install || return 1 + rm -f ${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so + rm -rf ${pkgdir}/usr/include + rm -rf ${pkgdir}/usr/lib/pkgconfig } |