Merge pull request #935 from ulmus-scott/NuppelVideo

Remove NuppelVideoRecorder
MythTV · Jan 30, 2025 · a3a96c0 · a3a96c0
2 parents ae1c92d + f7cb412
commit a3a96c0
Show file tree

Hide file tree

Showing 50 changed files with 365 additions and 10,475 deletions.
diff --git a/cmake/BuildExternalLibraries.cmake b/cmake/BuildExternalLibraries.cmake
@@ -44,7 +44,6 @@ if(WIN32)
   include(externallibs/FindOrBuildMesa)
 endif()
 include(externallibs/FindOrBuildPCRE2)
-include(externallibs/FindOrBuildLzo)
 include(externallibs/FindOrBuildZip)
 include(externallibs/FindOrBuildTaglib)
 include(externallibs/FindOrBuildFreetype)
@@ -80,7 +79,6 @@ if(WIN32)
   find_or_build_mesa()
 endif()
 find_or_build_pcre2()
-find_or_build_lzo()
 find_or_build_libzip()
 find_or_build_taglib()
 find_or_build_freetype()

diff --git a/cmake/externallibs/FindOrBuildLzo.cmake b/cmake/externallibs/FindOrBuildLzo.cmake
diff --git a/mythplugins/settings.pro b/mythplugins/settings.pro
@@ -62,9 +62,6 @@ QMAKE_LIBDIR_X11 =
 
 EXTRA_LIBS += $$EXTRALIBS
 EXTRA_LIBS += $$FREETYPE_LIBS
-contains(CONFIG_LIBMP3LAME, "yes") {
-  EXTRA_LIBS += -lmp3lame
-}
 EXTRA_LIBS += $$CONFIG_AUDIO_ALSA_LIBS
 EXTRA_LIBS += $$CONFIG_AUDIO_JACK_LIBS
 EXTRA_LIBS += $$CONFIG_FIREWIRE_LIBS

diff --git a/mythtv/cmake/MythFindPackages.cmake b/mythtv/cmake/MythFindPackages.cmake
@@ -201,9 +201,6 @@ endif()
 # libzip: fedora:libzip-devel debian:libzip-dev
 pkg_check_modules(LIBZIP "libzip" REQUIRED IMPORTED_TARGET)
 
-# liblzo: fedora:lzo-devel debian:liblzo2-dev
-pkg_check_modules(LZO2 "lzo2" REQUIRED IMPORTED_TARGET)
-
 # taglib: fedora:taglib-devel debian:libtag1-dev
 pkg_check_modules(TAGLIB "taglib>=1.11.1" REQUIRED IMPORTED_TARGET)
 add_build_config(PkgConfig::TAGLIB "taglib")

diff --git a/mythtv/libs/libmythbase/CMakeLists.txt b/mythtv/libs/libmythbase/CMakeLists.txt
@@ -17,7 +17,6 @@ set(LIBMYTHBASE_HEADERS
     compat.h
     dbutil.h
     exitcodes.h
-    ffmpeg-mmx.h
     filesysteminfo.h
     hardwareprofile.h
     iso3166.h

diff --git a/mythtv/libs/libmythbase/compat.h b/mythtv/libs/libmythbase/compat.h
@@ -197,19 +197,6 @@
 #    define WEXITSTATUS(w) (((w) >> 8) & 0xff)
 #    define WTERMSIG(w)    ((w) & 0x7f)
 
-
-#   ifdef LZO_COMPILE_TIME_ASSERT_HEADER
-#   undef LZO_COMPILE_TIME_ASSERT_HEADER
-#   endif
-
-#   define LZO_COMPILE_TIME_ASSERT_HEADER( a )
-
-#   ifdef LZO_COMPILE_TIME_ASSERT
-#   undef LZO_COMPILE_TIME_ASSERT
-#   endif
-
-#   define LZO_COMPILE_TIME_ASSERT( a )
-
 #endif // _WIN32