Attachment 127563 Details for Bug 171408 – fretsonfire.diff

[patch] fretsonfire.diff

fretsonfire.diff (text/x-patch), 7.77 KB, created by nemysis on 2012-09-21 15:16:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-09-21 15:16:05 UTC

Size: 7.77 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/games/fretsonfire/Makefile ./Makefile
>--- /usr/ports/games/fretsonfire/Makefile	2012-03-26 10:04:08.000000000 +0200
>+++ ./Makefile	2012-09-21 14:21:54.000000000 +0200
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	fretsonfire
> PORTVERSION=	1.3.110
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games python
> MASTER_SITES=	SF
> DISTNAME=	${PORTNAME:S/f/F/g:S/o/O/}-${PORTVERSION}
>@@ -16,34 +16,36 @@
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	A game of musical skill and fast fingers
> 
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
>-		${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
>-		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \
>-		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
>+RUN_DEPENDS=	${PYNUMPY} \
>+		${PYTHON_PKGNAMEPREFIX}game>=0:${PORTSDIR}/devel/py-game \
>+		${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl \
>+		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
> 		${LOCALBASE}/share/${PORTNAME}/default.ttf:${PORTSDIR}/games/fretsonfire-data
> 
> USE_PYTHON=	yes
> USE_DOS2UNIX=	*.txt
> NO_BUILD=	yes
> 
>-BROKEN=		does not build
>-
> DATADIR=	share/${PORTNAME}
> EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude 'data'
> SUB_FILES=	pkg-message FretsOnFire
> SUB_LIST=	PROGRAM_DIR="${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}"
> WRKSRC=		"${WRKDIR}/Frets on Fire-${PORTVERSION}"
> 
>+USE_GETTEXT=	yes
>+
> FOF_DIR=	${PREFIX}/lib/${PORTNAME}
> 
>-.include <bsd.port.pre.mk>
>+PORTDOCS=	readme.txt
> 
>-.if ${ARCH} != "i386"
>-WITHOUT_PSYCO=	yes
>-.endif
>+OPTIONS_DEFINE=	PSYCO
>+PSYCO_DESC=	Enable Psyco support (Only for i386)
>+
>+.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
>-.if !defined(WITHOUT_PSYCO)
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
>+.if ${PORT_OPTIONS:MPSYCO}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psyco>=0:${PORTSDIR}/devel/py-psyco
> .endif
> 
> do-install:
>@@ -52,14 +54,15 @@
> 		${FIND} * -type d -exec ${MKDIR} "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; && \
> 			${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} "{}" "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \;
> 
>+# Data
> 	${MKDIR} ${FOF_DIR}/data
> 	${LN} -s ${LOCALBASE}/${DATADIR}/* ${FOF_DIR}/data
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME:S/f/F/g:S/o/O/} ${PREFIX}/bin
> 
>-.if !defined(NOPORTDOCS)
>+# Documentation
>+.if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/README
>-	${INSTALL_DATA} ${WRKSRC}/install.txt ${DOCSDIR}/INSTALL
>+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
> .endif
> 
> post-install:
>diff -ruN --exclude=CVS /usr/ports/games/fretsonfire/files/patch-src-Font.py ./files/patch-src-Font.py
>--- /usr/ports/games/fretsonfire/files/patch-src-Font.py	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-src-Font.py	2012-09-07 13:25:56.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- src/Font.py.orig	2008-02-02 15:27:38.000000000 +0100
>++++ src/Font.py	2012-09-07 13:22:33.000000000 +0200
>+@@ -186,7 +186,7 @@
>+     glDisable(GL_TEXTURE_2D)
>+ 
>+   def _allocateGlyphTexture(self):
>+-    t = TextureAtlas(size = glGetInteger(GL_MAX_TEXTURE_SIZE))
>++    t= TextureAtlas()
>+     t.texture.setFilter(GL_LINEAR, GL_LINEAR)
>+     t.texture.setRepeat(GL_CLAMP, GL_CLAMP)
>+     self.glyphTextures.append(t)
>diff -ruN --exclude=CVS /usr/ports/games/fretsonfire/pkg-descr ./pkg-descr
>--- /usr/ports/games/fretsonfire/pkg-descr	2006-10-03 19:42:13.000000000 +0200
>+++ ./pkg-descr	2012-09-07 13:42:03.000000000 +0200
>@@ -1,4 +1,4 @@
> Frets on Fire is a game of musical skill and fast fingers. The aim of the game 
> is to play guitar with the keyboard as accurately as possible.
> 
>-WWW:	http://louhi.kempele.fi/~skyostil/uv/fretsonfire/
>+WWW:	http://www.unrealvoodoo.org/projects/fretsonfire/
>diff -ruN --exclude=CVS /usr/ports/games/fretsonfire/pkg-plist ./pkg-plist
>--- /usr/ports/games/fretsonfire/pkg-plist	2009-05-30 04:48:27.000000000 +0200
>+++ ./pkg-plist	2012-09-21 14:24:44.000000000 +0200
>@@ -1,16 +1,4 @@
> bin/FretsOnFire
>-lib/fretsonfire/FretsOnFire/midi/RawInstreamFile.py
>-lib/fretsonfire/FretsOnFire/midi/constants.py
>-lib/fretsonfire/FretsOnFire/midi/MidiInFile.py
>-lib/fretsonfire/FretsOnFire/midi/MidiFileParser.py
>-lib/fretsonfire/FretsOnFire/midi/__init__.py
>-lib/fretsonfire/FretsOnFire/midi/DataTypeConverters.py
>-lib/fretsonfire/FretsOnFire/midi/RawOutstreamFile.py
>-lib/fretsonfire/FretsOnFire/midi/EventDispatcher.py
>-lib/fretsonfire/FretsOnFire/midi/MidiOutStream.py
>-lib/fretsonfire/FretsOnFire/midi/MidiOutFile.py
>-lib/fretsonfire/FretsOnFire/midi/MidiToText.py
>-lib/fretsonfire/FretsOnFire/midi/MidiInStream.py
> lib/fretsonfire/FretsOnFire/Audio.py
> lib/fretsonfire/FretsOnFire/AudioTest.py
> lib/fretsonfire/FretsOnFire/Camera.py
>@@ -32,12 +20,12 @@
> lib/fretsonfire/FretsOnFire/GameEngineTest.py
> lib/fretsonfire/FretsOnFire/GameResultsScene.py
> lib/fretsonfire/FretsOnFire/GameTask.py
>-lib/fretsonfire/FretsOnFire/Log.py
> lib/fretsonfire/FretsOnFire/Guitar.py
> lib/fretsonfire/FretsOnFire/GuitarScene.py
> lib/fretsonfire/FretsOnFire/Input.py
> lib/fretsonfire/FretsOnFire/Language.py
> lib/fretsonfire/FretsOnFire/Lobby.py
>+lib/fretsonfire/FretsOnFire/Log.py
> lib/fretsonfire/FretsOnFire/MainMenu.py
> lib/fretsonfire/FretsOnFire/Menu.py
> lib/fretsonfire/FretsOnFire/MenuTest.py
>@@ -57,8 +45,8 @@
> lib/fretsonfire/FretsOnFire/Server.py
> lib/fretsonfire/FretsOnFire/ServerTest.py
> lib/fretsonfire/FretsOnFire/Session.py
>-lib/fretsonfire/FretsOnFire/Song.py
> lib/fretsonfire/FretsOnFire/Settings.py
>+lib/fretsonfire/FretsOnFire/Song.py
> lib/fretsonfire/FretsOnFire/SongChoosingScene.py
> lib/fretsonfire/FretsOnFire/SongTest.py
> lib/fretsonfire/FretsOnFire/Stage.py
>@@ -77,6 +65,18 @@
> lib/fretsonfire/FretsOnFire/View.py
> lib/fretsonfire/FretsOnFire/ViewTest.py
> lib/fretsonfire/FretsOnFire/World.py
>+lib/fretsonfire/FretsOnFire/midi/DataTypeConverters.py
>+lib/fretsonfire/FretsOnFire/midi/EventDispatcher.py
>+lib/fretsonfire/FretsOnFire/midi/MidiFileParser.py
>+lib/fretsonfire/FretsOnFire/midi/MidiInFile.py
>+lib/fretsonfire/FretsOnFire/midi/MidiInStream.py
>+lib/fretsonfire/FretsOnFire/midi/MidiOutFile.py
>+lib/fretsonfire/FretsOnFire/midi/MidiOutStream.py
>+lib/fretsonfire/FretsOnFire/midi/MidiToText.py
>+lib/fretsonfire/FretsOnFire/midi/RawInstreamFile.py
>+lib/fretsonfire/FretsOnFire/midi/RawOutstreamFile.py
>+lib/fretsonfire/FretsOnFire/midi/__init__.py
>+lib/fretsonfire/FretsOnFire/midi/constants.py
> lib/fretsonfire/FretsOnFire/rgb2py.py
> lib/fretsonfire/FretsOnFire/setup_mac.py
> lib/fretsonfire/FretsOnFire/svg2png.py
>@@ -146,16 +146,15 @@
> lib/fretsonfire/data/logo.png
> lib/fretsonfire/data/logo.svg
> lib/fretsonfire/data/menu.ogg
>-lib/fretsonfire/data/mods
> lib/fretsonfire/data/myhero.ogg
> lib/fretsonfire/data/neck.png
> lib/fretsonfire/data/neck.svg
> lib/fretsonfire/data/note-star.3DS
> lib/fretsonfire/data/note.3DS
>-lib/fretsonfire/data/out.ogg
> lib/fretsonfire/data/note.dae
> lib/fretsonfire/data/note.png
> lib/fretsonfire/data/note.svg
>+lib/fretsonfire/data/out.ogg
> lib/fretsonfire/data/perfect1.ogg
> lib/fretsonfire/data/perfect2.ogg
> lib/fretsonfire/data/perfect3.ogg
>@@ -163,7 +162,6 @@
> lib/fretsonfire/data/pose.svg
> lib/fretsonfire/data/right.png
> lib/fretsonfire/data/right.svg
>-lib/fretsonfire/data/songs
> lib/fretsonfire/data/specialnote.dae
> lib/fretsonfire/data/stage.ini
> lib/fretsonfire/data/stage_audience1.png
>@@ -198,11 +196,10 @@
> lib/fretsonfire/data/testi.dae
> lib/fretsonfire/data/theme.ini
> lib/fretsonfire/data/title.ttf
>-lib/fretsonfire/data/translations
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+@dirrm lib/fretsonfire/data/translations
>+@dirrm lib/fretsonfire/data/songs
>+@dirrm lib/fretsonfire/data/mods
>+@dirrm lib/fretsonfire/data
> @dirrm lib/fretsonfire/FretsOnFire/midi
> @dirrm lib/fretsonfire/FretsOnFire
>-@dirrm lib/fretsonfire/data
> @dirrm lib/fretsonfire
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>===> Done

Actions: View | Diff

Attachments on bug 171408: 127561 | 127562 | 127563