cmake,plugins,build-aux: Remove enc-amf

obsproject · Jul 23, 2023 · edf2c82 · edf2c82
1 parent 2f50383
commit edf2c82
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 17 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "plugins/win-dshow/libdshowcapture"]
 	path = plugins/win-dshow/libdshowcapture
 	url = https://github.com/obsproject/libdshowcapture.git
-[submodule "plugins/enc-amf"]
-	path = plugins/enc-amf
-	url = https://github.com/obsproject/obs-amd-encoder.git
 [submodule "plugins/obs-browser"]
 	path = plugins/obs-browser
 	url = https://github.com/obsproject/obs-browser.git

diff --git a/build-aux/.run-format.zsh b/build-aux/.run-format.zsh
@@ -51,7 +51,7 @@ invoke_formatter() {
       fi
 
       local -a source_files=((libobs|libobs-*|UI|plugins|deps)/**/*.(c|cpp|h|hpp|m|mm)(.N))
-      source_files=(${source_files:#*/(obs-websocket/deps|decklink/*/decklink-sdk|enc-amf|mac-syphon/syphon-framework|obs-outputs/ftl-sdk|win-dshow/libdshowcapture)/*})
+      source_files=(${source_files:#*/(obs-websocket/deps|decklink/*/decklink-sdk|mac-syphon/syphon-framework|obs-outputs/ftl-sdk|win-dshow/libdshowcapture)/*})
 
       local -a format_args=(-style=file -fallback-style=none)
       if (( _loglevel > 2 )) format_args+=(--verbose)
@@ -71,7 +71,7 @@ invoke_formatter() {
       }
 
       local -a source_files=((libobs|libobs-*|UI|plugins|deps|cmake)/**/(CMakeLists.txt|*.cmake)(.N))
-      source_files=(${source_files:#*/(obs-outputs/ftl-sdk|jansson|decklink/*/decklink-sdk|enc-amf|obs-websocket|obs-browser|win-dshow/libdshowcapture)/*})
+      source_files=(${source_files:#*/(obs-outputs/ftl-sdk|jansson|decklink/*/decklink-sdk|obs-websocket|obs-browser|win-dshow/libdshowcapture)/*})
 
       local -a format_args=()
       if (( _loglevel > 2 )) format_args+=(--log-level debug)

diff --git a/cmake/windows/helpers.cmake b/cmake/windows/helpers.cmake
@@ -34,8 +34,6 @@ function(set_target_properties_obs target)
       # cmake-format: off
       _target_install_obs(${target} DESTINATION ${OBS_EXECUTABLE_DESTINATION} 32BIT)
       # cmake-format: on
-    elseif(target STREQUAL enc-amf-test)
-      set(OBS_EXECUTABLE_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/enc-amf")
     endif()
 
     # cmake-format: off

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -43,9 +43,6 @@ if(OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
      OR OS_LINUX)
     add_subdirectory(decklink)
   endif()
-  if(OS_WINDOWS)
-    add_subdirectory(enc-amf)
-  endif()
   add_subdirectory(image-source)
   if(OS_LINUX)
     add_subdirectory(linux-alsa)
@@ -122,12 +119,6 @@ if(OS_WINDOWS)
   add_subdirectory(vlc-video)
   add_subdirectory(obs-vst)
 
-  if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/enc-amf/CMakeLists.txt")
-    add_subdirectory(enc-amf)
-  else()
-    obs_status(WARNING "enc-amf plugin not found.")
-  endif()
-
   check_obs_browser()
 elseif(OS_MACOS)
   add_subdirectory(coreaudio-encoder)

diff --git a/plugins/enc-amf b/plugins/enc-amf