pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/MesaLib7 Re-import the old MesaLib package as...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e6371d9b734
branches:  trunk
changeset: 649590:2e6371d9b734
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Apr 05 17:01:37 2015 +0000

description:
Re-import the old MesaLib package as graphics/MesaLib7.
Set INSTALLATION_PREFIX to allow this to co-exist with graphics/MesaLib.

This package is here to allow x11/modular-xorg-server112 to find
dri drivers, which it should pick up from /usr/pkg/MesaLib7/lib/dri.

diffstat:

 graphics/MesaLib7/DESCR                                                        |    5 +
 graphics/MesaLib7/Makefile                                                     |  145 ++++++++++
 graphics/MesaLib7/PLIST                                                        |   46 +++
 graphics/MesaLib7/buildlink3.mk                                                |   36 ++
 graphics/MesaLib7/distinfo                                                     |   34 ++
 graphics/MesaLib7/files/gen_matypes.awk                                        |   31 ++
 graphics/MesaLib7/files/gen_matypes.sh                                         |   98 ++++++
 graphics/MesaLib7/files/mapfile.externs                                        |   27 +
 graphics/MesaLib7/glx-config.mk                                                |   58 ++++
 graphics/MesaLib7/options.mk                                                   |   66 ++++
 graphics/MesaLib7/patches/patch-af                                             |   21 +
 graphics/MesaLib7/patches/patch-bin_mklib                                      |   79 +++++
 graphics/MesaLib7/patches/patch-configure.ac                                   |   13 +
 graphics/MesaLib7/patches/patch-include_GL_gl.h                                |   16 +
 graphics/MesaLib7/patches/patch-src_gallium_auxiliary_util_u__atomic.h         |  107 +++++++
 graphics/MesaLib7/patches/patch-src_gallium_include_pipe_p__config.h           |   44 +++
 graphics/MesaLib7/patches/patch-src_glsl_ir__constant__expression.cpp          |   20 +
 graphics/MesaLib7/patches/patch-src_glsl_ralloc.c                              |   23 +
 graphics/MesaLib7/patches/patch-src_glu_sgi_glu.exports                        |   67 ++++
 graphics/MesaLib7/patches/patch-src_glu_sgi_libtess_sweep.c                    |   49 +++
 graphics/MesaLib7/patches/patch-src_glx_XF86dri.c                              |   40 ++
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_dri__util.h        |   15 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_common_mmio.h             |   12 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c |   16 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i915_intel__tris.c        |   13 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__draw.c          |   22 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__draw__upload.c  |   19 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_brw__misc__state.c   |  142 +++++++++
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6__vs__state.c    |   17 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_gen6__wm__state.c    |   38 ++
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c |   16 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.c    |   13 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_intel_intel__context.h    |   27 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_dri_mach64_mach64__context.h  |   23 +
 graphics/MesaLib7/patches/patch-src_mesa_drivers_x11_Makefile                  |   16 +
 graphics/MesaLib7/patches/patch-src_mesa_main_compiler.h                       |   47 +++
 graphics/MesaLib7/patches/patch-src_mesa_main_context.c                        |   40 ++
 graphics/MesaLib7/patches/patch-src_mesa_main_imports.c                        |   13 +
 graphics/MesaLib7/patches/patch-src_mesa_main_imports.h                        |   13 +
 39 files changed, 1527 insertions(+), 0 deletions(-)

diffs (truncated from 1683 to 300 lines):

