From: Good Guy Date: Mon, 8 Jan 2024 22:39:38 +0000 (-0700) Subject: delete non-working flac webm format and previous library versions X-Git-Tag: 2024-01~5 X-Git-Url: https://www.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=commitdiff_plain;h=40cf203cc5cc2fa387087cc5c7a118b97e55cadc delete non-working flac webm format and previous library versions --- diff --git a/cinelerra-5.1/ffmpeg/audio/flac.webm b/cinelerra-5.1/ffmpeg/audio/flac.webm deleted file mode 100644 index 84f34f94..00000000 --- a/cinelerra-5.1/ffmpeg/audio/flac.webm +++ /dev/null @@ -1 +0,0 @@ -webm flac diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.13.0.patch1 b/cinelerra-5.1/thirdparty/src/libvpx-1.13.0.patch1 deleted file mode 100644 index 37009517..00000000 --- a/cinelerra-5.1/thirdparty/src/libvpx-1.13.0.patch1 +++ /dev/null @@ -1,11 +0,0 @@ ---- a/vpx_ports/mem.h 2019-12-09 16:09:20.000000000 -0700 -+++ b/vpx_ports/mem.h 2020-07-31 09:20:22.303406738 -0600 -@@ -15,7 +15,7 @@ - #include "vpx/vpx_integer.h" - - #if (defined(__GNUC__) && __GNUC__) || defined(__SUNPRO_C) --#define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(n))) -+#define DECLARE_ALIGNED(n, typ, val) typ val __attribute__((aligned(64))) - #elif defined(_MSC_VER) - #define DECLARE_ALIGNED(n, typ, val) __declspec(align(n)) typ val - #else diff --git a/cinelerra-5.1/thirdparty/src/libvpx-1.13.0.tar.gz b/cinelerra-5.1/thirdparty/src/libvpx-1.13.0.tar.gz deleted file mode 100644 index f33c91bb..00000000 Binary files a/cinelerra-5.1/thirdparty/src/libvpx-1.13.0.tar.gz and /dev/null differ diff --git a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch1 b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch1 deleted file mode 100644 index 9e3d2b04..00000000 --- a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch1 +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9503daa..61c15e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,20 +75,6 @@ set(INSTALLED_LIBRARIES) - - # ############################################################################## - # Android only. --if(ANDROID) -- include_directories(${ANDROID_NDK}/sources/android/cpufeatures) -- add_library(cpufeatures STATIC -- ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c) -- list(APPEND INSTALLED_LIBRARIES cpufeatures) -- target_link_libraries(cpufeatures dl) -- set(WEBP_DEP_LIBRARIES ${WEBP_DEP_LIBRARIES} cpufeatures) -- set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS} -- ${ANDROID_NDK}/sources/android/cpufeatures) -- add_definitions(-DHAVE_CPU_FEATURES_H=1) -- set(HAVE_CPU_FEATURES_H 1) --else() -- set(HAVE_CPU_FEATURES_H 0) --endif() - - function(configure_pkg_config FILE) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.in" diff --git a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch2 b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch2 deleted file mode 100644 index 737e1efa..00000000 --- a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch2 +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake -index da9a42a..46a8f4a 100644 ---- a/cmake/cpu.cmake -+++ b/cmake/cpu.cmake -@@ -46,14 +46,7 @@ set(WEBP_SIMD_FILES_TO_NOT_INCLUDE) - set(WEBP_SIMD_FILES_TO_INCLUDE) - set(WEBP_SIMD_FLAGS_TO_INCLUDE) - --if(${ANDROID}) -- if(${ANDROID_ABI} STREQUAL "armeabi-v7a") -- # This is because Android studio uses the configuration "-march=armv7-a -- # -mfloat-abi=softfp -mfpu=vfpv3-d16" that does not trigger neon -- # optimizations but should (as this configuration does not exist anymore). -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon ") -- endif() --endif() -+ - - list(LENGTH WEBP_SIMD_FLAGS WEBP_SIMD_FLAGS_LENGTH) - math(EXPR WEBP_SIMD_FLAGS_RANGE "${WEBP_SIMD_FLAGS_LENGTH} - 1") diff --git a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch3 b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch3 deleted file mode 100644 index 7696f589..00000000 --- a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.patch3 +++ /dev/null @@ -1,27 +0,0 @@ ---- ./CMakeLists.txt.orig 2021-11-23 13:07:40.473195486 +0300 -+++ ./CMakeLists.txt 2021-11-23 13:08:43.225195490 +0300 -@@ -4,15 +4,15 @@ - - # Options for coder / decoder executables. - option(WEBP_ENABLE_SIMD "Enable any SIMD optimization." ON) --option(WEBP_BUILD_ANIM_UTILS "Build animation utilities." ON) --option(WEBP_BUILD_CWEBP "Build the cwebp command line tool." ON) --option(WEBP_BUILD_DWEBP "Build the dwebp command line tool." ON) --option(WEBP_BUILD_GIF2WEBP "Build the gif2webp conversion tool." ON) --option(WEBP_BUILD_IMG2WEBP "Build the img2webp animation tool." ON) --option(WEBP_BUILD_VWEBP "Build the vwebp viewer tool." ON) --option(WEBP_BUILD_WEBPINFO "Build the webpinfo command line tool." ON) --option(WEBP_BUILD_WEBPMUX "Build the webpmux command line tool." ON) --option(WEBP_BUILD_EXTRAS "Build extras." ON) -+option(WEBP_BUILD_ANIM_UTILS "Build animation utilities." OFF) -+option(WEBP_BUILD_CWEBP "Build the cwebp command line tool." OFF) -+option(WEBP_BUILD_DWEBP "Build the dwebp command line tool." OFF) -+option(WEBP_BUILD_GIF2WEBP "Build the gif2webp conversion tool." OFF) -+option(WEBP_BUILD_IMG2WEBP "Build the img2webp animation tool." OFF) -+option(WEBP_BUILD_VWEBP "Build the vwebp viewer tool." OFF) -+option(WEBP_BUILD_WEBPINFO "Build the webpinfo command line tool." OFF) -+option(WEBP_BUILD_WEBPMUX "Build the webpmux command line tool." OFF) -+option(WEBP_BUILD_EXTRAS "Build extras." OFF) - option(WEBP_BUILD_WEBP_JS "Emscripten build of webp.js." OFF) - option(WEBP_NEAR_LOSSLESS "Enable near-lossless encoding" ON) - option(WEBP_ENABLE_SWAP_16BIT_CSP "Enable byte swap for 16 bit colorspaces." diff --git a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.tar.xz b/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.tar.xz deleted file mode 100644 index 45b5e3d9..00000000 Binary files a/cinelerra-5.1/thirdparty/src/libwebp-1.1.0.tar.xz and /dev/null differ diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.5.0.patch1 b/cinelerra-5.1/thirdparty/src/tiff-4.5.0.patch1 deleted file mode 100644 index 660f6dbc..00000000 --- a/cinelerra-5.1/thirdparty/src/tiff-4.5.0.patch1 +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.am -+++ ./Makefile.am -@@ -60,7 +60,7 @@ - rm -rf $(distdir)/_build/cmake - rm -rf $(distdir)/_inst/cmake - --SUBDIRS = port libtiff tools build contrib test doc -+SUBDIRS = port libtiff build - - release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.5.0.patch2 b/cinelerra-5.1/thirdparty/src/tiff-4.5.0.patch2 deleted file mode 100644 index 39887156..00000000 --- a/cinelerra-5.1/thirdparty/src/tiff-4.5.0.patch2 +++ /dev/null @@ -1,10 +0,0 @@ ---- ./configure.ac -+++ ./configure.ac -@@ -888,6 +888,7 @@ - if test "x$enable_webp" != "xno" ; then - - if test "x$with_webp_lib_dir" != "x" ; then -+ LIBS="-lpthread $LIBS" - LDFLAGS="-L$with_webp_lib_dir $LDFLAGS" - fi - diff --git a/cinelerra-5.1/thirdparty/src/tiff-4.5.0.tar.xz b/cinelerra-5.1/thirdparty/src/tiff-4.5.0.tar.xz deleted file mode 100644 index 9c855698..00000000 Binary files a/cinelerra-5.1/thirdparty/src/tiff-4.5.0.tar.xz and /dev/null differ