Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 30 May 2026 18:51:27 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Cc:        Stefan Schlosser <bsdcode@disroot.org>
Subject:   git: e9bc5c823ebb - main - emulators/ares: Update 147 => 148
Message-ID:  <6a1b31af.21982.74f98b8e@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e9bc5c823ebb641abf38db87e8905019923b8003

commit e9bc5c823ebb641abf38db87e8905019923b8003
Author:     Stefan Schlosser <bsdcode@disroot.org>
AuthorDate: 2026-05-30 18:49:51 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-05-30 18:49:51 +0000

    emulators/ares: Update 147 => 148
    
    Release Notes:
    https://ares-emu.net/news/ares-v148-released
    
    PR:             295728
    Sponsored by:   UNIS Labs
---
 emulators/ares/Makefile                            |  8 +---
 emulators/ares/distinfo                            |  8 ++--
 .../ares/files/patch-thirdparty_CMakeLists.txt     | 54 ++++++++++------------
 3 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile
index d269ff07545e..cd469e25b153 100644
--- a/emulators/ares/Makefile
+++ b/emulators/ares/Makefile
@@ -1,17 +1,11 @@
 PORTNAME=	ares
 DISTVERSIONPREFIX=	v
-DISTVERSION=	147
-PORTREVISION=	5
+DISTVERSION=	148
 CATEGORIES=	emulators
 MASTER_SITES=	https://github.com/${PORTNAME}-emulator/${PORTNAME}/releases/download/${DISTVERSIONFULL}/
 DISTNAME=	${PORTNAME}-source
 DIST_SUBDIR=	${PORTNAME}/${DISTVERSION}
 
-# fixes linker error when building PCE core without MD core, see also
-# https://github.com/ares-emulator/ares/pull/2329
-PATCH_SITES=	https://github.com/${PORTNAME}-emulator/${PORTNAME}/commit/
-PATCHFILES=	adfc78f9523adce9fef1d7ac282e08ab7fc66dd4.patch:-p1
-
 MAINTAINER=	bsdcode@disroot.org
 COMMENT=	Multi-system emulator
 WWW=		https://ares-emu.net
diff --git a/emulators/ares/distinfo b/emulators/ares/distinfo
index 31c45bb91726..b5fda227f3f5 100644
--- a/emulators/ares/distinfo
+++ b/emulators/ares/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1766567627
-SHA256 (ares/147/ares-source.tar.gz) = dcedffc1676d497cfe7889e424335a38cc587c87fffebb917775ee5042962f69
-SIZE (ares/147/ares-source.tar.gz) = 9074663
-SHA256 (ares/147/adfc78f9523adce9fef1d7ac282e08ab7fc66dd4.patch) = 4503bf48bfe67448e17b462fc6c99aab0dba780ae8f6a6059a04af2b59901b4f
-SIZE (ares/147/adfc78f9523adce9fef1d7ac282e08ab7fc66dd4.patch) = 563
+TIMESTAMP = 1780151282
+SHA256 (ares/148/ares-source.tar.gz) = 06b053d0f407d33272222efd55446d46bfd61859eea46b6ae16c0cc4fa1e51e5
+SIZE (ares/148/ares-source.tar.gz) = 5465693
diff --git a/emulators/ares/files/patch-thirdparty_CMakeLists.txt b/emulators/ares/files/patch-thirdparty_CMakeLists.txt
index 0a9b749623bd..220a3f74dbbf 100644
--- a/emulators/ares/files/patch-thirdparty_CMakeLists.txt
+++ b/emulators/ares/files/patch-thirdparty_CMakeLists.txt
@@ -1,36 +1,26 @@
---- thirdparty/CMakeLists.txt.orig	2025-08-27 21:41:50 UTC
+--- thirdparty/CMakeLists.txt.orig	2026-05-28 12:42:30 UTC
 +++ thirdparty/CMakeLists.txt
 @@ -7,55 +7,9 @@ if(ARES_ENABLE_CHD)
  option(ARES_ENABLE_CHD "Enable CHD format support via libchdr" ON)
  
  if(ARES_ENABLE_CHD)
 -  # lzma
--  add_subdirectory(libchdr/deps/lzma-24.05 EXCLUDE_FROM_ALL)
--  list(APPEND CHDR_LIBS lzma)
+-  add_subdirectory(libchdr/deps/lzma-25.01 EXCLUDE_FROM_ALL)
 -  list(APPEND CHDR_INCLUDES lzma)
 -
