diff options
Diffstat (limited to 'graphics')
36 files changed, 325 insertions, 248 deletions
diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile index e324f2197649..2877264bef89 100644 --- a/graphics/clutter-box2d/Makefile +++ b/graphics/clutter-box2d/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: clutter-box2d -# Date created: 2008-12-25 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= clutter-box2d PORTVERSION= 0.10.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://source.clutter-project.org/sources/${PORTNAME}/0.10/ @@ -18,12 +14,14 @@ LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter USE_GMAKE= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack ltverhack gnomeprefix +USES= pathfix +USE_GNOME= ltverhack gnomeprefix +USE_GL= gl USE_XORG= xp x11 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-introspection=no -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.mk> diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile index 772000bd8e72..81a74bfb9a72 100644 --- a/graphics/converseen/Makefile +++ b/graphics/converseen/Makefile @@ -18,13 +18,12 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ fftw3:${PORTSDIR}/math/fftw3 \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ - xcb:${PORTSDIR}/x11/libxcb \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig USE_BZIP2= yes USE_AUTOTOOLS= libltdl USES= cmake gettext iconv -USE_XORG= ice sm x11 xau xdmcp xext xrender xt +USE_XORG= ice sm x11 xau xcb xdmcp xext xrender xt USE_QT4= corelib gui linguist_build moc_build qmake_build \ rcc_build uic_build USE_GNOME= glib20 diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile index de1200fee370..9407bd12e9dc 100644 --- a/graphics/dri/Makefile +++ b/graphics/dri/Makefile @@ -1,4 +1,4 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= dri @@ -10,27 +10,30 @@ CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for the DRI LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm \ - expat.6:${PORTSDIR}/textproc/expat2 + expat:${PORTSDIR}/textproc/expat2 USES= pkgconfig USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto -ALL_DRI_DRIVERS=I810 I915 I965 MACH64 MGA R128 R200 R300 R600 RADEON \ - SAVAGE SIS SWRAST TDFX UNICHROME +ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST + +.if ! defined(WITH_NEW_XORG) +ALL_DRI_DRIVERS+=I810 MACH64 MGA R128 R300 R600 SAVAGE SIS TDFX UNICHROME +.endif .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" -.if ${ARCH} == "ia64" -BROKEN= does not install on ia64 -.endif +OPTIONS_DEFINE_i386= ${ALL_DRI_DRIVERS} +OPTIONS_DEFINE_amd64= ${OPTIONS_DEFINE_i386} -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -OPTIONS_DEFINE= ${ALL_DRI_DRIVERS} -.elif ${ARCH} == "powerpc" -OPTIONS_DEFINE= MACH64 RADEON SWRAST TDFX -.elif ${ARCH} == "sparc64" -OPTIONS_DEFINE= MACH64 RADEON SWRAST +.if defined(WITH_NEW_XORG) +OPTIONS_DEFINE_powerpc= RADEON SWRAST +OPTIONS_DEFINE_sparc64= RADEON SWRAST +.else +OPTIONS_DEFINE_powerpc= MACH64 RADEON SWRAST TDFX +OPTIONS_DEFINE_sparc64= MACH64 RADEON SWRAST .endif + OPTIONS_DEFAULT=${OPTIONS_DEFINE} I810_DESC= Include DRI support for Intel i810 @@ -42,7 +45,7 @@ R128_DESC= Include DRI support for AMD/ATI R128 R200_DESC= Include DRI support for AMD/ATI R200 R300_DESC= Include DRI support for AMD/ATI R300 R600_DESC= Include DRI support for AMD/ATI R600 -RADEON_DESC= Include DRI support for AMD/ATI R100 +RADEON_DESC= Include DRI support for AMD/ATI RADEON SAVAGE_DESC= Include DRI support for S3/Via Savage SIS_DESC= Include DRI support for SiS 300 and 6326 SWRAST_DESC= Include generic software DRI support @@ -61,7 +64,9 @@ PLIST_SUB+= ${_d}_DRIVER="@comment " .endif .endfor -.include <bsd.port.pre.mk> +.if ${ARCH} == "ia64" +BROKEN= does not install on ia64 +.endif .if !(${ARCH} == "amd64" || ${ARCH} == "i386") CONFIGURE_ARGS+=--disable-gallium-intel @@ -71,4 +76,4 @@ CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}" do-install: cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo deleted file mode 100644 index 106ab0bf5805..000000000000 --- a/graphics/dri/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist index 9442cdbae298..43e5ab1a8ade 100644 --- a/graphics/dri/pkg-plist +++ b/graphics/dri/pkg-plist @@ -1,19 +1,19 @@ include/GL/internal/dri_interface.h -%%I810_DRIVER%%lib/dri/i810_dri.so +%%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so %%I915_DRIVER%%lib/dri/i915_dri.so %%I965_DRIVER%%lib/dri/i965_dri.so -%%MACH64_DRIVER%%lib/dri/mach64_dri.so -%%MGA_DRIVER%%lib/dri/mga_dri.so -%%R128_DRIVER%%lib/dri/r128_dri.so +%%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so +%%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so +%%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so %%R200_DRIVER%%lib/dri/r200_dri.so -%%R300_DRIVER%%lib/dri/r300_dri.so -%%R600_DRIVER%%lib/dri/r600_dri.so +%%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so +%%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so %%RADEON_DRIVER%%lib/dri/radeon_dri.so -%%SAVAGE_DRIVER%%lib/dri/savage_dri.so -%%SIS_DRIVER%%lib/dri/sis_dri.so +%%OLD%%%%SAVAGE_DRIVER%%lib/dri/savage_dri.so +%%OLD%%%%SIS_DRIVER%%lib/dri/sis_dri.so %%SWRAST_DRIVER%%lib/dri/swrast_dri.so -%%TDFX_DRIVER%%lib/dri/tdfx_dri.so -%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so +%%OLD%%%%TDFX_DRIVER%%lib/dri/tdfx_dri.so +%%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so libdata/pkgconfig/dri.pc @dirrm lib/dri @dirrmtry include/GL/internal diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index b7abc76e2e91..a5a54da0ffa9 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -4,7 +4,7 @@ PORTNAME= eog-plugins PORTVERSION= 2.30.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,9 +18,10 @@ RUN_DEPENDS= eog:${PORTSDIR}/graphics/eog USE_BZIP2= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gtk20 +USE_GL= gl +USE_GNOME= gnomeprefix intlhack gtk20 WANT_GNOME= yes -USES= gettext +USES= gettext pathfix GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 9cf3c9f18cdc..08ab4bf17c92 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -1,7 +1,8 @@ +# Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= freeglut -PORTVERSION= 2.8.0 +PORTVERSION= 2.8.1 CATEGORIES= graphics MASTER_SITES= SF @@ -27,6 +28,8 @@ DOCS= download.html freeglut.html freeglut_logo.png \ progress.html structure.html BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes +.include <bsd.port.options.mk> + pre-configure: .for fract in Fractals/fractals.c Fractals_random/fractals_random.c @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \ @@ -38,14 +41,14 @@ post-build: ${WRKSRC}/progs/demos/CallbackMaker/.libs/callbackmaker post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR} .endfor @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${EXAMPLESDIR} .for prog in ${BINS} diff --git a/graphics/freeglut/distinfo b/graphics/freeglut/distinfo index 81ae29d16744..a0bf5031d1c0 100644 --- a/graphics/freeglut/distinfo +++ b/graphics/freeglut/distinfo @@ -1,2 +1,2 @@ -SHA256 (freeglut-2.8.0.tar.gz) = 197293ff886abe613bc9eb4a762d9161b0c9e64b3e8e613ed7c5e353974fba05 -SIZE (freeglut-2.8.0.tar.gz) = 979459 +SHA256 (freeglut-2.8.1.tar.gz) = dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a +SIZE (freeglut-2.8.1.tar.gz) = 1005343 diff --git a/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c b/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c deleted file mode 100644 index 8f12afa8b524..000000000000 --- a/graphics/freeglut/files/patch-progs-demos-smooth_opengl3_smooth_opengl3.c +++ /dev/null @@ -1,18 +0,0 @@ ---- progs/demos/smooth_opengl3/smooth_opengl3.c.orig 2012-01-04 14:38:43.000000000 +0100 -+++ progs/demos/smooth_opengl3/smooth_opengl3.c 2012-01-04 14:39:10.000000000 +0100 -@@ -98,6 +98,7 @@ - #define APIENTRY - #endif - -+#ifndef GL_VERSION_1_5 - typedef void (APIENTRY *PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); - typedef void (APIENTRY *PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); - typedef void (APIENTRY *PFNGLBUFFERDATAPROC) (GLenum target, ourGLsizeiptr size, const GLvoid *data, GLenum usage); -@@ -117,6 +118,7 @@ - typedef void (APIENTRY *PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef GLint (APIENTRY *PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const ourGLchar *name); - typedef void (APIENTRY *PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -+#endif - - PFNGLGENBUFFERSPROC gl_GenBuffers; - PFNGLBINDBUFFERPROC gl_BindBuffer; diff --git a/graphics/freeglut/pkg-message b/graphics/freeglut/pkg-message new file mode 100644 index 000000000000..f41059efbc28 --- /dev/null +++ b/graphics/freeglut/pkg-message @@ -0,0 +1,9 @@ +Since FreeBSD has new USB stack, freeglut normally doesn't build on FreeBSD 8 +(yet). To workaround this a small patch adds one include file and comments out +content of one function (only leaves return NULL). + +This might cause side effects. Joysticks do not work, and there might be ports +that do not compile or applications that crash because of this. + +Do not hesitate to contact x11@FreeBSD.org if there are any issues and side +effects because of this. diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index f98201c3aaf5..28575c123a0e 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -12,15 +12,14 @@ COMMENT= Portable framework for OpenGL development LICENSE= ZLIB LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - drm:${PORTSDIR}/graphics/libdrm \ - xcb:${PORTSDIR}/x11/libxcb + drm:${PORTSDIR}/graphics/libdrm USE_BZIP2= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= compile.sh ALL_TARGET= x11 INSTALL_TARGET= x11-install -USE_XORG= x11 xau xdamage xdmcp xext xfixes xrandr xrender xxf86vm +USE_XORG= x11 xau xcb xdamage xdmcp xext xfixes xrandr xrender xxf86vm USE_GL= glu USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index c55870890bf9..f4da3e4f8b3d 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -13,15 +13,14 @@ COMMENT= A 2D graphics library LICENSE= LGPL20 MIT LICENSE_COMB= multi -LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - xcb:${PORTSDIR}/x11/libxcb +LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs OPTIONS_DEFINE= BGI BMP JPEG PNG PRINT TIFF ZLIB OPTIONS_DEFAULT= ZLIB BGI BMP PNG PRINT BGI_DESC= Enable BGI support BMP_DESC= Enable BMP support -USE_XORG= x11 xau xdmcp +USE_XORG= x11 xau xcb xdmcp USE_GMAKE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --with-fontpath=${DATADIR}/fonts \ diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile index 1557e3e82a88..012ac64369bf 100644 --- a/graphics/libGL/Makefile +++ b/graphics/libGL/Makefile @@ -1,4 +1,4 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= libGL diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk index d163e5a7dae7..6ccc9378f272 100644 --- a/graphics/libGL/bsd.mesalib.mk +++ b/graphics/libGL/bsd.mesalib.mk @@ -11,11 +11,9 @@ # # - graphics/libGL # - graphics/libGLU -# - graphics/libGLw # - graphics/dri # # $FreeBSD$ -# .MAKE.FreeBSD_UL= yes @@ -23,7 +21,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} .if defined(WITH_NEW_XORG) -MESABASEVERSION= 7.11.2 +MESABASEVERSION= 8.0.5 # if there is a subversion, include the '-' between 7.11-rc2 for example. MESASUBVERSION= PLIST_SUB+= OLD="@comment " NEW="" @@ -33,8 +31,8 @@ MESASUBVERSION= PLIST_SUB+= OLD="" NEW="@comment " .endif -MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut -DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ +DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER?= x11@FreeBSD.org BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ @@ -46,22 +44,19 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE= yes +MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ - --disable-egl --disable-glut + --disable-egl .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${PATCHDIR}/extra-configure \ - ${PATCHDIR}/extra-mach64_context.h \ - ${PATCHDIR}/extra-sis_context.h \ ${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp \ ${PATCHDIR}/extra-src__gallium__include__pipe__p_config.h \ ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_array.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c \ - ${PATCHDIR}/extra-src__mesa__drivers__dri__radeon__radeon_span.c + ${PATCHDIR}/extra-src__mesa__drivers__dri__nouveau__nouveau_render_t.c .else EXTRA_PATCHES+= ${PATCHDIR}/extra-configure-old \ ${PATCHDIR}/extra-mach64_context.h-old \ @@ -69,12 +64,16 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-configure-old \ ${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \ ${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \ ${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S +CONFIGURE_ARGS+=--disable-glut --disable-glw .endif ALL_TARGET= default -PATCHDIR= ${.CURDIR}/../../graphics/libGL/files -WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION} +MASTERDIR= ${.CURDIR}/../../graphics/libGL +PATCHDIR= ${MASTERDIR}/files +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +WRKSRC= ${WRKDIR}/Mesa-${MESADISTVERSION} .if !defined(ARCH) ARCH!= uname -p @@ -86,38 +85,25 @@ COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//} CONFIGURE_ARGS+= --disable-glu .endif -.if ${COMPONENT:Mglw} == "" -CONFIGURE_ARGS+= --disable-glw -.else -CONFIGURE_ARGS+= --enable-motif -.endif - .if ${COMPONENT:Mdri} == "" CONFIGURE_ARGS+= --with-dri-drivers=no +.else +CONFIGURE_ARGS+= --with-dri-drivers="i915,i965,r200,radeon,swrast" .endif +.if !defined(WITH_NEW_XORG) .if defined(WITHOUT_XCB) CONFIGURE_ARGS+= --disable-xcb .else CONFIGURE_ARGS+= --enable-xcb .endif +.endif post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ - -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/src/glu/Makefile \ - ${WRKSRC}/src/glw/Makefile \ ${WRKSRC}/src/mesa/Makefile \ ${WRKSRC}/src/mesa/drivers/dri/Makefile -.if defined(WITH_NEW_XORG) -# replace hardlinks with patched radeon_span.c -.for i in r200 r300 r600 - @${CP} -fp ${WRKSRC}/src/mesa/drivers/dri/radeon/radeon_span.c \ - ${WRKSRC}/src/mesa/drivers/dri/${i}/ -.endfor -.endif -.if ${COMPONENT:Mglut} != "" - @${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ - ${WRKSRC}/src/glut/glx/Makefile -.endif + diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo index 106ab0bf5805..5ee9af26ab05 100644 --- a/graphics/libGL/distinfo +++ b/graphics/libGL/distinfo @@ -1,4 +1,4 @@ SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 +SHA256 (MesaLib-8.0.5.tar.bz2) = 511b8da34f8e69ed24caf422964fb7ae747f3b1d8093f6b8aa2602164a475a5e +SIZE (MesaLib-8.0.5.tar.bz2) = 5734571 diff --git a/graphics/libGL/files/extra-configure b/graphics/libGL/files/extra-configure index fc1a68f41695..d1ae3b75e23d 100644 --- a/graphics/libGL/files/extra-configure +++ b/graphics/libGL/files/extra-configure @@ -1,42 +1,40 @@ ---- configure.orig 2011-11-17 19:46:34.000000000 +0000 -+++ configure 2012-06-28 12:53:09.000000000 +0000 -@@ -7817,10 +7817,35 @@ - DEFINES="$DEFINES -DGLX_DIRECT_RENDERING" - fi +--- configure.orig 2012-07-10 17:30:46.000000000 +0200 ++++ configure 2012-09-01 13:27:22.000000000 +0200 +@@ -9017,9 +9017,34 @@ + DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1" + DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" - if test "x$DRI_DIRS" = "xyes"; then -- DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 \ -- radeon tdfx unichrome savage sis swrast" +- DRI_DIRS="i915 i965 nouveau r200 radeon swrast" - fi + case "$host_cpu" in + x86_64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i915 i965 mach64 mga nouveau r128 r200 r300 r600 \ -+ radeon savage tdfx unichrome sis swrast" ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + i*86) + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 \ -+ r600 radeon savage tdfx unichrome sis swrast" ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + powerpc*) + # Build only the drivers for cards that exist on PowerPC. + # At some point MGA will be added, but not yet. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast" ++ DRI_DIRS="r200 radeon swrast" + fi + ;; + sparc*) + # Build only the drivers for cards that exist on SPARC. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast" ++ DRI_DIRS="r200 radeon swrast" + fi + ;; + esac ++ ;; gnu*) DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" diff --git a/graphics/libGL/files/extra-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h deleted file mode 100644 index f844599bfa68..000000000000 --- a/graphics/libGL/files/extra-mach64_context.h +++ /dev/null @@ -1,21 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2011-05-13 01:47:18.000000000 +0200 -+++ src/mesa/drivers/dri/mach64/mach64_context.h 2011-07-27 09:59:53.000000000 +0200 -@@ -289,7 +289,7 @@ - /* ================================================================ - * Byte ordering - */ --#if MESA_LITTLE_ENDIAN == 1 -+#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1 - #define LE32_IN( x ) ( *(GLuint *)(x) ) - #define LE32_IN_FLOAT( x ) ( *(GLfloat *)(x) ) - #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0) -@@ -298,6 +298,9 @@ - #if defined(__OpenBSD__) || defined(__NetBSD__) - #include <machine/endian.h> - #define bswap_32 bswap32 -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+#define bswap_32 bswap32 - #else - #include <byteswap.h> - #endif diff --git a/graphics/libGL/files/extra-sis_context.h b/graphics/libGL/files/extra-sis_context.h deleted file mode 100644 index 0e16f51c0a10..000000000000 --- a/graphics/libGL/files/extra-sis_context.h +++ /dev/null @@ -1,22 +0,0 @@ ---- src/mesa/drivers/dri/sis/sis_context.h.orig 2010-12-14 22:43:15.000000000 +0100 -+++ src/mesa/drivers/dri/sis/sis_context.h 2011-07-27 09:58:22.000000000 +0200 -@@ -400,10 +400,18 @@ - #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg)) - #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg)) - --#if defined(__i386__) || defined(__x86_64__) -+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) - #define MMIO_WMB() __asm __volatile("" : : : "memory") - #elif defined(__ia64__) - #define MMIO_WMB() __asm __volatile("mf" : : : "memory") -+#elif defined(__powerpc__) -+#define MMIO_WMB() __asm __volatile("eieio" : : : "memory") -+#elif defined(__sparc64__) -+/* -+ * #StoreStore probably would be sufficient for this driver at the -+ * time of this writing but we use #Sync for safety. -+ */ -+#define MMIO_WMB() __asm __volatile("membar #Sync" : : : "memory") - #else - #error platform needs WMB - #endif diff --git a/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c b/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c deleted file mode 100644 index 3a186e98d644..000000000000 --- a/graphics/libGL/files/extra-src__mesa__drivers__dri__radeon__radeon_span.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/mesa/drivers/dri/radeon/radeon_span.c.orig 2011-07-09 03:37:10.000000000 +0200 -+++ src/mesa/drivers/dri/radeon/radeon_span.c 2012-06-28 21:44:07.000000000 +0200 -@@ -55,7 +55,11 @@ - #include <byteswap.h> - #define CPU_TO_LE16( x ) bswap_16( x ) - #define LE16_TO_CPU( x ) bswap_16( x ) --#endif /* __linux__ */ -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+#define CPU_TO_LE16( x ) bswap16( x ) -+#define LE16_TO_CPU( x ) bswap16( x ) -+#endif - #else - #define CPU_TO_LE16( x ) ( x ) - #define LE16_TO_CPU( x ) ( x ) diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist index 3204b097462c..e24cff6cd396 100644 --- a/graphics/libGL/pkg-plist +++ b/graphics/libGL/pkg-plist @@ -3,11 +3,11 @@ include/GL/gl.h include/GL/gl_mangle.h include/GL/glext.h -include/GL/glfbdev.h +%%OLD%%include/GL/glfbdev.h include/GL/glx.h include/GL/glx_mangle.h include/GL/glxext.h -include/GL/mesa_wgl.h +%%OLD%%include/GL/mesa_wgl.h %%OLD%%include/GL/mglmesa.h include/GL/osmesa.h %%OLD%%include/GL/svgamesa.h diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile index fa90ee18f974..4ab08baba3b8 100644 --- a/graphics/libGLU/Makefile +++ b/graphics/libGLU/Makefile @@ -1,8 +1,7 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= libGLU -PORTREVISION= 2 PORTVERSION= ${MESAVERSION} CATEGORIES= graphics @@ -19,11 +18,4 @@ pre-install: ${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/ .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" - -.include <bsd.port.pre.mk> - -.if !(${ARCH} == "amd64" || ${ARCH} == "i386") -CONFIGURE_ARGS+=--disable-gallium-intel -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo deleted file mode 100644 index 106ab0bf5805..000000000000 --- a/graphics/libGLU/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile index 45ccde00f2da..655986da0b20 100644 --- a/graphics/libGLw/Makefile +++ b/graphics/libGLw/Makefile @@ -1,26 +1,25 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= libGLw -PORTVERSION= ${MESAVERSION} -PORTREVISION= 2 +PORTVERSION= 8.0.0 CATEGORIES= graphics +MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glw/ +DISTNAME= glw-${PORTVERSION} +DIST_SUBDIR= GL +MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL widgets library +USE_BZIP2= yes +USES= pathfix pkgconfig +USE_LDCONFIG= yes USE_GL= gl USE_MOTIF= yes -USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes dri2proto +USE_XORG= x11 xt xext +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static --enable-motif +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib -INSTALL_WRKSRC= ${WRKSRC}/src/glw -BUILD_WRKSRC= ${WRKSRC}/src/glw - -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" - -.include <bsd.port.pre.mk> - -.if !(${ARCH} == "amd64" || ${ARCH} == "i386") -CONFIGURE_ARGS+=--disable-gallium-intel -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo index 106ab0bf5805..f2e4e38a16da 100644 --- a/graphics/libGLw/distinfo +++ b/graphics/libGLw/distinfo @@ -1,4 +1,2 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 +SHA256 (GL/glw-8.0.0.tar.bz2) = 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597 +SIZE (GL/glw-8.0.0.tar.bz2) = 221136 diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist index 211b58674677..87418e60a81b 100644 --- a/graphics/libGLw/pkg-plist +++ b/graphics/libGLw/pkg-plist @@ -2,7 +2,7 @@ include/GL/GLwDrawA.h include/GL/GLwDrawAP.h include/GL/GLwMDrawA.h include/GL/GLwMDrawAP.h +lib/libGLw.la lib/libGLw.so lib/libGLw.so.1 libdata/pkgconfig/glw.pc -@dirrmtry include/GL diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 1ff688d92a3d..3c3cf5b8b7a2 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -10,23 +10,26 @@ MASTER_SITES= http://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs LIB_DEPENDS= pciaccess:${PORTSDIR}/devel/libpciaccess \ pthread-stubs:${PORTSDIR}/devel/libpthread-stubs -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-nouveau-experimental-api - MAKE_JOBS_SAFE= yes .if defined(WITH_NEW_XORG) -OPTIONS_DEFINE= KMS -KMS_DESC= Enable experimental KMS support +USE_GMAKE= yes + +OPTIONS_DEFINE= KMS MANPAGES +OPTIONS_DEFAULT=KMS +KMS_DESC= Enable KMS support + +.if defined(PACKAGE_BUILDING) +OPTIONS_DEFAULT+= MANPAGES +.endif .include <bsd.port.options.mk> @@ -38,12 +41,34 @@ PLIST_SUB+= KMS="" PLIST_SUB+= KMS="@comment " .endif -LIBDRM_VERSION= 2.4.31 -LIBDRM_REVISION=1 +.if ${PORT_OPTIONS:MMANPAGES} +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + xsltproc:${PORTSDIR}/textproc/libxslt +MAN3= drmAvailable.3 \ + drmHandleEvent.3 \ + drmModeGetResources.3 +MAN7= drm-gem.7 \ + drm-kms.7 \ + drm-memory.7 \ + drm-mm.7 \ + drm-ttm.7 \ + drm.7 +.else +CONFIGURE_ARGS+=--disable-manpages +.endif + +LIBDRM_VERSION= 2.4.44 +LIBDRM_REVISION=0 PLIST_SUB+= OLD="@comment " NEW="" +EXTRA_PATCHES+= ${FILESDIR}/extra-configure \ + ${FILESDIR}/extra-tests_modetest_Makefile.in \ + ${FILESDIR}/extra-tests_modetest_modetest.c \ + ${FILESDIR}/extra-tests_modetest_strchrnul.c +CONFIGURE_ARGS+=--disable-vmwgfx .else +CONFIGURE_ARGS= --enable-nouveau-experimental-api LIBDRM_VERSION= 2.4.17 -LIBDRM_REVISION=1 +LIBDRM_REVISION=0 PLIST_SUB+= OLD="" NEW="@comment " .endif @@ -59,7 +84,7 @@ PLIST_SUB+= RADEON_DRIVERS="@comment " pre-patch: @${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \ - 12661s/x86_/amd/g' \ + s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index df36a538eeed..1c2e82768509 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,4 +1,4 @@ SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a SIZE (libdrm-2.4.17.tar.bz2) = 408882 -SHA256 (libdrm-2.4.31.tar.bz2) = 8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4 -SIZE (libdrm-2.4.31.tar.bz2) = 475677 +SHA256 (libdrm-2.4.44.tar.bz2) = 42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2 +SIZE (libdrm-2.4.44.tar.bz2) = 538416 diff --git a/graphics/libdrm/files/extra-configure b/graphics/libdrm/files/extra-configure new file mode 100644 index 000000000000..3d9d5718483d --- /dev/null +++ b/graphics/libdrm/files/extra-configure @@ -0,0 +1,39 @@ +--- configure.orig 2013-02-22 00:30:16.861698520 +0100 ++++ configure 2013-02-22 00:30:26.189704713 +0100 +@@ -671,6 +671,8 @@ + HAVE_VMWGFX_TRUE + HAVE_LIBKMS_FALSE + HAVE_LIBKMS_TRUE ++HAVE_STRCHRNUL_FALSE ++HAVE_STRCHRNUL_TRUE + CLOCK_LIB + pkgconfigdir + PTHREADSTUBS_LIBS +@@ -12341,6 +12345,27 @@ + done + + ++for ac_func in strchrnul ++do : ++ ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul" ++if test "x$ac_cv_func_strchrnul" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_STRCHRNUL 1 ++_ACEOF ++ HAVE_STRCHRNUL=yes ++fi ++done ++ ++ ++ if test "x$ac_cv_func_strchrnul" = xyes; then ++ HAVE_STRCHRNUL_TRUE= ++ HAVE_STRCHRNUL_FALSE='#' ++else ++ HAVE_STRCHRNUL_TRUE='#' ++ HAVE_STRCHRNUL_FALSE= ++fi ++ ++ + + + MAYBE_WARN="-Wall -Wextra \ diff --git a/graphics/libdrm/files/extra-tests_modetest_Makefile.in b/graphics/libdrm/files/extra-tests_modetest_Makefile.in new file mode 100644 index 000000000000..74748e9b240a --- /dev/null +++ b/graphics/libdrm/files/extra-tests_modetest_Makefile.in @@ -0,0 +1,52 @@ +--- tests/modetest/Makefile.in.orig 2013-04-04 15:41:48.212028807 +0200 ++++ tests/modetest/Makefile.in 2013-04-04 15:45:21.384003991 +0200 +@@ -36,8 +52,11 @@ + host_triplet = @host@ + @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT) + @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT) +-@HAVE_CAIRO_TRUE@am__append_1 = $(CAIRO_CFLAGS) +-@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_LIBS) ++@HAVE_STRCHRNUL_FALSE@am__append_1 = \ ++@HAVE_STRCHRNUL_FALSE@ strchrnul.c ++ ++@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS) ++@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS) + subdir = tests/modetest + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -53,7 +72,10 @@ + CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +-am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT) ++am__modetest_SOURCES_DIST = buffers.c modetest.c buffers.h strchrnul.c ++@HAVE_STRCHRNUL_FALSE@am__objects_1 = strchrnul.$(OBJEXT) ++am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT) \ ++ $(am__objects_1) + modetest_OBJECTS = $(am_modetest_OBJECTS) + am__DEPENDENCIES_1 = + @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +@@ -229,12 +265,10 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \ +- -I$(top_srcdir) $(am__append_1) +-modetest_SOURCES = \ +- buffers.c modetest.c buffers.h +- ++ -I$(top_srcdir) $(am__append_2) ++modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1) + modetest_LDADD = $(top_builddir)/libdrm.la \ +- $(top_builddir)/libkms/libkms.la $(am__append_2) ++ $(top_builddir)/libkms/libkms.la $(am__append_3) + all: all-am + + .SUFFIXES: +@@ -333,6 +370,7 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/graphics/libdrm/files/extra-tests_modetest_modetest.c b/graphics/libdrm/files/extra-tests_modetest_modetest.c new file mode 100644 index 000000000000..db62e98f2cdf --- /dev/null +++ b/graphics/libdrm/files/extra-tests_modetest_modetest.c @@ -0,0 +1,13 @@ +--- tests/modetest/modetest.c.orig 2013-02-22 00:44:28.203705216 +0100 ++++ tests/modetest/modetest.c 2013-02-22 00:44:56.803699770 +0100 +@@ -57,6 +57,10 @@ + + #include "buffers.h" + ++#ifndef HAVE_STRCHRNUL ++char *strchrnul(const char *, int); ++#endif ++ + drmModeRes *resources; + int fd, modes; + diff --git a/graphics/libdrm/files/extra-tests_modetest_strchrnul.c b/graphics/libdrm/files/extra-tests_modetest_strchrnul.c new file mode 100644 index 000000000000..26ba9ac2e8b3 --- /dev/null +++ b/graphics/libdrm/files/extra-tests_modetest_strchrnul.c @@ -0,0 +1,48 @@ +--- tests/modetest/strchrnul.c.orig 2013-02-22 00:35:04.198698781 +0100 ++++ tests/modetest/strchrnul.c 2013-02-22 00:34:36.280333357 +0100 +@@ -0,0 +1,45 @@ ++/*- ++ * Copyright (c) 2013 Niclas Zeising ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ * ++ */ ++ ++/* ++ * Copied from: ++ * svn://svn.freebsd.org/base/head/lib/libc/string/strchrnul.c 246766 2013-02-13 15:46:33Z zeising ++ */ ++ ++char * ++strchrnul(const char *p, int ch) ++{ ++ char c; ++ ++ c = ch; ++ for (;; ++p) { ++ if (*p == c || *p == '\0') ++ return ((char *)p); ++ } ++ /* NOTREACHED */ ++} ++ diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 4cdc099404b7..b8b6ed53fb45 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -17,12 +17,13 @@ %%NEW%%include/libdrm/drm_mode.h %%NEW%%include/libdrm/drm_sarea.h %%NEW%%include/libdrm/i915_drm.h +%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_aub.h %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h %%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h %%NEW%%include/libdrm/mach64_drm.h %%NEW%%include/libdrm/mga_drm.h +%%NEW%%include/libdrm/nouveau.h %%NEW%%include/libdrm/nouveau_drm.h -%%NEW%%include/libdrm/nouveau_drmif.h %%NEW%%include/libdrm/r128_drm.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h @@ -37,17 +38,14 @@ %%NEW%%include/libdrm/sis_drm.h %%NEW%%include/libdrm/via_drm.h %%NEW%%%%KMS%%include/libkms/libkms.h -include/nouveau/nouveau_bo.h -include/nouveau/nouveau_channel.h +%%OLD%%include/nouveau/nouveau_bo.h +%%OLD%%include/nouveau/nouveau_channel.h %%OLD%%include/nouveau/nouveau_class.h -include/nouveau/nouveau_device.h -include/nouveau/nouveau_grobj.h -include/nouveau/nouveau_notifier.h -include/nouveau/nouveau_pushbuf.h -%%NEW%%include/nouveau/nouveau_reloc.h -include/nouveau/nouveau_resource.h -%%NEW%%include/nouveau/nv04_pushbuf.h -%%NEW%%include/nouveau/nvc0_pushbuf.h +%%OLD%%include/nouveau/nouveau_device.h +%%OLD%%include/nouveau/nouveau_grobj.h +%%OLD%%include/nouveau/nouveau_notifier.h +%%OLD%%include/nouveau/nouveau_pushbuf.h +%%OLD%%include/nouveau/nouveau_resource.h include/xf86drm.h include/xf86drmMode.h lib/libdrm.la @@ -58,7 +56,8 @@ lib/libdrm.so.2 %%INTEL_DRIVER%%lib/libdrm_intel.so.1 lib/libdrm_nouveau.la lib/libdrm_nouveau.so -lib/libdrm_nouveau.so.1 +%%OLD%%lib/libdrm_nouveau.so.1 +%%NEW%%lib/libdrm_nouveau.so.2 %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so %%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 @@ -70,7 +69,7 @@ libdata/pkgconfig/libdrm.pc libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc -@dirrm include/nouveau +%%OLD%%@dirrm include/nouveau %%NEW%%%%KMS%%@dirrm include/libkms %%NEW%%@dirrm include/libdrm %%OLD%%@dirrm include/drm diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile index 6b62dd5aee22..1a46a87eb96e 100644 --- a/graphics/libreatlas/Makefile +++ b/graphics/libreatlas/Makefile @@ -27,13 +27,12 @@ LIB_DEPENDS= mspack:${PORTSDIR}/archivers/libmspack \ freetype:${PORTSDIR}/print/freetype2 \ expat:${PORTSDIR}/textproc/expat2 \ freexl:${PORTSDIR}/textproc/freexl \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ - xcb:${PORTSDIR}/x11/libxcb + fontconfig:${PORTSDIR}/x11-fonts/fontconfig GNU_CONFIGURE= yes USES= pkgconfig gettext iconv USE_GMAKE= yes -USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \ +USE_XORG= ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender xxf86vm USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango USE_WX= 2.8 diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index d633917958e6..3f738ac0477c 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -1,4 +1,4 @@ -# Created by: anholt@FreeBSD.org +# Created by: Eric Anholt <anholt@FreeBSD.org> # $FreeBSD$ PORTNAME= mesa-demos diff --git a/graphics/pinpoint/Makefile b/graphics/pinpoint/Makefile index 8b0e5cdb36ef..0f7847c2e5cc 100644 --- a/graphics/pinpoint/Makefile +++ b/graphics/pinpoint/Makefile @@ -3,7 +3,7 @@ PORTNAME= pinpoint DISTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GNOME @@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= clutter-glx-1.0:${PORTSDIR}/graphics/clutter USE_XZ= yes +USE_GL= gl USE_GMAKE= yes USE_GNOME= librsvg2 GNU_CONFIGURE= yes diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index d480372a2c43..c196dfcba76f 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -31,8 +31,7 @@ CONFIGURE_ARGS+= --with-jpeg=no .endif .if ${PORT_OPTIONS:MX11} -USE_XORG= ice sm x11 xau xdmcp xext xv -LIB_DEPENDS+= xcb:${PORTSDIR}/x11/libxcb +USE_XORG= ice sm x11 xau xcb xdmcp xext xv CONFIGURE_ARGS+= --with-x=yes .else CONFIGURE_ARGS+= --with-x=no --without-xshm --without-xv |