[Midnightbsd-cvs] mports: graphics/libglut: this is terrible, but it works
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Mar 30 16:28:16 EDT 2009
Log Message:
-----------
this is terrible, but it works
Modified Files:
--------------
mports/graphics/libglut:
Makefile (r1.7 -> r1.8)
distinfo (r1.3 -> r1.4)
pkg-plist (r1.1 -> r1.2)
Added Files:
-----------
mports/graphics/libglut/files:
midnightbsd (r1.1)
midnightbsd-dri (r1.1)
midnightbsd-dri-amd64 (r1.1)
midnightbsd-dri-x86 (r1.1)
patch-Makefile (r1.1)
patch-bin__mklib (r1.1)
Removed Files:
-------------
mports/graphics/libglut/files:
Makefile
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/libglut/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libglut/pkg-plist -L graphics/libglut/pkg-plist -u -r1.1 -r1.2
--- graphics/libglut/pkg-plist
+++ graphics/libglut/pkg-plist
@@ -1,5 +1,6 @@
include/GL/glut.h
-lib/libglut.a
+include/GL/glutf90.h
lib/libglut.so
-lib/libglut.so.4
+lib/libglut.so.3
+libdata/pkgconfig/glut.pc
@dirrmtry include/GL
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/libglut/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L graphics/libglut/Makefile -L graphics/libglut/Makefile -u -r1.7 -r1.8
--- graphics/libglut/Makefile
+++ graphics/libglut/Makefile
@@ -1,37 +1,39 @@
-# New ports collection makefile for: libglut
-# Date created: Tue Feb 7 12:02:49 1995
-# Whom: anholt
-#
# $MidnightBSD$
-# $FreeBSD: ports/graphics/libglut/Makefile,v 1.7 2006/06/19 20:06:53 shaun Exp $
-#
PORTNAME= libglut
-PORTVERSION= 7.0.1
+PORTVERSION= ${MESAVERSION}
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mesa3d
-DISTNAME= MesaGLUT-${PORTVERSION}
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A graphics library similar to SGI's OpenGL # '
-LICENSE= restricted
+COMMENT= OpenGL utility toolkit
+LICENSE= agg
+# mostly MIT with some SGI free stuff
-# not public domain, but freely redistributable.
-
-USE_BZIP2= yes
USE_LDCONFIG= yes
USE_GL= glu
-USE_XORG= xmu xi
-
-WRKSRC= ${WRKDIR}/Mesa-${PORTVERSION}/src/glut/glx
+USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
-FAKE_OPTS= trueprefix
+FAKE_OPTS= prefixhack
pre-patch:
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}/
+ ${CP} ${FILESDIR}/midnightbsd ${FILESDIR}/midnightbsd-dri \
+ ${FILESDIR}/midnightbsd-dri-amd64 \
+ ${FILESDIR}/midnightbsd-dri-x86 ${WRKSRC}/configs
pre-install:
@${MKDIR} ${PREFIX}/include/GL
+do-install:
+ cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
+ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${WRKSRC}/include/GL/glutf90.h \
+ ${WRKSRC}/include/GL/glut.h \
+ ${PREFIX}/include/GL
+ ${INSTALL_SCRIPT} ${WRKSRC}/lib/libglut.so.3 \
+ ${PREFIX}/lib
+ ${LN} -s ${PREFIX}/lib/libglut.so.3 ${PREFIX}/lib/libglut.so
+ ${INSTALL_DATA} ${WRKSRC}/src/glut/glx/glut.pc \
+ ${PREFIX}/libdata/pkgconfig
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/libglut/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L graphics/libglut/distinfo -L graphics/libglut/distinfo -u -r1.3 -r1.4
--- graphics/libglut/distinfo
+++ graphics/libglut/distinfo
@@ -1,3 +1,6 @@
-MD5 (MesaGLUT-7.0.1.tar.bz2) = 25f30d0c1651997b4412366ba0572f7f
-SHA256 (MesaGLUT-7.0.1.tar.bz2) = 4f7cd181b652d88cea4aac59564b757de95cd6ca0ab00441dc0707b377d5527e
-SIZE (MesaGLUT-7.0.1.tar.bz2) = 315599
+MD5 (MesaLib-7.3.tar.bz2) = 781e7811a6ed5c97b2b8defefc8ffbc9
+SHA256 (MesaLib-7.3.tar.bz2) = 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
+SIZE (MesaLib-7.3.tar.bz2) = 3368281
+MD5 (MesaGLUT-7.3.tar.bz2) = abe8036a724c1a483bdad6b5a55ddc1a
+SHA256 (MesaGLUT-7.3.tar.bz2) = 7e7aabb18bfb712191fb569d53c5d8b6a8cf9df995f231f2ba70e2f25c1822d8
+SIZE (MesaGLUT-7.3.tar.bz2) = 330107
--- /dev/null
+++ graphics/libglut/files/midnightbsd
@@ -0,0 +1,31 @@
+# Configuration for MidnightBSD
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = MidnightBSD
+
+# Compiler and flags
+CC = cc
+CXX = c++
+MAKE = gmake
+
+OPT_FLAGS = -O2
+PIC_FLAGS = -fPIC
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
+ -DHZ=100
+
+X11_INCLUDES = -I/usr/local/include
+
+CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic
+
+CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
+
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+EXTRA_LIB_PATH = -L/usr/local/lib
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
--- /dev/null
+++ graphics/libglut/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig 2009-03-30 16:09:52 -0400
++++ Makefile 2009-03-30 16:11:30 -0400
+@@ -86,6 +86,10 @@
+ freebsd-dri \
+ freebsd-dri-amd64 \
+ freebsd-dri-x86 \
++midnightbsd \
++midnightbsd-dri \
++midnightbsd-dri-amd64 \
++midnightbsd-dri-x86 \
+ hpux10 \
+ hpux10-gcc \
+ hpux10-static \
--- /dev/null
+++ graphics/libglut/files/midnightbsd-dri-x86
@@ -0,0 +1,13 @@
+# -*-makefile-*-
+# Configuration for midnightbsd-dri: MidnightBSD DRI hardware drivers
+
+include $(TOP)/configs/midnightbsd-dri
+
+CONFIG_NAME = midnightbsd-dri-x86
+
+# Unnecessary on x86, generally.
+PIC_FLAGS =
+
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
--- /dev/null
+++ graphics/libglut/files/midnightbsd-dri
@@ -0,0 +1,54 @@
+# -*-makefile-*-
+# Configuration for midnightbsd-dri: MidnightBSD DRI hardware drivers
+
+include $(TOP)/configs/midnightbsd
+
+CONFIG_NAME = midnightbsd-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O -g
+
+EXPAT_INCLUDES = -I/usr/local/include
+X11_INCLUDES = -I/usr/local/include
+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+ -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+ -DHAVE_ALIAS
+
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
+ $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES)
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+ASM_SOURCES =
+
+# Library/program dependencies
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+LIBDRM_LIB = `pkg-config --libs libdrm`
+DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+ -lm -pthread $(LIBDRM_LIB)
+
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
+
+
+# Directories
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
+DRIVER_DIRS = dri
+PROGRAM_DIRS =
+WINDOW_SYSTEM=dri
+
+DRM_SOURCE_PATH=$(TOP)/../drm
+
+# ffb and gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+ unichrome savage sis
+
--- /dev/null
+++ graphics/libglut/files/midnightbsd-dri-amd64
@@ -0,0 +1,10 @@
+# -*-makefile-*-
+# Configuration for midnightbsd-dri-amd64: MidnightBSD DRI hardware drivers
+
+include $(TOP)/configs/midnightbsd-dri
+
+CONFIG_NAME = midnightbsd-dri-x86-64
+
+ASM_FLAGS = -DUSE_X86_64_ASM
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
--- graphics/libglut/files/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# Makefile for building libglut
-#
-# $MidnightBSD: mports/graphics/libglut/files/Makefile,v 1.3 2007/11/10 00:15:08 laffer1 Exp $
-# $FreeBSD: ports/graphics/libglut/files/Makefile,v 1.4 2007/07/02 16:46:12 jkim Exp $
-
-LIB= glut
-SHLIB_MAJOR= 4
-CFLAGS+= -I../../../include -I${X11BASE}/include
-LDFLAGS+= -L${X11BASE}/lib -lGLU -lX11 -lXext -lGL -lXmu -lXi
-LIBDIR= ${PREFIX}/lib
-NO_PROFILE?= yes
-
-beforeinstall:
- ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${.CURDIR}/../../../include/GL/glut.h \
- ${DESTDIR}${PREFIX}/include/GL
-
-SRCS = \
- glut_8x13.c \
- glut_9x15.c \
- glut_bitmap.c \
- glut_bwidth.c \
- glut_cindex.c \
- glut_cmap.c \
- glut_cursor.c \
- glut_dials.c \
- glut_dstr.c \
- glut_event.c \
- glut_ext.c \
- glut_fbc.c \
- glut_fullscrn.c \
- glut_gamemode.c \
- glut_get.c \
- glut_glxext.c \
- glut_hel10.c \
- glut_hel12.c \
- glut_hel18.c \
- glut_init.c \
- glut_input.c \
- glut_joy.c \
- glut_key.c \
- glut_keyctrl.c \
- glut_keyup.c \
- glut_menu.c \
- glut_menu2.c \
- glut_mesa.c \
- glut_modifier.c \
- glut_mroman.c \
- glut_overlay.c \
- glut_roman.c \
- glut_shapes.c \
- glut_space.c \
- glut_stroke.c \
- glut_swap.c \
- glut_swidth.c \
- glut_tablet.c \
- glut_teapot.c \
- glut_tr10.c \
- glut_tr24.c \
- glut_util.c \
- glut_vidresize.c \
- glut_warp.c \
- glut_win.c \
- glut_winmisc.c \
- layerutil.c
-
-.include <bsd.lib.mk>
--- /dev/null
+++ graphics/libglut/files/patch-bin__mklib
@@ -0,0 +1,11 @@
+--- bin/mklib.bak 2009-03-15 15:22:11 -0400
++++ bin/mklib 2009-03-15 15:22:25 -0400
+@@ -420,7 +420,7 @@
+ fi
+ ;;
+
+- 'FreeBSD')
++ 'FreeBSD' | 'MidnightBSD')
+ # we assume gcc
+
+ if [ "x$LINK" = "x" ] ; then
More information about the Midnightbsd-cvs
mailing list