subject:"\[UPDATE\] teeworlds\-0.6.2"

Re: [UPDATE] teeworlds-0.6.2

2014-11-14 Thread Donovan Watteau

Hi,

Anyone else's ok for this update?  Thanks.

On Fri, 11 Jul 2014, Jonathan Armani wrote:
 Hi,
 Tested ok on amd64 and diff looks good. 
 I'm not sure the tweaks in MESSAGE are still revelant, but it can be
 adjusted later.
 
 Does someone have an idea for SDL_VIDEO_X11_DGAMOUSE ? A problem without
 gfx_noclip 0 ?
 
 ok armani@
 
 
 2014-05-08 18:42 GMT+02:00 Donovan Watteau tso...@gmail.com:
   Hi,
 
   The following diff updates Teeworlds to 0.6.2.
 
   In early 2012, I sent an update from teeworlds-0.5.2 to 0.6.1 to
   armani@.  But today, 0.5.2 is still the tree, so I'd like to
   take
   its maintainership.
 
   Here are the changes:
   - don't bother building on strict-alignment archs.  On loongson,
   both
     the client and the server SIGBUS during startup, and looking
   at the
     code it seems that it will crash on anything not x86 or ppc.
   - don't include an extra copy of DejaVuSans.ttf.
   - use audio/wavpack, not an internal copy.
   - make sure an internal zlib is never used.
   - invoke bam with -a, to make sure that it will abort on
   error.
   - don't enforce the stack protector, base gcc(1) enables it
   wherever
     it's possible.
   - fix endianness detection (my macppc is no longer supported,
   but
     two years ago this patch was required).
   - drop patch-src_engine_client_ec_snd_c.  At first, I ported it
   to
     teeworlds-0.6.2, but actually this patch makes audio much
   worse
     for me, and I can't observe anymore the crash it was supposed
     to fix.
 
   snip

Re: [UPDATE] teeworlds-0.6.2

2014-11-14 Thread Donovan Watteau

