Re: [update/fix] games/blobby 1.0rc3 -> 1.0.20200119
Ping :)
On Sun, 26 Jan 2020 21:52:39 +0100
Charlene Wendling wrote:
> On Sun, 26 Jan 2020 19:36:39 +
> Mikolaj Kucharski wrote:
>
> > Hi,
> >
> > I didn't test your diff, but just by reading your mail, I think you
> > should set updated version to 1.0.20200119, to get what you want, so
> > avoiding epoch, make 1.0rc3 get updated to 1.0., and make 1.1
> > get update from 1.0..
> >
> > With your version of the diff, future version 1.1 and your new
> > version 1.020200119, not sure is 1.1 > 1.020200119. I could test
> > this, but I guess, going to 1.0.20200119 shold just make this work.
>
> According to packages-specs(7), you're right, what you're proposing
> is safer. I've updated the diff below accordingly.
>
> > On Sun, Jan 26, 2020 at 03:16:46PM +0100, Charlene Wendling wrote:
> > > Hi again,
> > >
> > > We ship a broken games/blobby:
> > >
> > > -->8--
> > > ~$ blobby
> > > error loading language lang_en.xml!
> > > falling back to english
> > > blobby(23503) in free(): bogus pointer (double free?) 0x6
> > > Abort trap
> > > --8<--
> > >
> > > It's from 2012, and that version is unsupported, so i'm proposing
> > > an update against latest developments of blobby.
> > >
> > > What's new upstream:
> > >
> > > - move from sf.net to github
> > > - use sdl2 instead of sdl
> > >
> > > What's new in port:
> > >
> > > - drop all patches, upstream made similar changes
> > > - bring back bots (upstreamed patch)
> > > - avoid the use of EPOCH by using date versioning, the next
> > > release will be 1.1 [0], so updating go (and will go) smoothly
> > > - remove base-gcc from COMPILER, it's C++11
> > > - add DEBUG_PACKAGES (i'm not sure of the usefulness of it for
> > > that port)
> > >
> > >
> > > Testing (on powerpc, you'll need the fixed devel/physfs i
> > > committed earlier):
> > >
> > > - amd64: no issues
> > > - powerpc: builds and works but blobs colors are off in SDL mode,
> > > they're more complex to draw that it seems, and swapping colors
> > > does not solve the problem. I refrained from setting the properly
> > > working OpenGL renderer as default/fallback on big endian, because
> > > i guess not all BE archs have OpenGL.
> > > BE and LE hosts/clients can't talk to each other through the
> > > network.
> > >
> > > Despite the endianness issues, given that the runtime is totally
> > > broken on amd64, i think we should commit that update.
> > >
> > > Comments/feedback are welcome,
> > >
> > > Charlène.
> > >
> > >
> > > [0]
> > > https://github.com/danielknobe/blobbyvolley2/issues/1#issuecomment-569493894
Index: Makefile
===
RCS file: /cvs/ports/games/blobby/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:46:15 - 1.10
+++ Makefile26 Jan 2020 20:44:03 -
@@ -2,30 +2,30 @@
COMMENT = volleyball game with online play
-V =1.0rc3
-DISTNAME = blobby2-linux-${V}
-PKGNAME = blobby-${V}
-REVISION = 2
+GH_ACCOUNT = danielknobe
+GH_PROJECT = blobbyvolley2
+GH_COMMIT =bcea5be5eae91fda5455e7b77d9057d2780cc752
+
+DISTNAME = blobby-1.0.20200119
CATEGORIES = games
HOMEPAGE = http://blobby.sourceforge.net/
# GPLv2+
-PERMIT_PACKAGE = Yes
-
-WANTLIB += GL GLU ICE SDL SM X11 Xext c m physfs pthread
${COMPILER_LIBCXX}
+PERMIT_PACKAGE = Yes
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 c m physfs
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=blobby/}
+# C++11
+COMPILER = base-clang ports-gcc
MODULES = devel/cmake
BUILD_DEPENDS =devel/boost \
archivers/zip
-LIB_DEPENDS = devel/sdl \
+LIB_DEPENDS = devel/sdl2 \
devel/physfs
-WRKDIST = ${WRKDIR}/blobby-${V}
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
.include
Index: distinfo
===
RCS file: /cvs/ports/games/blobby/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo27 Oct 2012 07:12:45 - 1.1.1.1
+++ distinfo26 Jan 2020 20:44:03 -
@@ -1,2 +1,2 @@
-SHA256 (blobby2-linux-1.0rc3.tar.gz) =
Rb2yUwt+sbUIaT0wTjEIjJqbNm+Xj3FrWgzx58UCxYE=
-SIZE (blobby2-linux-1.0rc3.tar.gz) = 2323776
+SHA256 (blobby-1.0.20200119-bcea5be5.tar.gz) =
erjyDj77PyhMK27dmDeRBPkALaCuzcT2OCX4XkmYCiA=
+SIZE (blobby-1.0.20200119-bcea5be5.tar.gz) = 2363487
Index: patches/patch-src_InputManager_cpp
===
RCS file: patches/patch-src_InputManager_cpp
diff -N patches/patch-src_InputManager_cpp
--- patches/patch-src_InputManager_cpp 27 Oct 2012 07:12:45 - 1.1.1.1
+++ /dev/null 1 Jan 1970
Re: [update/fix] games/blobby 1.0rc3 -> 1.0.20200119
On Sun, 26 Jan 2020 19:36:39 +
Mikolaj Kucharski wrote:
> Hi,
>
> I didn't test your diff, but just by reading your mail, I think you
> should set updated version to 1.0.20200119, to get what you want, so
> avoiding epoch, make 1.0rc3 get updated to 1.0., and make 1.1
> get update from 1.0..
>
> With your version of the diff, future version 1.1 and your new version
> 1.020200119, not sure is 1.1 > 1.020200119. I could test this, but I
> guess, going to 1.0.20200119 shold just make this work.
According to packages-specs(7), you're right, what you're proposing
is safer. I've updated the diff below accordingly.
> On Sun, Jan 26, 2020 at 03:16:46PM +0100, Charlene Wendling wrote:
> > Hi again,
> >
> > We ship a broken games/blobby:
> >
> > -->8--
> > ~$ blobby
> > error loading language lang_en.xml!
> > falling back to english
> > blobby(23503) in free(): bogus pointer (double free?) 0x6
> > Abort trap
> > --8<--
> >
> > It's from 2012, and that version is unsupported, so i'm proposing an
> > update against latest developments of blobby.
> >
> > What's new upstream:
> >
> > - move from sf.net to github
> > - use sdl2 instead of sdl
> >
> > What's new in port:
> >
> > - drop all patches, upstream made similar changes
> > - bring back bots (upstreamed patch)
> > - avoid the use of EPOCH by using date versioning, the next release
> > will be 1.1 [0], so updating go (and will go) smoothly
> > - remove base-gcc from COMPILER, it's C++11
> > - add DEBUG_PACKAGES (i'm not sure of the usefulness of it for that
> > port)
> >
> >
> > Testing (on powerpc, you'll need the fixed devel/physfs i committed
> > earlier):
> >
> > - amd64: no issues
> > - powerpc: builds and works but blobs colors are off in SDL mode,
> > they're more complex to draw that it seems, and swapping colors
> > does not solve the problem. I refrained from setting the properly
> > working OpenGL renderer as default/fallback on big endian, because
> > i guess not all BE archs have OpenGL.
> > BE and LE hosts/clients can't talk to each other through the
> > network.
> >
> > Despite the endianness issues, given that the runtime is totally
> > broken on amd64, i think we should commit that update.
> >
> > Comments/feedback are welcome,
> >
> > Charlène.
> >
> >
> > [0]
> > https://github.com/danielknobe/blobbyvolley2/issues/1#issuecomment-569493894
Index: Makefile
===
RCS file: /cvs/ports/games/blobby/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:46:15 - 1.10
+++ Makefile26 Jan 2020 20:44:03 -
@@ -2,30 +2,30 @@
COMMENT = volleyball game with online play
-V =1.0rc3
-DISTNAME = blobby2-linux-${V}
-PKGNAME = blobby-${V}
-REVISION = 2
+GH_ACCOUNT = danielknobe
+GH_PROJECT = blobbyvolley2
+GH_COMMIT =bcea5be5eae91fda5455e7b77d9057d2780cc752
+
+DISTNAME = blobby-1.0.20200119
CATEGORIES = games
HOMEPAGE = http://blobby.sourceforge.net/
# GPLv2+
-PERMIT_PACKAGE = Yes
-
-WANTLIB += GL GLU ICE SDL SM X11 Xext c m physfs pthread
${COMPILER_LIBCXX}
+PERMIT_PACKAGE = Yes
-COMPILER = base-clang ports-gcc base-gcc
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 c m physfs
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=blobby/}
+# C++11
+COMPILER = base-clang ports-gcc
MODULES = devel/cmake
BUILD_DEPENDS =devel/boost \
archivers/zip
-LIB_DEPENDS = devel/sdl \
+LIB_DEPENDS = devel/sdl2 \
devel/physfs
-WRKDIST = ${WRKDIR}/blobby-${V}
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
.include
Index: distinfo
===
RCS file: /cvs/ports/games/blobby/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo27 Oct 2012 07:12:45 - 1.1.1.1
+++ distinfo26 Jan 2020 20:44:03 -
@@ -1,2 +1,2 @@
-SHA256 (blobby2-linux-1.0rc3.tar.gz) =
Rb2yUwt+sbUIaT0wTjEIjJqbNm+Xj3FrWgzx58UCxYE=
-SIZE (blobby2-linux-1.0rc3.tar.gz) = 2323776
+SHA256 (blobby-1.0.20200119-bcea5be5.tar.gz) =
erjyDj77PyhMK27dmDeRBPkALaCuzcT2OCX4XkmYCiA=
+SIZE (blobby-1.0.20200119-bcea5be5.tar.gz) = 2363487
Index: patches/patch-src_InputManager_cpp
===
RCS file: patches/patch-src_InputManager_cpp
diff -N patches/patch-src_InputManager_cpp
--- patches/patch-src_InputManager_cpp 27 Oct 2012 07:12:45 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_InputManager_cpp,v 1.1.1.1 2012/10/27 07:12:45 bentley Exp
$
-
-Remove byte-order mark.
-
src/InputManager.cpp.orig Sat Oct 27 00:24:44 2012
-+++
