On Sun, Sep 09, 2012 at 09:39:12AM +0200, Landry Breuil wrote: > On Sun, Sep 09, 2012 at 02:02:08AM +0200, Tobias Ulmer wrote: > > Ping. Anyone brave enough to put this patch and the fixes into a bulk > > build? > Send a full diff and i'll put it into the next. > > Landry >
Index: graphics/freeglut/Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/graphics/freeglut/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- graphics/freeglut/Makefile 1 May 2012 16:10:07 -0000 1.6 +++ graphics/freeglut/Makefile 9 Sep 2012 10:00:14 -0000 @@ -1,9 +1,8 @@ # $OpenBSD: Makefile,v 1.6 2012/05/01 16:10:07 pascal Exp $ COMMENT = open source alternative to glut -DISTNAME = freeglut-2.6.0 -REVISION = 1 -SHARED_LIBS = glut 4.1 +DISTNAME = freeglut-2.8.0 +SHARED_LIBS = glut 5.0 CATEGORIES = graphics HOMEPAGE = http://freeglut.sourceforge.net/ MAINTAINER = Tobias Ulmer <[email protected]> @@ -14,7 +13,8 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = GL X11 Xext Xi Xxf86vm m xcb Xdamage Xfixes drm stdc++ +WANTLIB = GL X11 Xext Xxf86vm m xcb Xdamage Xfixes drm stdc++ +WANTLIB += usbhid MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=freeglut/} Index: graphics/freeglut/distinfo =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/graphics/freeglut/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- graphics/freeglut/distinfo 21 Mar 2010 12:45:21 -0000 1.2 +++ graphics/freeglut/distinfo 9 Sep 2012 10:00:14 -0000 @@ -1,5 +1,2 @@ -MD5 (freeglut-2.6.0.tar.gz) = OfDy3onzmVKdK5gRiAgiGA== -RMD160 (freeglut-2.6.0.tar.gz) = Q72xptmURe4JNwkw7GvA+DEOf88= -SHA1 (freeglut-2.6.0.tar.gz) = aDBsRIbBPQBaTk1UA14MCxvcIgs= -SHA256 (freeglut-2.6.0.tar.gz) = YVtB7clsQF7mu36aKUJkIUDD5Xwd2MaOlooX3ftZ6Y8= -SIZE (freeglut-2.6.0.tar.gz) = 1124186 +SHA256 (freeglut-2.8.0.tar.gz) = GXKT/4hqvmE7yetKdi2RYbDJ5ks+jmE+18XjU5dPugU= +SIZE (freeglut-2.8.0.tar.gz) = 979459 Index: graphics/freeglut/patches/patch-Makefile_in =================================================================== RCS file: graphics/freeglut/patches/patch-Makefile_in diff -N graphics/freeglut/patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/freeglut/patches/patch-Makefile_in 9 Sep 2012 10:00:14 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- Makefile.in.orig Thu Aug 30 08:08:49 2012 ++++ Makefile.in Thu Aug 30 08:09:12 2012 +@@ -230,7 +230,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src include progs doc ++SUBDIRS = src include #progs doc + AUTOMAKE_OPTIONS = gnu + EXTRA_DIST = \ + FrequentlyAskedQuestions \ Index: graphics/freeglut/patches/patch-include_GL_freeglut_ext_h =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/graphics/freeglut/patches/patch-include_GL_freeglut_ext_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-include_GL_freeglut_ext_h --- graphics/freeglut/patches/patch-include_GL_freeglut_ext_h 1 May 2012 16:10:07 -0000 1.1 +++ graphics/freeglut/patches/patch-include_GL_freeglut_ext_h 9 Sep 2012 10:00:14 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-include_GL_freeglut_ext_h,v 1.1 2012/05/01 16:10:07 pascal Exp $ ---- include/GL/freeglut_ext.h.orig Mon Apr 30 20:39:58 2012 -+++ include/GL/freeglut_ext.h Mon Apr 30 20:40:07 2012 -@@ -163,7 +163,7 @@ FGAPI void FGAPIENTRY glutSolidCylinder( GLdouble r +--- include/GL/freeglut_ext.h.orig Sun Sep 4 21:38:32 2011 ++++ include/GL/freeglut_ext.h Thu Aug 30 07:10:04 2012 +@@ -170,7 +170,7 @@ FGAPI void FGAPIENTRY glutSolidCylinder( GLdouble r /* * Extension functions, see freeglut_ext.c */ Index: graphics/hs-GLUT/Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/graphics/hs-GLUT/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- graphics/hs-GLUT/Makefile 2 Sep 2012 21:21:05 -0000 1.13 +++ graphics/hs-GLUT/Makefile 9 Sep 2012 10:00:15 -0000 @@ -3,7 +3,7 @@ COMMENT = Haskell binding for the OpenGL Utility Toolkit DISTNAME = GLUT-2.1.2.1 -REVISION = 9 +REVISION = 10 CATEGORIES = graphics devel HOMEPAGE = http://www.haskell.org/HOpenGL/ @@ -28,6 +28,6 @@ BUILD_DEPENDS = ${RUN_DEPENDS} MODGHC_SETUP_CONF_ENV = CPPFLAGS=-I${LOCALBASE}/include \ - LDFLAGS=-L${LOCALBASE}/lib + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr" .include <bsd.port.mk> Index: graphics/hugin/Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/graphics/hugin/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- graphics/hugin/Makefile 29 Mar 2012 13:38:31 -0000 1.27 +++ graphics/hugin/Makefile 9 Sep 2012 10:00:15 -0000 @@ -6,7 +6,7 @@ SHARED_ONLY = Yes COMMENT = panorama image stitcher DISTNAME = hugin-2011.0.0 -REVISION= 0 +REVISION= 1 EXTRACT_SUFX = .tar.bz2 # not needed for releases, but makes RCs/betas easier to work with Index: graphics/hugin/patches/patch-CMakeModules_FindGLUT_cmake =================================================================== RCS file: graphics/hugin/patches/patch-CMakeModules_FindGLUT_cmake diff -N graphics/hugin/patches/patch-CMakeModules_FindGLUT_cmake --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/hugin/patches/patch-CMakeModules_FindGLUT_cmake 9 Sep 2012 10:00:15 -0000 @@ -0,0 +1,28 @@ +$OpenBSD$ +--- CMakeModules/FindGLUT.cmake.orig Thu Aug 30 19:53:26 2012 ++++ CMakeModules/FindGLUT.cmake Thu Aug 30 20:10:13 2012 +@@ -54,6 +54,10 @@ ELSE (WIN32) + FIND_LIBRARY( GLUT_Xi_LIBRARY Xi + /usr/openwin/lib + ) ++ ++ FIND_LIBRARY( GLUT_Xrandr_LIBRARY Xrandr ++ /usr/openwin/lib ++ ) + + FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu + /usr/openwin/lib +@@ -72,6 +76,7 @@ IF(GLUT_INCLUDE_DIR) + ${GLUT_glut_LIBRARY} + ${GLUT_Xmu_LIBRARY} + ${GLUT_Xi_LIBRARY} ++ ${GLUT_Xrandr_LIBRARY} + ${GLUT_cocoa_LIBRARY} + ) + SET( GLUT_FOUND "YES" ) +@@ -94,4 +99,5 @@ MARK_AS_ADVANCED( + GLUT_glut_LIBRARY + GLUT_Xmu_LIBRARY + GLUT_Xi_LIBRARY ++ GLUT_Xrandr_LIBRARY + ) Index: graphics/mhgui/Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/graphics/mhgui/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- graphics/mhgui/Makefile 15 Mar 2012 13:38:33 -0000 1.12 +++ graphics/mhgui/Makefile 9 Sep 2012 10:00:17 -0000 @@ -4,7 +4,7 @@ COMMENT= GUI widget library used in Make DISTNAME= mhgui-0.2 CATEGORIES= graphics -REVISION= 0 +REVISION= 1 SHARED_LIBS += mhgui 1.0 # unknown @@ -17,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += GL GLU ICE SM X11 Xdamage Xext Xfixes Xi Xmu Xt Xxf86vm -WANTLIB += animorph drm glut m png stdc++ xcb z +WANTLIB += animorph drm glut m png stdc++ xcb z Xrandr Xrender usbhid MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=makehuman/} @@ -30,7 +30,7 @@ CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/GL \ -I${LOCALBASE}/include/libpng" \ - LDFLAGS="-L${LOCALBASE}/lib -lz -lm" + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lz -lm -lXrandr" CONFIGURE_ARGS= ${CONFIGURE_SHARED} Index: games/glsfcave/Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/games/glsfcave/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- games/glsfcave/Makefile 16 Nov 2010 11:23:27 -0000 1.6 +++ games/glsfcave/Makefile 9 Sep 2012 10:00:25 -0000 @@ -5,7 +5,7 @@ COMMENT= control a ribbon to avoid hitti V= 1.0 DISTNAME= glsfcave-$V-mitl PKGNAME= glsfcave-$V -REVISION = 2 +REVISION = 3 CATEGORIES= games EXTRACT_SUFX= .tar.bz2 @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -WANTLIB= GL GLU X11 Xext Xi Xmu c m pthread-stubs xcb glut>=4 +WANTLIB= GL GLU X11 Xext Xi Xmu c m pthread-stubs xcb glut>=4 Xrandr LIB_DEPENDS= graphics/freeglut Index: games/glsfcave/patches/patch-Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/games/glsfcave/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile --- games/glsfcave/patches/patch-Makefile 19 Mar 2008 20:22:09 -0000 1.1.1.1 +++ games/glsfcave/patches/patch-Makefile 9 Sep 2012 10:00:25 -0000 @@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2008/ #LDFLAGS=-lglut -lGLU -lGL -lXmu -lXi -lXext -lX11 -lgen ## FreeBSD/Linux -#LDFLAGS=-L/usr/X11R6/lib -lglut -lGLU -lGL -lXmu -lXi -lXext -lX11 -+LDFLAGS+=-lglut -lGLU -lGL -lXmu -lXi -lXext -lX11 -lm ++LDFLAGS+=-lglut -lGLU -lGL -lXmu -lXi -lXrandr -lXext -lX11 -lm glsfcave: main.o $(CC) $(CFLAGS) -o glsfcave main.o $(LDFLAGS) Index: games/supertuxkart/Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/games/supertuxkart/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- games/supertuxkart/Makefile 8 May 2011 20:14:54 -0000 1.7 +++ games/supertuxkart/Makefile 9 Sep 2012 10:00:30 -0000 @@ -5,6 +5,7 @@ COMMENT = kart racing game with OSS mas BASENAME = supertuxkart-0.7 DISTNAME = ${BASENAME}-src PKGNAME = ${BASENAME} +REVISION = 0 CATEGORIES = games @@ -19,7 +20,7 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB = GL GLU Irrlicht SDL X11 Xi Xmu c fribidi m ogg openal \ - pthread stdc++ vorbis vorbisfile glut + pthread stdc++ vorbis vorbisfile glut Xrandr MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=supertuxkart/SuperTuxKart/} EXTRACT_SUFX = .tar.bz2 @@ -43,7 +44,8 @@ CONFIGURE_ARGS = --with-libintl-prefix=$ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv \ -lGL -lGLU -lIrrlicht -lSDL -lXi -lXmu -lX11 \ - -lglut -lm -logg -pthread -lvorbis -lvorbisfile" + -lXrandr -lglut -lm -logg -pthread -lvorbis \ + -lvorbisfile" WRKDIST = ${WRKDIR}/${BASENAME} Index: lang/parrot/Makefile =================================================================== RCS file: /home/vcs/cvs/openbsd/ports/lang/parrot/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- lang/parrot/Makefile 13 Jul 2012 09:46:05 -0000 1.23 +++ lang/parrot/Makefile 9 Sep 2012 10:00:36 -0000 @@ -6,6 +6,7 @@ COMMENT= virtual machine designed for in V= 4.5.0 DISTNAME= parrot-$V +REVISION= 0 CATEGORIES= lang perl6 SHARED_LIBS= parrot 6.0 @@ -22,7 +23,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += GL GLU c glut gmp icudata icuuc m ncurses pthread -WANTLIB += readline stdc++ util z ffi +WANTLIB += readline stdc++ util z ffi Xi Xrandr BUILD_DEPENDS= graphics/glew \ devel/pcre Index: lang/parrot/patches/patch-config_auto_opengl_pm =================================================================== RCS file: lang/parrot/patches/patch-config_auto_opengl_pm diff -N lang/parrot/patches/patch-config_auto_opengl_pm --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/parrot/patches/patch-config_auto_opengl_pm 9 Sep 2012 10:00:36 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- config/auto/opengl.pm.orig Fri Aug 31 15:43:50 2012 ++++ config/auto/opengl.pm Fri Aug 31 15:44:11 2012 +@@ -177,7 +177,7 @@ sub runstep { + win32_gcc => '-lglut32 -lglu32 -lopengl32', + win32_nongcc => 'opengl32.lib glu32.lib glut32.lib', + darwin => '-framework OpenGL -framework GLUT', +- default => '-lglut -lGLU -lGL', ++ default => '-lglut -lGLU -lGL -lXi -lXrandr', + } ); + + $conf->cc_gen('config/auto/opengl/opengl_c.in');
