From nobody Tue May 14 00:50:50 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vdd7t62Pvz5K2Qb; Tue, 14 May 2024 00:50:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vdd7t3vnxz4FcS; Tue, 14 May 2024 00:50:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715647850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRMek9drXhObNlmdPF6yJxXs1YA5fuJKiGQMxUfevAE=; b=QJAmQpeiDQGrM+pXUFILzaOXdIqVCWASRlOV00azDyrtcTm/i1rGUoGa3VBlAYV8rypw7z /i6gt7hEQTOul0X2M+7n2/u104SuOXEx7cJgZas5fjuqDR/Fk1ODuXGkT2mGO1dbkyDFiY gSrEnARJAb/6CL2AB6Y8OOZ6D8fWpkpWHajKmPFXlPN37H3qwnaQ4k5hVAl0SQmQf0f4S8 DZd4Nler5er8SyFtbt/7EQiIs4MszpBkyVfe0mAHLMwoXqFoMExni7OD76uFnM+CEK/u/W RJ/3o+OrgVgBQ8qwhcsWc+WTKkfachpSA5gb55RIHny3d97DPP0Ss4vA2jRVdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715647850; a=rsa-sha256; cv=none; b=X2+fopeVTwGHyq1Zwl8RLuVBCB/mE23qck5mSBcT2offVF7vMDElEwrquEZaz/y0t2Hesh xMpzEsvPnAjEQE5nsi8xrqmrUCUICkkWTPJOMGCZGdTxqn6EzT0oHU8iVbjfNb0rqAPCfz ghHcsdoLqPg3uk4RxyW1q/a8J+2KNGyp7e/Z65lGItNa+ZeRtNPCrsX4CEOsde+xiAMCm3 asfu/P0DYgzVeZtkUXMw+HUnVODZT9f/KfBuFKDngMYZpuA3DCGCLBJ2IStgC4sWcmSvyt wkKTtEn+MsmtwCbvnbkNfDCHFkSqkBw2A6em9BiPjYV2DbiuMFPahb/QyVoaGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715647850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VRMek9drXhObNlmdPF6yJxXs1YA5fuJKiGQMxUfevAE=; b=qvflITGW4Shqvua7YopwFzNVm3hibaAQ6h5hAMR9rF8BF/XYcFALb5/hNSSW8osy3Y6XhC qwcksq5zIKFu5rTbHooR+fXB59o4MbJaus7hKqUMIlk9UaC+DbnK0WVE1oZnQ7r74HQD/D boyrvLZ/507wyhHHsvkPGH9cZ801OdqmrqnRd6WMIUDTIH9xpaanV5EMygx/OT+RcU7a76 GVyIRKbKv7VQHT13rX0h3OqZZFYxgOwOXc7zDQc7flPHSTb+ZDgdfqBn9GN4howmNP0f0w nn02rQfey+ESpPBzF83ENtD8UhnOQTdvxGSB457MW7X1qHFifRUWz0xCxrrqoA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vdd7t3X7Qz190q; Tue, 14 May 2024 00:50:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44E0ooHs090098; Tue, 14 May 2024 00:50:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E0ooLc090095; Tue, 14 May 2024 00:50:50 GMT (envelope-from git) Date: Tue, 14 May 2024 00:50:50 GMT Message-Id: <202405140050.44E0ooLc090095@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: f86a608b9d7f - main - games/ri-li: update 2.0.1 =?utf-8?Q?=E2=86=92?= 3.1.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f86a608b9d7f39bd591a957a2aae3fcbb767fd1e Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=f86a608b9d7f39bd591a957a2aae3fcbb767fd1e commit f86a608b9d7f39bd591a957a2aae3fcbb767fd1e Author: Dmitry Marakasov AuthorDate: 2024-05-06 18:02:37 +0000 Commit: Dmitry Marakasov CommitDate: 2024-05-14 00:38:04 +0000 games/ri-li: update 2.0.1 → 3.1.4 --- games/ri-li/Makefile | 34 +++++++++++----------------------- games/ri-li/distinfo | 5 +++-- games/ri-li/files/patch-CMakeLists.txt | 25 +++++++++++++++++++++++++ games/ri-li/files/patch-src_sprite.cc | 20 -------------------- games/ri-li/files/patch-src_tableau.cc | 11 ----------- games/ri-li/pkg-plist | 8 ++++++++ 6 files changed, 47 insertions(+), 56 deletions(-) diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile index 6399235eb475..6f11a8caedad 100644 --- a/games/ri-li/Makefile +++ b/games/ri-li/Makefile @@ -1,38 +1,26 @@ PORTNAME= Ri-li -PORTVERSION= 2.0.1 -PORTREVISION= 7 +DISTVERSIONPREFIX= v +DISTVERSION= 3.1.4 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}%20Linux_Unix/${PORTNAME}%20V${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Drive a toy wood train in many levels - snake-like arcade game -WWW= https://ri-li.sourceforge.net/ +WWW= https://github.com/petitlapin/Li-Ri LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING -USES= gmake sdl tar:bzip2 -GNU_CONFIGURE= yes -USE_SDL= sdl mixer +BUILD_DEPENDS= ${LOCALBASE}/include/SimpleIni.h:devel/simpleini -CPPFLAGS+= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include +USES= cmake pkgconfig sdl +USE_GITHUB= yes +GH_ACCOUNT= petitlapin +GH_PROJECT= Li-Ri +USE_SDL= sdl2 mixer2 +CMAKE_ON= USE_CONAN # doesn't really use conan, just handles system depends properly -PLIST_FILES= bin/Ri_li +DATADIR= ${PREFIX}/share/Li-ri PORTDATA= * -DESKTOP_ENTRIES="Ri-li" \ - "Drive a toy wood train in many levels - snake-like arcade game" \ - "${DATADIR}/Ri-li-icon-48x48.png" \ - "Ri_li" \ - "Game;ArcadeGame;" \ - false - -post-patch: - @${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs`|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's| gentoo||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/strcpy.*DefPath/ s|.*|strcpy(DefPath,"${DATADIR}/");|' ${WRKSRC}/src/main.cc - @${REINPLACE_CMD} -e '/include/ s|iostream.h|iostream|' ${WRKSRC}/src/*.cc - @${REINPLACE_CMD} -e 's|cerr|std::&|g; s|endl|std::&|g' ${WRKSRC}/src/*.cc - .include diff --git a/games/ri-li/distinfo b/games/ri-li/distinfo index 3e333b2b4785..fd10a7a3778f 100644 --- a/games/ri-li/distinfo +++ b/games/ri-li/distinfo @@ -1,2 +1,3 @@ -SHA256 (Ri-li-2.0.1.tar.bz2) = f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd -SIZE (Ri-li-2.0.1.tar.bz2) = 13745398 +TIMESTAMP = 1715015770 +SHA256 (petitlapin-Li-Ri-v3.1.4_GH0.tar.gz) = 56687ef201c915bef44fa9ce0f4e195d6e6d0cda5d960ba33b67caf2148324f6 +SIZE (petitlapin-Li-Ri-v3.1.4_GH0.tar.gz) = 47178812 diff --git a/games/ri-li/files/patch-CMakeLists.txt b/games/ri-li/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..da6d3b62dd11 --- /dev/null +++ b/games/ri-li/files/patch-CMakeLists.txt @@ -0,0 +1,25 @@ +--- CMakeLists.txt.orig 2024-01-15 20:22:00 UTC ++++ CMakeLists.txt +@@ -25,6 +25,7 @@ if(USE_CONAN) + if(USE_CONAN) + find_package(SDL2 REQUIRED CONFIG) + find_package(SDL2_mixer REQUIRED CONFIG) ++ find_path(SIMPLEINI_INCLUDE_DIR SimpleIni.h) + else() + find_package(PkgConfig REQUIRED) + pkg_check_modules(SDL2 REQUIRED sdl2 SDL2_mixer) +@@ -69,12 +70,13 @@ if(USE_CONAN) + + if(USE_CONAN) + target_link_libraries(${LIRI_EXECUTABLE_NAME} PRIVATE SDL2::SDL2 SDL2_mixer::SDL2_mixer) ++ target_include_directories(${LIRI_EXECUTABLE_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIR}) ++ target_compile_definitions(${LIRI_EXECUTABLE_NAME} PRIVATE SI_NO_CONVERSION) + else() + target_include_directories(${LIRI_EXECUTABLE_NAME} PUBLIC ${SDL2_INCLUDE_DIRS}) + target_link_libraries(${LIRI_EXECUTABLE_NAME} PRIVATE ${SDL2_LINK_LIBRARIES}) + endif() + +-target_link_libraries(${LIRI_EXECUTABLE_NAME} PRIVATE SimpleIni::SimpleIni) + + + include(GNUInstallDirs) diff --git a/games/ri-li/files/patch-src_sprite.cc b/games/ri-li/files/patch-src_sprite.cc deleted file mode 100644 index b0da5acfcc2c..000000000000 --- a/games/ri-li/files/patch-src_sprite.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/sprite.cc.orig 2007-11-02 11:48:20 UTC -+++ src/sprite.cc -@@ -351,7 +351,7 @@ bool Sprite::Load(unsigned char *Buf,lon - // Fabrique la surface - Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8, - 0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3)); -- if(Image[i]<=NULL) { -+ if(Image[i]==NULL) { - cerr <<"Impossible de créer une Surface SDL!"<