diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-03-15 11:50:30 +0000 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-03-15 11:50:30 +0000 |
| commit | c83fc147f281f40368eeeb99ccaddf23c951985f (patch) | |
| tree | abd636436f529da27c1fa809e260480c5889902c | |
| parent | 844a1e6efa7f63aaccac878cd3476dbf129e7a4f (diff) | |
| download | FreeBSD-ports-c83fc147f281f40368eeeb99ccaddf23c951985f.zip FreeBSD-ports-c83fc147f281f40368eeeb99ccaddf23c951985f.tar.gz | |
- Unbreak build with Clang
- Drop USE_GCC as it's no longer required
- Bump PORTREVISION for 10+ packages
Differential Revision: https://reviews.freebsd.org/D1860
PR: 197010
Obtained from: https://bitbucket.org/pygame/pygame/commits/e296ada67fad
Approved by: mva (maintainer)
| -rw-r--r-- | devel/py-game/Makefile | 6 | ||||
| -rw-r--r-- | devel/py-game/files/patch-src_scale__mmx64.c | 28 |
2 files changed, 31 insertions, 3 deletions
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile index f228f89..5b34035 100644 --- a/devel/py-game/Makefile +++ b/devel/py-game/Makefile @@ -3,7 +3,7 @@ PORTNAME= game PORTVERSION= 1.9.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel python MASTER_SITES= http://pygame.seul.org/ftp/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,9 +17,9 @@ LICENSE= LGPL21 LIB_DEPENDS= libsmpeg.so:${PORTSDIR}/multimedia/smpeg RUN_DEPENDS= ${PYNUMPY} -USES= python +USES= dos2unix python +DOS2UNIX_FILES= src/scale_mmx64.c USE_SDL= ttf image mixer sdl -USE_GCC= any USE_PYTHON= autoplist distutils SDLNOX11= sdl-nox11-[0-9]* diff --git a/devel/py-game/files/patch-src_scale__mmx64.c b/devel/py-game/files/patch-src_scale__mmx64.c new file mode 100644 index 0000000..df9f9b5 --- /dev/null +++ b/devel/py-game/files/patch-src_scale__mmx64.c @@ -0,0 +1,28 @@ +# HG changeset patch +# User Rene Dudfield <renesd@gmail.com> +# Date 1343499364 -7200 +# Node ID e296ada67fad8e01e017ed6ede554fabb1402d26 +# Parent d2c7ea7488013b87c483f4df0b5ca80bdc87e065 +Fix for scale_mmx64.c with clang. Thanks Joshua Root. Closes #94 + +diff --git a/src/scale_mmx64.c b/src/scale_mmx64.c +--- src/scale_mmx64.c.orig 2008-10-22 20:54:59 UTC ++++ src/scale_mmx64.c +@@ -425,7 +425,7 @@ filter_expand_X_MMX(Uint8 *srcpix, Uint8 + " movl %5, %%ecx; " + " pxor %%mm0, %%mm0; " + "1: " +- " movsxl (%3), %%rax; " /* get xidx0[x] */ ++ " movslq (%3), %%rax; " /* get xidx0[x] */ + " add $4, %3; " + " movq (%0), %%mm1; " /* load mult0 */ + " add $8, %0; " +@@ -500,7 +500,7 @@ filter_expand_X_SSE(Uint8 *srcpix, Uint8 + " movl %5, %%ecx; " + " pxor %%mm0, %%mm0; " + "1: " +- " movsxl (%3), %%rax; " /* get xidx0[x] */ ++ " movslq (%3), %%rax; " /* get xidx0[x] */ + " add $4, %3; " + " movq (%0), %%mm1; " /* load mult0 */ + " add $8, %0; " |
