wok-6.x rev 21765

updated frogatto and frogatto-data (1.1.1 -> 1.3.1)
author Hans-G?nter Theisgen
date Sat Jun 29 09:06:33 2019 +0100 (2019-06-29)
parents 9a1f50677074
children 781ac64941ee
files frogatto-data/receipt frogatto/receipt frogatto/stuff/patches/server.cpp-1.3.1
line diff
     1.1 --- a/frogatto-data/receipt	Thu Jun 27 22:27:24 2019 +0200
     1.2 +++ b/frogatto-data/receipt	Sat Jun 29 09:06:33 2019 +0100
     1.3 @@ -1,20 +1,21 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="frogatto-data"
     1.7 -VERSION="1.1.1"
     1.8 +VERSION="1.3.1"
     1.9  CATEGORY="games"
    1.10 -SHORT_DESC="An old-school 2d platformer game, starring a certain quixotic frog (data files)"
    1.11 +SHORT_DESC="An old-school 2d platform game, starring a certain quixotic frog (data files)."
    1.12  MAINTAINER="gokhlayeh@slitaz.org"
    1.13  LICENSE="GPL3"
    1.14 -WEB_SITE="http://www.frogatto.com"
    1.15 +WEB_SITE="https://www.frogatto.com"
    1.16 +
    1.17  WANTED="frogatto"
    1.18  
    1.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.20  genpkg_rules()
    1.21  {
    1.22  	mkdir -p $fs/usr/games/frogatto
    1.23 -	for i in data images music sounds FreeMono.ttf DejaVuSans.ttf; do
    1.24 +	for i in data images music sounds FreeMono.ttf DejaVuSans.ttf
    1.25 +	  do
    1.26  		cp -a $src/$i $fs/usr/games/frogatto
    1.27 -	done
    1.28 +	  done
    1.29  }
    1.30 -
     2.1 --- a/frogatto/receipt	Thu Jun 27 22:27:24 2019 +0200
     2.2 +++ b/frogatto/receipt	Sat Jun 29 09:06:33 2019 +0100
     2.3 @@ -1,36 +1,42 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="frogatto"
     2.7 -VERSION="1.1.1"
     2.8 +VERSION="1.3.1"
     2.9  CATEGORY="games"
    2.10 -SHORT_DESC="An old-school 2d platformer game, starring a certain quixotic frog."
    2.11 +SHORT_DESC="An old-school 2d platform game, starring a certain quixotic frog."
    2.12  MAINTAINER="gokhlayeh@slitaz.org"
    2.13  LICENSE="GPL3"
    2.14 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.15 -WEB_SITE="http://www.frogatto.com"
    2.16 -WGET_URL="$WEB_SITE/files/$TARBALL"
    2.17 +WEB_SITE="https://www.frogatto.com"
    2.18  
    2.19 -DEPENDS="xorg-server mesa glew libsdl libsdl-image libsdl-ttf libsdl-mixer libpng \
    2.20 -libboost-regex libboost-system libboost-date-time libboost-thread libboost-iostreams \
    2.21 -frogatto-data"
    2.22 -BUILD_DEPENDS="${DEPENDS/frogatto-data/} ccache xorg-server-dev mesa-dev libsdl-dev libsdl-image-dev \
    2.23 -libsdl-ttf-dev libsdl-mixer-dev libpng-dev libboost-regex-dev libboost-system-dev \
    2.24 -libboost-date-time-dev libboost-thread-dev libboost-iostreams-dev glew-dev"
    2.25 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.26 +WGET_URL="https://github.com/$PACKAGE/$PACKAGE/archive/$VERSION/$TARBALL"
    2.27 +
    2.28 +DEPENDS="frogatto-data glew libboost-date-time libboost-iostreams \
    2.29 +	libboost-regex libboost-system libboost-thread libpng \
    2.30 +	libsdl libsdl-image libsdl-mixer libsdl-ttf mesa xorg-server"
    2.31 +BUILD_DEPENDS="${DEPENDS/frogatto-data/} ccache core-utils glew-dev \
    2.32 +	libboost-date-time-dev libboost-iostreams-dev libboost-regex-dev \
    2.33 +	libboost-system-dev libboost-thread-dev libpng-dev libsdl-dev \
    2.34 +	libsdl-image-dev libsdl-mixer-dev libsdl-ttf-dev mesa-dev \
    2.35 +	xorg-server-dev"
    2.36  
    2.37  # Rules to configure and make the package.
    2.38  compile_rules()
    2.39  {
    2.40 -	cd $src
    2.41 +	patch --input=$stuff/patches/server.cpp-1.3.1 
    2.42 +		src/server.cpp
    2.43  
    2.44  	# Frogatto look for multithread libbost (*-mt.so) but we don't use
    2.45  	# them in SliTaz, let's lure it.
    2.46 -	for lib in $(ls /usr/lib/libboost*); do
    2.47 +	for lib in $(ls /usr/lib/libboost*)
    2.48 +	  do
    2.49  		link=$(echo $lib | sed 's/\./-mt./')
    2.50  		ln -s $lib $link
    2.51 -	done
    2.52 +	  done
    2.53  
    2.54  	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756#19
    2.55 -	sed -i 's/io_service()/get_io_service()/' $src/src/server.cpp
    2.56 +#	sed -i 's/io_service()/get_io_service()/' $src/src/server.cpp
    2.57 +#	not required with version 1.3.1
    2.58  
    2.59  	make $MAKEFLAGS game server
    2.60  
    2.61 @@ -41,8 +47,12 @@
    2.62  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.63  genpkg_rules()
    2.64  {
    2.65 -	mkdir -p $fs/usr/games/frogatto $fs/usr/bin $fs/usr/share/pixmaps
    2.66 -	cp -a $src/game $src/server $fs/usr/games/frogatto
    2.67 -	cp -a $src/images/window-icon.png $fs/usr/share/pixmaps
    2.68 -	cp -a $stuff/frogatto $fs/usr/bin
    2.69 +	mkdir -p $fs/usr/games/frogatto
    2.70 +	mkdir -p $fs/usr/bin
    2.71 +	mkdir -p $fs/usr/share/pixmaps
    2.72 +
    2.73 +	cp -a $src/game				$fs/usr/games/frogatto
    2.74 +	cp -a $src/server			$fs/usr/games/frogatto
    2.75 +	cp -a $src/images/window-icon.png	$fs/usr/share/pixmaps
    2.76 +	cp -a $stuff/frogatto			$fs/usr/bin
    2.77  }
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/frogatto/stuff/patches/server.cpp-1.3.1	Sat Jun 29 09:06:33 2019 +0100
     3.3 @@ -0,0 +1,11 @@
     3.4 +--- server.cpp.orig	2019-06-28 17:48:43.024758899 +0100
     3.5 ++++ server.cpp	2019-06-28 17:47:35.522368962 +0100
     3.6 +@@ -174,7 +174,7 @@ private:
     3.7 + 
     3.8 + 	void handle_udp_receive(udp_endpoint_ptr endpoint, const boost::system::error_code& error, size_t len)
     3.9 + 	{
    3.10 +-		fprintf(stderr, "RECEIVED UDP PACKET: %lu\n", len);
    3.11 ++		fprintf(stderr, "RECEIVED UDP PACKET: %u\n", len);
    3.12 + 		if(len >= 5) {
    3.13 + 			uint32_t id;
    3.14 + 			memcpy(&id, &udp_buf_[1], 4);