From c2dd8941a9731c8da49eaf850a81c2efefbfa781 Mon Sep 17 00:00:00 2001 From: Crestwave <35413013+Crestwave@users.noreply.github.com> Date: Sun, 15 Mar 2020 22:06:18 +0800 Subject: [PATCH] RetroArch: bump to 1.8.4 (#4798) Co-authored-by: Crestwave --- .../patches/retroarch-1.8.4.patchset | 25 +++++++++++++++++++ ...ch-1.8.2.recipe => retroarch-1.8.4.recipe} | 24 ++++++++++++------ 2 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 games-emulation/retroarch/patches/retroarch-1.8.4.patchset rename games-emulation/retroarch/{retroarch-1.8.2.recipe => retroarch-1.8.4.recipe} (85%) diff --git a/games-emulation/retroarch/patches/retroarch-1.8.4.patchset b/games-emulation/retroarch/patches/retroarch-1.8.4.patchset new file mode 100644 index 000000000..a7b0ff8af --- /dev/null +++ b/games-emulation/retroarch/patches/retroarch-1.8.4.patchset @@ -0,0 +1,25 @@ +From 3999164cb9613d4892b767dea0c5d9690f4a1ecf Mon Sep 17 00:00:00 2001 +From: Crestwave +Date: Sun, 15 Mar 2020 20:36:38 +0800 +Subject: (Haiku) Use GL1 video driver by default + + +diff --git a/configuration.c b/configuration.c +index c339e9e..16174c6 100644 +--- a/configuration.c ++++ b/configuration.c +@@ -322,9 +322,9 @@ enum midi_driver_enum + static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL; + #elif defined(HAVE_VITA2D) + static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D; +-#elif (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__)) && !defined(__WINRT__) ++#elif (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__)) && !defined(__WINRT__) && !defined(__HAIKU__) + static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL; +-#elif defined(HAVE_OPENGL_CORE) ++#elif defined(HAVE_OPENGL_CORE) && !defined(__HAIKU__) + static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL_CORE; + #elif defined(HAVE_OPENGL1) + static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL1; +-- +2.24.1 + diff --git a/games-emulation/retroarch/retroarch-1.8.2.recipe b/games-emulation/retroarch/retroarch-1.8.4.recipe similarity index 85% rename from games-emulation/retroarch/retroarch-1.8.2.recipe rename to games-emulation/retroarch/retroarch-1.8.4.recipe index 55bb24054..e7e199ba8 100644 --- a/games-emulation/retroarch/retroarch-1.8.2.recipe +++ b/games-emulation/retroarch/retroarch-1.8.4.recipe @@ -4,18 +4,21 @@ players. It enables you to run classic games on a wide range of computers and \ consoles through its slick graphical interface. It has advanced features like \ shaders, netplay, rewinding, next-frame response times, and more!" HOMEPAGE="https://www.retroarch.com/" -COPYRIGHT="2010-2018 The RetroArch Team" +COPYRIGHT="2010-2020 The RetroArch Team" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/libretro/RetroArch/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="2c620e5a248261805be6fb3f985e516cdc8053cb9acfe8ac05c3cce96e15bc8d" +CHECKSUM_SHA256="027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52" SOURCE_FILENAME="retroarch-$portVersion.tar.gz" SOURCE_DIR="RetroArch-$portVersion" +PATCHES="retroarch-$portVersion.patchset" ADDITIONAL_FILES="retroarch.rdef.in" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then SECONDARY_ARCHITECTURES="x86" +commandBinDir=$prefix/bin fi GLOBAL_WRITABLE_FILES=" @@ -29,11 +32,12 @@ USER_SETTINGS_FILES=" PROVIDES=" retroarch$secondaryArchSuffix = $portVersion app:retroarch = $portVersion - app:retroarch_cg2glsl = $portVersion + cmd:retroarch_cg2glsl " REQUIRES=" haiku$secondaryArchSuffix retroarch_assets + cmd:python3 lib:libavcodec$secondaryArchSuffix lib:libavdevice$secondaryArchSuffix lib:libavformat$secondaryArchSuffix @@ -52,7 +56,7 @@ BUILD_REQUIRES=" devel:libavformat$secondaryArchSuffix devel:libavutil$secondaryArchSuffix devel:libGL$secondaryArchSuffix - devel:libsdl2$secondaryArchSuffix + devel:libsdl2_2.0$secondaryArchSuffix devel:libswresample$secondaryArchSuffix devel:libswscale$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -64,6 +68,9 @@ BUILD_PREREQUIRES=" cmd:which " +defineDebugInfoPackage retroarch$secondaryArchSuffix \ + "$appsDir/RetroArch" + PATCH() { libretroDir="`finddir B_SYSTEM_DIRECTORY`/$relativeAddOnsDir/libretro" @@ -84,7 +91,7 @@ PATCH() BUILD() { ./configure --prefix="$prefix" --sysconfdir="$sysconfDir" \ - --bindir="$appsDir" --datarootdir="$dataRootDir" \ + --bindir="$commandBinDir" --datarootdir="$dataRootDir" \ --docdir="$docDir" --mandir="$manDir" \ --with-assets_dir="$dataDir" --disable-discord make $jobArgs @@ -94,6 +101,9 @@ INSTALL() { make install + install -m 0755 -d "$appsDir" + mv "$commandBinDir/retroarch" "$appsDir/RetroArch" + install -m 0755 -d "$dataDir"/retroarch install -m 0644 -T retroarch.cfg "$settingsDir"/retroarch.cfg install -m 0644 -T retroarch.cfg "$dataDir"/retroarch/retroarch.cfg.default @@ -110,7 +120,7 @@ INSTALL() $portDir/additional-files/retroarch.rdef.in > retroarch.rdef addResourcesToBinaries retroarch.rdef \ - "$appsDir"/retroarch + "$appsDir"/RetroArch - addAppDeskbarSymlink "$appsDir"/retroarch "RetroArch" + addAppDeskbarSymlink "$appsDir"/RetroArch }