diff --git a/games-engines/gemrb/gemrb-0.8.5.recipe b/games-engines/gemrb/gemrb-0.8.6.recipe similarity index 89% rename from games-engines/gemrb/gemrb-0.8.5.recipe rename to games-engines/gemrb/gemrb-0.8.6.recipe index 573389efc..f1d151d5e 100644 --- a/games-engines/gemrb/gemrb-0.8.5.recipe +++ b/games-engines/gemrb/gemrb-0.8.6.recipe @@ -7,11 +7,10 @@ you like to create a game like Baldur's Gate?" HOMEPAGE="https://github.com/gemrb/gemrb" COPYRIGHT="2003-2017 The GemRB Team" LICENSE="MIT" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/gemrb/gemrb/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="d927e1eebd13a4643db363087fc61c5d2242e8a614da261f15bf4e2b1d94965c" +CHECKSUM_SHA256="ee8bbdf553be346cad25fa3e07c64263cbe5f248ccd3d3db9cd9f5fb4520c58f" SOURCE_FILENAME="gemrb-$portVersion.tar.gz" -PATCHES="gemrb-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86" @@ -35,7 +34,7 @@ REQUIRES=" lib:libopenal$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix - lib:libsdl_mixer$secondaryArchSuffix + lib:libSDL_mixer_1.2$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -48,8 +47,8 @@ BUILD_REQUIRES=" devel:libogg$secondaryArchSuffix devel:libopenal$secondaryArchSuffix devel:libpng16$secondaryArchSuffix - devel:libSDL$secondaryArchSuffix - devel:libsdl_mixer$secondaryArchSuffix + devel:libSDL_1.2$secondaryArchSuffix + devel:libSDL_mixer_1.2$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/games-engines/gemrb/patches/gemrb-0.8.5.patchset b/games-engines/gemrb/patches/gemrb-0.8.5.patchset deleted file mode 100644 index 738155c48..000000000 --- a/games-engines/gemrb/patches/gemrb-0.8.5.patchset +++ /dev/null @@ -1,28 +0,0 @@ -From e070aee8744caa52897290052a76073164ad576e Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 12 Nov 2019 21:02:00 +0100 -Subject: Haiku: don't install icon, logo, menu. - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5d2017..d2f56d1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -511,9 +511,11 @@ CONFIGURE_FILE( - ADD_SUBDIRECTORY( gemrb ) - IF (NOT APPLE) - INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/gemrb.6" DESTINATION ${MAN_DIR} ) -- INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} RENAME gemrb.png ) -- INSTALL( FILES artwork/logo04-rb_only.svg DESTINATION ${SVG_DIR} RENAME gemrb.svg ) -- INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} ) -+ if (NOT HAIKU) -+ INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} RENAME gemrb.png ) -+ INSTALL( FILES artwork/logo04-rb_only.svg DESTINATION ${SVG_DIR} RENAME gemrb.svg ) -+ INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} ) -+ ENDIF() - ENDIF() - INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION ${DOC_DIR} ) - INSTALL( FILES admin/extend2da.py DESTINATION ${BIN_DIR} --- -2.24.0 -