--  if(OS_MACOS)
--    option(WITH_SYSTEM_ZLIB "Use system zlib" ON)
--  endif()
--  # zlib
--  if(WITH_SYSTEM_ZLIB)
--    find_package(ZLIB REQUIRED)
--    list(APPEND PLATFORM_LIBS ZLIB::ZLIB)
--  else()
--    option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" OFF)
--    add_subdirectory(libchdr/deps/zlib-1.3.1 EXCLUDE_FROM_ALL)
--    set_target_properties(
--      zlibstatic
--      PROPERTIES POSITION_INDEPENDENT_CODE ON FOLDER thirdparty PREFIX ""
--    )
--    list(APPEND CHDR_LIBS zlibstatic)
--  endif()
--
+-  # miniz
+-  add_subdirectory(libchdr/deps/miniz-3.1.1 EXCLUDE_FROM_ALL)
+-  set_target_properties(
+-    miniz
+-    PROPERTIES POSITION_INDEPENDENT_CODE ON FOLDER thirdparty PREFIX ""
+-  )
+-  list(APPEND CHDR_LIBS miniz)
+-  
 -  # zstd
 -  option(ZSTD_BUILD_SHARED "BUILD SHARED LIBRARIES" OFF)
 -  option(ZSTD_BUILD_PROGRAMS "BUILD PROGRAMS" OFF)
--  add_subdirectory(libchdr/deps/zstd-1.5.6/build/cmake EXCLUDE_FROM_ALL)
--  list(APPEND CHDR_LIBS libzstd_static)
+-  add_subdirectory(libchdr/deps/zstd-1.5.7 EXCLUDE_FROM_ALL)
+-  list(APPEND CHDR_LIBS zstd)
 -  #--------------------------------------------------
 -  # chdr
 -  #--------------------------------------------------
@@ -42,6 +32,16 @@
 -    libchdr/src/libchdr_chd.c
 -    libchdr/src/libchdr_flac.c
 -    libchdr/src/libchdr_huffman.c
+-    libchdr/src/libchdr_codec_cdfl.c
+-    libchdr/src/libchdr_codec_cdlz.c
+-    libchdr/src/libchdr_codec_cdzl.c
+-    libchdr/src/libchdr_codec_cdzs.c
+-    libchdr/src/libchdr_codec_flac.c
+-    libchdr/src/libchdr_codec_huff.c
+-    libchdr/src/libchdr_codec_lzma.c
+-    libchdr/src/libchdr_codec_zlib.c
+-    libchdr/src/libchdr_codec_zstd.c
+-    libchdr/deps/lzma-25.01/src/LzmaDec.c
 -  )
 -
 -  list(APPEND CHDR_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/libchdr/include)
@@ -59,17 +59,13 @@
  endif()
  
  add_library(
-@@ -111,12 +65,4 @@ set_target_properties(sljit PROPERTIES FOLDER thirdpar
+@@ -108,9 +62,4 @@ set_target_properties(sljit PROPERTIES FOLDER thirdpar
  set_target_properties(ymfm PROPERTIES FOLDER thirdparty PREFIX "")
  set_target_properties(tzxfile PROPERTIES FOLDER thirdparty PREFIX "")
  set_target_properties(sljit PROPERTIES FOLDER thirdparty PREFIX "")
 -if(ARES_ENABLE_CHD)
 -  set_target_properties(chdr-static PROPERTIES FOLDER thirdparty PREFIX "")
--  if(NOT WITH_SYSTEM_ZLIB)
--    set_target_properties(zlib PROPERTIES FOLDER thirdparty PREFIX "")
--  endif()
--  set_target_properties(lzma PROPERTIES FOLDER thirdparty PREFIX "")
--  set_target_properties(libzstd_static PROPERTIES FOLDER thirdparty PREFIX "")
+-  set_target_properties(miniz PROPERTIES FOLDER thirdparty PREFIX "")
+-  set_target_properties(zstd PROPERTIES FOLDER thirdparty PREFIX "")
 -endif()
  set_target_properties(qon PROPERTIES FOLDER thirdparty PREFIX "")
-\ No newline at end of file
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1b31af.21982.74f98b8e>