diff -r fe6096f5c67a -r 2e6371d9b734 graphics/MesaLib7/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib7/DESCR   Sun Apr 05 17:01:37 2015 +0000
@@ -0,0 +1,5 @@
+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.
diff -r fe6096f5c67a -r 2e6371d9b734 graphics/MesaLib7/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib7/Makefile        Sun Apr 05 17:01:37 2015 +0000
@@ -0,0 +1,145 @@
+# $NetBSD: Makefile,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+DISTNAME?=     ${MESA_DISTNAME}
+PKGNAME=       MesaLib7-${MESA_PKGVERSION}
+CATEGORIES=    graphics
+MASTER_SITES=  ${MESA_SITES}
+EXTRACT_SUFX=  .tar.bz2
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://www.mesa3d.org/
+COMMENT=       Graphics library similar to SGI's OpenGL
+
+INSTALLATION_PREFIX=   ${LOCALBASE}/MesaLib7
+
+DISTFILES+=            MesaLib-${MESA_VERSION}${EXTRACT_SUFX}
+MESA_DISTNAME=                 MesaLib-${MESA_VERSION}
+MESA_SITES=            ftp://freedesktop.org/pub/mesa/${MESA_VERSION}/
+MESA_VERSION=          7.11.2
+MESA_PKGVERSION=       ${MESA_VERSION}
+
+GNU_CONFIGURE=         yes
+USE_LANGUAGES=         c99 c++
+USE_TOOLS+=            automake bison flex gmake pkg-config makedepend
+WRKSRC=                        ${WRKDIR}/Mesa-${MESA_VERSION}
+DIST_SUBDIR=           Mesa-${MESA_PKGVERSION}
+
+CONFLICTS+=    xf86driproto<2.0.4
+
+PLIST_VARS=            dri nodri
+
+PKGCONFIG_OVERRIDE+=   src/mesa/drivers/dri/dri.pc.in
+PKGCONFIG_OVERRIDE+=   src/mesa/gl.pc.in
+PKGCONFIG_OVERRIDE+=   src/mesa/osmesa.pc.in
+PKGCONFIG_OVERRIDE+=   src/glw/glw.pc.in
+
+CONFIGURE_ARGS+=       --disable-glu
+CONFIGURE_ARGS+=       --disable-glut
+CONFIGURE_ARGS+=       --disable-motif
+CONFIGURE_ARGS+=       --with-gallium-drivers=""
+CONFIGURE_ARGS+=       --disable-gallium-llvm
+CONFIGURE_ARGS+=       --disable-egl
+
+.include "glx-config.mk"
+
+PYTHON_FOR_BUILD_ONLY=         tool
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 7.11.2
+
+MAKE_ENV+=             MAKE=${GMAKE:Q}
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mccc)
+CFLAGS+=       -D__FUNCTION__=__FILE__
+.endif
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=  rm:-fvisibility=hidden
+.endif
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+# XXX This is not quite enough: we will need to patch the makefile
+# because it bogusly tries to reuse objects for native tools and target
+# libraries, and for cross-compiling the objects need to be built
+# separately.  Alternatively, we could just update Mesa to something
+# less prehistoric...
+SUBST_CLASSES+=                nativecc
+SUBST_STAGE.nativecc=  pre-configure
+SUBST_MESSAGE.nativecc=        Fix makefiles to compile tools with native cc.
+SUBST_FILES.nativecc+= src/glsl/Makefile
+SUBST_SED.nativecc+=   -e 's,$$(CC),$$(APP_CC),g'
+SUBST_SED.nativecc+=   -e 's,$$(CXX),$$(APP_CXX),g'
+MAKE_FLAGS+=           APP_CC=${NATIVE_CC:Q}
+MAKE_FLAGS+=           APP_CXX=${NATIVE_CXX:Q}
+.endif
+
+.include "options.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
+##
+## NetBSD 2.x and earlier require pthread stubs
+##
+.  include "../../devel/pthread-stublib/buildlink3.mk"
+PTHREAD_STUBLIB= -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpthstub
+.elif !empty(MACHINE_PLATFORM:MNetBSD-*)
+##
+## NetBSD 3.x and later have pthread stubs in libc
+##
+PTHREAD_STUBLIB=
+.else
+##
+## Other platforms may or may not have stubs provided by libc, but pulling in
+## threading support via the pthread.buildlink3.mk definitions will provide
+## all the necessary interfaces.  This matches the standard configuration for
+## most platforms as they appear in "${WRKSRC}/configs", and is necessary
+## for successful linking with libGL under many platforms.
+##
+.include "../../mk/pthread.buildlink3.mk"
+PTHREAD_STUBLIB= ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+.endif
+PKGSRC_MAKE_ENV+=      PTHREAD_STUBLIB=${PTHREAD_STUBLIB:Q}
+MAKE_ENV+=             PTHREAD_STUBLIB=${PTHREAD_STUBLIB:Q}
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+MAKE_ENV+=     CROSS_COMPILING=yes
+.endif
+
+pre-configure:
+       cd ${WRKSRC} && ${MAKE} configure
+
+post-extract:
+.if !empty(PKG_OPTIONS:Mdri) && (${OPSYS} == "SunOS")
+       ${CP} ${FILESDIR}/mapfile.externs ${WRKSRC}/src/mesa/drivers/dri/
+.endif
+       ${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86
+       ${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86
+       ${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh
+
+#
+# remove include files installed respectively by ../glu and ../glut
+#
+pre-install:
+       ${RM} -f ${WRKSRC}/include/GL/glu*.h
+
+.include "../../mk/compiler.mk"
+
+.if !empty(PKGSRC_COMPILER:Mclang)
+CFLAGS+=       -no-integrated-as -fvisibility=hidden
+.endif
+
+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=  rm:-fvisibility=hidden
+.endif
+
+.include "../../lang/python/tool.mk"
+BUILDLINK_DEPMETHOD.libxml2?=  build
+.include "../../textproc/libxml2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glproto+=        glproto>=1.4.11
+.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r fe6096f5c67a -r 2e6371d9b734 graphics/MesaLib7/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib7/PLIST   Sun Apr 05 17:01:37 2015 +0000
@@ -0,0 +1,46 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/05 17:01:37 tnn Exp $
+include/GL/GLwDrawA.h
+include/GL/GLwDrawAP.h
+include/GL/GLwMDrawA.h
+include/GL/GLwMDrawAP.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glext.h
+include/GL/glfbdev.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/glxext.h
+${PLIST.dri}include/GL/internal/dri_interface.h
+include/GL/mesa_wgl.h
+include/GL/osmesa.h
+include/GL/vms_x_fix.h
+include/GL/wglext.h
+include/GL/wmesa.h
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.2
+lib/libGLw.so
+lib/libGLw.so.1
+lib/libGLw.so.1.0.0
+${PLIST.nodri}lib/libOSMesa.so
+${PLIST.nodri}lib/libOSMesa.so.7
+${PLIST.nodri}lib/libOSMesa.so.7.11.0
+${PLIST.dri}lib/dri/i810_dri.so
+${PLIST.dri}lib/dri/i915_dri.so
+${PLIST.dri}lib/dri/i965_dri.so
+${PLIST.dri}lib/dri/mach64_dri.so
+${PLIST.dri}lib/dri/mga_dri.so
+${PLIST.dri}lib/dri/r128_dri.so
+${PLIST.dri}lib/dri/r200_dri.so
+${PLIST.dri}lib/dri/r300_dri.so
+${PLIST.dri}lib/dri/r600_dri.so
+${PLIST.dri}lib/dri/radeon_dri.so
+${PLIST.dri}lib/dri/savage_dri.so
+${PLIST.dri}lib/dri/sis_dri.so
+${PLIST.dri}lib/dri/swrast_dri.so
+${PLIST.dri}lib/dri/tdfx_dri.so
+${PLIST.dri}lib/dri/unichrome_dri.so
+${PLIST.dri}lib/pkgconfig/dri.pc
+lib/pkgconfig/gl.pc
+lib/pkgconfig/glw.pc
+${PLIST.nodri}lib/pkgconfig/osmesa.pc
diff -r fe6096f5c67a -r 2e6371d9b734 graphics/MesaLib7/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib7/buildlink3.mk   Sun Apr 05 17:01:37 2015 +0000
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+BUILDLINK_TREE+=       MesaLib7
+
+.if !defined(MESALIB7_BUILDLINK3_MK)
+MESALIB7_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.MesaLib7+=       MesaLib7>=7.11.2
+BUILDLINK_PKGSRCDIR.MesaLib7?=         ../../graphics/MesaLib7
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# See <http://developer.apple.com/qa/qa2007/qa1567.html>.
+.if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
+BUILDLINK_LDFLAGS.MesaLib7+=   
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+.endif
+
+pkgbase:= MesaLib7
+.include "../../mk/pkg-build-options.mk"
+
+.if ${X11_TYPE} == "native" && ${OPSYS} != "Cygwin" && exists(${X11BASE}/lib/pkgconfig/dri.pc)
+PKG_BUILD_OPTIONS.MesaLib7+=   dri
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.MesaLib7:Mdri)
+.  include "../../graphics/MesaLib/dri.mk"
+.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
+.include "../../devel/pthread-stublib/buildlink3.mk"
+.endif
+
+.include "../../x11/libXext/buildlink3.mk"
+.endif # MESALIB7_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -MesaLib7
diff -r fe6096f5c67a -r 2e6371d9b734 graphics/MesaLib7/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib7/distinfo        Sun Apr 05 17:01:37 2015 +0000
@@ -0,0 +1,34 @@
+$NetBSD: distinfo,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9
+RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea
+Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes
+SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba
+SHA1 (patch-bin_mklib) = 8c54bf5382541cab9d971b0e0e627035db1af468
+SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61
+SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0
+SHA1 (patch-src_gallium_auxiliary_util_u__atomic.h) = 68ba9694aca506add2aa96a6892a7227481c2c11
+SHA1 (patch-src_gallium_include_pipe_p__config.h) = 34f4c2a033dd7a494dd3f51db407002a3388f84e
+SHA1 (patch-src_glsl_ir__constant__expression.cpp) = 281e281f51afed244b1a29b92942d572fc095124
+SHA1 (patch-src_glsl_ralloc.c) = 40885fac898058f8e83852a79ca50a74b61121ab
+SHA1 (patch-src_glu_sgi_glu.exports) = 66609d2ea59b02fc46b41311b0042fe4a2da517f
+SHA1 (patch-src_glu_sgi_libtess_sweep.c) = 6ee6d67b2178d23e1b7848d64eede6349f46ee96
+SHA1 (patch-src_glx_XF86dri.c) = b69b7cf5e0d617eca129f0d7f0b06c7603d00db0
+SHA1 (patch-src_mesa_drivers_dri_common_dri__util.h) = 53e63dcc6243b1872f4e4816b46e92910cf97edc
+SHA1 (patch-src_mesa_drivers_dri_common_mmio.h) = b6da48111fb2792b1c71eb7549d0f03adceec9f1
+SHA1 (patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c) = fec8b1a9f6888e9a4225861ea5bda776ecc5f054
+SHA1 (patch-src_mesa_drivers_dri_i915_intel__tris.c) = 74a2ca9f9c865db9b6212087e442f65bb0621227
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw.c) = ce12dc2d2391300d32776a06f5d0096448019c6b
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw__upload.c) = 44162ca546072669b85093981728e635dda69e55
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__misc__state.c) = d37f967dea0fc3bd32566d6a26fd434ca9564081
+SHA1 (patch-src_mesa_drivers_dri_i965_gen6__vs__state.c) = c918b5a91b339e49850d718c957d7e717c2dc130
+SHA1 (patch-src_mesa_drivers_dri_i965_gen6__wm__state.c) = a8ecf943525888b22ec99fe454b08f43c5d8a911
+SHA1 (patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c) = 653c87e1123ce9a27b71221fff4119df34abe15f
+SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.c) = 21d3c08a27817a6358b88101f889120869eebcce
+SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.h) = 6d394e704636134768a6cb5a200ebcc7bc3f52ed
+SHA1 (patch-src_mesa_drivers_dri_mach64_mach64__context.h) = fe95c6610de4c1482c568463aca82f53ed0df900
+SHA1 (patch-src_mesa_drivers_x11_Makefile) = 17b72d2b74d89fbd8db05491cfcf253bb856b139
+SHA1 (patch-src_mesa_main_compiler.h) = b164781b541cb83b64597facbb7a7e21d8bdb686
+SHA1 (patch-src_mesa_main_context.c) = 6b6f1e3ad4ea189291fcf221d4b8bfbd650f8908
+SHA1 (patch-src_mesa_main_imports.c) = d0c50004c749e4c5c136ac2ed50a6989ca90065f
+SHA1 (patch-src_mesa_main_imports.h) = f5a96195b3a14294ca3389c9fe17a6076c46db8a
diff -r fe6096f5c67a -r 2e6371d9b734 graphics/MesaLib7/files/gen_matypes.awk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib7/files/gen_matypes.awk   Sun Apr 05 17:01:37 2015 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: gen_matypes.awk,v 1.1 2015/04/05 17:01:37 tnn Exp $
+
+BEGIN {
+       while (getline) {
+               if (/int main/) break;
+       }
+}
+
+/printf/ {
+       printf("printf %s\n", substr($0, 12, length($0) - 14))



Home | Main Index | Thread Index | Old Index