diff options
author | tytan652 | 2023-09-01 12:29:22 +0200 |
---|---|---|
committer | tytan652 | 2023-09-01 12:29:22 +0200 |
commit | c23cfa0521041f3373e70508cc8f48d4a2201491 (patch) | |
tree | 53d95077a26874de580fac9067fec03ee0e08efc | |
parent | 7dbb355d4cace5305b87b4dccf55c20c755dd131 (diff) | |
download | aur-c23cfa0521041f3373e70508cc8f48d4a2201491.tar.gz |
build: Backport changes
- Fix blank browser dock titles with Qt 6.5
- Use system-wide uthash RC package backport
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | 0001-Add_finder_for_uthash.patch | 192 | ||||
-rw-r--r-- | 0002-Use_system_uthash.patch | 1296 | ||||
-rw-r--r-- | 0003-Fix_blank_browser_dock_titles.patch | 397 | ||||
-rw-r--r-- | PKGBUILD | 14 |
5 files changed, 1906 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = obs-studio-browser pkgdesc = Free and open source software for video recording and live streaming. With everything except service integration pkgver = 29.1.3 - pkgrel = 2 + pkgrel = 3 url = https://github.com/obsproject/obs-studio arch = x86_64 arch = aarch64 @@ -10,6 +10,7 @@ pkgbase = obs-studio-browser makedepends = cmake makedepends = jack makedepends = git + makedepends = uthash makedepends = libajantv2 makedepends = libfdk-aac makedepends = luajit @@ -93,9 +94,15 @@ pkgbase = obs-studio-browser source = obs-browser::git+https://github.com/obsproject/obs-browser.git source = obs-websocket::git+https://github.com/obsproject/obs-websocket.git source = qr::git+https://github.com/nayuki/QR-Code-generator.git + source = 0001-Add_finder_for_uthash.patch + source = 0002-Use_system_uthash.patch + source = 0003-Fix_blank_browser_dock_titles.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP + sha256sums = f4a56021a7f1c564f95b588d7c09b60a89efa2c1954c8a418cf6320b5a818542 + sha256sums = 966250c40ab47276e1d420941b5b1e448886b0ab8643f25ba37dce08df68f34d + sha256sums = 8980d1e871177c3f65d5cf0c249ef36c5a9e2a6956bbc592283782ec58d825e7 pkgname = obs-studio-browser diff --git a/0001-Add_finder_for_uthash.patch b/0001-Add_finder_for_uthash.patch new file mode 100644 index 000000000000..c27fe27a92b9 --- /dev/null +++ b/0001-Add_finder_for_uthash.patch @@ -0,0 +1,192 @@ +From ba026f32aa87c6deefdfabf1bcc48b205622c708 Mon Sep 17 00:00:00 2001 +From: tytan652 <tytan652@tytanium.xyz> +Date: Mon, 24 Jul 2023 10:50:14 +0200 +Subject: [PATCH] cmake: Add finder for uthash + +--- + cmake/Modules/FindUthash.cmake | 84 ++++++++++++++++++++++++++++++++++ + cmake/finders/FindUthash.cmake | 84 ++++++++++++++++++++++++++++++++++ + 2 files changed, 168 insertions(+) + create mode 100644 cmake/Modules/FindUthash.cmake + create mode 100644 cmake/finders/FindUthash.cmake + +diff --git a/cmake/Modules/FindUthash.cmake b/cmake/Modules/FindUthash.cmake +new file mode 100644 +index 0000000000000..fde6bd5d12321 +--- /dev/null ++++ b/cmake/Modules/FindUthash.cmake +@@ -0,0 +1,84 @@ ++#[=======================================================================[.rst ++FindUthash ++---------- ++ ++FindModule for uthash and the associated library ++ ++Imported Targets ++^^^^^^^^^^^^^^^^ ++ ++.. versionadded:: 3.0 ++ ++This module defines the :prop_tgt:`IMPORTED` target ``Uthash::Uthash``. ++ ++Result Variables ++^^^^^^^^^^^^^^^^ ++ ++This module sets the following variables: ++ ++``Uthash_FOUND`` ++ True, if the library was found. ++``Uthash_VERSION`` ++ Detected version of found uthash library. ++ ++Cache variables ++^^^^^^^^^^^^^^^ ++ ++The following cache variables may also be set: ++ ++``Uthash_INCLUDE_DIR`` ++ Directory containing ``uthash.h``. ++ ++#]=======================================================================] ++ ++# cmake-format: off ++# cmake-lint: disable=C0103 ++# cmake-lint: disable=C0301 ++# cmake-format: on ++ ++include(FindPackageHandleStandardArgs) ++ ++find_path( ++ Uthash_INCLUDE_DIR ++ NAMES uthash.h ++ PATHS /usr/include /usr/local/include ++ DOC "uthash include directory") ++ ++if(EXISTS "${Uthash_INCLUDE_DIR}/uthash.h") ++ file(STRINGS "${Uthash_INCLUDE_DIR}/uthash.h" _version_string ++ REGEX "#define[ \t]+UTHASH_VERSION[ \t]+[0-9]+\\.[0-9]+\\.[0-9]+") ++ ++ string(REGEX REPLACE "#define[ \t]+UTHASH_VERSION[ \t]+([0-9]+\\.[0-9]+\\.[0-9]+)" "\\1" Uthash_VERSION ++ "${_version_string}") ++else() ++ if(NOT Uthash_FIND_QUIETLY) ++ message(AUTHOR_WARNING "Failed to find uthash version.") ++ endif() ++ set(Uthash_VERSION 0.0.0) ++endif() ++ ++if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows") ++ set(Uthash_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.") ++elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD") ++ set(Uthash_ERROR_REASON "Ensure uthash library is available in local include paths.") ++endif() ++ ++find_package_handle_standard_args( ++ Uthash ++ REQUIRED_VARS Uthash_INCLUDE_DIR ++ VERSION_VAR Uthash_VERSION REASON_FAILURE_MESSAGE "${Uthash_ERROR_REASON}") ++mark_as_advanced(Uthash_INCLUDE_DIR) ++unset(Uthash_ERROR_REASON) ++ ++if(Uthash_FOUND) ++ if(NOT TARGET Uthash::Uthash) ++ add_library(Uthash::Uthash INTERFACE IMPORTED) ++ set_target_properties(Uthash::Uthash PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Uthash_INCLUDE_DIR}") ++ endif() ++endif() ++ ++include(FeatureSummary) ++set_package_properties( ++ Uthash PROPERTIES ++ URL "https://troydhanson.github.io/uthash" ++ DESCRIPTION "A hash table for C structures") +diff --git a/cmake/finders/FindUthash.cmake b/cmake/finders/FindUthash.cmake +new file mode 100644 +index 0000000000000..fde6bd5d12321 +--- /dev/null ++++ b/cmake/finders/FindUthash.cmake +@@ -0,0 +1,84 @@ ++#[=======================================================================[.rst ++FindUthash ++---------- ++ ++FindModule for uthash and the associated library ++ ++Imported Targets ++^^^^^^^^^^^^^^^^ ++ ++.. versionadded:: 3.0 ++ ++This module defines the :prop_tgt:`IMPORTED` target ``Uthash::Uthash``. ++ ++Result Variables ++^^^^^^^^^^^^^^^^ ++ ++This module sets the following variables: ++ ++``Uthash_FOUND`` ++ True, if the library was found. ++``Uthash_VERSION`` ++ Detected version of found uthash library. ++ ++Cache variables ++^^^^^^^^^^^^^^^ ++ ++The following cache variables may also be set: ++ ++``Uthash_INCLUDE_DIR`` ++ Directory containing ``uthash.h``. ++ ++#]=======================================================================] ++ ++# cmake-format: off ++# cmake-lint: disable=C0103 ++# cmake-lint: disable=C0301 ++# cmake-format: on ++ ++include(FindPackageHandleStandardArgs) ++ ++find_path( ++ Uthash_INCLUDE_DIR ++ NAMES uthash.h ++ PATHS /usr/include /usr/local/include ++ DOC "uthash include directory") ++ ++if(EXISTS "${Uthash_INCLUDE_DIR}/uthash.h") ++ file(STRINGS "${Uthash_INCLUDE_DIR}/uthash.h" _version_string ++ REGEX "#define[ \t]+UTHASH_VERSION[ \t]+[0-9]+\\.[0-9]+\\.[0-9]+") ++ ++ string(REGEX REPLACE "#define[ \t]+UTHASH_VERSION[ \t]+([0-9]+\\.[0-9]+\\.[0-9]+)" "\\1" Uthash_VERSION ++ "${_version_string}") ++else() ++ if(NOT Uthash_FIND_QUIETLY) ++ message(AUTHOR_WARNING "Failed to find uthash version.") ++ endif() ++ set(Uthash_VERSION 0.0.0) ++endif() ++ ++if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows") ++ set(Uthash_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.") ++elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD") ++ set(Uthash_ERROR_REASON "Ensure uthash library is available in local include paths.") ++endif() ++ ++find_package_handle_standard_args( ++ Uthash ++ REQUIRED_VARS Uthash_INCLUDE_DIR ++ VERSION_VAR Uthash_VERSION REASON_FAILURE_MESSAGE "${Uthash_ERROR_REASON}") ++mark_as_advanced(Uthash_INCLUDE_DIR) ++unset(Uthash_ERROR_REASON) ++ ++if(Uthash_FOUND) ++ if(NOT TARGET Uthash::Uthash) ++ add_library(Uthash::Uthash INTERFACE IMPORTED) ++ set_target_properties(Uthash::Uthash PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Uthash_INCLUDE_DIR}") ++ endif() ++endif() ++ ++include(FeatureSummary) ++set_package_properties( ++ Uthash PROPERTIES ++ URL "https://troydhanson.github.io/uthash" ++ DESCRIPTION "A hash table for C structures") diff --git a/0002-Use_system_uthash.patch b/0002-Use_system_uthash.patch new file mode 100644 index 000000000000..b942ca763286 --- /dev/null +++ b/0002-Use_system_uthash.patch @@ -0,0 +1,1296 @@ +From 8d1b5aa01d290b2e2203623cc5f51b7c854012da Mon Sep 17 00:00:00 2001 +From: tytan652 <tytan652@tytanium.xyz> +Date: Mon, 24 Jul 2023 10:52:05 +0200 +Subject: [PATCH] deps,libobs: Replace uthash with prefix/system install + +--- + deps/CMakeLists.txt | 1 - + deps/uthash/.clang-format | 3 - + deps/uthash/CMakeLists.txt | 8 - + deps/uthash/uthash/LICENSE | 21 - + deps/uthash/uthash/uthash.h | 1136 ----------------------------------- + libobs/CMakeLists.txt | 4 +- + libobs/cmake/legacy.cmake | 3 +- + libobs/util/uthash.h | 2 +- + 8 files changed, 5 insertions(+), 1173 deletions(-) + delete mode 100644 deps/uthash/.clang-format + delete mode 100644 deps/uthash/CMakeLists.txt + delete mode 100644 deps/uthash/uthash/LICENSE + delete mode 100644 deps/uthash/uthash/uthash.h + +diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt +index 9e92bb114..6ab050f03 100644 +--- a/deps/CMakeLists.txt ++++ b/deps/CMakeLists.txt +@@ -16,7 +16,6 @@ add_subdirectory(file-updater) + add_subdirectory(obs-scripting) + add_subdirectory(opts-parser) + add_subdirectory(libcaption) +-add_subdirectory(uthash) + + # Use bundled jansson version as fallback + find_package(Jansson 2.5 QUIET) +diff --git a/deps/uthash/.clang-format b/deps/uthash/.clang-format +deleted file mode 100644 +index 6420a4688..000000000 +--- a/deps/uthash/.clang-format ++++ /dev/null +@@ -1,3 +0,0 @@ +-Language: Cpp +-SortIncludes: false +-DisableFormat: true +diff --git a/deps/uthash/CMakeLists.txt b/deps/uthash/CMakeLists.txt +deleted file mode 100644 +index 19f262a36..000000000 +--- a/deps/uthash/CMakeLists.txt ++++ /dev/null +@@ -1,8 +0,0 @@ +-cmake_minimum_required(VERSION 3.16...3.25) +- +-add_library(uthash INTERFACE) +-add_library(OBS::uthash ALIAS uthash) +- +-target_sources(uthash INTERFACE uthash/uthash.h) +- +-set_target_properties(uthash PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}") +diff --git a/deps/uthash/uthash/LICENSE b/deps/uthash/uthash/LICENSE +deleted file mode 100644 +index e75a243af..000000000 +--- a/deps/uthash/uthash/LICENSE ++++ /dev/null +@@ -1,21 +0,0 @@ +-Copyright (c) 2005-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ +-All rights reserved. +- +-Redistribution and use in source and binary forms, with or without +-modification, are permitted provided that the following conditions are met: +- +- * Redistributions of source code must retain the above copyright +- notice, this list of conditions and the following disclaimer. +- +-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- +diff --git a/deps/uthash/uthash/uthash.h b/deps/uthash/uthash/uthash.h +deleted file mode 100644 +index ac78fdab5..000000000 +--- a/deps/uthash/uthash/uthash.h ++++ /dev/null +@@ -1,1136 +0,0 @@ +-/* +-Copyright (c) 2003-2021, Troy D. Hanson http://troydhanson.github.com/uthash/ +-All rights reserved. +- +-Redistribution and use in source and binary forms, with or without +-modification, are permitted provided that the following conditions are met: +- +- * Redistributions of source code must retain the above copyright +- notice, this list of conditions and the following disclaimer. +- +-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-*/ +- +-#ifndef UTHASH_H +-#define UTHASH_H +- +-#define UTHASH_VERSION 2.3.0 +- +-#include <string.h> /* memcmp, memset, strlen */ +-#include <stddef.h> /* ptrdiff_t */ +-#include <stdlib.h> /* exit */ +- +-#if defined(HASH_DEFINE_OWN_STDINT) && HASH_DEFINE_OWN_STDINT +-/* This codepath is provided for backward compatibility, but I plan to remove it. */ +-#warning "HASH_DEFINE_OWN_STDINT is deprecated; please use HASH_NO_STDINT instead" +-typedef unsigned int uint32_t; +-typedef unsigned char uint8_t; +-#elif defined(HASH_NO_STDINT) && HASH_NO_STDINT +-#else +-#include <stdint.h> /* uint8_t, uint32_t */ +-#endif +- +-/* These macros use decltype or the earlier __typeof GNU extension. +- As decltype is only available in newer compilers (VS2010 or gcc 4.3+ +- when compiling c++ source) this code uses whatever method is needed +- or, for VS2008 where neither is available, uses casting workarounds. */ +-#if !defined(DECLTYPE) && !defined(NO_DECLTYPE) +-#if defined(_MSC_VER) /* MS compiler */ +-#if _MSC_VER >= 1600 && defined(__cplusplus) /* VS2010 or newer in C++ mode */ +-#define DECLTYPE(x) (decltype(x)) +-#else /* VS2008 or older (or VS2010 in C mode) */ +-#define NO_DECLTYPE +-#endif +-#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__) +-#define NO_DECLTYPE +-#else /* GNU, Sun and other compilers */ +-#define DECLTYPE(x) (__typeof(x)) +-#endif +-#endif +- +-#ifdef NO_DECLTYPE +-#define DECLTYPE(x) +-#define DECLTYPE_ASSIGN(dst,src) \ +-do { \ +- char **_da_dst = (char**)(&(dst)); \ +- *_da_dst = (char*)(src); \ +-} while (0) +-#else +-#define DECLTYPE_ASSIGN(dst,src) \ +-do { \ +- (dst) = DECLTYPE(dst)(src); \ +-} while (0) +-#endif +- +-#ifndef uthash_malloc +-#define uthash_malloc(sz) malloc(sz) /* malloc fcn */ +-#endif +-#ifndef uthash_free +-#define uthash_free(ptr,sz) free(ptr) /* free fcn */ +-#endif +-#ifndef uthash_bzero +-#define uthash_bzero(a,n) memset(a,'\0',n) +-#endif +-#ifndef uthash_strlen +-#define uthash_strlen(s) strlen(s) +-#endif +- +-#ifndef HASH_FUNCTION +-#define HASH_FUNCTION(keyptr,keylen,hashv) HASH_JEN(keyptr, keylen, hashv) +-#endif +- +-#ifndef HASH_KEYCMP +-#define HASH_KEYCMP(a,b,n) memcmp(a,b,n) +-#endif +- +-#ifndef uthash_noexpand_fyi +-#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ +-#endif +-#ifndef uthash_expand_fyi +-#define uthash_expand_fyi(tbl) /* can be defined to log expands */ +-#endif +- +-#ifndef HASH_NONFATAL_OOM +-#define HASH_NONFATAL_OOM 0 +-#endif +- +-#if HASH_NONFATAL_OOM +-/* malloc failures can be recovered from */ +- +-#ifndef uthash_nonfatal_oom +-#define uthash_nonfatal_oom(obj) do {} while (0) /* non-fatal OOM error */ +-#endif +- +-#define HASH_RECORD_OOM(oomed) do { (oomed) = 1; } while (0) +-#define IF_HASH_NONFATAL_OOM(x) x +- +-#else +-/* malloc failures result in lost memory, hash tables are unusable */ +- +-#ifndef uthash_fatal +-#define uthash_fatal(msg) exit(-1) /* fatal OOM error */ +-#endif +- +-#define HASH_RECORD_OOM(oomed) uthash_fatal("out of memory") +-#define IF_HASH_NONFATAL_OOM(x) +- +-#endif +- +-/* initial number of buckets */ +-#define HASH_INITIAL_NUM_BUCKETS 32U /* initial number of buckets */ +-#define HASH_INITIAL_NUM_BUCKETS_LOG2 5U /* lg2 of initial number of buckets */ +-#define HASH_BKT_CAPACITY_THRESH 10U /* expand when bucket count reaches */ +- +-/* calculate the element whose hash handle address is hhp */ +-#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho))) +-/* calculate the hash handle from element address elp */ +-#define HH_FROM_ELMT(tbl,elp) ((UT_hash_handle*)(void*)(((char*)(elp)) + ((tbl)->hho))) +- +-#define HASH_ROLLBACK_BKT(hh, head, itemptrhh) \ +-do { \ +- struct UT_hash_handle *_hd_hh_item = (itemptrhh); \ +- unsigned _hd_bkt; \ +- HASH_TO_BKT(_hd_hh_item->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ +- (head)->hh.tbl->buckets[_hd_bkt].count++; \ +- _hd_hh_item->hh_next = NULL; \ +- _hd_hh_item->hh_prev = NULL; \ +-} while (0) +- +-#define HASH_VALUE(keyptr,keylen,hashv) \ +-do { \ +- HASH_FUNCTION(keyptr, keylen, hashv); \ +-} while (0) +- +-#define HASH_FIND_BYHASHVALUE(hh,head,keyptr,keylen,hashval,out) \ +-do { \ +- (out) = NULL; \ +- if (head) { \ +- unsigned _hf_bkt; \ +- HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _hf_bkt); \ +- if (HASH_BLOOM_TEST((head)->hh.tbl, hashval) != 0) { \ +- HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], keyptr, keylen, hashval, out); \ +- } \ +- } \ +-} while (0) +- +-#define HASH_FIND(hh,head,keyptr,keylen,out) \ +-do { \ +- (out) = NULL; \ +- if (head) { \ +- unsigned _hf_hashv; \ +- HASH_VALUE(keyptr, keylen, _hf_hashv); \ +- HASH_FIND_BYHASHVALUE(hh, head, keyptr, keylen, _hf_hashv, out); \ +- } \ +-} while (0) +- +-#ifdef HASH_BLOOM +-#define HASH_BLOOM_BITLEN (1UL << HASH_BLOOM) +-#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8UL) + (((HASH_BLOOM_BITLEN%8UL)!=0UL) ? 1UL : 0UL) +-#define HASH_BLOOM_MAKE(tbl,oomed) \ +-do { \ +- (tbl)->bloom_nbits = HASH_BLOOM; \ +- (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN); \ +- if (!(tbl)->bloom_bv) { \ +- HASH_RECORD_OOM(oomed); \ +- } else { \ +- uthash_bzero((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ +- (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \ +- } \ +-} while (0) +- +-#define HASH_BLOOM_FREE(tbl) \ +-do { \ +- uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ +-} while (0) +- +-#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8U] |= (1U << ((idx)%8U))) +-#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8U] & (1U << ((idx)%8U))) +- +-#define HASH_BLOOM_ADD(tbl,hashv) \ +- HASH_BLOOM_BITSET((tbl)->bloom_bv, ((hashv) & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U))) +- +-#define HASH_BLOOM_TEST(tbl,hashv) \ +- HASH_BLOOM_BITTEST((tbl)->bloom_bv, ((hashv) & (uint32_t)((1UL << (tbl)->bloom_nbits) - 1U))) +- +-#else +-#define HASH_BLOOM_MAKE(tbl,oomed) +-#define HASH_BLOOM_FREE(tbl) +-#define HASH_BLOOM_ADD(tbl,hashv) +-#define HASH_BLOOM_TEST(tbl,hashv) (1) +-#define HASH_BLOOM_BYTELEN 0U +-#endif +- +-#define HASH_MAKE_TABLE(hh,head,oomed) \ +-do { \ +- (head)->hh.tbl = (UT_hash_table*)uthash_malloc(sizeof(UT_hash_table)); \ +- if (!(head)->hh.tbl) { \ +- HASH_RECORD_OOM(oomed); \ +- } else { \ +- uthash_bzero((head)->hh.tbl, sizeof(UT_hash_table)); \ +- (head)->hh.tbl->tail = &((head)->hh); \ +- (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \ +- (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2; \ +- (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head); \ +- (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc( \ +- HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket)); \ +- (head)->hh.tbl->signature = HASH_SIGNATURE; \ +- if (!(head)->hh.tbl->buckets) { \ +- HASH_RECORD_OOM(oomed); \ +- uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ +- } else { \ +- uthash_bzero((head)->hh.tbl->buckets, \ +- HASH_INITIAL_NUM_BUCKETS * sizeof(struct UT_hash_bucket)); \ +- HASH_BLOOM_MAKE((head)->hh.tbl, oomed); \ +- IF_HASH_NONFATAL_OOM( \ +- if (oomed) { \ +- uthash_free((head)->hh.tbl->buckets, \ +- HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ +- uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ +- } \ +- ) \ +- } \ +- } \ +-} while (0) +- +-#define HASH_REPLACE_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,replaced,cmpfcn) \ +-do { \ +- (replaced) = NULL; \ +- HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \ +- if (replaced) { \ +- HASH_DELETE(hh, head, replaced); \ +- } \ +- HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn); \ +-} while (0) +- +-#define HASH_REPLACE_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add,replaced) \ +-do { \ +- (replaced) = NULL; \ +- HASH_FIND_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, replaced); \ +- if (replaced) { \ +- HASH_DELETE(hh, head, replaced); \ +- } \ +- HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add); \ +-} while (0) +- +-#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced) \ +-do { \ +- unsigned _hr_hashv; \ +- HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv); \ +- HASH_REPLACE_BYHASHVALUE(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced); \ +-} while (0) +- +-#define HASH_REPLACE_INORDER(hh,head,fieldname,keylen_in,add,replaced,cmpfcn) \ +-do { \ +- unsigned _hr_hashv; \ +- HASH_VALUE(&((add)->fieldname), keylen_in, _hr_hashv); \ +- HASH_REPLACE_BYHASHVALUE_INORDER(hh, head, fieldname, keylen_in, _hr_hashv, add, replaced, cmpfcn); \ +-} while (0) +- +-#define HASH_APPEND_LIST(hh, head, add) \ +-do { \ +- (add)->hh.next = NULL; \ +- (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail); \ +- (head)->hh.tbl->tail->next = (add); \ +- (head)->hh.tbl->tail = &((add)->hh); \ +-} while (0) +- +-#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn) \ +-do { \ +- do { \ +- if (cmpfcn(DECLTYPE(head)(_hs_iter), add) > 0) { \ +- break; \ +- } \ +- } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next)); \ +-} while (0) +- +-#ifdef NO_DECLTYPE +-#undef HASH_AKBI_INNER_LOOP +-#define HASH_AKBI_INNER_LOOP(hh,head,add,cmpfcn) \ +-do { \ +- char *_hs_saved_head = (char*)(head); \ +- do { \ +- DECLTYPE_ASSIGN(head, _hs_iter); \ +- if (cmpfcn(head, add) > 0) { \ +- DECLTYPE_ASSIGN(head, _hs_saved_head); \ +- break; \ +- } \ +- DECLTYPE_ASSIGN(head, _hs_saved_head); \ +- } while ((_hs_iter = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->next)); \ +-} while (0) +-#endif +- +-#if HASH_NONFATAL_OOM +- +-#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed) \ +-do { \ +- if (!(oomed)) { \ +- unsigned _ha_bkt; \ +- (head)->hh.tbl->num_items++; \ +- HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt); \ +- HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed); \ +- if (oomed) { \ +- HASH_ROLLBACK_BKT(hh, head, &(add)->hh); \ +- HASH_DELETE_HH(hh, head, &(add)->hh); \ +- (add)->hh.tbl = NULL; \ +- uthash_nonfatal_oom(add); \ +- } else { \ +- HASH_BLOOM_ADD((head)->hh.tbl, hashval); \ +- HASH_EMIT_KEY(hh, head, keyptr, keylen_in); \ +- } \ +- } else { \ +- (add)->hh.tbl = NULL; \ +- uthash_nonfatal_oom(add); \ +- } \ +-} while (0) +- +-#else +- +-#define HASH_ADD_TO_TABLE(hh,head,keyptr,keylen_in,hashval,add,oomed) \ +-do { \ +- unsigned _ha_bkt; \ +- (head)->hh.tbl->num_items++; \ +- HASH_TO_BKT(hashval, (head)->hh.tbl->num_buckets, _ha_bkt); \ +- HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt], hh, &(add)->hh, oomed); \ +- HASH_BLOOM_ADD((head)->hh.tbl, hashval); \ +- HASH_EMIT_KEY(hh, head, keyptr, keylen_in); \ +-} while (0) +- +-#endif +- +- +-#define HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh,head,keyptr,keylen_in,hashval,add,cmpfcn) \ +-do { \ +- IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; ) \ +- (add)->hh.hashv = (hashval); \ +- (add)->hh.key = (char*) (keyptr); \ +- (add)->hh.keylen = (unsigned) (keylen_in); \ +- if (!(head)) { \ +- (add)->hh.next = NULL; \ +- (add)->hh.prev = NULL; \ +- HASH_MAKE_TABLE(hh, add, _ha_oomed); \ +- IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { ) \ +- (head) = (add); \ +- IF_HASH_NONFATAL_OOM( } ) \ +- } else { \ +- void *_hs_iter = (head); \ +- (add)->hh.tbl = (head)->hh.tbl; \ +- HASH_AKBI_INNER_LOOP(hh, head, add, cmpfcn); \ +- if (_hs_iter) { \ +- (add)->hh.next = _hs_iter; \ +- if (((add)->hh.prev = HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev)) { \ +- HH_FROM_ELMT((head)->hh.tbl, (add)->hh.prev)->next = (add); \ +- } else { \ +- (head) = (add); \ +- } \ +- HH_FROM_ELMT((head)->hh.tbl, _hs_iter)->prev = (add); \ +- } else { \ +- HASH_APPEND_LIST(hh, head, add); \ +- } \ +- } \ +- HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed); \ +- HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE_INORDER"); \ +-} while (0) +- +-#define HASH_ADD_KEYPTR_INORDER(hh,head,keyptr,keylen_in,add,cmpfcn) \ +-do { \ +- unsigned _hs_hashv; \ +- HASH_VALUE(keyptr, keylen_in, _hs_hashv); \ +- HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, keyptr, keylen_in, _hs_hashv, add, cmpfcn); \ +-} while (0) +- +-#define HASH_ADD_BYHASHVALUE_INORDER(hh,head,fieldname,keylen_in,hashval,add,cmpfcn) \ +- HASH_ADD_KEYPTR_BYHASHVALUE_INORDER(hh, head, &((add)->fieldname), keylen_in, hashval, add, cmpfcn) +- +-#define HASH_ADD_INORDER(hh,head,fieldname,keylen_in,add,cmpfcn) \ +- HASH_ADD_KEYPTR_INORDER(hh, head, &((add)->fieldname), keylen_in, add, cmpfcn) +- +-#define HASH_ADD_KEYPTR_BYHASHVALUE(hh,head,keyptr,keylen_in,hashval,add) \ +-do { \ +- IF_HASH_NONFATAL_OOM( int _ha_oomed = 0; ) \ +- (add)->hh.hashv = (hashval); \ +- (add)->hh.key = (const void*) (keyptr); \ +- (add)->hh.keylen = (unsigned) (keylen_in); \ +- if (!(head)) { \ +- (add)->hh.next = NULL; \ +- (add)->hh.prev = NULL; \ +- HASH_MAKE_TABLE(hh, add, _ha_oomed); \ +- IF_HASH_NONFATAL_OOM( if (!_ha_oomed) { ) \ +- (head) = (add); \ +- IF_HASH_NONFATAL_OOM( } ) \ +- } else { \ +- (add)->hh.tbl = (head)->hh.tbl; \ +- HASH_APPEND_LIST(hh, head, add); \ +- } \ +- HASH_ADD_TO_TABLE(hh, head, keyptr, keylen_in, hashval, add, _ha_oomed); \ +- HASH_FSCK(hh, head, "HASH_ADD_KEYPTR_BYHASHVALUE"); \ +-} while (0) +- +-#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \ +-do { \ +- unsigned _ha_hashv; \ +- HASH_VALUE(keyptr, keylen_in, _ha_hashv); \ +- HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, keyptr, keylen_in, _ha_hashv, add); \ +-} while (0) +- +-#define HASH_ADD_BYHASHVALUE(hh,head,fieldname,keylen_in,hashval,add) \ +- HASH_ADD_KEYPTR_BYHASHVALUE(hh, head, &((add)->fieldname), keylen_in, hashval, add) +- +-#define HASH_ADD(hh,head,fieldname,keylen_in,add) \ +- HASH_ADD_KEYPTR(hh, head, &((add)->fieldname), keylen_in, add) +- +-#define HASH_TO_BKT(hashv,num_bkts,bkt) \ +-do { \ +- bkt = ((hashv) & ((num_bkts) - 1U)); \ +-} while (0) +- +-/* delete "delptr" from the hash table. +- * "the usual" patch-up process for the app-order doubly-linked-list. +- * The use of _hd_hh_del below deserves special explanation. +- * These used to be expressed using (delptr) but that led to a bug +- * if someone used the same symbol for the head and deletee, like +- * HASH_DELETE(hh,users,users); +- * We want that to work, but by changing the head (users) below +- * we were forfeiting our ability to further refer to the deletee (users) +- * in the patch-up process. Solution: use scratch space to +- * copy the deletee pointer, then the latter references are via that +- * scratch pointer rather than through the repointed (users) symbol. +- */ +-#define HASH_DELETE(hh,head,delptr) \ +- HASH_DELETE_HH(hh, head, &(delptr)->hh) +- +-#define HASH_DELETE_HH(hh,head,delptrhh) \ +-do { \ +- struct UT_hash_handle *_hd_hh_del = (delptrhh); \ +- if ((_hd_hh_del->prev == NULL) && (_hd_hh_del->next == NULL)) { \ +- HASH_BLOOM_FREE((head)->hh.tbl); \ +- uthash_free((head)->hh.tbl->buckets, \ +- (head)->hh.tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ +- uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ +- (head) = NULL; \ +- } else { \ +- unsigned _hd_bkt; \ +- if (_hd_hh_del == (head)->hh.tbl->tail) { \ +- (head)->hh.tbl->tail = HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev); \ +- } \ +- if (_hd_hh_del->prev != NULL) { \ +- HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->prev)->next = _hd_hh_del->next; \ +- } else { \ +- DECLTYPE_ASSIGN(head, _hd_hh_del->next); \ +- } \ +- if (_hd_hh_del->next != NULL) { \ +- HH_FROM_ELMT((head)->hh.tbl, _hd_hh_del->next)->prev = _hd_hh_del->prev; \ +- } \ +- HASH_TO_BKT(_hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ +- HASH_DEL_IN_BKT((head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del); \ +- (head)->hh.tbl->num_items--; \ +- } \ +- HASH_FSCK(hh, head, "HASH_DELETE_HH"); \ +-} while (0) +- +-/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */ +-#define HASH_FIND_STR(head,findstr,out) \ +-do { \ +- unsigned _uthash_hfstr_keylen = (unsigned)uthash_strlen(findstr); \ +- HASH_FIND(hh, head, findstr, _uthash_hfstr_keylen, out); \ +-} while (0) +-#define HASH_ADD_STR(head,strfield,add) \ +-do { \ +- unsigned _uthash_hastr_keylen = (unsigned)uthash_strlen((add)->strfield); \ +- HASH_ADD(hh, head, strfield[0], _uthash_hastr_keylen, add); \ +-} while (0) +-#define HASH_REPLACE_STR(head,strfield,add,replaced) \ +-do { \ +- unsigned _uthash_hrstr_keylen = (unsigned)uthash_strlen((add)->strfield); \ +- HASH_REPLACE(hh, head, strfield[0], _uthash_hrstr_keylen, add, replaced); \ +-} while (0) +-#define HASH_FIND_INT(head,findint,out) \ +- HASH_FIND(hh,head,findint,sizeof(int),out) +-#define HASH_ADD_INT(head,intfield,add) \ +- HASH_ADD(hh,head,intfield,sizeof(int),add) +-#define HASH_REPLACE_INT(head,intfield,add,replaced) \ +- HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced) +-#define HASH_FIND_PTR(head,findptr,out) \ +- HASH_FIND(hh,head,findptr,sizeof(void *),out) +-#define HASH_ADD_PTR(head,ptrfield,add) \ +- HASH_ADD(hh,head,ptrfield,sizeof(void *),add) +-#define HASH_REPLACE_PTR(head,ptrfield,add,replaced) \ +- HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced) +-#define HASH_DEL(head,delptr) \ +- HASH_DELETE(hh,head,delptr) +- +-/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined. +- * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined. +- */ +-#ifdef HASH_DEBUG +-#include <stdio.h> /* fprintf, stderr */ +-#define HASH_OOPS(...) do { fprintf(stderr, __VA_ARGS__); exit(-1); } while (0) +-#define HASH_FSCK(hh,head,where) \ +-do { \ +- struct UT_hash_handle *_thh; \ +- if (head) { \ +- unsigned _bkt_i; \ +- unsigned _count = 0; \ +- char *_prev; \ +- for (_bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; ++_bkt_i) { \ +- unsigned _bkt_count = 0; \ +- _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head; \ +- _prev = NULL; \ +- while (_thh) { \ +- if (_prev != (char*)(_thh->hh_prev)) { \ +- HASH_OOPS("%s: invalid hh_prev %p, actual %p\n", \ +- (where), (void*)_thh->hh_prev, (void*)_prev); \ +- } \ +- _bkt_count++; \ +- _prev = (char*)(_thh); \ +- _thh = _thh->hh_next; \ +- } \ +- _count += _bkt_count; \ +- if ((head)->hh.tbl->buckets[_bkt_i].count != _bkt_count) { \ +- HASH_OOPS("%s: invalid bucket count %u, actual %u\n", \ +- (where), (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count); \ +- } \ +- } \ +- if (_count != (head)->hh.tbl->num_items) { \ +- HASH_OOPS("%s: invalid hh item count %u, actual %u\n", \ +- (where), (head)->hh.tbl->num_items, _count); \ +- } \ +- _count = 0; \ +- _prev = NULL; \ +- _thh = &(head)->hh; \ +- while (_thh) { \ +- _count++; \ +- if (_prev != (char*)_thh->prev) { \ +- HASH_OOPS("%s: invalid prev %p, actual %p\n", \ +- (where), (void*)_thh->prev, (void*)_prev); \ +- } \ +- _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh); \ +- _thh = (_thh->next ? HH_FROM_ELMT((head)->hh.tbl, _thh->next) : NULL); \ +- } \ +- if (_count != (head)->hh.tbl->num_items) { \ +- HASH_OOPS("%s: invalid app item count %u, actual %u\n", \ +- (where), (head)->hh.tbl->num_items, _count); \ +- } \ +- } \ +-} while (0) +-#else +-#define HASH_FSCK(hh,head,where) +-#endif +- +-/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to +- * the descriptor to which this macro is defined for tuning the hash function. +- * The app can #include <unistd.h> to get the prototype for write(2). */ +-#ifdef HASH_EMIT_KEYS +-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \ +-do { \ +- unsigned _klen = fieldlen; \ +- write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \ +- write(HASH_EMIT_KEYS, keyptr, (unsigned long)fieldlen); \ +-} while (0) +-#else +-#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) +-#endif +- +-/* The Bernstein hash function, used in Perl prior to v5.6. Note (x<<5+x)=x*33. */ +-#define HASH_BER(key,keylen,hashv) \ +-do { \ +- unsigned _hb_keylen = (unsigned)keylen; \ +- const unsigned char *_hb_key = (const unsigned char*)(key); \ +- (hashv) = 0; \ +- while (_hb_keylen-- != 0U) { \ +- (hashv) = (((hashv) << 5) + (hashv)) + *_hb_key++; \ +- } \ +-} while (0) +- +- +-/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at +- * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */ +-#define HASH_SAX(key,keylen,hashv) \ +-do { \ +- unsigned _sx_i; \ +- const unsigned char *_hs_key = (const unsigned char*)(key); \ +- hashv = 0; \ +- for (_sx_i=0; _sx_i < keylen; _sx_i++) { \ +- hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i]; \ +- } \ +-} while (0) +-/* FNV-1a variation */ +-#define HASH_FNV(key,keylen,hashv) \ +-do { \ +- unsigned _fn_i; \ +- const unsigned char *_hf_key = (const unsigned char*)(key); \ +- (hashv) = 2166136261U; \ +- for (_fn_i=0; _fn_i < keylen; _fn_i++) { \ +- hashv = hashv ^ _hf_key[_fn_i]; \ +- hashv = hashv * 16777619U; \ +- } \ +-} while (0) +- +-#define HASH_OAT(key,keylen,hashv) \ +-do { \ +- unsigned _ho_i; \ +- const unsigned char *_ho_key=(const unsigned char*)(key); \ +- hashv = 0; \ +- for(_ho_i=0; _ho_i < keylen; _ho_i++) { \ +- hashv += _ho_key[_ho_i]; \ +- hashv += (hashv << 10); \ +- hashv ^= (hashv >> 6); \ +- } \ +- hashv += (hashv << 3); \ +- hashv ^= (hashv >> 11); \ +- hashv += (hashv << 15); \ +-} while (0) +- +-#define HASH_JEN_MIX(a,b,c) \ +-do { \ +- a -= b; a -= c; a ^= ( c >> 13 ); \ +- b -= c; b -= a; b ^= ( a << 8 ); \ +- c -= a; c -= b; c ^= ( b >> 13 ); \ +- a -= b; a -= c; a ^= ( c >> 12 ); \ +- b -= c; b -= a; b ^= ( a << 16 ); \ +- c -= a; c -= b; c ^= ( b >> 5 ); \ +- a -= b; a -= c; a ^= ( c >> 3 ); \ +- b -= c; b -= a; b ^= ( a << 10 ); \ +- c -= a; c -= b; c ^= ( b >> 15 ); \ +-} while (0) +- +-#define HASH_JEN(key,keylen,hashv) \ +-do { \ +- unsigned _hj_i,_hj_j,_hj_k; \ +- unsigned const char *_hj_key=(unsigned const char*)(key); \ +- hashv = 0xfeedbeefu; \ +- _hj_i = _hj_j = 0x9e3779b9u; \ +- _hj_k = (unsigned)(keylen); \ +- while (_hj_k >= 12U) { \ +- _hj_i += (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 ) \ +- + ( (unsigned)_hj_key[2] << 16 ) \ +- + ( (unsigned)_hj_key[3] << 24 ) ); \ +- _hj_j += (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 ) \ +- + ( (unsigned)_hj_key[6] << 16 ) \ +- + ( (unsigned)_hj_key[7] << 24 ) ); \ +- hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 ) \ +- + ( (unsigned)_hj_key[10] << 16 ) \ +- + ( (unsigned)_hj_key[11] << 24 ) ); \ +- \ +- HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ +- \ +- _hj_key += 12; \ +- _hj_k -= 12U; \ +- } \ +- hashv += (unsigned)(keylen); \ +- switch ( _hj_k ) { \ +- case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); /* FALLTHROUGH */ \ +- case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); /* FALLTHROUGH */ \ +- case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); /* FALLTHROUGH */ \ +- case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); /* FALLTHROUGH */ \ +- case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); /* FALLTHROUGH */ \ +- case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); /* FALLTHROUGH */ \ +- case 5: _hj_j += _hj_key[4]; /* FALLTHROUGH */ \ +- case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); /* FALLTHROUGH */ \ +- case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); /* FALLTHROUGH */ \ +- case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); /* FALLTHROUGH */ \ +- case 1: _hj_i += _hj_key[0]; /* FALLTHROUGH */ \ +- default: ; \ +- } \ +- HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ +-} while (0) +- +-/* The Paul Hsieh hash function */ +-#undef get16bits +-#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \ +- || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__) +-#define get16bits(d) (*((const uint16_t *) (d))) +-#endif +- +-#if !defined (get16bits) +-#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8) \ +- +(uint32_t)(((const uint8_t *)(d))[0]) ) +-#endif +-#define HASH_SFH(key,keylen,hashv) \ +-do { \ +- unsigned const char *_sfh_key=(unsigned const char*)(key); \ +- uint32_t _sfh_tmp, _sfh_len = (uint32_t)keylen; \ +- \ +- unsigned _sfh_rem = _sfh_len & 3U; \ +- _sfh_len >>= 2; \ +- hashv = 0xcafebabeu; \ +- \ +- /* Main loop */ \ +- for (;_sfh_len > 0U; _sfh_len--) { \ +- hashv += get16bits (_sfh_key); \ +- _sfh_tmp = ((uint32_t)(get16bits (_sfh_key+2)) << 11) ^ hashv; \ +- hashv = (hashv << 16) ^ _sfh_tmp; \ +- _sfh_key += 2U*sizeof (uint16_t); \ +- hashv += hashv >> 11; \ +- } \ +- \ +- /* Handle end cases */ \ +- switch (_sfh_rem) { \ +- case 3: hashv += get16bits (_sfh_key); \ +- hashv ^= hashv << 16; \ +- hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)]) << 18; \ +- hashv += hashv >> 11; \ +- break; \ +- case 2: hashv += get16bits (_sfh_key); \ +- hashv ^= hashv << 11; \ +- hashv += hashv >> 17; \ +- break; \ +- case 1: hashv += *_sfh_key; \ +- hashv ^= hashv << 10; \ +- hashv += hashv >> 1; \ +- break; \ +- default: ; \ +- } \ +- \ +- /* Force "avalanching" of final 127 bits */ \ +- hashv ^= hashv << 3; \ +- hashv += hashv >> 5; \ +- hashv ^= hashv << 4; \ +- hashv += hashv >> 17; \ +- hashv ^= hashv << 25; \ +- hashv += hashv >> 6; \ +-} while (0) +- +-/* iterate over items in a known bucket to find desired item */ +-#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,hashval,out) \ +-do { \ +- if ((head).hh_head != NULL) { \ +- DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (head).hh_head)); \ +- } else { \ +- (out) = NULL; \ +- } \ +- while ((out) != NULL) { \ +- if ((out)->hh.hashv == (hashval) && (out)->hh.keylen == (keylen_in)) { \ +- if (HASH_KEYCMP((out)->hh.key, keyptr, keylen_in) == 0) { \ +- break; \ +- } \ +- } \ +- if ((out)->hh.hh_next != NULL) { \ +- DECLTYPE_ASSIGN(out, ELMT_FROM_HH(tbl, (out)->hh.hh_next)); \ +- } else { \ +- (out) = NULL; \ +- } \ +- } \ +-} while (0) +- +-/* add an item to a bucket */ +-#define HASH_ADD_TO_BKT(head,hh,addhh,oomed) \ +-do { \ +- UT_hash_bucket *_ha_head = &(head); \ +- _ha_head->count++; \ +- (addhh)->hh_next = _ha_head->hh_head; \ +- (addhh)->hh_prev = NULL; \ +- if (_ha_head->hh_head != NULL) { \ +- _ha_head->hh_head->hh_prev = (addhh); \ +- } \ +- _ha_head->hh_head = (addhh); \ +- if ((_ha_head->count >= ((_ha_head->expand_mult + 1U) * HASH_BKT_CAPACITY_THRESH)) \ +- && !(addhh)->tbl->noexpand) { \ +- HASH_EXPAND_BUCKETS(addhh,(addhh)->tbl, oomed); \ +- IF_HASH_NONFATAL_OOM( \ +- if (oomed) { \ +- HASH_DEL_IN_BKT(head,addhh); \ +- } \ +- ) \ +- } \ +-} while (0) +- +-/* remove an item from a given bucket */ +-#define HASH_DEL_IN_BKT(head,delhh) \ +-do { \ +- UT_hash_bucket *_hd_head = &(head); \ +- _hd_head->count--; \ +- if (_hd_head->hh_head == (delhh)) { \ +- _hd_head->hh_head = (delhh)->hh_next; \ +- } \ +- if ((delhh)->hh_prev) { \ +- (delhh)->hh_prev->hh_next = (delhh)->hh_next; \ +- } \ +- if ((delhh)->hh_next) { \ +- (delhh)->hh_next->hh_prev = (delhh)->hh_prev; \ +- } \ +-} while (0) +- +-/* Bucket expansion has the effect of doubling the number of buckets +- * and redistributing the items into the new buckets. Ideally the +- * items will distribute more or less evenly into the new buckets +- * (the extent to which this is true is a measure of the quality of +- * the hash function as it applies to the key domain). +- * +- * With the items distributed into more buckets, the chain length +- * (item count) in each bucket is reduced. Thus by expanding buckets +- * the hash keeps a bound on the chain length. This bounded chain +- * length is the essence of how a hash provides constant time lookup. +- * +- * The calculation of tbl->ideal_chain_maxlen below deserves some +- * explanation. First, keep in mind that we're calculating the ideal +- * maximum chain length based on the *new* (doubled) bucket count. +- * In fractions this is just n/b (n=number of items,b=new num buckets). +- * Since the ideal chain length is an integer, we want to calculate +- * ceil(n/b). We don't depend on floating point arithmetic in this +- * hash, so to calculate ceil(n/b) with integers we could write +- * +- * ceil(n/b) = (n/b) + ((n%b)?1:0) +- * +- * and in fact a previous version of this hash did just that. +- * But now we have improved things a bit by recognizing that b is +- * always a power of two. We keep its base 2 log handy (call it lb), +- * so now we can write this with a bit shift and logical AND: +- * +- * ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0) +- * +- */ +-#define HASH_EXPAND_BUCKETS(hh,tbl,oomed) \ +-do { \ +- unsigned _he_bkt; \ +- unsigned _he_bkt_i; \ +- struct UT_hash_handle *_he_thh, *_he_hh_nxt; \ +- UT_hash_bucket *_he_new_buckets, *_he_newbkt; \ +- _he_new_buckets = (UT_hash_bucket*)uthash_malloc( \ +- sizeof(struct UT_hash_bucket) * (tbl)->num_buckets * 2U); \ +- if (!_he_new_buckets) { \ +- HASH_RECORD_OOM(oomed); \ +- } else { \ +- uthash_bzero(_he_new_buckets, \ +- sizeof(struct UT_hash_bucket) * (tbl)->num_buckets * 2U); \ +- (tbl)->ideal_chain_maxlen = \ +- ((tbl)->num_items >> ((tbl)->log2_num_buckets+1U)) + \ +- ((((tbl)->num_items & (((tbl)->num_buckets*2U)-1U)) != 0U) ? 1U : 0U); \ +- (tbl)->nonideal_items = 0; \ +- for (_he_bkt_i = 0; _he_bkt_i < (tbl)->num_buckets; _he_bkt_i++) { \ +- _he_thh = (tbl)->buckets[ _he_bkt_i ].hh_head; \ +- while (_he_thh != NULL) { \ +- _he_hh_nxt = _he_thh->hh_next; \ +- HASH_TO_BKT(_he_thh->hashv, (tbl)->num_buckets * 2U, _he_bkt); \ +- _he_newbkt = &(_he_new_buckets[_he_bkt]); \ +- if (++(_he_newbkt->count) > (tbl)->ideal_chain_maxlen) { \ +- (tbl)->nonideal_items++; \ +- if (_he_newbkt->count > _he_newbkt->expand_mult * (tbl)->ideal_chain_maxlen) { \ +- _he_newbkt->expand_mult++; \ +- } \ +- } \ +- _he_thh->hh_prev = NULL; \ +- _he_thh->hh_next = _he_newbkt->hh_head; \ +- if (_he_newbkt->hh_head != NULL) { \ +- _he_newbkt->hh_head->hh_prev = _he_thh; \ +- } \ +- _he_newbkt->hh_head = _he_thh; \ +- _he_thh = _he_hh_nxt; \ +- } \ +- } \ +- uthash_free((tbl)->buckets, (tbl)->num_buckets * sizeof(struct UT_hash_bucket)); \ +- (tbl)->num_buckets *= 2U; \ +- (tbl)->log2_num_buckets++; \ +- (tbl)->buckets = _he_new_buckets; \ +- (tbl)->ineff_expands = ((tbl)->nonideal_items > ((tbl)->num_items >> 1)) ? \ +- ((tbl)->ineff_expands+1U) : 0U; \ +- if ((tbl)->ineff_expands > 1U) { \ +- (tbl)->noexpand = 1; \ +- uthash_noexpand_fyi(tbl); \ +- } \ +- uthash_expand_fyi(tbl); \ +- } \ +-} while (0) +- +- +-/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */ +-/* Note that HASH_SORT assumes the hash handle name to be hh. +- * HASH_SRT was added to allow the hash handle name to be passed in. */ +-#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn) +-#define HASH_SRT(hh,head,cmpfcn) \ +-do { \ +- unsigned _hs_i; \ +- unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize; \ +- struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail; \ +- if (head != NULL) { \ +- _hs_insize = 1; \ +- _hs_looping = 1; \ +- _hs_list = &((head)->hh); \ +- while (_hs_looping != 0U) { \ +- _hs_p = _hs_list; \ +- _hs_list = NULL; \ +- _hs_tail = NULL; \ +- _hs_nmerges = 0; \ +- while (_hs_p != NULL) { \ +- _hs_nmerges++; \ +- _hs_q = _hs_p; \ +- _hs_psize = 0; \ +- for (_hs_i = 0; _hs_i < _hs_insize; ++_hs_i) { \ +- _hs_psize++; \ +- _hs_q = ((_hs_q->next != NULL) ? \ +- HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ +- if (_hs_q == NULL) { \ +- break; \ +- } \ +- } \ +- _hs_qsize = _hs_insize; \ +- while ((_hs_psize != 0U) || ((_hs_qsize != 0U) && (_hs_q != NULL))) { \ +- if (_hs_psize == 0U) { \ +- _hs_e = _hs_q; \ +- _hs_q = ((_hs_q->next != NULL) ? \ +- HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ +- _hs_qsize--; \ +- } else if ((_hs_qsize == 0U) || (_hs_q == NULL)) { \ +- _hs_e = _hs_p; \ +- if (_hs_p != NULL) { \ +- _hs_p = ((_hs_p->next != NULL) ? \ +- HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL); \ +- } \ +- _hs_psize--; \ +- } else if ((cmpfcn( \ +- DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_p)), \ +- DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl, _hs_q)) \ +- )) <= 0) { \ +- _hs_e = _hs_p; \ +- if (_hs_p != NULL) { \ +- _hs_p = ((_hs_p->next != NULL) ? \ +- HH_FROM_ELMT((head)->hh.tbl, _hs_p->next) : NULL); \ +- } \ +- _hs_psize--; \ +- } else { \ +- _hs_e = _hs_q; \ +- _hs_q = ((_hs_q->next != NULL) ? \ +- HH_FROM_ELMT((head)->hh.tbl, _hs_q->next) : NULL); \ +- _hs_qsize--; \ +- } \ +- if ( _hs_tail != NULL ) { \ +- _hs_tail->next = ((_hs_e != NULL) ? \ +- ELMT_FROM_HH((head)->hh.tbl, _hs_e) : NULL); \ +- } else { \ +- _hs_list = _hs_e; \ +- } \ +- if (_hs_e != NULL) { \ +- _hs_e->prev = ((_hs_tail != NULL) ? \ +- ELMT_FROM_HH((head)->hh.tbl, _hs_tail) : NULL); \ +- } \ +- _hs_tail = _hs_e; \ +- } \ +- _hs_p = _hs_q; \ +- } \ +- if (_hs_tail != NULL) { \ +- _hs_tail->next = NULL; \ +- } \ +- if (_hs_nmerges <= 1U) { \ +- _hs_looping = 0; \ +- (head)->hh.tbl->tail = _hs_tail; \ +- DECLTYPE_ASSIGN(head, ELMT_FROM_HH((head)->hh.tbl, _hs_list)); \ +- } \ +- _hs_insize *= 2U; \ +- } \ +- HASH_FSCK(hh, head, "HASH_SRT"); \ +- } \ +-} while (0) +- +-/* This function selects items from one hash into another hash. +- * The end result is that the selected items have dual presence +- * in both hashes. There is no copy of the items made; rather +- * they are added into the new hash through a secondary hash +- * hash handle that must be present in the structure. */ +-#define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \ +-do { \ +- unsigned _src_bkt, _dst_bkt; \ +- void *_last_elt = NULL, *_elt; \ +- UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL; \ +- ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst)); \ +- if ((src) != NULL) { \ +- for (_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) { \ +- for (_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head; \ +- _src_hh != NULL; \ +- _src_hh = _src_hh->hh_next) { \ +- _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh); \ +- if (cond(_elt)) { \ +- IF_HASH_NONFATAL_OOM( int _hs_oomed = 0; ) \ +- _dst_hh = (UT_hash_handle*)(void*)(((char*)_elt) + _dst_hho); \ +- _dst_hh->key = _src_hh->key; \ +- _dst_hh->keylen = _src_hh->keylen; \ +- _dst_hh->hashv = _src_hh->hashv; \ +- _dst_hh->prev = _last_elt; \ +- _dst_hh->next = NULL; \ +- if (_last_elt_hh != NULL) { \ +- _last_elt_hh->next = _elt; \ +- } \ +- if ((dst) == NULL) { \ +- DECLTYPE_ASSIGN(dst, _elt); \ +- HASH_MAKE_TABLE(hh_dst, dst, _hs_oomed); \ +- IF_HASH_NONFATAL_OOM( \ +- if (_hs_oomed) { \ +- uthash_nonfatal_oom(_elt); \ +- (dst) = NULL; \ +- continue; \ +- } \ +- ) \ +- } else { \ +- _dst_hh->tbl = (dst)->hh_dst.tbl; \ +- } \ +- HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt); \ +- HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt], hh_dst, _dst_hh, _hs_oomed); \ +- (dst)->hh_dst.tbl->num_items++; \ +- IF_HASH_NONFATAL_OOM( \ +- if (_hs_oomed) { \ +- HASH_ROLLBACK_BKT(hh_dst, dst, _dst_hh); \ +- HASH_DELETE_HH(hh_dst, dst, _dst_hh); \ +- _dst_hh->tbl = NULL; \ +- uthash_nonfatal_oom(_elt); \ +- continue; \ +- } \ +- ) \ +- HASH_BLOOM_ADD(_dst_hh->tbl, _dst_hh->hashv); \ +- _last_elt = _elt; \ +- _last_elt_hh = _dst_hh; \ +- } \ +- } \ +- } \ +- } \ +- HASH_FSCK(hh_dst, dst, "HASH_SELECT"); \ +-} while (0) +- +-#define HASH_CLEAR(hh,head) \ +-do { \ +- if ((head) != NULL) { \ +- HASH_BLOOM_FREE((head)->hh.tbl); \ +- uthash_free((head)->hh.tbl->buckets, \ +- (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket)); \ +- uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ +- (head) = NULL; \ +- } \ +-} while (0) +- +-#define HASH_OVERHEAD(hh,head) \ +- (((head) != NULL) ? ( \ +- (size_t)(((head)->hh.tbl->num_items * sizeof(UT_hash_handle)) + \ +- ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket)) + \ +- sizeof(UT_hash_table) + \ +- (HASH_BLOOM_BYTELEN))) : 0U) +- +-#ifdef NO_DECLTYPE +-#define HASH_ITER(hh,head,el,tmp) \ +-for(((el)=(head)), ((*(char**)(&(tmp)))=(char*)((head!=NULL)?(head)->hh.next:NULL)); \ +- (el) != NULL; ((el)=(tmp)), ((*(char**)(&(tmp)))=(char*)((tmp!=NULL)?(tmp)->hh.next:NULL))) +-#else +-#define HASH_ITER(hh,head,el,tmp) \ +-for(((el)=(head)), ((tmp)=DECLTYPE(el)((head!=NULL)?(head)->hh.next:NULL)); \ +- (el) != NULL; ((el)=(tmp)), ((tmp)=DECLTYPE(el)((tmp!=NULL)?(tmp)->hh.next:NULL))) +-#endif +- +-/* obtain a count of items in the hash */ +-#define HASH_COUNT(head) HASH_CNT(hh,head) +-#define HASH_CNT(hh,head) ((head != NULL)?((head)->hh.tbl->num_items):0U) +- +-typedef struct UT_hash_bucket { +- struct UT_hash_handle *hh_head; +- unsigned count; +- +- /* expand_mult is normally set to 0. In this situation, the max chain length +- * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If +- * the bucket's chain exceeds this length, bucket expansion is triggered). +- * However, setting expand_mult to a non-zero value delays bucket expansion +- * (that would be triggered by additions to this particular bucket) +- * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH. +- * (The multiplier is simply expand_mult+1). The whole idea of this +- * multiplier is to reduce bucket expansions, since they are expensive, in +- * situations where we know that a particular bucket tends to be overused. +- * It is better to let its chain length grow to a longer yet-still-bounded +- * value, than to do an O(n) bucket expansion too often. +- */ +- unsigned expand_mult; +- +-} UT_hash_bucket; +- +-/* random signature used only to find hash tables in external analysis */ +-#define HASH_SIGNATURE 0xa0111fe1u +-#define HASH_BLOOM_SIGNATURE 0xb12220f2u +- +-typedef struct UT_hash_table { +- UT_hash_bucket *buckets; +- unsigned num_buckets, log2_num_buckets; +- unsigned num_items; +- struct UT_hash_handle *tail; /* tail hh in app order, for fast append */ +- ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */ +- +- /* in an ideal situation (all buckets used equally), no bucket would have +- * more than ceil(#items/#buckets) items. that's the ideal chain length. */ +- unsigned ideal_chain_maxlen; +- +- /* nonideal_items is the number of items in the hash whose chain position +- * exceeds the ideal chain maxlen. these items pay the penalty for an uneven +- * hash distribution; reaching them in a chain traversal takes >ideal steps */ +- unsigned nonideal_items; +- +- /* ineffective expands occur when a bucket doubling was performed, but +- * afterward, more than half the items in the hash had nonideal chain +- * positions. If this happens on two consecutive expansions we inhibit any +- * further expansion, as it's not helping; this happens when the hash +- * function isn't a good fit for the key domain. When expansion is inhibited +- * the hash will still work, albeit no longer in constant time. */ +- unsigned ineff_expands, noexpand; +- +- uint32_t signature; /* used only to find hash tables in external analysis */ +-#ifdef HASH_BLOOM +- uint32_t bloom_sig; /* used only to test bloom exists in external analysis */ +- uint8_t *bloom_bv; +- uint8_t bloom_nbits; +-#endif +- +-} UT_hash_table; +- +-typedef struct UT_hash_handle { +- struct UT_hash_table *tbl; +- void *prev; /* prev element in app order */ +- void *next; /* next element in app order */ +- struct UT_hash_handle *hh_prev; /* previous hh in bucket order */ +- struct UT_hash_handle *hh_next; /* next hh in bucket order */ +- const void *key; /* ptr to enclosing struct's key */ +- unsigned keylen; /* enclosing struct's key len */ +- unsigned hashv; /* result of hash-fcn(key) */ +-} UT_hash_handle; +- +-#endif /* UTHASH_H */ +diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt +index d2e26710d..759e98ede 100644 +--- a/libobs/CMakeLists.txt ++++ b/libobs/CMakeLists.txt +@@ -8,6 +8,7 @@ add_library(OBS::libobs ALIAS libobs) + find_package(Threads REQUIRED) + find_package(FFmpeg REQUIRED avformat avutil swscale swresample OPTIONAL_COMPONENTS avcodec) + find_package(ZLIB REQUIRED) ++find_package(Uthash REQUIRED) + + if(ENABLE_UI) + find_qt(COMPONENTS Core) +@@ -15,7 +16,6 @@ endif() + + find_package(jansson REQUIRED) + add_subdirectory("${CMAKE_SOURCE_DIR}/deps/libcaption" "${CMAKE_BINARY_DIR}/deps/libcaption") +-add_subdirectory("${CMAKE_SOURCE_DIR}/deps/uthash" "${CMAKE_BINARY_DIR}/deps/uthash") + + target_sources( + libobs +@@ -225,13 +225,13 @@ target_compile_definitions( + target_link_libraries( + libobs + PRIVATE OBS::caption +- OBS::uthash + FFmpeg::avcodec + FFmpeg::avformat + FFmpeg::avutil + FFmpeg::swscale + FFmpeg::swresample + jansson::jansson ++ Uthash::Uthash + ZLIB::ZLIB + PUBLIC Threads::Threads) + +diff --git a/libobs/cmake/legacy.cmake b/libobs/cmake/legacy.cmake +index fcbacd7b9..f870ceb0f 100644 +--- a/libobs/cmake/legacy.cmake ++++ b/libobs/cmake/legacy.cmake +@@ -10,6 +10,7 @@ find_package( + COMPONENTS avformat avutil swscale swresample + OPTIONAL_COMPONENTS avcodec) + find_package(ZLIB REQUIRED) ++find_package(Uthash REQUIRED) + + if(ENABLE_UI) + find_qt(COMPONENTS Core) +@@ -248,7 +249,7 @@ target_link_libraries( + FFmpeg::swresample + Jansson::Jansson + OBS::caption +- OBS::uthash ++ Uthash::Uthash + ZLIB::ZLIB + PUBLIC Threads::Threads) + +diff --git a/libobs/util/uthash.h b/libobs/util/uthash.h +index 5698466ea..fb6a240da 100644 +--- a/libobs/util/uthash.h ++++ b/libobs/util/uthash.h +@@ -21,7 +21,7 @@ + * This file (re)defines various uthash settings for use in libobs + */ + +-#include <uthash/uthash.h> ++#include <uthash.h> + + /* Use OBS allocator */ + #undef uthash_malloc +-- +2.42.0 + diff --git a/0003-Fix_blank_browser_dock_titles.patch b/0003-Fix_blank_browser_dock_titles.patch new file mode 100644 index 000000000000..d841c6421421 --- /dev/null +++ b/0003-Fix_blank_browser_dock_titles.patch @@ -0,0 +1,397 @@ +From db9719ebfe9ccf4de8ca35cff1de1331ef240c36 Mon Sep 17 00:00:00 2001 +From: Matt Gajownik <matt@obsproject.com> +Date: Thu, 10 Aug 2023 18:31:19 +1000 +Subject: [PATCH 1/4] UI: Set browser dock title in constructor + +Works around a bug in Qt where setWindowTitle called on a native window +that hasn't been initialised yet causes the title data to be lost, +resulting in the window's title never being set. +--- + UI/auth-restream.cpp | 6 +++--- + UI/auth-twitch.cpp | 8 ++++---- + UI/auth-youtube.cpp | 3 +-- + UI/auth-youtube.hpp | 1 + + UI/window-dock-browser.hpp | 4 ++++ + UI/window-dock.hpp | 4 ++++ + UI/window-extra-browsers.cpp | 2 +- + 7 files changed, 18 insertions(+), 10 deletions(-) + +diff --git a/UI/auth-restream.cpp b/UI/auth-restream.cpp +index 9188da118..bedc10c70 100644 +--- a/UI/auth-restream.cpp ++++ b/UI/auth-restream.cpp +@@ -150,7 +150,7 @@ void RestreamAuth::LoadUI() + QSize size = main->frameSize(); + QPoint pos = main->pos(); + +- BrowserDock *chat = new BrowserDock(); ++ BrowserDock *chat = new BrowserDock(QTStr("Auth.Chat")); + chat->setObjectName(RESTREAM_CHAT_DOCK_NAME); + chat->resize(420, 600); + chat->setMinimumSize(200, 300); +@@ -166,7 +166,7 @@ void RestreamAuth::LoadUI() + + url = "https://restream.io/titles/embed"; + +- BrowserDock *info = new BrowserDock(); ++ BrowserDock *info = new BrowserDock(QTStr("Auth.StreamInfo")); + info->setObjectName(RESTREAM_INFO_DOCK_NAME); + info->resize(410, 600); + info->setMinimumSize(200, 150); +@@ -182,7 +182,7 @@ void RestreamAuth::LoadUI() + + url = "https://restream.io/channel/embed"; + +- BrowserDock *channels = new BrowserDock(); ++ BrowserDock *channels = new BrowserDock(QTStr("RestreamAuth.Channels")); + channels->setObjectName(RESTREAM_CHANNELS_DOCK_NAME); + channels->resize(410, 600); + channels->setMinimumSize(410, 300); +diff --git a/UI/auth-twitch.cpp b/UI/auth-twitch.cpp +index 386a0e927..88e14e0be 100644 +--- a/UI/auth-twitch.cpp ++++ b/UI/auth-twitch.cpp +@@ -251,7 +251,7 @@ void TwitchAuth::LoadUI() + QSize size = main->frameSize(); + QPoint pos = main->pos(); + +- BrowserDock *chat = new BrowserDock(); ++ BrowserDock *chat = new BrowserDock(QTStr("Auth.Chat")); + chat->setObjectName(TWITCH_CHAT_DOCK_NAME); + chat->resize(300, 600); + chat->setMinimumSize(200, 300); +@@ -340,7 +340,7 @@ void TwitchAuth::LoadSecondaryUIPanes() + url += name; + url += "/stream-manager/edit-stream-info"; + +- BrowserDock *info = new BrowserDock(); ++ BrowserDock *info = new BrowserDock(QTStr("Auth.StreamInfo")); + info->setObjectName(TWITCH_INFO_DOCK_NAME); + info->resize(300, 650); + info->setMinimumSize(200, 300); +@@ -359,7 +359,7 @@ void TwitchAuth::LoadSecondaryUIPanes() + url += name; + url += "/dashboard/live/stats"; + +- BrowserDock *stats = new BrowserDock(); ++ BrowserDock *stats = new BrowserDock(QTStr("TwitchAuth.Stats")); + stats->setObjectName(TWITCH_STATS_DOCK_NAME); + stats->resize(200, 250); + stats->setMinimumSize(200, 150); +@@ -379,7 +379,7 @@ void TwitchAuth::LoadSecondaryUIPanes() + url += "/stream-manager/activity-feed"; + url += "?uuid=" + uuid; + +- BrowserDock *feed = new BrowserDock(); ++ BrowserDock *feed = new BrowserDock(QTStr("TwitchAuth.Feed")); + feed->setObjectName(TWITCH_FEED_DOCK_NAME); + feed->resize(300, 650); + feed->setMinimumSize(200, 300); +diff --git a/UI/auth-youtube.cpp b/UI/auth-youtube.cpp +index 7783fa62d..906481959 100644 +--- a/UI/auth-youtube.cpp ++++ b/UI/auth-youtube.cpp +@@ -154,11 +154,10 @@ void YoutubeAuth::LoadUI() + QSize size = main->frameSize(); + QPoint pos = main->pos(); + +- chat = new YoutubeChatDock(); ++ chat = new YoutubeChatDock(QTStr("Auth.Chat")); + chat->setObjectName(YOUTUBE_CHAT_DOCK_NAME); + chat->resize(300, 600); + chat->setMinimumSize(200, 300); +- chat->setWindowTitle(QTStr("Auth.Chat")); + chat->setAllowedAreas(Qt::AllDockWidgetAreas); + + browser = cef->create_widget(chat, YOUTUBE_CHAT_PLACEHOLDER_URL, +diff --git a/UI/auth-youtube.hpp b/UI/auth-youtube.hpp +index ffe35c25c..5c5015def 100644 +--- a/UI/auth-youtube.hpp ++++ b/UI/auth-youtube.hpp +@@ -21,6 +21,7 @@ private: + QHBoxLayout *chatLayout; + + public: ++ inline YoutubeChatDock(const QString &title) : BrowserDock(title) {} + void SetWidget(QCefWidget *widget_); + void SetApiChatId(const std::string &id); + +diff --git a/UI/window-dock-browser.hpp b/UI/window-dock-browser.hpp +index 37583c200..717ff7787 100644 +--- a/UI/window-dock-browser.hpp ++++ b/UI/window-dock-browser.hpp +@@ -10,6 +10,10 @@ extern QCefCookieManager *panel_cookies; + class BrowserDock : public OBSDock { + public: + inline BrowserDock() : OBSDock() { setAttribute(Qt::WA_NativeWindow); } ++ inline BrowserDock(const QString &title) : OBSDock(title) ++ { ++ setAttribute(Qt::WA_NativeWindow); ++ } + + QScopedPointer<QCefWidget> cefWidget; + +diff --git a/UI/window-dock.hpp b/UI/window-dock.hpp +index ccb1cf0ae..2d4062ec7 100644 +--- a/UI/window-dock.hpp ++++ b/UI/window-dock.hpp +@@ -7,6 +7,10 @@ class OBSDock : public QDockWidget { + + public: + inline OBSDock(QWidget *parent = nullptr) : QDockWidget(parent) {} ++ inline OBSDock(const QString &title, QWidget *parent = nullptr) ++ : QDockWidget(title, parent) ++ { ++ } + + virtual void closeEvent(QCloseEvent *event); + }; +diff --git a/UI/window-extra-browsers.cpp b/UI/window-extra-browsers.cpp +index a53f66106..d26138756 100644 +--- a/UI/window-extra-browsers.cpp ++++ b/UI/window-extra-browsers.cpp +@@ -527,7 +527,7 @@ void OBSBasic::AddExtraBrowserDock(const QString &title, const QString &url, + panel_version = obs_browser_qcef_version(); + } + +- BrowserDock *dock = new BrowserDock(); ++ BrowserDock *dock = new BrowserDock(title); + QString bId(uuid.isEmpty() ? QUuid::createUuid().toString() : uuid); + bId.replace(QRegularExpression("[{}-]"), ""); + dock->setProperty("uuid", bId); +-- +2.42.0 + + +From e30be01b053958f793f748c306a480bdb63e0e96 Mon Sep 17 00:00:00 2001 +From: Ryan Foster <ryan@obsproject.com> +Date: Fri, 11 Aug 2023 16:27:55 -0400 +Subject: [PATCH 2/4] UI: Track custom browser dock names internally + +This is a workaround for a change in Qt behavior between 6.5.1 and +6.5.2[1] which affected the outcome of attempting to set the window +title of a window that is not currently open. In Qt 6.4.3 and 6.5.1, the +window title would be set. In Qt 6.5.2, the window title will become +NULL/empty. + +Instead of relying on Qt to have valid titles for custom browser dock +windows that we manage, let's track the names ourselves. + +[1]: https://github.com/qt/qtbase/commit/c153066baaa88718ed45b68230d81285eb436d3d +--- + UI/window-basic-main.hpp | 1 + + UI/window-extra-browsers.cpp | 15 ++++++++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp +index 55abea8fe..20a02ca1c 100644 +--- a/UI/window-basic-main.hpp ++++ b/UI/window-basic-main.hpp +@@ -560,6 +560,7 @@ private: + QPointer<QAction> extraBrowserMenuDocksSeparator; + + QList<QSharedPointer<QDockWidget>> extraBrowserDocks; ++ QStringList extraBrowserDockNames; + QStringList extraBrowserDockTargets; + + void ClearExtraBrowserDocks(); +diff --git a/UI/window-extra-browsers.cpp b/UI/window-extra-browsers.cpp +index d26138756..a8076f1b1 100644 +--- a/UI/window-extra-browsers.cpp ++++ b/UI/window-extra-browsers.cpp +@@ -32,12 +32,9 @@ void ExtraBrowsersModel::Reset() + OBSBasic *main = OBSBasic::Get(); + + for (int i = 0; i < main->extraBrowserDocks.size(); i++) { +- BrowserDock *dock = reinterpret_cast<BrowserDock *>( +- main->extraBrowserDocks[i].data()); +- + Item item; + item.prevIdx = i; +- item.title = dock->windowTitle(); ++ item.title = main->extraBrowserDockNames[i]; + item.url = main->extraBrowserDockTargets[i]; + items.push_back(item); + } +@@ -180,6 +177,10 @@ void ExtraBrowsersModel::UpdateItem(Item &item) + dock->setWindowTitle(item.title); + dock->setObjectName(item.title + OBJ_NAME_SUFFIX); + ++ if (main->extraBrowserDockNames[idx] != item.title) { ++ main->extraBrowserDockNames[idx] = item.title; ++ } ++ + if (main->extraBrowserDockTargets[idx] != item.url) { + dock->cefWidget->setURL(QT_TO_UTF8(item.url)); + main->extraBrowserDockTargets[idx] = item.url; +@@ -234,6 +235,7 @@ void ExtraBrowsersModel::Apply() + for (int i = deleted.size() - 1; i >= 0; i--) { + int idx = deleted[i]; + main->extraBrowserDockTargets.removeAt(idx); ++ main->extraBrowserDockNames.removeAt(idx); + main->extraBrowserDocks.removeAt(idx); + } + +@@ -460,6 +462,7 @@ void OBSExtraBrowsers::on_apply_clicked() + void OBSBasic::ClearExtraBrowserDocks() + { + extraBrowserDockTargets.clear(); ++ extraBrowserDockNames.clear(); + extraBrowserDocks.clear(); + } + +@@ -492,10 +495,11 @@ void OBSBasic::SaveExtraBrowserDocks() + Json::array array; + for (int i = 0; i < extraBrowserDocks.size(); i++) { + QDockWidget *dock = extraBrowserDocks[i].data(); ++ QString title = extraBrowserDockNames[i]; + QString url = extraBrowserDockTargets[i]; + QString uuid = dock->property("uuid").toString(); + Json::object obj{ +- {"title", QT_TO_UTF8(dock->windowTitle())}, ++ {"title", QT_TO_UTF8(title)}, + {"url", QT_TO_UTF8(url)}, + {"uuid", QT_TO_UTF8(uuid)}, + }; +@@ -564,6 +568,7 @@ void OBSBasic::AddExtraBrowserDock(const QString &title, const QString &url, + + AddDockWidget(dock, Qt::RightDockWidgetArea, true); + extraBrowserDocks.push_back(QSharedPointer<QDockWidget>(dock)); ++ extraBrowserDockNames.push_back(title); + extraBrowserDockTargets.push_back(url); + + if (firstCreate) { +-- +2.42.0 + + +From 1a6858af32bd65fcbafb7927dcf8d988b80bd2e9 Mon Sep 17 00:00:00 2001 +From: Ryan Foster <ryan@obsproject.com> +Date: Fri, 11 Aug 2023 16:29:57 -0400 +Subject: [PATCH 3/4] UI: Update text for custom browser dock menu items + manually + +Instead of relying on the dock's having their window title already set +for the menu items to be updated, let's just manually update the menu +item text ourselves when updating the item. +--- + UI/window-extra-browsers.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/UI/window-extra-browsers.cpp b/UI/window-extra-browsers.cpp +index a8076f1b1..64741e0a6 100644 +--- a/UI/window-extra-browsers.cpp ++++ b/UI/window-extra-browsers.cpp +@@ -179,6 +179,7 @@ void ExtraBrowsersModel::UpdateItem(Item &item) + + if (main->extraBrowserDockNames[idx] != item.title) { + main->extraBrowserDockNames[idx] = item.title; ++ dock->toggleViewAction()->setText(item.title); + } + + if (main->extraBrowserDockTargets[idx] != item.url) { +-- +2.42.0 + + +From 12ebcec223a8d117a475bf8d2969e615f5fd56f2 Mon Sep 17 00:00:00 2001 +From: Ryan Foster <ryan@obsproject.com> +Date: Fri, 11 Aug 2023 16:47:29 -0400 +Subject: [PATCH 4/4] UI: Store dock titles in BrowserDock instead of relying + on Qt + +Attempting to set the window title of a BrowserDock that is closed, then +opening the BrowserDock, would show that BrowserDock with an incorrect +title. We can handle this by overriding the showEvent of BrowserDock and +manually setting the window title after the showEvent is called, +hopefully ensuring that we are only setting the window title on a window +that exists. +--- + UI/window-dock-browser.cpp | 6 ++++++ + UI/window-dock-browser.hpp | 9 ++++++++- + UI/window-dock.cpp | 5 +++++ + UI/window-dock.hpp | 1 + + UI/window-extra-browsers.cpp | 1 + + 5 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/UI/window-dock-browser.cpp b/UI/window-dock-browser.cpp +index 7ae55e77c..30e1de1bc 100644 +--- a/UI/window-dock-browser.cpp ++++ b/UI/window-dock-browser.cpp +@@ -18,3 +18,9 @@ void BrowserDock::closeEvent(QCloseEvent *event) + cefWidget->closeBrowser(); + } + } ++ ++void BrowserDock::showEvent(QShowEvent *event) ++{ ++ OBSDock::showEvent(event); ++ setWindowTitle(title); ++} +diff --git a/UI/window-dock-browser.hpp b/UI/window-dock-browser.hpp +index 717ff7787..750ed42bd 100644 +--- a/UI/window-dock-browser.hpp ++++ b/UI/window-dock-browser.hpp +@@ -8,10 +8,14 @@ extern QCef *cef; + extern QCefCookieManager *panel_cookies; + + class BrowserDock : public OBSDock { ++private: ++ QString title; ++ + public: + inline BrowserDock() : OBSDock() { setAttribute(Qt::WA_NativeWindow); } +- inline BrowserDock(const QString &title) : OBSDock(title) ++ inline BrowserDock(const QString &title_) : OBSDock(title_) + { ++ title = title_; + setAttribute(Qt::WA_NativeWindow); + } + +@@ -23,5 +27,8 @@ public: + cefWidget.reset(widget_); + } + ++ inline void setTitle(const QString &title_) { title = title_; } ++ + void closeEvent(QCloseEvent *event) override; ++ void showEvent(QShowEvent *event) override; + }; +diff --git a/UI/window-dock.cpp b/UI/window-dock.cpp +index ed8e92860..3c3eed995 100644 +--- a/UI/window-dock.cpp ++++ b/UI/window-dock.cpp +@@ -34,3 +34,8 @@ void OBSDock::closeEvent(QCloseEvent *event) + + QDockWidget::closeEvent(event); + } ++ ++void OBSDock::showEvent(QShowEvent *event) ++{ ++ QDockWidget::showEvent(event); ++} +diff --git a/UI/window-dock.hpp b/UI/window-dock.hpp +index 2d4062ec7..e73620a2b 100644 +--- a/UI/window-dock.hpp ++++ b/UI/window-dock.hpp +@@ -13,4 +13,5 @@ public: + } + + virtual void closeEvent(QCloseEvent *event); ++ virtual void showEvent(QShowEvent *event); + }; +diff --git a/UI/window-extra-browsers.cpp b/UI/window-extra-browsers.cpp +index 64741e0a6..a7f593782 100644 +--- a/UI/window-extra-browsers.cpp ++++ b/UI/window-extra-browsers.cpp +@@ -180,6 +180,7 @@ void ExtraBrowsersModel::UpdateItem(Item &item) + if (main->extraBrowserDockNames[idx] != item.title) { + main->extraBrowserDockNames[idx] = item.title; + dock->toggleViewAction()->setText(item.title); ++ dock->setTitle(item.title); + } + + if (main->extraBrowserDockTargets[idx] != item.url) { +-- +2.42.0 + @@ -7,7 +7,7 @@ pkgname=obs-studio-browser pkgver=29.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Free and open source software for video recording and live streaming. With everything except service integration" arch=("x86_64" "aarch64") url="https://github.com/obsproject/obs-studio" @@ -66,6 +66,7 @@ makedepends=( "cmake" "jack" # Deps of JACK plugin "git" + "uthash" # Deps of libobs "libajantv2" # Deps of AJA plugin (static lib) "libfdk-aac" # Deps of FDK AAC plugin "luajit" # Deps of Scripting plugin @@ -106,12 +107,18 @@ source=( "obs-browser::git+https://github.com/obsproject/obs-browser.git" "obs-websocket::git+https://github.com/obsproject/obs-websocket.git" "qr::git+https://github.com/nayuki/QR-Code-generator.git" + "0001-Add_finder_for_uthash.patch" + "0002-Use_system_uthash.patch" + "0003-Fix_blank_browser_dock_titles.patch" ) sha256sums=( "SKIP" "SKIP" "SKIP" "SKIP" + "f4a56021a7f1c564f95b588d7c09b60a89efa2c1954c8a418cf6320b5a818542" + "966250c40ab47276e1d420941b5b1e448886b0ab8643f25ba37dce08df68f34d" + "8980d1e871177c3f65d5cf0c249ef36c5a9e2a6956bbc592283782ec58d825e7" ) if [[ $CARCH == 'x86_64' ]]; then @@ -124,6 +131,11 @@ prepare() { git config submodule.plugins/obs-websocket.url $srcdir/obs-websocket git -c protocol.file.allow=always submodule update + patch -Np1 -i "$srcdir/0001-Add_finder_for_uthash.patch" + patch -Np1 -i "$srcdir/0002-Use_system_uthash.patch" + # https://github.com/obsproject/obs-studio/pull/9373 + patch -Np1 -i "$srcdir/0003-Fix_blank_browser_dock_titles.patch" + cd plugins/obs-websocket git config submodule.deps/qr.url $srcdir/qr git -c protocol.file.allow=always submodule update deps/qr |