diff options
Diffstat (limited to 'abs/core/libgl')
| -rw-r--r-- | abs/core/libgl/PKGBUILD | 63 | ||||
| -rw-r--r-- | abs/core/libgl/mesa-7.1-link-shared.patch | 102 |
2 files changed, 129 insertions, 36 deletions
diff --git a/abs/core/libgl/PKGBUILD b/abs/core/libgl/PKGBUILD index 43e7c58..ce2faba 100644 --- a/abs/core/libgl/PKGBUILD +++ b/abs/core/libgl/PKGBUILD @@ -1,49 +1,40 @@ -# $Id: PKGBUILD 1895 2008-05-22 17:55:59Z jgc $ +# $Id: PKGBUILD 12994 2008-09-25 18:01:13Z jgc $ # Maintainer: Alexander Baldeck <kth5@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libgl -pkgver=7.0.3 -pkgrel=2 +pkgver=7.2 +pkgrel=1 pkgdesc="Mesa DRI OpenGL library and drivers" arch=(i686 x86_64) license=('LGPL') url="http://www.mesa3d.org" -depends=('libxxf86vm' 'libdrm>=2.3' 'libxdamage') -makedepends=('imake' 'glproto>=1.4.9' 'fixesproto' 'damageproto' 'pkgconfig') +depends=('libdrm>=2.3.1' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1') +makedepends=('dri2proto>=1.1' 'glproto>=1.4.9' 'pkgconfig') provides=('libgl-dri') replaces=('libgl-dri' 'libgl-mesa') -source=(http://downloads.sourceforge.net/sourceforge/mesa3d/MesaLib-${pkgver}.tar.bz2) -md5sums=('e6e6379d7793af40a6bc3ce1bace572e') +options=(!makeflags) +source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2 + mesa-7.1-link-shared.patch) +md5sums=('04d379292e023df0b0266825cb0dbde5' + 'f0baa948d9810f268413111ee439d24b') build() { cd ${startdir}/src/Mesa-${pkgver} - - CONFIG="linux-dri-x86" - if [ "${CARCH}" = "x86_64" ]; then - CONFIG="linux-dri-x86-64" - sed -i -e "s/lib64/lib/g" configs/${CONFIG} - fi - - echo "EXTRA_LIB_PATH =" >> configs/${CONFIG} - echo "OPT_FLAGS = ${CFLAGS}" >> configs/${CONFIG} - echo "SRC_DIRS = glx/x11 mesa" >> configs/${CONFIG} - rm -f include/GL/glut*h - echo "USING_EGL = 0" >> configs/${CONFIG} - echo "PROGRAM_DIRS =" >> configs/${CONFIG} - echo "MKDEP = makedepend" >> configs/${CONFIG} - echo "DRI_DIRS =" >> configs/${CONFIG} - echo "DRI_DRIVER_SEARCH_DIR = /usr/lib/xorg/modules/dri" >> configs/${CONFIG} - echo "ARCH_FLAGS += -DGLX_USE_TLS" >> configs/${CONFIG} - echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> configs/${CONFIG} - - make ${CONFIG} || return 1 - install -m755 -d ${startdir}/pkg/usr - make INSTALL_DIR=${startdir}/pkg/usr install || return 1 - - rm -rf ${startdir}/pkg/usr/include - - install -m755 -d ${startdir}/pkg/usr/lib/xorg/modules/extensions || return 1 - cd ${startdir}/pkg/usr/lib/xorg/modules/extensions || return 1 - ln -sf libGLcore.xorg libGLcore.so - ln -sf libglx.xorg libglx.so + 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=swrast \ + --enable-glx-tls \ + --disable-ttm-api \ + --with-driver=dri \ + --enable-xcb \ + --disable-glu \ + --disable-glut \ + --disable-glw || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + rm -rf ${pkgdir}/usr/include + rm -rf ${pkgdir}/usr/lib/pkgconfig + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/extensions + ln -sf libglx.xorg ${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so || return 1 } diff --git a/abs/core/libgl/mesa-7.1-link-shared.patch b/abs/core/libgl/mesa-7.1-link-shared.patch new file mode 100644 index 0000000..7fdbf14 --- /dev/null +++ b/abs/core/libgl/mesa-7.1-link-shared.patch @@ -0,0 +1,102 @@ +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 ++default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs + + + $(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) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) ++ $(OBJECTS) $(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: |