On Fri, 14 Nov 2014, Brian Callahan wrote:
 Could you resend the diff? (and make sure it's still working on -current) July
 was a long time ago...

Yes, it still works on -current.

Here you go (there are some CRLF in patch-bam_0_2_0_src_base_bam
though):

Index: Makefile
===
RCS file: /cvs/ports/games/teeworlds/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile9 Aug 2013 19:04:49 -   1.17
+++ Makefile14 Nov 2014 20:45:41 -
@@ -1,60 +1,69 @@
 # $OpenBSD: Makefile,v 1.17 2013/08/09 19:04:49 ajacoutot Exp $
 
-COMMENT =  platform game featuring buggers equipped with weapons
+# Crashes on strict-alignment archs, see: src/base/system.c:164
+ONLY_FOR_ARCHS=amd64 i386 powerpc
 
-V =0.5.2
-DISTNAME = teeworlds-${V}-src
-PKGNAME =  teeworlds-${V}
-REVISION = 4
-CATEGORIES =   games
+COMMENT=   platform game featuring buggers equipped with weapons
 
-MAINTAINER =   Jonathan Armani arm...@openbsd.org
-HOMEPAGE = http://www.teeworlds.com/
+V= 0.6.2
+DISTNAME=  teeworlds-${V}-source
+PKGNAME=   teeworlds-${V}
+CATEGORIES=games
 
-BAM_VERSION =  0.2.0
-BAM_WRKSRC =   ${WRKSRC}/bam-${BAM_VERSION}
-BAM_TARGET =   release
+HOMEPAGE=  http://www.teeworlds.com/
 
-MASTER_SITES = http://www.teeworlds.com/files/
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
+MAINTAINER=Donovan Watteau tso...@gmail.com
 
-# GPLv2
-PERMIT_PACKAGE_CDROM = Yes
+BAM_VERSION=   0.4.0
+BAM_WRKSRC=${WRKSRC}/bam-${BAM_VERSION}
 
-WANTLIB =  GL GLU SDL X11 c m pthread stdc++ z
-LIB_DEPENDS =  devel/sdl
+MASTER_SITES=  http://www.teeworlds.com/files/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
 
-MODULES =  lang/python
+# BSD-like
+PERMIT_PACKAGE_CDROM=  Yes
 
-NO_TEST =  Yes
+WANTLIB=   GL GLU SDL X11 c freetype m pthread stdc++ wavpack z
 
-GAMEDIR =  ${PREFIX}/share/teeworlds
+LIB_DEPENDS=   audio/wavpack \
+   devel/sdl
 
-SUBST_VARS =   CC CXX CFLAGS
+MODULES=   lang/python
+
+SUBST_VARS=CC CXX CFLAGS CXXFLAGS X11BASE
+
+NO_TEST=   Yes
 
 post-extract:
@mv ${WRKDIR}/bam-${BAM_VERSION} ${BAM_WRKSRC}
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/src/engine/e_engine.c \
-   ${WRKSRC}/scripts/make_src.py \
+   @${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
+   ${WRKSRC}/src/game/client/gameclient.cpp \
+   ${WRKSRC}/scripts/build.py \
+   ${WRKSRC}/scripts/compiler.py \
${WRKSRC}/scripts/font_installer.sh \
-   ${WRKSRC}/default.bam \
+   ${WRKSRC}/scripts/make_src.py \
+   ${WRKSRC}/bam.lua \
${BAM_WRKSRC}/make_unix.sh \
-   ${BAM_WRKSRC}/src/driver_gcc.bam \
-   ${BAM_WRKSRC}/src/base.bam
+   ${BAM_WRKSRC}/src/driver_gcc.lua \
+   ${BAM_WRKSRC}/src/base.lua
+   # Make sure internal wavpack and zlib can't be picked up
+   rm -rf ${WRKSRC}/src/engine/external/{wavpack,zlib}
+   # Don't provide an extra copy of DejaVu
+   rm -rf ${WRKSRC}/data/fonts
 
 # build bam executable - teeworlds own build system
 pre-build:
cd ${BAM_WRKSRC}  /bin/sh -v make_unix.sh
 
 do-build:
-   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/src/bam -v ${BAM_TARGET}
+   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/bam -a -v release 
wavpack=${LOCALBASE}
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
-   ${INSTALL_DATA_DIR} ${GAMEDIR}
-   cd ${WRKSRC}; tar cf - data | tar xf - -C ${GAMEDIR}
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/teeworlds
+   cd ${WRKSRC}; tar cf - data | tar xf - -C ${PREFIX}/share/teeworlds
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/games/teeworlds/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Aug 2013 19:04:49 -   1.4
+++ distinfo14 Nov 2014 20:45:41 -
@@ -1,4 +1,4 @@
-SHA256 (bam-0.2.0.tar.gz) = 72zdwd9HsNgQYmUDPvTlXmHeyr8ieaKs1/3wFmM8B1g=
-SHA256 (teeworlds-0.5.2-src.tar.gz) = 
GBGnG/mhRwx6aTCANXREkvPoUK790S8bwiP7hdmM9MA=
-SIZE (bam-0.2.0.tar.gz) = 162342
-SIZE (teeworlds-0.5.2-src.tar.gz) = 6393472
+SHA256 (bam-0.4.0.tar.gz) = Xk5JILTSZdpYL2Z3TpseyN37513cAo+6hsEvaG6hjbM=
+SHA256 (teeworlds-0.6.2-source.tar.gz) = 
AAYbMDd1l6YYEO2j3F3gyq1DnKhRy47rvkFS5Phh4q8=
+SIZE (bam-0.4.0.tar.gz) = 206780
+SIZE (teeworlds-0.6.2-source.tar.gz) = 9179568
Index: patches/patch-bam-0_2_0_make_unix_sh
===
RCS file: patches/patch-bam-0_2_0_make_unix_sh
diff -N patches/patch-bam-0_2_0_make_unix_sh
--- patches/patch-bam-0_2_0_make_unix_sh9 Aug 2013 19:04:49 -   
1.3

Re: [UPDATE] teeworlds-0.6.2

2014-11-14 Thread Brian Callahan



On 11/14/14 15:51, Donovan Watteau wrote:

On Fri, 14 Nov 2014, Brian Callahan wrote:

Could you resend the diff? (and make sure it's still working on -current) July
was a long time ago...

Yes, it still works on -current.


Thanks. One of the patches doesn't apply cleanly but it's a patch that 
gets removed anyway.

Tests good on amd64. Someone else to give an ok?

~Brian


Here you go (there are some CRLF in patch-bam_0_2_0_src_base_bam
though):

Index: Makefile
===
RCS file: /cvs/ports/games/teeworlds/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile9 Aug 2013 19:04:49 -   1.17
+++ Makefile14 Nov 2014 20:45:41 -
@@ -1,60 +1,69 @@
  # $OpenBSD: Makefile,v 1.17 2013/08/09 19:04:49 ajacoutot Exp $
  
-COMMENT =	platform game featuring buggers equipped with weapons

+# Crashes on strict-alignment archs, see: src/base/system.c:164
+ONLY_FOR_ARCHS=amd64 i386 powerpc
  
-V =		0.5.2

-DISTNAME = teeworlds-${V}-src
-PKGNAME =  teeworlds-${V}
-REVISION = 4
-CATEGORIES =   games
+COMMENT=   platform game featuring buggers equipped with weapons
  
-MAINTAINER =	Jonathan Armani arm...@openbsd.org

-HOMEPAGE = http://www.teeworlds.com/
+V= 0.6.2
+DISTNAME=  teeworlds-${V}-source
+PKGNAME=   teeworlds-${V}
+CATEGORIES=games
  
-BAM_VERSION =	0.2.0

-BAM_WRKSRC =   ${WRKSRC}/bam-${BAM_VERSION}
-BAM_TARGET =   release
+HOMEPAGE=  http://www.teeworlds.com/
  
-MASTER_SITES =	http://www.teeworlds.com/files/

-DISTFILES =${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
+MAINTAINER=Donovan Watteau tso...@gmail.com
  
-# GPLv2

-PERMIT_PACKAGE_CDROM = Yes
+BAM_VERSION=   0.4.0
+BAM_WRKSRC=${WRKSRC}/bam-${BAM_VERSION}
  
-WANTLIB =	GL GLU SDL X11 c m pthread stdc++ z

-LIB_DEPENDS =  devel/sdl
+MASTER_SITES=  http://www.teeworlds.com/files/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
  
-MODULES =	lang/python

+# BSD-like
+PERMIT_PACKAGE_CDROM=  Yes
  
-NO_TEST =	Yes

+WANTLIB=   GL GLU SDL X11 c freetype m pthread stdc++ wavpack z
  
-GAMEDIR =	${PREFIX}/share/teeworlds

+LIB_DEPENDS=   audio/wavpack \
+   devel/sdl
  
-SUBST_VARS =	CC CXX CFLAGS

+MODULES=   lang/python
+
+SUBST_VARS=CC CXX CFLAGS CXXFLAGS X11BASE
+
+NO_TEST=   Yes
  
  post-extract:

@mv ${WRKDIR}/bam-${BAM_VERSION} ${BAM_WRKSRC}
  
  pre-configure:

-   ${SUBST_CMD} ${WRKSRC}/src/engine/e_engine.c \
-   ${WRKSRC}/scripts/make_src.py \
+   @${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
+   ${WRKSRC}/src/game/client/gameclient.cpp \
+   ${WRKSRC}/scripts/build.py \
+   ${WRKSRC}/scripts/compiler.py \
${WRKSRC}/scripts/font_installer.sh \
-   ${WRKSRC}/default.bam \
+   ${WRKSRC}/scripts/make_src.py \
+   ${WRKSRC}/bam.lua \
${BAM_WRKSRC}/make_unix.sh \
-   ${BAM_WRKSRC}/src/driver_gcc.bam \
-   ${BAM_WRKSRC}/src/base.bam
+   ${BAM_WRKSRC}/src/driver_gcc.lua \
+   ${BAM_WRKSRC}/src/base.lua
+   # Make sure internal wavpack and zlib can't be picked up
+   rm -rf ${WRKSRC}/src/engine/external/{wavpack,zlib}
+   # Don't provide an extra copy of DejaVu
+   rm -rf ${WRKSRC}/data/fonts
  
  # build bam executable - teeworlds own build system

  pre-build:
cd ${BAM_WRKSRC}  /bin/sh -v make_unix.sh
  
  do-build:

-   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/src/bam -v ${BAM_TARGET}
+   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/bam -a -v release 
wavpack=${LOCALBASE}
  
  do-install:

${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
-   ${INSTALL_DATA_DIR} ${GAMEDIR}
-   cd ${WRKSRC}; tar cf - data | tar xf - -C ${GAMEDIR}
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/teeworlds
+   cd ${WRKSRC}; tar cf - data | tar xf - -C ${PREFIX}/share/teeworlds
  
  .include bsd.port.mk

Index: distinfo
===
RCS file: /cvs/ports/games/teeworlds/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Aug 2013 19:04:49 -   1.4
+++ distinfo14 Nov 2014 20:45:41 -
@@ -1,4 +1,4 @@
-SHA256 (bam-0.2.0.tar.gz) = 72zdwd9HsNgQYmUDPvTlXmHeyr8ieaKs1/3wFmM8B1g=
-SHA256 (teeworlds-0.5.2-src.tar.gz) = 
GBGnG/mhRwx6aTCANXREkvPoUK790S8bwiP7hdmM9MA=
-SIZE (bam-0.2.0.tar.gz) = 162342
-SIZE (teeworlds-0.5.2-src.tar.gz) = 6393472
+SHA256 (bam-0.4.0.tar.gz) = Xk5JILTSZdpYL2Z3TpseyN37513cAo+6hsEvaG6hjbM=
+SHA256 (teeworlds-0.6.2-source.tar.gz) = 
AAYbMDd1l6YYEO2j3F3gyq1DnKhRy47rvkFS5Phh4q8=
+SIZE (bam-0.4.0.tar.gz) = 206780
+SIZE (teeworlds-0.6.2-source.tar.gz) = 9179568
Index: patches/patch-bam-0_2_0_make_unix_sh

Re: [UPDATE] teeworlds-0.6.2

2014-09-05 Thread Jonathan Armani

Hi,

I would like a review / ok from another porter to commit that.

Thanks


2014-07-11 12:19 GMT+02:00 Jonathan Armani d...@asystant.net:

 Hi,

 Tested ok on amd64 and diff looks good.
 I'm not sure the tweaks in MESSAGE are still revelant, but it can be
 adjusted later.

 Does someone have an idea for SDL_VIDEO_X11_DGAMOUSE ? A problem without
 gfx_noclip 0 ?

 ok armani@


 2014-05-08 18:42 GMT+02:00 Donovan Watteau tso...@gmail.com:

 Hi,

 The following diff updates Teeworlds to 0.6.2.

 In early 2012, I sent an update from teeworlds-0.5.2 to 0.6.1 to
 armani@.  But today, 0.5.2 is still the tree, so I'd like to take
 its maintainership.

 Here are the changes:
 - don't bother building on strict-alignment archs.  On loongson, both
   the client and the server SIGBUS during startup, and looking at the
   code it seems that it will crash on anything not x86 or ppc.
 - don't include an extra copy of DejaVuSans.ttf.
 - use audio/wavpack, not an internal copy.
 - make sure an internal zlib is never used.
 - invoke bam with -a, to make sure that it will abort on error.
 - don't enforce the stack protector, base gcc(1) enables it wherever
   it's possible.
 - fix endianness detection (my macppc is no longer supported, but
   two years ago this patch was required).
 - drop patch-src_engine_client_ec_snd_c.  At first, I ported it to
   teeworlds-0.6.2, but actually this patch makes audio much worse
   for me, and I can't observe anymore the crash it was supposed
   to fix.

 Index: Makefile
 ===
 RCS file: /cvs/ports/games/teeworlds/Makefile,v
 retrieving revision 1.17
 diff -u -p -r1.17 Makefile
 --- Makefile9 Aug 2013 19:04:49 -   1.17
 +++ Makefile8 May 2014 16:16:48 -
 @@ -1,60 +1,69 @@
  # $OpenBSD: Makefile,v 1.17 2013/08/09 19:04:49 ajacoutot Exp $

 -COMMENT =  platform game featuring buggers equipped with weapons
 +# Crashes on strict-alignment archs, see: src/base/system.c:164
 +ONLY_FOR_ARCHS=amd64 i386 powerpc

 -V =0.5.2
 -DISTNAME = teeworlds-${V}-src
 -PKGNAME =  teeworlds-${V}
 -REVISION = 4
 -CATEGORIES =   games
 +COMMENT=   platform game featuring buggers equipped with weapons

 -MAINTAINER =   Jonathan Armani arm...@openbsd.org
 -HOMEPAGE = http://www.teeworlds.com/
 +V= 0.6.2
 +DISTNAME=  teeworlds-${V}-source
 +PKGNAME=   teeworlds-${V}
 +CATEGORIES=games

 -BAM_VERSION =  0.2.0
 -BAM_WRKSRC =   ${WRKSRC}/bam-${BAM_VERSION}
 -BAM_TARGET =   release
 +HOMEPAGE=  http://www.teeworlds.com/

 -MASTER_SITES = http://www.teeworlds.com/files/
 -DISTFILES =${DISTNAME}${EXTRACT_SUFX}
 bam-${BAM_VERSION}${EXTRACT_SUFX}
 +MAINTAINER=Donovan Watteau tso...@gmail.com

 -# GPLv2
 -PERMIT_PACKAGE_CDROM = Yes
 +BAM_VERSION=   0.4.0
 +BAM_WRKSRC=${WRKSRC}/bam-${BAM_VERSION}

 -WANTLIB =  GL GLU SDL X11 c m pthread stdc++ z
 -LIB_DEPENDS =  devel/sdl
 +MASTER_SITES=  http://www.teeworlds.com/files/
 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
 bam-${BAM_VERSION}${EXTRACT_SUFX}

 -MODULES =  lang/python
 +# BSD-like
 +PERMIT_PACKAGE_CDROM=  Yes

 -NO_TEST =  Yes
 +WANTLIB=   GL GLU SDL X11 c freetype m pthread stdc++ wavpack z

 -GAMEDIR =  ${PREFIX}/share/teeworlds
 +LIB_DEPENDS=   audio/wavpack \
 +   devel/sdl

 -SUBST_VARS =   CC CXX CFLAGS
 +MODULES=   lang/python
 +
 +SUBST_VARS=CC CXX CFLAGS CXXFLAGS X11BASE
 +
 +NO_TEST=   Yes

  post-extract:
 @mv ${WRKDIR}/bam-${BAM_VERSION} ${BAM_WRKSRC}

  pre-configure:
 -   ${SUBST_CMD} ${WRKSRC}/src/engine/e_engine.c \
 -   ${WRKSRC}/scripts/make_src.py \
 +   @${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
 +   ${WRKSRC}/src/game/client/gameclient.cpp \
 +   ${WRKSRC}/scripts/build.py \
 +   ${WRKSRC}/scripts/compiler.py \
 ${WRKSRC}/scripts/font_installer.sh \
 -   ${WRKSRC}/default.bam \
 +   ${WRKSRC}/scripts/make_src.py \
 +   ${WRKSRC}/bam.lua \
 ${BAM_WRKSRC}/make_unix.sh \
 -   ${BAM_WRKSRC}/src/driver_gcc.bam \
 -   ${BAM_WRKSRC}/src/base.bam
 +   ${BAM_WRKSRC}/src/driver_gcc.lua \
 +   ${BAM_WRKSRC}/src/base.lua
 +   # Make sure internal wavpack and zlib can't be picked up
 +   rm -rf ${WRKSRC}/src/engine/external/{wavpack,zlib}
 +   # Don't provide an extra copy of DejaVu
 +   rm -rf ${WRKSRC}/data/fonts

  # build bam executable - teeworlds own build system
  pre-build:
 cd ${BAM_WRKSRC}  /bin/sh -v make_unix.sh

  do-build:
 -   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/src/bam -v ${BAM_TARGET}
 +   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/bam -a -v release
 wavpack=${LOCALBASE}

  do-install:
 ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
 ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
 -

Re: [UPDATE] teeworlds-0.6.2

2014-07-11 Thread Jonathan Armani

Hi,

Tested ok on amd64 and diff looks good.
I'm not sure the tweaks in MESSAGE are still revelant, but it can be
adjusted later.

Does someone have an idea for SDL_VIDEO_X11_DGAMOUSE ? A problem without
gfx_noclip 0 ?

ok armani@


2014-05-08 18:42 GMT+02:00 Donovan Watteau tso...@gmail.com:

 Hi,

 The following diff updates Teeworlds to 0.6.2.

 In early 2012, I sent an update from teeworlds-0.5.2 to 0.6.1 to
 armani@.  But today, 0.5.2 is still the tree, so I'd like to take
 its maintainership.

 Here are the changes:
 - don't bother building on strict-alignment archs.  On loongson, both
   the client and the server SIGBUS during startup, and looking at the
   code it seems that it will crash on anything not x86 or ppc.
 - don't include an extra copy of DejaVuSans.ttf.
 - use audio/wavpack, not an internal copy.
 - make sure an internal zlib is never used.
 - invoke bam with -a, to make sure that it will abort on error.
 - don't enforce the stack protector, base gcc(1) enables it wherever
   it's possible.
 - fix endianness detection (my macppc is no longer supported, but
   two years ago this patch was required).
 - drop patch-src_engine_client_ec_snd_c.  At first, I ported it to
   teeworlds-0.6.2, but actually this patch makes audio much worse
   for me, and I can't observe anymore the crash it was supposed
   to fix.

 Index: Makefile
 ===
 RCS file: /cvs/ports/games/teeworlds/Makefile,v
 retrieving revision 1.17
 diff -u -p -r1.17 Makefile
 --- Makefile9 Aug 2013 19:04:49 -   1.17
 +++ Makefile8 May 2014 16:16:48 -
 @@ -1,60 +1,69 @@
  # $OpenBSD: Makefile,v 1.17 2013/08/09 19:04:49 ajacoutot Exp $

 -COMMENT =  platform game featuring buggers equipped with weapons
 +# Crashes on strict-alignment archs, see: src/base/system.c:164
 +ONLY_FOR_ARCHS=amd64 i386 powerpc

 -V =0.5.2
 -DISTNAME = teeworlds-${V}-src
 -PKGNAME =  teeworlds-${V}
 -REVISION = 4
 -CATEGORIES =   games
 +COMMENT=   platform game featuring buggers equipped with weapons

 -MAINTAINER =   Jonathan Armani arm...@openbsd.org
 -HOMEPAGE = http://www.teeworlds.com/
 +V= 0.6.2
 +DISTNAME=  teeworlds-${V}-source
 +PKGNAME=   teeworlds-${V}
 +CATEGORIES=games

 -BAM_VERSION =  0.2.0
 -BAM_WRKSRC =   ${WRKSRC}/bam-${BAM_VERSION}
 -BAM_TARGET =   release
 +HOMEPAGE=  http://www.teeworlds.com/

 -MASTER_SITES = http://www.teeworlds.com/files/
 -DISTFILES =${DISTNAME}${EXTRACT_SUFX}
 bam-${BAM_VERSION}${EXTRACT_SUFX}
 +MAINTAINER=Donovan Watteau tso...@gmail.com

 -# GPLv2
 -PERMIT_PACKAGE_CDROM = Yes
 +BAM_VERSION=   0.4.0
 +BAM_WRKSRC=${WRKSRC}/bam-${BAM_VERSION}

 -WANTLIB =  GL GLU SDL X11 c m pthread stdc++ z
 -LIB_DEPENDS =  devel/sdl
 +MASTER_SITES=  http://www.teeworlds.com/files/
 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
 bam-${BAM_VERSION}${EXTRACT_SUFX}

 -MODULES =  lang/python
 +# BSD-like
 +PERMIT_PACKAGE_CDROM=  Yes

 -NO_TEST =  Yes
 +WANTLIB=   GL GLU SDL X11 c freetype m pthread stdc++ wavpack z

 -GAMEDIR =  ${PREFIX}/share/teeworlds
 +LIB_DEPENDS=   audio/wavpack \
 +   devel/sdl

 -SUBST_VARS =   CC CXX CFLAGS
 +MODULES=   lang/python
 +
 +SUBST_VARS=CC CXX CFLAGS CXXFLAGS X11BASE
 +
 +NO_TEST=   Yes

  post-extract:
 @mv ${WRKDIR}/bam-${BAM_VERSION} ${BAM_WRKSRC}

  pre-configure:
 -   ${SUBST_CMD} ${WRKSRC}/src/engine/e_engine.c \
 -   ${WRKSRC}/scripts/make_src.py \
 +   @${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
 +   ${WRKSRC}/src/game/client/gameclient.cpp \
 +   ${WRKSRC}/scripts/build.py \
 +   ${WRKSRC}/scripts/compiler.py \
 ${WRKSRC}/scripts/font_installer.sh \
 -   ${WRKSRC}/default.bam \
 +   ${WRKSRC}/scripts/make_src.py \
 +   ${WRKSRC}/bam.lua \
 ${BAM_WRKSRC}/make_unix.sh \
 -   ${BAM_WRKSRC}/src/driver_gcc.bam \
 -   ${BAM_WRKSRC}/src/base.bam
 +   ${BAM_WRKSRC}/src/driver_gcc.lua \
 +   ${BAM_WRKSRC}/src/base.lua
 +   # Make sure internal wavpack and zlib can't be picked up
 +   rm -rf ${WRKSRC}/src/engine/external/{wavpack,zlib}
 +   # Don't provide an extra copy of DejaVu
 +   rm -rf ${WRKSRC}/data/fonts

  # build bam executable - teeworlds own build system
  pre-build:
 cd ${BAM_WRKSRC}  /bin/sh -v make_unix.sh

  do-build:
 -   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/src/bam -v ${BAM_TARGET}
 +   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/bam -a -v release
 wavpack=${LOCALBASE}

  do-install:
 ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
 ${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
 -   ${INSTALL_DATA_DIR} ${GAMEDIR}
 -   cd ${WRKSRC}; tar cf - data | tar xf - -C ${GAMEDIR}
 +   ${INSTALL_DATA_DIR} ${PREFIX}/share/teeworlds
 +

[UPDATE] teeworlds-0.6.2

2014-05-08 Thread Donovan Watteau

Hi,

The following diff updates Teeworlds to 0.6.2.

In early 2012, I sent an update from teeworlds-0.5.2 to 0.6.1 to
armani@.  But today, 0.5.2 is still the tree, so I'd like to take
its maintainership.

Here are the changes:
- don't bother building on strict-alignment archs.  On loongson, both
  the client and the server SIGBUS during startup, and looking at the
  code it seems that it will crash on anything not x86 or ppc.
- don't include an extra copy of DejaVuSans.ttf.
- use audio/wavpack, not an internal copy.
- make sure an internal zlib is never used.
- invoke bam with -a, to make sure that it will abort on error.
- don't enforce the stack protector, base gcc(1) enables it wherever
  it's possible.
- fix endianness detection (my macppc is no longer supported, but
  two years ago this patch was required).
- drop patch-src_engine_client_ec_snd_c.  At first, I ported it to
  teeworlds-0.6.2, but actually this patch makes audio much worse
  for me, and I can't observe anymore the crash it was supposed
  to fix.

Index: Makefile
===
RCS file: /cvs/ports/games/teeworlds/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile9 Aug 2013 19:04:49 -   1.17
+++ Makefile8 May 2014 16:16:48 -
@@ -1,60 +1,69 @@
 # $OpenBSD: Makefile,v 1.17 2013/08/09 19:04:49 ajacoutot Exp $
 
-COMMENT =  platform game featuring buggers equipped with weapons
+# Crashes on strict-alignment archs, see: src/base/system.c:164
+ONLY_FOR_ARCHS=amd64 i386 powerpc
 
-V =0.5.2
-DISTNAME = teeworlds-${V}-src
-PKGNAME =  teeworlds-${V}
-REVISION = 4
-CATEGORIES =   games
+COMMENT=   platform game featuring buggers equipped with weapons
 
-MAINTAINER =   Jonathan Armani arm...@openbsd.org
-HOMEPAGE = http://www.teeworlds.com/
+V= 0.6.2
+DISTNAME=  teeworlds-${V}-source
+PKGNAME=   teeworlds-${V}
+CATEGORIES=games
 
-BAM_VERSION =  0.2.0
-BAM_WRKSRC =   ${WRKSRC}/bam-${BAM_VERSION}
-BAM_TARGET =   release
+HOMEPAGE=  http://www.teeworlds.com/
 
-MASTER_SITES = http://www.teeworlds.com/files/
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
+MAINTAINER=Donovan Watteau tso...@gmail.com
 
-# GPLv2
-PERMIT_PACKAGE_CDROM = Yes
+BAM_VERSION=   0.4.0
+BAM_WRKSRC=${WRKSRC}/bam-${BAM_VERSION}
 
-WANTLIB =  GL GLU SDL X11 c m pthread stdc++ z
-LIB_DEPENDS =  devel/sdl
+MASTER_SITES=  http://www.teeworlds.com/files/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} bam-${BAM_VERSION}${EXTRACT_SUFX}
 
-MODULES =  lang/python
+# BSD-like
+PERMIT_PACKAGE_CDROM=  Yes
 
-NO_TEST =  Yes
+WANTLIB=   GL GLU SDL X11 c freetype m pthread stdc++ wavpack z
 
-GAMEDIR =  ${PREFIX}/share/teeworlds
+LIB_DEPENDS=   audio/wavpack \
+   devel/sdl
 
-SUBST_VARS =   CC CXX CFLAGS
+MODULES=   lang/python
+
+SUBST_VARS=CC CXX CFLAGS CXXFLAGS X11BASE
+
+NO_TEST=   Yes
 
 post-extract:
@mv ${WRKDIR}/bam-${BAM_VERSION} ${BAM_WRKSRC}
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/src/engine/e_engine.c \
-   ${WRKSRC}/scripts/make_src.py \
+   @${SUBST_CMD} ${WRKSRC}/src/engine/shared/storage.cpp \
+   ${WRKSRC}/src/game/client/gameclient.cpp \
+   ${WRKSRC}/scripts/build.py \
+   ${WRKSRC}/scripts/compiler.py \
${WRKSRC}/scripts/font_installer.sh \
-   ${WRKSRC}/default.bam \
+   ${WRKSRC}/scripts/make_src.py \
+   ${WRKSRC}/bam.lua \
${BAM_WRKSRC}/make_unix.sh \
-   ${BAM_WRKSRC}/src/driver_gcc.bam \
-   ${BAM_WRKSRC}/src/base.bam
+   ${BAM_WRKSRC}/src/driver_gcc.lua \
+   ${BAM_WRKSRC}/src/base.lua
+   # Make sure internal wavpack and zlib can't be picked up
+   rm -rf ${WRKSRC}/src/engine/external/{wavpack,zlib}
+   # Don't provide an extra copy of DejaVu
+   rm -rf ${WRKSRC}/data/fonts
 
 # build bam executable - teeworlds own build system
 pre-build:
cd ${BAM_WRKSRC}  /bin/sh -v make_unix.sh
 
 do-build:
-   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/src/bam -v ${BAM_TARGET}
+   cd ${WRKSRC}  CC=${CC} ${BAM_WRKSRC}/bam -a -v release 
wavpack=${LOCALBASE}
 
 do-install:
${INSTALL_PROGRAM} ${WRKSRC}/teeworlds ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/teeworlds_srv ${PREFIX}/bin
-   ${INSTALL_DATA_DIR} ${GAMEDIR}
-   cd ${WRKSRC}; tar cf - data | tar xf - -C ${GAMEDIR}
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/teeworlds
+   cd ${WRKSRC}; tar cf - data | tar xf - -C ${PREFIX}/share/teeworlds
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/games/teeworlds/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo9 Aug 2013 19:04:49 -   1.4
+++ distinfo8 May 2014 16:16:48 -
@@ -1,4 +1,4 @@

Re: [UPDATE] teeworlds-0.6.2

Re: [UPDATE] teeworlds-0.6.2

Re: [UPDATE] teeworlds-0.6.2

Re: [UPDATE] teeworlds-0.6.2

Re: [UPDATE] teeworlds-0.6.2

[UPDATE] teeworlds-0.6.2

6 matches

Site Navigation

Mail list logo

Footer information