Index: head/emulators/higan/Makefile =================================================================== --- head/emulators/higan/Makefile (revision 363231) +++ head/emulators/higan/Makefile (revision 363232) @@ -1,148 +1,148 @@ # Created by: elbarto # $FreeBSD$ PORTNAME= higan PORTVERSION= 0.94 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://byuu.org/files/ \ http://www.cyberbotx.com/higan/ DISTNAME= ${PORTNAME}_v${PORTVERSION:S/.//}-source MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Nintendo multi-system emulator USES= compiler:c++11-lib gmake pkgconfig tar:xz USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 #MAKE_ENV+= c="${CC} -std=gnu99" cpp="${CXX} -std=gnu++0x" MAKE_ENV+= compiler="${CXX}" cflags="-x c -std=c99 ${CFLAGS}" \ cppflags="-x c++ -std=c++11 ${CXXFLAGS}" OPTIONS_DEFINE= DEBUG OPTIONS_SINGLE= PROFILE GUI OPTIONS_SINGLE_PROFILE= ACCURACY BALANCED PERFORMANCE OPTIONS_SINGLE_GUI= GTK2 QT4 OPTIONS_MULTI= VIDEO SOUND INPUT OPTIONS_MULTI_VIDEO= GLX SDL XSHM XV OPTIONS_MULTI_SOUND= AO OPENAL OSS PULSEAUDIO OPTIONS_MULTI_INPUT= INPUT_SDL INPUT_X OPTIONS_DEFAULT= BALANCED GTK2 GLX XSHM XV SDL \ OSS INPUT_SDL INPUT_X ACCURACY_DESC= Use accuracy profile BALANCED_DESC= Use balanced profile PERFORMANCE_DESC= Use performance profile GTK2_DESC= Build with GTK+2 GUI QT4_DESC= Build with QT4 GUI GLX_DESC= Build GLX video driver SDL_DESC= Build SDL video driver XSHM_DESC= Build XShm video driver XV_DESC= Build Xv video driver AO_DESC= Build AO sound driver OPENAL_DESC= Build OpenAL sound driver OSS_DESC= Build OSS sound driver PULSEAUDIO_DESC= Build Pulseaudio sound driver INPUT_SDL_DESC= Build SDL input driver INPUT_X_DESC= Build X input driver ACCURACY_MAKE_ENV= profile="accuracy" BALANCED_MAKE_ENV= profile="balanced" PERFORMANCE_MAKE_ENV= profile="performance" GTK2_USE= GNOME=gtk20 GTK2_MAKE_ENV= phoenix="gtk" QT4_USE= QT4=gui,moc_build QT4_MAKE_ENV= phoenix="qt" GLX_USE= GL=gl SDL_USE= XORG=xv SDL=sdl XSHM_USE= XORG=xext XV_USE= XORG=xv AO_LIB_DEPENDS= libao.so:${PORTSDIR}/audio/libao OPENAL_USES= openal:al PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio INPUT_SDL_USE= SDL=sdl .include .if ${PORT_OPTIONS:MGLX} VIDEO_DRIVER+= video.glx .endif .if ${PORT_OPTIONS:MSDL} VIDEO_DRIVER+= video.sdl .endif .if ${PORT_OPTIONS:MXSHM} VIDEO_DRIVER+= video.xshm .endif .if ${PORT_OPTIONS:MXV} VIDEO_DRIVER+= video.xv .endif .if ${PORT_OPTIONS:MAO} AUDIO_DRIVER+= audio.ao .endif .if ${PORT_OPTIONS:MOPENAL} AUDIO_DRIVER+= audio.openal .endif .if ${PORT_OPTIONS:MOSS} AUDIO_DRIVER+= audio.oss .endif .if ${PORT_OPTIONS:MPULSEAUDIO} AUDIO_DRIVER+= audio.pulseaudio .endif .if ${PORT_OPTIONS:MINPUT_SDL} INPUT_DRIVER+= input.sdl .endif .if ${PORT_OPTIONS:MINPUT_X} INPUT_DRIVER+= input.xlib .endif post-patch: ${REINPLACE_CMD} \ -e 's|%%VIDEO%%|${VIDEO_DRIVER}|' \ -e 's|%%AUDIO%%|${AUDIO_DRIVER}|' \ -e 's|%%INPUT%%|${INPUT_DRIVER}|' \ ${WRKSRC}/target-ethos/Makefile ${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|' \ ${WRKSRC}/nall/string/platform.hpp .if ${PORT_OPTIONS:MDEBUG} ${REINPLACE_CMD} -e 's|-O3|-g|g' \ ${WRKSRC}/ananke/Makefile \ ${WRKSRC}/Makefile ${REINPLACE_CMD} -e 's|:= -s|:= #|g' \ ${WRKSRC}/Makefile .endif # ${RM} ${WRKSRC}/shaders/Sepia.Direct3D.shader do-build: .if ${PORT_OPTIONS:MQT4} (cd ${WRKSRC}/phoenix/qt && ${MOC} -i -o platform.moc platform.moc.hpp) .endif .for d in . ananke (cd ${WRKSRC}/${d} && ${MAKE_CMD} ${MAKE_ENV}) .endfor do-install: ${INSTALL_LIB} ${WRKSRC}/ananke/libananke.so ${STAGEDIR}${PREFIX}/lib/libananke.so.1 ${LN} -sf libananke.so.1 ${STAGEDIR}${PREFIX}/lib/libananke.so ${INSTALL_PROGRAM} ${WRKSRC}/out/higan ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/data/higan.png ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_DATA} ${WRKSRC}/data/higan.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${DATADIR}/shaders (cd ${WRKSRC}/profile && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/) (cd ${WRKSRC}/shaders && ${COPYTREE_SHARE} \*.shader ${STAGEDIR}${DATADIR}/shaders/) .include Index: head/emulators/higan/files/patch-ruby__video__glx.cpp =================================================================== --- head/emulators/higan/files/patch-ruby__video__glx.cpp (nonexistent) +++ head/emulators/higan/files/patch-ruby__video__glx.cpp (revision 363232) @@ -0,0 +1,31 @@ +--- ./ruby/video/glx.cpp.orig 2014-01-20 01:37:14.000000000 -0500 ++++ ./ruby/video/glx.cpp 2014-06-02 23:32:39.000000000 -0400 +@@ -128,6 +128,28 @@ + //require GLX 1.2+ API + if(glx.version_major < 1 || (glx.version_major == 1 && glx.version_minor < 2)) return false; + ++ int major, minor; ++ const char *version = (const char *) glGetString (GL_VERSION); ++ const char *dot = version == NULL ? NULL : strchr (version, '.'); ++ const char *major_start = dot; ++ ++ /* Sanity check */ ++ if (dot == NULL || dot == version || *(dot + 1) == '\0') { ++ major = 0; ++ minor = 0; ++ } else { ++ /* Find the start of the major version in the string */ ++ while (major_start > version && *major_start != ' ') ++ --major_start; ++ major = strtol (major_start, NULL, 10); ++ minor = strtol (dot + 1, NULL, 0); ++ } ++ ++ if(major < 3 || (major == 3 && minor < 2)) { ++ printf("Error: OpenGL 3.2 is not available. Select another video driver on the Advanced Configuration tab and restart higan.\n"); ++ return false; ++ } ++ + XWindowAttributes window_attributes; + XGetWindowAttributes(display, settings.handle, &window_attributes); + Property changes on: head/emulators/higan/files/patch-ruby__video__glx.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property