[rpms/yosys] f44: update to newer 0.67 snapshot

[Gabriel Somlo <gsomlo@gmail.com>]

A new commit has been pushed.

Repo   : rpms/yosys
Branch : f44
Commit : ec3d1922dd1766e4788aa0828f1da950ef9feb21
Author : Gabriel Somlo <gsomlo@gmail.com>
Date   : 2026-07-13T21:37:58-04:00
Stats  : +62/-193 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/yosys/c/ec3d1922dd1766e4788aa0828f1da950ef9feb21?branch=f44

Log:
update to newer 0.67 snapshot

---
diff --git a/.gitignore b/.gitignore
index 92c8afd..030903d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
 /yosys-86f2dde.tar.gz
 /yosys-b88b73a.tar.gz
 /yosys_0.65-1.debian.tar.xz
+/yosys-22c15a7.tar.gz

diff --git a/0001-CMake-Support-for-pre-packaged-dependencies.patch b/0001-CMake-Support-for-pre-packaged-dependencies.patch
deleted file mode 100644
index c07f47b..0000000
--- a/0001-CMake-Support-for-pre-packaged-dependencies.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From bfbeb68417cd7876cef0b8339e9deec1b18fd955 Mon Sep 17 00:00:00 2001
-From: Gabriel Somlo <gsomlo@gmail.com>
-Date: Sat, 11 Jul 2026 14:26:48 -0400
-Subject: [PATCH] CMake: Support for pre-packaged dependencies
-
-When packaging for a distro (e.g., Fedora), support linking
-against pre-packaged dependencies instead of vendoring. When
-enabling the YOSYS_WITH_PKG_DEPS option, assume dependencies
-such as `cxxopts-devel`, `[sv-]slang[-devel]`, etc. are
-already available and installed.
-
-Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
----
- CMakeLists.txt           |  1 +
- frontends/CMakeLists.txt |  4 +-
- kernel/CMakeLists.txt    |  3 +-
- kernel/driver.cc         |  2 +-
- libs/CMakeLists.txt      | 88 +++++++++++++++++++++-------------------
- 5 files changed, 53 insertions(+), 45 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb3766fd7..9cfdace58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,6 +56,7 @@ option(YOSYS_WITHOUT_EDITLINE "Disable editline integration" OFF)
- option(YOSYS_WITHOUT_SLANG "Disable Slang integration" OFF)
- option(YOSYS_WITHOUT_TCL "Disable Tcl integration" OFF)
- option(YOSYS_WITH_PYTHON "Enable Python integration" OFF)
-+option(YOSYS_WITH_PKG_DEPS "Disable bundled/vendored dependencies" OFF)
- 
- set(YOSYS_VERIFIC_DIR "" CACHE FILEPATH "Path to the Verific source code (empty to disable)")
- set(YOSYS_VERIFIC_COMPONENTS "" CACHE STRING
-diff --git a/frontends/CMakeLists.txt b/frontends/CMakeLists.txt
-index 6e6eda488..3972fd811 100644
---- a/frontends/CMakeLists.txt
-+++ b/frontends/CMakeLists.txt
-@@ -6,6 +6,8 @@ add_subdirectory(json)
- add_subdirectory(liberty)
- add_subdirectory(rpc)
- add_subdirectory(rtlil)
--add_subdirectory(slang)
-+if (NOT (YOSYS_WITH_PKG_DEPS OR YOSYS_WITHOUT_SLANG))
-+    add_subdirectory(slang)
-+endif()
- add_subdirectory(verific)
- add_subdirectory(verilog)
-diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
-index 4cd76b4ff..45f3bb0e3 100644
---- a/kernel/CMakeLists.txt
-+++ b/kernel/CMakeLists.txt
-@@ -89,9 +89,10 @@ yosys_core(kernel
- 	yw.cc
- 	yw.h
- 	INCLUDE_DIRS
-+		$<$<NOT:$<BOOL:${YOSYS_WITH_PKG_DEPS}>>:${CMAKE_CURRENT_SOURCE_DIR}/libs/cxxopts/include/>
- 		${pybind11_INCLUDE_DIR}
- 	LIBRARIES
--		cxxopts
-+		$<$<NOT:$<BOOL:${YOSYS_WITH_PKG_DEPS}>>:cxxopts>
- 		$<${YOSYS_ENABLE_PLUGINS}:${Dlfcn_LIBRARIES}>
- 		$<${YOSYS_ENABLE_ZLIB}:PkgConfig::zlib>
- 		$<${YOSYS_ENABLE_READLINE}:PkgConfig::readline>
-diff --git a/kernel/driver.cc b/kernel/driver.cc
-index 2a4ad1295..7bb67ffea 100644
---- a/kernel/driver.cc
-+++ b/kernel/driver.cc
-@@ -21,7 +21,7 @@
- #include "kernel/hashlib.h"
- #include "libs/sha1/sha1.h"
- #define CXXOPTS_VECTOR_DELIMITER '\0'
--#include "libs/cxxopts/include/cxxopts.hpp"
-+#include <cxxopts.hpp>
- #include <iostream>
- #include <chrono>
- 
-diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
-index 5ea08ef9d..4dc97df3d 100644
---- a/libs/CMakeLists.txt
-+++ b/libs/CMakeLists.txt
-@@ -1,5 +1,7 @@
- add_subdirectory(bigint)
--add_subdirectory(cxxopts)
-+if (NOT YOSYS_WITH_PKG_DEPS)
-+    add_subdirectory(cxxopts)
-+endif()
- add_subdirectory(dlfcn-win32)
- add_subdirectory(ezsat)
- add_subdirectory(fst)
-@@ -7,50 +9,52 @@ add_subdirectory(json11)
- add_subdirectory(minisat)
- add_subdirectory(sha1)
- add_subdirectory(subcircuit)
--block()
--    set(BUILD_SHARED_LIBS OFF)
--    include(FetchContent)
--    set(FETCHCONTENT_FULLY_DISCONNECTED ON)
-+if (NOT YOSYS_WITH_PKG_DEPS)
-+    block()
-+        set(BUILD_SHARED_LIBS OFF)
-+        include(FetchContent)
-+        set(FETCHCONTENT_FULLY_DISCONNECTED ON)
- 
--    option(FMT_INSTALL OFF)
--    FetchContent_Declare(
--        fmt
--        EXCLUDE_FROM_ALL
--        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/fmt
--    )
--    FetchContent_MakeAvailable(fmt)
-+        option(FMT_INSTALL OFF)
-+        FetchContent_Declare(
-+            fmt
-+            EXCLUDE_FROM_ALL
-+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/fmt
-+        )
-+        FetchContent_MakeAvailable(fmt)
- 
--    FetchContent_Declare(
--        tomlplusplus
--        EXCLUDE_FROM_ALL
--        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tomlplusplus
--    )
--    FetchContent_MakeAvailable(tomlplusplus)
-+        FetchContent_Declare(
-+            tomlplusplus
-+            EXCLUDE_FROM_ALL
-+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tomlplusplus
-+        )
-+        FetchContent_MakeAvailable(tomlplusplus)
- 
--    FetchContent_Declare(
--        boost_regex
--        EXCLUDE_FROM_ALL
--        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/boost_regex
--        SOURCE_SUBDIR _no_build_
--    )
--    FetchContent_MakeAvailable(boost_regex)
-+        FetchContent_Declare(
-+            boost_regex
-+            EXCLUDE_FROM_ALL
-+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/boost_regex
-+            SOURCE_SUBDIR _no_build_
-+        )
-+        FetchContent_MakeAvailable(boost_regex)
- 
--    if (NOT YOSYS_WITHOUT_SLANG)
--        set(SLANG_USE_MIMALLOC OFF)
--        add_subdirectory(slang)
--        # Headers autodetect based on <boost/config.hpp> but when version
--        # does exist but does not match requirements it becomes problematic
--        if(NOT Boost_FOUND)
--            target_compile_definitions(slang_slang PRIVATE BOOST_REGEX_STANDALONE)
--        endif()
--        if (SLANG_INCLUDE_TOOLS)
--            # Temporary to prevent build issues
--            set_target_properties(slang_tidy_obj_lib PROPERTIES YOSYS_IS_ABC ON)
-+        if (NOT YOSYS_WITHOUT_SLANG)
-+            set(SLANG_USE_MIMALLOC OFF)
-+            add_subdirectory(slang)
-+            # Headers autodetect based on <boost/config.hpp> but when version
-+            # does exist but does not match requirements it becomes problematic
-+            if(NOT Boost_FOUND)
-+                target_compile_definitions(slang_slang PRIVATE BOOST_REGEX_STANDALONE)
-+            endif()
-+            if (SLANG_INCLUDE_TOOLS)
-+                # Temporary to prevent build issues
-+                set_target_properties(slang_tidy_obj_lib PROPERTIES YOSYS_IS_ABC ON)
- 
--            install(TARGETS slang_driver RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--            install(TARGETS slang_hier RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--            install(TARGETS slang_reflect RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--            install(TARGETS slang_tidy RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+                install(TARGETS slang_driver RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+                install(TARGETS slang_hier RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+                install(TARGETS slang_reflect RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+                install(TARGETS slang_tidy RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-+            endif()
-         endif()
--    endif()
--endblock()
-+    endblock()
-+endif()
--- 
-2.54.0
-

diff --git a/0001-fedora-unbundle-cxxopts.patch b/0001-fedora-unbundle-cxxopts.patch
new file mode 100644
index 0000000..d72d7b5
--- /dev/null
+++ b/0001-fedora-unbundle-cxxopts.patch
@@ -0,0 +1,49 @@
+From e54bbc1ffa4b8f81559e3e4d9d2521e9d83f1748 Mon Sep 17 00:00:00 2001
+From: Gabriel Somlo <gsomlo@gmail.com>
+Date: Mon, 13 Jul 2026 17:01:17 -0400
+Subject: [PATCH] fedora: unbundle cxxopts
+
+---
+ kernel/CMakeLists.txt | 1 -
+ kernel/driver.cc      | 2 +-
+ libs/CMakeLists.txt   | 1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
+index 4cd76b4ff..24d86997b 100644
+--- a/kernel/CMakeLists.txt
++++ b/kernel/CMakeLists.txt
+@@ -91,7 +91,6 @@ yosys_core(kernel
+ 	INCLUDE_DIRS
+ 		${pybind11_INCLUDE_DIR}
+ 	LIBRARIES
+-		cxxopts
+ 		$<${YOSYS_ENABLE_PLUGINS}:${Dlfcn_LIBRARIES}>
+ 		$<${YOSYS_ENABLE_ZLIB}:PkgConfig::zlib>
+ 		$<${YOSYS_ENABLE_READLINE}:PkgConfig::readline>
+diff --git a/kernel/driver.cc b/kernel/driver.cc
+index 2a4ad1295..7bb67ffea 100644
+--- a/kernel/driver.cc
++++ b/kernel/driver.cc
+@@ -21,7 +21,7 @@
+ #include "kernel/hashlib.h"
+ #include "libs/sha1/sha1.h"
+ #define CXXOPTS_VECTOR_DELIMITER '\0'
+-#include "libs/cxxopts/include/cxxopts.hpp"
++#include <cxxopts.hpp>
+ #include <iostream>
+ #include <chrono>
+ 
+diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
+index cb81b3af2..4eb313c5d 100644
+--- a/libs/CMakeLists.txt
++++ b/libs/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ add_subdirectory(bigint)
+-add_subdirectory(cxxopts)
+ add_subdirectory(dlfcn-win32)
+ add_subdirectory(ezsat)
+ add_subdirectory(fst)
+-- 
+2.54.0
+

diff --git a/sources b/sources
index 73eeecb..c58da99 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (yosys-b88b73a.tar.gz) = fbff64033e953ab1c387a300297f7609ff43d074c3cf9f7d66601d3fefe949ceb468d46a94d237591d2b0cabd4a2ae8566e19c6dc8a381602d677ecdc0fe2401
+SHA512 (yosys-22c15a7.tar.gz) = 2fbc300e1532e770e6988f19e162fe8cafc2d086418d9b77cf0ba1524679fb305a0e642f95fe57b809fa4b16b74b471e26fdeac2828a43bc2d11ce2c06b21da1
 SHA512 (yosys_0.65-1.debian.tar.xz) = a0a68a8229b42d48f87618d3c4e40acf3576e8d18188b83ef3d83c277a17c09ea783fab45dfc3c52cc0fcee220af1a00b7d012a258dc3b124a44d65696d490ba

diff --git a/yosys.spec b/yosys.spec
index 654d1ce..4e02c05 100644
--- a/yosys.spec
+++ b/yosys.spec
@@ -1,11 +1,11 @@
-%global commit0 b88b73a99a9db67030a952e00f2f111d00cb6013
+%global commit0 22c15a7ecd53437f18f67c72572bd693f78357ca
 %global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
-%global snapdate 20260709
+%global snapdate 20260713
 
 Name:           yosys
 Version:        0.67
-Release:        1.%{snapdate}git%{shortcommit0}%{?dist}
+Release:        2.%{snapdate}git%{shortcommit0}%{?dist}
 Summary:        Yosys Open SYnthesis Suite, including Verilog synthesizer
 License:        ISC and MIT
 URL:            http://www.clifford.at/yosys/
@@ -18,9 +18,8 @@ Source2:        http://http.debian.net/debian/pool/main/y/yosys/yosys_0.65-1.deb
 # requested that upstream include those man pages:
 #   https://github.com/YosysHQ/yosys/issues/278
 
-# Fedora-specific patch:
-# Support for pre-packaged dependencies:
-Patch1:         0001-CMake-Support-for-pre-packaged-dependencies.patch
+# Fedora-specific patch: # unbundle cxxopts dependency
+Patch1:         0001-fedora-unbundle-cxxopts.patch
 
 
 BuildRequires:  cmake
@@ -112,8 +111,9 @@ do
 done
 
 %build
+# turning off newly-added sv-slang frontend support, for now;
+# FIXME: decide on packaging slang dependency vs. enabling bundled subrepo!
 %cmake -DYOSYS_ABC_EXECUTABLE=%{_bindir}/abc \
-       -DYOSYS_WITH_PKG_DEPS=ON \
        -DYOSYS_WITHOUT_SLANG=ON
 %cmake_build
 #manual
@@ -173,6 +173,10 @@ install -m 0644 docs/build/latex/yosyshqyosys.pdf %{buildroot}%{_docdir}/%{name}
 
 
 %changelog
+* Mon Jul 13 2026 Gabriel Somlo <gsomlo@gmail.com> - 0.67.2.20260713git22c15a7
+- update to newer 0.67 snapshot
+- simplify downstream (un-bundling) patch since some upstream support added
+
 * Thu Jul 09 2026 Gabriel Somlo <gsomlo@gmail.com> - 0.67.1.20260709gitb88b73a
 - update to 0.67 snapshot
 - switch build to cmake