Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: blobby2-1.0
@ 2019-12-27 16:17 voidlinux-github
  2019-12-29 18:34 ` [PR PATCH] [Merged]: " voidlinux-github
  0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-12-27 16:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 359 bytes --]

There is a new pull request by selfsigned against master on the void-packages repository

https://github.com/selfsigned/void-packages blobby2
https://github.com/void-linux/void-packages/pull/17816

New package: blobby2-1.0
A fun and addictive open source volley game.

A patch file from https://github.com/void-linux/void-packages/pull/17816.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blobby2-17816.patch --]
[-- Type: text/x-diff, Size: 25698 bytes --]

From c0346f6c5ed85fea0f43d6da51886b5c55e71894 Mon Sep 17 00:00:00 2001
From: selfsigned <selfsigned@protonmail.ch>
Date: Fri, 27 Dec 2019 17:06:51 +0100
Subject: [PATCH] New package: blobby2-1.0

---
 srcpkgs/blobby2/files/blobby.desktop          |   7 +
 srcpkgs/blobby2/files/blobby.png              | Bin 0 -> 8151 bytes
 srcpkgs/blobby2/patches/01_sdl_default.patch  |  20 +++
 .../blobby2/patches/02_use_system_lua.patch   |  60 +++++++
 .../patches/04_use_system_tinyxml.patch       |  74 ++++++++
 .../patches/07_cxxflags_append.patch.1        |  17 ++
 .../blobby2/patches/08_config_loading.patch   | 170 ++++++++++++++++++
 .../blobby2/patches/10_ostream_include.patch  |  13 ++
 srcpkgs/blobby2/template                      |  21 +++
 9 files changed, 382 insertions(+)
 create mode 100644 srcpkgs/blobby2/files/blobby.desktop
 create mode 100644 srcpkgs/blobby2/files/blobby.png
 create mode 100644 srcpkgs/blobby2/patches/01_sdl_default.patch
 create mode 100644 srcpkgs/blobby2/patches/02_use_system_lua.patch
 create mode 100644 srcpkgs/blobby2/patches/04_use_system_tinyxml.patch
 create mode 100644 srcpkgs/blobby2/patches/07_cxxflags_append.patch.1
 create mode 100644 srcpkgs/blobby2/patches/08_config_loading.patch
 create mode 100644 srcpkgs/blobby2/patches/10_ostream_include.patch
 create mode 100644 srcpkgs/blobby2/template

diff --git a/srcpkgs/blobby2/files/blobby.desktop b/srcpkgs/blobby2/files/blobby.desktop
new file mode 100644
index 00000000000..1c547d36594
--- /dev/null
+++ b/srcpkgs/blobby2/files/blobby.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Blobby Volley
+Exec=blobby
+Icon=blobby
+Categories=Game;ArcadeGame
+Terminal=false
diff --git a/srcpkgs/blobby2/files/blobby.png b/srcpkgs/blobby2/files/blobby.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb707faf63b1328a2a638d519dee5dfe6a83acef
GIT binary patch
literal 8151
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/blobby2/patches/01_sdl_default.patch b/srcpkgs/blobby2/patches/01_sdl_default.patch
new file mode 100644
index 00000000000..e2d0943d7de
--- /dev/null
+++ b/srcpkgs/blobby2/patches/01_sdl_default.patch
@@ -0,0 +1,20 @@
+Description: Use SDL by default since it's faster without hardware acceleration
+Author: Felix Geyer <fgeyer@debian.org>
+
+---
+ src/main.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -212,8 +212,8 @@ int main(int argc, char* argv[])
+ 		else
+ 		{
+ 			std::cerr << "Warning: Unknown renderer selected!";
+-			std::cerr << "Falling back to OpenGL" << std::endl;
+-			rmanager = RenderManager::createRenderManagerGL2D();
++			std::cerr << "Falling back to SDL" << std::endl;
++			rmanager = RenderManager::createRenderManagerSDL();
+ 		}
+ 	#else
+ 		#if MAC_OS_X
diff --git a/srcpkgs/blobby2/patches/02_use_system_lua.patch b/srcpkgs/blobby2/patches/02_use_system_lua.patch
new file mode 100644
index 00000000000..adc679248d3
--- /dev/null
+++ b/srcpkgs/blobby2/patches/02_use_system_lua.patch
@@ -0,0 +1,60 @@
+Description: Use system lua library instead of building a local copy
+Author: Felix Geyer <fgeyer@debian.org>
+
+---
+ src/CMakeLists.txt          |    5 ++---
+ src/GameLogic.cpp           |    6 +++---
+ src/ScriptedInputSource.cpp |    6 +++---
+ 3 files changed, 8 insertions(+), 9 deletions(-)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(lua)
+ add_subdirectory(tinyxml)
+ ADD_DEFINITIONS(-std=c++11)
+ add_subdirectory(raknet)
+@@ -101,11 +101,11 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ 
+ add_executable(blobby ${blobby_SRC})
+-target_link_libraries(blobby lua raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${OPENGL_LIBRARIES} ${SDL2_LIBRARIES} pthread)
++target_link_libraries(blobby lua5.2 raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${OPENGL_LIBRARIES} ${SDL2_LIBRARIES} pthread)
+ 
+ if (UNIX)
+ 	add_executable(blobby-server ${blobby-server_SRC})
+-	target_link_libraries(blobby-server lua raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++	target_link_libraries(blobby-server lua5.2 raknet blobnet tinyxml ${RAKNET_LIBRARIES} ${PHYSFS_LIBRARY} ${SDL2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ endif (UNIX)
+ 
+ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+--- a/src/ScriptedInputSource.cpp
++++ b/src/ScriptedInputSource.cpp
+@@ -30,9 +30,9 @@ Foundation, Inc., 59 Temple Place, Suite
+ 
+ extern "C"
+ {
+-#include "lua/lua.h"
+-#include "lua/lauxlib.h"
+-#include "lua/lualib.h"
++#include <lua5.2/lua.h>
++#include <lua5.2/lauxlib.h>
++#include <lua5.2/lualib.h>
+ }
+ 
+ #include "DuelMatch.h"
+--- a/src/GameLogic.cpp
++++ b/src/GameLogic.cpp
+@@ -28,9 +28,9 @@ Foundation, Inc., 59 Temple Place, Suite
+ 
+ extern "C"
+ {
+-#include "lua/lua.h"
+-#include "lua/lauxlib.h"
+-#include "lua/lualib.h"
++#include <lua5.2/lua.h>
++#include <lua5.2/lauxlib.h>
++#include <lua5.2/lualib.h>
+ }
+ 
+ #include "FileRead.h"
diff --git a/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch b/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch
new file mode 100644
index 00000000000..cf49bafcd2b
--- /dev/null
+++ b/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch
@@ -0,0 +1,74 @@
+Description: Use system tinyxml library instead of building a local copy
+Author: Felix Geyer <fgeyer@debian.org>
+
+---
+ src/CMakeLists.txt               |    1 -
+ src/FileRead.cpp                 |    2 +-
+ src/ReplayRecorder.cpp           |    2 +-
+ src/TextManager.cpp              |    2 +-
+ src/UserConfig.cpp               |    2 +-
+ src/state/NetworkSearchState.cpp |    2 +-
+ 6 files changed, 5 insertions(+), 6 deletions(-)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-add_subdirectory(tinyxml)
+ ADD_DEFINITIONS(-std=c++11)
+ add_subdirectory(raknet)
+ add_subdirectory(blobnet)
+--- a/src/FileRead.cpp
++++ b/src/FileRead.cpp
+@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include <boost/scoped_array.hpp>
+ #include <boost/algorithm/string.hpp>
+ 
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ extern "C"
+ {
+--- a/src/ReplayRecorder.cpp
++++ b/src/ReplayRecorder.cpp
+@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ 
+ #include <boost/crc.hpp>
+ 
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include "raknet/BitStream.h"
+ 
+--- a/src/TextManager.cpp
++++ b/src/TextManager.cpp
+@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include <algorithm>
+ #include <set>
+ 
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include "Global.h"
+ #include "FileRead.h"
+--- a/src/UserConfig.cpp
++++ b/src/UserConfig.cpp
+@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ 
+ #include <boost/make_shared.hpp>
+ 
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include "Global.h"
+ #include "FileRead.h"
+--- a/src/state/NetworkSearchState.cpp
++++ b/src/state/NetworkSearchState.cpp
+@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite
+ #include "blobnet/layer/Http.hpp"
+ #include "blobnet/exception/HttpException.hpp"
+ 
+-#include "tinyxml/tinyxml.h"
++#include <tinyxml.h>
+ 
+ #include "NetworkState.h"
+ #include "LobbyState.h"
diff --git a/srcpkgs/blobby2/patches/07_cxxflags_append.patch.1 b/srcpkgs/blobby2/patches/07_cxxflags_append.patch.1
new file mode 100644
index 00000000000..445cc3eaa9c
--- /dev/null
+++ b/srcpkgs/blobby2/patches/07_cxxflags_append.patch.1
@@ -0,0 +1,17 @@
+Description: Append CXXFLAGS instead of overwriting them.
+ Otherwise the dpkg-buildflags are ignored.
+Author: Felix Geyer <fgeyer@debian.org>
+
+--- blobby-1.0~rc4.orig/src/CMakeLists.txt
++++ blobby-1.0~rc4/src/CMakeLists.txt
+@@ -3,8 +3,8 @@ add_subdirectory(raknet)
+ add_subdirectory(blobnet)
+ 
+ add_definitions(-DTIXML_USE_STL)
+-set(CMAKE_CXX_FLAGS "-std=c++11")
+-set(CMAKE_CXX_FLAGS "-Wall")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ include_directories(.)
+ 
+ set(common_SRC
diff --git a/srcpkgs/blobby2/patches/08_config_loading.patch b/srcpkgs/blobby2/patches/08_config_loading.patch
new file mode 100644
index 00000000000..e8f35481432
--- /dev/null
+++ b/srcpkgs/blobby2/patches/08_config_loading.patch
@@ -0,0 +1,170 @@
+Description: Cherry-pick upstream commits 1528, 1530 and 1531.
+Origin: upstream
+
+Index: src/main.cpp
+===================================================================
+--- a/src/main.cpp	(revision 1529)
++++ b/src/main.cpp	(revision 1531)
+@@ -26,16 +26,16 @@
+ 
+ #include <SDL2/SDL.h>
+ 
+-#ifndef __APPLE__
+-#ifndef __ANDROID__
+-#include "config.h"
+-#endif
+-#endif
++#include "Global.h"
+ 
+ #ifdef __APPLE__
+ 	#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+ 		#include <physfs.h>
+-	#else
++	#endif
++#endif
++
++#if __DESKTOP__
++	#ifndef WIN32
+ 		#include "config.h"
+ 	#endif
+ #endif
+@@ -99,14 +99,6 @@
+ 	#if defined(WIN32)
+ 		// Just write in installation directory
+ 		fs.setWriteDir("data");
+-
+-		// handle the case when it is installed
+-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby");
+-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/gfx.zip");
+-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/sounds.zip");
+-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/scripts.zip");
+-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/backgrounds.zip");
+-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/rules.zip");
+ 	#else
+ 		#ifndef __ANDROID__
+ 			// Create a search path in the home directory and ensure that
+@@ -118,7 +110,16 @@
+ 					std::string userdir = fs.getUserDir();
+ 				#endif
+ 			#else
++				// Linux
+ 				std::string userdir = fs.getUserDir();
++
++				// handle the case when it is installed
++				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby");
++				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/gfx.zip");
++				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/sounds.zip");
++				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/scripts.zip");
++				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/backgrounds.zip");
++				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/rules.zip");
+ 			#endif
+ 			std::string userAppend = ".blobby";
+ 			std::string homedir = userdir + userAppend;
+Index: src/server/servermain.cpp
+===================================================================
+--- a/src/server/servermain.cpp	(revision 1529)
++++ b/src/server/servermain.cpp	(revision 1531)
+@@ -36,6 +36,7 @@
+ #include "SpeedController.h"
+ #include "FileSystem.h"
+ #include "UserConfig.h"
++#include "Global.h"
+ 
+ // platform specific
+ #ifndef WIN32
+@@ -45,8 +46,14 @@
+ #include <cstdarg>
+ #endif
+ 
++#if __DESKTOP__
++#ifndef WIN32
++#include "config.h"
++#endif
++#endif
+ 
+ 
++
+ /* implementation */
+ 
+ #ifdef WIN32
+@@ -60,7 +67,7 @@
+ static bool g_run_in_foreground = false;
+ static bool g_print_syslog_to_stderr = false;
+ static bool g_workaround_memleaks = false;
+-static std::string g_config_file = "server/server.xml";
++static std::string g_config_file = "server.xml";
+ static std::string g_rules_file = "";
+ 
+ // ...
+@@ -85,8 +92,7 @@
+ 	process_arguments(argc, argv);
+ 
+ 	FileSystem fileSys(argv[0]);
+-	fileSys.addToSearchPath("data" + fileSys.getDirSeparator() + "rules.zip");
+-
++	
+ 	if (!g_run_in_foreground)
+ 	{
+ 		fork_to_background();
+@@ -312,7 +318,15 @@
+ void setup_physfs(char* argv0)
+ {
+ 	FileSystem& fs = FileSystem::getSingleton();
++
++	#if __DESKTOP__
++	#ifndef WIN32
++		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby");
++		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/rules.zip");
++	#endif
++	#endif	
+ 	fs.addToSearchPath("data");
++	fs.addToSearchPath("data" + fs.getDirSeparator() + "rules.zip");
+ }
+ 
+ 
+Index: data/server/server.xml
+===================================================================
+--- a/data/server/server.xml	(revision 1529)
++++ b/data/server/server.xml	(revision 1531)
+@@ -1,10 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-
+-<userconfig>
+-	<var name="speed" value="75"/>
+-	<var name="port" value="1234"/>
+-	<var name="maximum_clients" value="100" />
+-	<var name="name" value="Blobby Volley 2 Server"/>
+-	<var name="description" value="replace this with a description of the server. To do this, edit data/server.xml"/>
+-	<var name="rules" value="default.lua"/>
+-</userconfig>
+Index: data/server.xml
+===================================================================
+--- a/data/server.xml	(revision 0)
++++ b/data/server.xml	(revision 1531)
+@@ -0,0 +1,10 @@
++<?xml version="1.0" encoding="utf-8"?>
++
++<userconfig>
++	<var name="speed" value="75"/>
++	<var name="port" value="1234"/>
++	<var name="maximum_clients" value="100" />
++	<var name="name" value="Blobby Volley 2 Server"/>
++	<var name="description" value="replace this with a description of the server. To do this, edit data/server.xml"/>
++	<var name="rules" value="default.lua"/>
++</userconfig>
+Index: data/CMakeLists.txt
+===================================================================
+--- a/data/CMakeLists.txt	(revision 1527)
++++ b/data/CMakeLists.txt	(revision 1531)
+@@ -24,9 +24,10 @@
+ 	${CMAKE_CURRENT_BINARY_DIR}/scripts.zip
+ 	${CMAKE_CURRENT_BINARY_DIR}/backgrounds.zip
+ 	${CMAKE_CURRENT_BINARY_DIR}/rules.zip
++	Icon.bmp
+ 	config.xml
+ 	inputconfig.xml
+-	server/server.xml
++	server.xml
+ 	lang_de.xml
+ 	lang_en.xml
+ 	lang_fr.xml)
diff --git a/srcpkgs/blobby2/patches/10_ostream_include.patch b/srcpkgs/blobby2/patches/10_ostream_include.patch
new file mode 100644
index 00000000000..cccd77e8fb2
--- /dev/null
+++ b/srcpkgs/blobby2/patches/10_ostream_include.patch
@@ -0,0 +1,13 @@
+Description: added inlude
+Origin: upstream, http://sourceforge.net/p/blobby/code/1542/
+
+--- a/src/NetworkMessage.cpp
++++ b/src/NetworkMessage.cpp
+@@ -23,6 +23,7 @@
+ 
+ /* includes */
+ #include <cstring>
++#include <ostream>
+ 
+ #include "UserConfig.h"
+ #include "SpeedController.h"
diff --git a/srcpkgs/blobby2/template b/srcpkgs/blobby2/template
new file mode 100644
index 00000000000..ad004607868
--- /dev/null
+++ b/srcpkgs/blobby2/template
@@ -0,0 +1,21 @@
+# Template file for 'blobby2'
+pkgname=blobby2
+version=1.0
+revision=1
+wrksrc="blobby-${version}"
+build_style=cmake
+hostmakedepends="cmake pkg-config zip"
+makedepends="boost-devel SDL2-devel physfs-devel tinyxml-devel lua52-devel"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="Arcade style volleyball game"
+maintainer="selfsigned <selfsigned@protonmail.ch>"
+license="GPL-2.0-or-later"
+homepage="http://blobbyvolley.de"
+distfiles="${SOURCEFORGE_SITE}/blobby/${pkgname}-linux-${version}.tar.gz"
+checksum=ba7a049e298aaa2014c1e1ac1faf3b0256b4c66266cd4db06e7939e8695bf5e2
+patch_args="-Np1"
+
+post_install() {
+	vinstall ${FILESDIR}/blobby.desktop 644 usr/share/applications
+	vinstall ${FILESDIR}/blobby.png 644 usr/share/pixmaps
+}

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: New package: blobby2-1.0
  2019-12-27 16:17 [PR PATCH] New package: blobby2-1.0 voidlinux-github
@ 2019-12-29 18:34 ` voidlinux-github
  0 siblings, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-12-29 18:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

There's a merged pull request on the void-packages repository

New package: blobby2-1.0
https://github.com/void-linux/void-packages/pull/17816

Description:
A fun and addictive open source volley game.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-12-29 18:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-27 16:17 [PR PATCH] New package: blobby2-1.0 voidlinux-github
2019-12-29 18:34 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).