From 7d8189e6471854d754143fd91ee7cfdb1c3299a1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 19 Mar 2009 06:43:21 +0100 Subject: [PATCH] MesaLib: update to 7.4, converted to subpkgs, new deps style. --HG-- extra : convert_revision : d10eefa58ea0ba38ec27090c7fc5862c697db206 --- templates/MesaLib-devel | 1 + templates/MesaLib/build.diff | 99 ++++++++++++++++++++++++++++++++ templates/MesaLib/depends | 2 + templates/MesaLib/devel.template | 16 ++++++ templates/MesaLib/template | 28 +++++++-- 5 files changed, 141 insertions(+), 5 deletions(-) create mode 120000 templates/MesaLib-devel create mode 100644 templates/MesaLib/build.diff create mode 100644 templates/MesaLib/depends create mode 100644 templates/MesaLib/devel.template diff --git a/templates/MesaLib-devel b/templates/MesaLib-devel new file mode 120000 index 0000000000..8bf5fbea21 --- /dev/null +++ b/templates/MesaLib-devel @@ -0,0 +1 @@ +MesaLib \ No newline at end of file diff --git a/templates/MesaLib/build.diff b/templates/MesaLib/build.diff new file mode 100644 index 0000000000..2d824a3392 --- /dev/null +++ b/templates/MesaLib/build.diff @@ -0,0 +1,99 @@ +--- src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000 ++++ 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 +--- src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000 ++++ 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) +--- src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000 ++++ 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: diff --git a/templates/MesaLib/depends b/templates/MesaLib/depends new file mode 100644 index 0000000000..a34e2435e7 --- /dev/null +++ b/templates/MesaLib/depends @@ -0,0 +1,2 @@ +abi_depends=7.3 +api_depends=${abi_depends} diff --git a/templates/MesaLib/devel.template b/templates/MesaLib/devel.template new file mode 100644 index 0000000000..55722ef012 --- /dev/null +++ b/templates/MesaLib/devel.template @@ -0,0 +1,16 @@ +# Template file for 'MesaLib-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run MesaLib + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +} diff --git a/templates/MesaLib/template b/templates/MesaLib/template index 70d1f677af..9173634d70 100644 --- a/templates/MesaLib/template +++ b/templates/MesaLib/template @@ -1,17 +1,35 @@ # Template build file for 'MesaLib'. pkgname=MesaLib -version=7.2 +sourcepkg=$pkgname +version=7.3 wrksrc="Mesa-$version" -distfiles="$SOURCEFORGE_SITE/mesa3d/$pkgname-$version.tar.bz2" +distfiles="${SOURCEFORGE_SITE}/mesa3d/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_build_args="MKDEP=mkdep" -configure_args="--with-expat=$XBPS_MASTERDIR" +configure_args="--enable-glx-tls" short_desc="Graphics library similar to SGI's OpenGL" maintainer="Juan RP " -checksum=1e7c2cc6aa27ebaf7e726ac2086c10a5155d0832 +checksum=64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b long_desc=" MesaLib is a 3-D graphics library with an API which is very similar to that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc." + +subpackages="devel" +Add_dependency build pkg-config +Add_dependency build glproto +Add_dependency build dri2proto +Add_dependency build makedepend +Add_dependency full glibc +Add_dependency full expat +Add_dependency full libdrm +Add_dependency full libX11 +Add_dependency full libXext +Add_dependency full libXt +Add_dependency full libXmu +Add_dependency full libXi +Add_dependency full libXfixes +Add_dependency full libXdamage +Add_dependency full libXxf86vm +Add_dependency run gcc-libstdc++