[arch-commits] Commit in xf86-video-trident/trunk (2 files)
Jan de Groot
jgc at archlinux.org
Mon Aug 3 20:09:51 UTC 2009
Date: Monday, August 3, 2009 @ 16:09:51
Author: jgc
Revision: 48777
upgpkg: xf86-video-trident 1.3.2-3
Modified:
xf86-video-trident/trunk/PKGBUILD
Deleted:
xf86-video-trident/trunk/mesa-7.1-link-shared.patch
----------------------------+
PKGBUILD | 30 +-----------
mesa-7.1-link-shared.patch | 102 -------------------------------------------
2 files changed, 4 insertions(+), 128 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-08-03 20:08:13 UTC (rev 48776)
+++ PKGBUILD 2009-08-03 20:09:51 UTC (rev 48777)
@@ -3,24 +3,19 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xf86-video-trident
pkgver=1.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="X.org Trident video driver"
-_mesaver="7.5"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=("libgl>=${_mesaver}" 'expat')
-makedepends=('pkgconfig' 'xorg-server>=1.6.2' "mesa>=${_mesaver}" 'xf86driproto' 'dri2proto>=2.1' 'xf86dgaproto' 'glproto')
-conflicts=('xorg-server<1.6.0')
+depends=('glibc' 'trident-dri')
+makedepends=('pkgconfig' 'xorg-server>=1.6.3' 'mesa>=7.5' 'xf86driproto' 'xf86dgaproto' 'glproto')
+conflicts=('xorg-server<1.6.3')
groups=('xorg-video-drivers')
options=(!libtool)
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
- http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${_mesaver}.tar.bz2
- mesa-7.1-link-shared.patch
LICENSE)
md5sums=('26d77d8ec3887f20bef917d6429c761d'
- '459f332551f6ebb86f384d21dd15e1f0'
- '9eddc02e23ec08295822911e726ae89a'
'92c153c192ee248572ec5fe8232a3d4d')
build() {
@@ -29,22 +24,5 @@
make || return 1
make DESTDIR="${pkgdir}" 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=trident \
- --enable-glx-tls \
- --with-driver=dri \
- --enable-xcb \
- --disable-glu \
- --disable-glut \
- --disable-glw || return 1
- make -j1 || return 1
- cd src/mesa/drivers/dri || return 1
- make -j1 DESTDIR="${pkgdir}" install || return 1
- rm -rf "${pkgdir}/usr/lib/pkgconfig"
- rm -rf "${pkgdir}/usr/include"
- rm -f "${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so"
install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
}
Deleted: mesa-7.1-link-shared.patch
===================================================================
--- mesa-7.1-link-shared.patch 2009-08-03 20:08:13 UTC (rev 48776)
+++ mesa-7.1-link-shared.patch 2009-08-03 20:09:51 UTC (rev 48777)
@@ -1,102 +0,0 @@
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile
---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000
-@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-
-
-
--default: $(TOP)/$(LIB_DIR) subdirs dri.pc
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
-
-
- $(TOP)/$(LIB_DIR):
- -mkdir $(TOP)/$(LIB_DIR)
-
-+libdricore.so:
-+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc
-+
-+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so
-+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR)
-
- subdirs:
- @for dir in $(DRI_DIRS) ; do \
-@@ -31,12 +36,14 @@ dri.pc: dri.pc.in
- $(pcedit) $< > $@
-
-
--install: dri.pc
-+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so
- @for dir in $(DRI_DIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
- $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
- $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
-@@ -52,5 +59,6 @@ clean:
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
-+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so
- -rm -f common/*.o
- -rm -f *.pc
-diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template
---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
-
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
-
- COMMON_SOURCES = \
- ../common/utils.c \
-@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO
-
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
- $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \
-+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
-+ $(DRI_LIB_DEPS)
-
-
- $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
-diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S
---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000
-+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000
-@@ -77,7 +77,6 @@
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_MMX
--.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX
- .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function
- _generic_read_RGBA_span_BGRA8888_REV_MMX:
- pushl %ebx
-@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX
- */
-
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE:
- pushl %esi
-@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2
--.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2
- .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function
- _generic_read_RGBA_span_BGRA8888_REV_SSE2:
- pushl %esi
-@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE
-
- .text
- .globl _generic_read_RGBA_span_RGB565_MMX
-- .hidden _generic_read_RGBA_span_RGB565_MMX
- .type _generic_read_RGBA_span_RGB565_MMX, @function
-
- _generic_read_RGBA_span_RGB565_MMX:
More information about the arch-commits
mailing list