From 847d1510e8eeb470f89b9f8d874e6692593dc274 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 7 Jun 2024 02:45:44 -0400 Subject: [PATCH] blobby2: update to 1.1.1. devendor desktop file/icon --- srcpkgs/blobby2/files/blobby.desktop | 7 - srcpkgs/blobby2/files/blobby.png | Bin 8151 -> 0 bytes srcpkgs/blobby2/patches/01_sdl_default.patch | 20 --- .../blobby2/patches/02_use_system_lua.patch | 60 ------- .../patches/04_use_system_tinyxml.patch | 74 -------- .../blobby2/patches/07_cxxflags_append.patch | 17 -- .../blobby2/patches/08_config_loading.patch | 170 ------------------ .../blobby2/patches/10_ostream_include.patch | 13 -- .../patches/fix-missing-ctime-include.patch | 10 -- srcpkgs/blobby2/patches/system-deps.patch | 76 ++++++++ srcpkgs/blobby2/template | 16 +- 11 files changed, 82 insertions(+), 381 deletions(-) delete mode 100644 srcpkgs/blobby2/files/blobby.desktop delete mode 100644 srcpkgs/blobby2/files/blobby.png delete mode 100644 srcpkgs/blobby2/patches/01_sdl_default.patch delete mode 100644 srcpkgs/blobby2/patches/02_use_system_lua.patch delete mode 100644 srcpkgs/blobby2/patches/04_use_system_tinyxml.patch delete mode 100644 srcpkgs/blobby2/patches/07_cxxflags_append.patch delete mode 100644 srcpkgs/blobby2/patches/08_config_loading.patch delete mode 100644 srcpkgs/blobby2/patches/10_ostream_include.patch delete mode 100644 srcpkgs/blobby2/patches/fix-missing-ctime-include.patch create mode 100644 srcpkgs/blobby2/patches/system-deps.patch diff --git a/srcpkgs/blobby2/files/blobby.desktop b/srcpkgs/blobby2/files/blobby.desktop deleted file mode 100644 index 1c547d36594..00000000000 --- a/srcpkgs/blobby2/files/blobby.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[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 deleted file mode 100644 index cb707faf63b1328a2a638d519dee5dfe6a83acef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8151 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 diff --git a/srcpkgs/blobby2/patches/01_sdl_default.patch b/srcpkgs/blobby2/patches/01_sdl_default.patch deleted file mode 100644 index e2d0943d7de..00000000000 --- a/srcpkgs/blobby2/patches/01_sdl_default.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Use SDL by default since it's faster without hardware acceleration -Author: Felix Geyer - ---- - 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 deleted file mode 100644 index adc679248d3..00000000000 --- a/srcpkgs/blobby2/patches/02_use_system_lua.patch +++ /dev/null @@ -1,60 +0,0 @@ -Description: Use system lua library instead of building a local copy -Author: Felix Geyer - ---- - 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 -+#include -+#include - } - - #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 -+#include -+#include - } - - #include "FileRead.h" diff --git a/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch b/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch deleted file mode 100644 index cf49bafcd2b..00000000000 --- a/srcpkgs/blobby2/patches/04_use_system_tinyxml.patch +++ /dev/null @@ -1,74 +0,0 @@ -Description: Use system tinyxml library instead of building a local copy -Author: Felix Geyer - ---- - 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 - #include - --#include "tinyxml/tinyxml.h" -+#include - - extern "C" - { ---- a/src/ReplayRecorder.cpp -+++ b/src/ReplayRecorder.cpp -@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite - - #include - --#include "tinyxml/tinyxml.h" -+#include - - #include "raknet/BitStream.h" - ---- a/src/TextManager.cpp -+++ b/src/TextManager.cpp -@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite - #include - #include - --#include "tinyxml/tinyxml.h" -+#include - - #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 - --#include "tinyxml/tinyxml.h" -+#include - - #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 - - #include "NetworkState.h" - #include "LobbyState.h" diff --git a/srcpkgs/blobby2/patches/07_cxxflags_append.patch b/srcpkgs/blobby2/patches/07_cxxflags_append.patch deleted file mode 100644 index 445cc3eaa9c..00000000000 --- a/srcpkgs/blobby2/patches/07_cxxflags_append.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Append CXXFLAGS instead of overwriting them. - Otherwise the dpkg-buildflags are ignored. -Author: Felix Geyer - ---- 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 deleted file mode 100644 index e8f35481432..00000000000 --- a/srcpkgs/blobby2/patches/08_config_loading.patch +++ /dev/null @@ -1,170 +0,0 @@ -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 - --#ifndef __APPLE__ --#ifndef __ANDROID__ --#include "config.h" --#endif --#endif -+#include "Global.h" - - #ifdef __APPLE__ - #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - #include -- #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 - #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 @@ -- -- -- -- -- -- -- -- -- -- -Index: data/server.xml -=================================================================== ---- a/data/server.xml (revision 0) -+++ b/data/server.xml (revision 1531) -@@ -0,0 +1,10 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -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 deleted file mode 100644 index cccd77e8fb2..00000000000 --- a/srcpkgs/blobby2/patches/10_ostream_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 -+#include - - #include "UserConfig.h" - #include "SpeedController.h" diff --git a/srcpkgs/blobby2/patches/fix-missing-ctime-include.patch b/srcpkgs/blobby2/patches/fix-missing-ctime-include.patch deleted file mode 100644 index cc21349374f..00000000000 --- a/srcpkgs/blobby2/patches/fix-missing-ctime-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Clock.h -+++ b/src/Clock.h -@@ -21,6 +21,7 @@ - #pragma once - - #include -+#include - - /*! \class Clock - \brief Game Timing Management diff --git a/srcpkgs/blobby2/patches/system-deps.patch b/srcpkgs/blobby2/patches/system-deps.patch new file mode 100644 index 00000000000..e80fad4292e --- /dev/null +++ b/srcpkgs/blobby2/patches/system-deps.patch @@ -0,0 +1,76 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,7 +10,6 @@ + + add_subdirectory(data) + add_subdirectory(src) +-add_subdirectory(deps) + + add_subdirectory(linux) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -82,8 +82,11 @@ + server/servermain.cpp + ) + ++find_package(PkgConfig REQUIRED) + find_package(Boost REQUIRED) + find_package(OpenGL) ++find_package(tinyxml2) ++pkg_check_modules(lua lua5.2) + add_subdirectory(raknet) + add_subdirectory(blobnet) + +@@ -103,7 +103,7 @@ + add_definitions("-DBLOBBY_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/blobby\"") + endif() + +-set(BLOBBY_COMMON_LIBS lua::lua blobnet::blobnet tinyxml2::tinyxml2 PhysFS::PhysFS SDL2::SDL2main SDL2::SDL2 Boost::boost) ++set(BLOBBY_COMMON_LIBS lua5.2 blobnet::blobnet tinyxml2::tinyxml2 PhysFS::PhysFS SDL2::SDL2main SDL2::SDL2 Boost::boost) + + # other additional dependencies + if (NOT WIN32) +--- a/src/FileRead.cpp ++++ b/src/FileRead.cpp +@@ -30,7 +30,7 @@ + #include + + #include "tinyxml2.h" +-#include "lua.hpp" ++#include + + + /* implementation */ +--- a/src/IScriptableComponent.cpp ++++ b/src/IScriptableComponent.cpp +@@ -1,6 +1,6 @@ + #include "IScriptableComponent.h" + +-#include "lua.hpp" ++#include + + #include "Global.h" + #include "GameConstants.h" +--- a/src/GameLogic.cpp ++++ b/src/GameLogic.cpp +@@ -26,7 +26,7 @@ + #include + #include + +-#include "lua.hpp" ++#include + + #include "FileRead.h" + #include "GameLogicState.h" +--- a/src/ScriptedInputSource.cpp ++++ b/src/ScriptedInputSource.cpp +@@ -26,7 +26,7 @@ + + #include + +-#include "lua.hpp" ++#include + + #include "DuelMatch.h" + #include "DuelMatchState.h" diff --git a/srcpkgs/blobby2/template b/srcpkgs/blobby2/template index 4dfebe680c8..c62dcfd8fd6 100644 --- a/srcpkgs/blobby2/template +++ b/srcpkgs/blobby2/template @@ -1,19 +1,15 @@ # Template file for 'blobby2' pkgname=blobby2 -version=1.0 -revision=2 +version=1.1.1 +revision=1 build_style=cmake hostmakedepends="cmake pkg-config zip" -makedepends="boost-devel SDL2-devel physfs-devel tinyxml-devel lua52-devel" +makedepends="boost-devel SDL2-devel physfs-devel tinyxml2-devel lua52-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Arcade style volleyball game" maintainer="selfsigned " license="GPL-2.0-or-later" homepage="http://blobbyvolley.de" -distfiles="${SOURCEFORGE_SITE}/blobby/${pkgname}-linux-${version}.tar.gz" -checksum=ba7a049e298aaa2014c1e1ac1faf3b0256b4c66266cd4db06e7939e8695bf5e2 - -post_install() { - vinstall ${FILESDIR}/blobby.desktop 644 usr/share/applications - vinstall ${FILESDIR}/blobby.png 644 usr/share/pixmaps -} +changelog="https://github.com/danielknobe/blobbyvolley2/raw/master/ChangeLog" +distfiles="${SOURCEFORGE_SITE}/blobby/blobby2-linux-${version}.tar.gz" +checksum=357ee513e69d3b50f67fc063d4acb7959a5fe88977817f0aab14ccc70db214ba