Build 0.12

0001-Add-more-version-prints.patch

@@ -0,0 +1,25 @@
+From 12c85e26ee3f93096031ace306a05849c012de8d Mon Sep 17 00:00:00 2001
+From: asonix <asonix@asonix.dog>
+Date: Tue, 27 Dec 2022 14:37:13 -0600
+Subject: [PATCH] Add more version prints
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 609b1d0..fd3e268 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,7 +79,7 @@ endif()
+ set(_VERSION_GIT_BASE "0.11.0")
+ 
+ # What is our version goal?
+-set(_VERSION "0.12.0")
++set(_VERSION "0.12.0.0")
+ version(PARSE _VERSION "${_VERSION}")
+ 
+ # If possible, automatically generate versions from git.
+-- 
+2.38.1
+

default.nix

@@ -2,5 +2,5 @@ let
   pkgs = import <nixpkgs> { };
 in
 with pkgs; {
-  obs-streamfx = libsForQt5.callPackage ./obs-streamfx.nix { };
+  obs-streamfx = qt6.callPackage ./obs-streamfx.nix { };
 }

obs-streamfx-force-frontend.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index acaa87c..e02bebf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -981,7 +981,7 @@ if(REQUIRE_NVIDIA_CUDA AND D_PLATFORM_WINDOWS)
- endif()
- 
- #- OBS Front-End API
--set(HAVE_OBSFE OFF)
-+set(HAVE_OBSFE ON)
- if(REQUIRE_OBSFE)
- 	if(${PREFIX}OBS_NATIVE)
- 		if(TARGET obs-frontend-api)

obs-streamfx-no-download.patch

@@ -1,25 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index acaa87c..2711adf 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -444,13 +444,13 @@ if(NOT ${PREFIX}OBS_NATIVE)
- 	endif()
- 
- 	# Download libOBS
--	download_project(
--		PROJ libobs
--		URL "${_DOWNLOAD_OBS_URL}"
--		URL_HASH "${_DOWNLOAD_OBS_HASH}"
--		DOWNLOAD_NO_PROGRESS OFF
--		UPDATE_DISCONNECTED OFF
--	)
-+	# download_project(
-+	# 	PROJ libobs
-+	# 	URL "${_DOWNLOAD_OBS_URL}"
-+	# 	URL_HASH "${_DOWNLOAD_OBS_HASH}"
-+	# 	DOWNLOAD_NO_PROGRESS OFF
-+	# 	UPDATE_DISCONNECTED OFF
-+	# )
- 
- 	include("${libobs_SOURCE_DIR}/cmake/LibObs/LibObsConfig.cmake")
- endif()

obs-streamfx.nix

@@ -2,8 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
-, ffmpeg
-, libaom
+, ffmpeg_4
 , ninja
 , pkg-config
 , qtbase
@@ -12,30 +11,34 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-streamfx";
-  version = "0.11.1";
+  version = "0.12.0b164";
 
   src = fetchFromGitHub {
     owner = "Xaymar";
     repo = "obs-StreamFx";
     rev = version;
-    sha256 = "KDzSrvmR4kt+46zyfLtu8uqLk6YOwS8GOI70b5s4vR8=";
+    sha256 = "hxVSoX+qzqvTAhni5mAjZnsAsKeWo3wbXlRQOEoBCBA=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ninja pkg-config ];
-  buildInputs = [ ffmpeg libaom obs-studio qtbase ];
+  buildInputs = [ ffmpeg_4 obs-studio qtbase ];
 
   dontWrapQtApps = true;
 
   cmakeFlags = with lib; [
-    "-Dlibobs_SOURCE_DIR=${obs-studio.out}/lib"
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DENABLE_CLANG=true"
+    "-DENABLE_PROFILING=off"
+    "-DPACKAGE_NAME=streamfx-nix-${version}"
+    "-Dlibobs_DIR=${obs-studio.out}/lib"
     "-DSTRUCTURE_PACKAGEMANAGER=true"
     "-DENABLE_UPDATER=false"
     "-DENABLE_FRONTEND=true"
     "-DREQUIRE_JSON=true"
   ];
 
-  patches = [ ./obs-streamfx-force-frontend.patch ./obs-streamfx-no-download.patch ];
+  patches = [ ./0001-Add-more-version-prints.patch ];
 
   meta = with lib; {
     description = "StreamFX is a plugin for OBS® Studio which adds many new effects, filters, sources, transitions and encoders - all for free! Be it 3D Transform, Blur, complex Masking, or even custom shaders, you'll find it all here.";