From f3a6dbca5b5c0bbd2014b643c4f1ecc6f4b78cf3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 21 Oct 2023 13:35:22 +0200 Subject: [PATCH] - disable ffmpeg support, rel 2 --- no-ffmpeg.patch | 107 ++++++++++++++++++++++++++++++++++++++++++++++++ ptlib.spec | 7 +++- 2 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 no-ffmpeg.patch diff --git a/no-ffmpeg.patch b/no-ffmpeg.patch new file mode 100644 index 0000000..c299067 --- /dev/null +++ b/no-ffmpeg.patch @@ -0,0 +1,107 @@ +--- ptlib-2.18.8/configure.ac~ 2023-10-21 00:58:41.000000000 +0200 ++++ ptlib-2.18.8/configure.ac 2023-10-21 13:32:49.785184059 +0200 +@@ -1369,104 +1369,6 @@ + + + dnl ######################################################################## +-dnl check for FFMPEG +- +-dnl MSWIN_DISPLAY ffmpeg32,FFMPEG 32 bit support +-dnl MSWIN_CHECK_FILE ffmpeg32,include\libavformat\avformat.h,P_FFMPEG_WIN32=1 +-dnl MSWIN_DIR_SYMBOL ffmpeg32,FFMPEG_WIN32_DIR +-dnl MSWIN_CHECK_DIR ffmpeg32,%FFMPEG32DIR%\ +-dnl MSWIN_CHECK_DIR ffmpeg32,..\ffmpeg-win32-dev* +-dnl MSWIN_CHECK_DIR ffmpeg32,..\external\ffmpeg-win32-dev* +-dnl MSWIN_CHECK_DIR ffmpeg32,..\..\external\ffmpeg-win32-dev* +-dnl MSWIN_CHECK_DIR ffmpeg32,%ProgramFiles%\ffmpeg-win32-dev* +-dnl MSWIN_CHECK_DIR ffmpeg32,%ProgramW6432%\ffmpeg-win32-dev* +- +-dnl MSWIN_DISPLAY ffmpeg64,FFMPEG 64 bit support +-dnl MSWIN_CHECK_FILE ffmpeg64,include\libavformat\avformat.h,P_FFMPEG_WIN64=1 +-dnl MSWIN_DIR_SYMBOL ffmpeg64,FFMPEG_WIN64_DIR +-dnl MSWIN_CHECK_DIR ffmpeg64,%FFMPEG64DIR%\ +-dnl MSWIN_CHECK_DIR ffmpeg64,..\ffmpeg-win64-dev* +-dnl MSWIN_CHECK_DIR ffmpeg64,..\external\ffmpeg-win64-dev* +-dnl MSWIN_CHECK_DIR ffmpeg64,..\..\external\ffmpeg-win64-dev* +-dnl MSWIN_CHECK_DIR ffmpeg64,%ProgramFiles%\ffmpeg-win64-dev* +-dnl MSWIN_CHECK_DIR ffmpeg64,%ProgramW6432%\ffmpeg-win64-dev* +- +-dnl MSWIN_DISPLAY ffmpeg32wb,FFMPEG 32 bit support (Win-Builds) +-dnl MSWIN_IF_FEATURE ffmpeg32wb,!ffmpeg32 +-dnl MSWIN_CHECK_FILE ffmpeg32wb,include\libavformat\avformat.h,P_FFMPEG_WINBUILDS_WIN32=1 +-dnl MSWIN_DIR_SYMBOL ffmpeg32wb,FFMPEG_WINBUILDS_WIN32_DIR +-dnl MSWIN_CHECK_DIR ffmpeg32wb,%WINBUILDSDIR%\ +-dnl MSWIN_CHECK_DIR ffmpeg32wb,..\Win-Builds\ +-dnl MSWIN_CHECK_DIR ffmpeg32wb,..\external\Win-Builds\ +-dnl MSWIN_CHECK_DIR ffmpeg32wb,..\..\external\Win-Builds\ +-dnl MSWIN_CHECK_DIR ffmpeg32wb,\Win-Builds\ +- +-dnl MSWIN_DISPLAY ffmpeg64wb,FFMPEG 64 bit support (Win-Builds) +-dnl MSWIN_IF_FEATURE ffmpeg64wb,!ffmpeg64 +-dnl MSWIN_CHECK_FILE ffmpeg64wb,include\libavformat\avformat.h,P_FFMPEG_WINBUILDS_WIN64=1 +-dnl MSWIN_DIR_SYMBOL ffmpeg64wb,FFMPEG_WINBUILDS_WIN64_DIR +-dnl MSWIN_CHECK_DIR ffmpeg64wb,%WINBUILDSDIR%\ +-dnl MSWIN_CHECK_DIR ffmpeg64wb,..\Win-Builds\ +-dnl MSWIN_CHECK_DIR ffmpeg64wb,..\external\Win-Builds\ +-dnl MSWIN_CHECK_DIR ffmpeg64wb,..\..\external\Win-Builds\ +-dnl MSWIN_CHECK_DIR ffmpeg64wb,\Win-Builds\ +- +- +-AC_LANG_PUSH(C) +- +-oldLIBS="$LIBS" +-CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" +- +-MY_PKG_CHECK_MODULE( +- [LIBAVUTIL], +- [libavutil >= 55], +- [#include ], +- [avutil_version()], +- [HAS_LIBAVUTIL=1] +-) +- +-MY_PKG_CHECK_MODULE( +- [LIBSWRESAMPLE], +- [libswresample], +- [#include ], +- [swresample_version()], +- [HAS_LIBSWRESAMPLE=1] +-) +- +-MY_PKG_CHECK_MODULE( +- [LIBSWSCALE], +- [libswscale >= 4], +- [#include ], +- [swscale_version()], +- [HAS_LIBSWSCALE=1] +-) +- +-MY_PKG_CHECK_MODULE( +- [LIBAVCODEC], +- [libavcodec >= 57], +- [#include ], +- [avcodec_version()], +- [HAS_LIBAVCODEC=1] +-) +- +-MY_PKG_CHECK_MODULE( +- [LIBAVFORMAT], +- [libavformat >= 57], +- [#include ], +- [avformat_version()], +- [HAS_LIBAVFORMAT=1] +-) +- +-if test "$HAS_LIBAVUTIL" = 1 -a "$HAS_LIBSWRESAMPLE" = 1 -a "$HAS_LIBSWSCALE" = 1 -a "$HAS_LIBAVCODEC" = 1 -a "$HAS_LIBAVFORMAT" = 1; then +- PTLIB_SUBST(FFMPEG, 1) +-else +- LIBS="$oldLIBS" +-fi +- +-AC_LANG_POP(C) +- +- +-dnl ######################################################################## + dnl check for ImageMagick + + dnl MSWIN_DISPLAY imagemagick,ImageMagick support diff --git a/ptlib.spec b/ptlib.spec index 4fe0f55..ae7677c 100644 --- a/ptlib.spec +++ b/ptlib.spec @@ -20,6 +20,7 @@ %bcond_with esd # EsounD audio support (obsolete) %bcond_with avc1394 # AVC1394 video input plugin [requires old libraw1394] %bcond_with dc1394 # DC1394 video input plugin [requires old libdc1394] +%bcond_with ffmpeg # FFMPEG support [requires ffmpeg < 5] # %ifnarch %{ix86} %{x8664} %{arm} mips %undefine with_v8 @@ -28,7 +29,7 @@ Summary: Portable Tools Library Summary(pl.UTF-8): Przenośna biblioteka narzędziowa Name: ptlib Version: 2.18.8 -Release: 1 +Release: 2 Epoch: 1 License: MPL v1.0 Group: Libraries @@ -36,6 +37,7 @@ Source0: http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2 # Source0-md5: 207f40521cde54a9c4e1e31a9cd8a101 Patch0: %{name}-prefer-gst1.patch Patch1: %{name}-festival.patch +Patch2: no-ffmpeg.patch # domain suspended (2022.04) #URL: http://www.opalvoip.org/ URL: https://sourceforge.net/projects/opalvoip/ @@ -48,7 +50,7 @@ BuildRequires: bison %{?with_esd:BuildRequires: esound-devel} BuildRequires: expat-devel %{?with_festival:BuildRequires: festival-devel} -BuildRequires: ffmpeg-devel +%{?with_ffmpeg:BuildRequires: ffmpeg-devel} BuildRequires: flex BuildRequires: gstreamer-devel >= 1.0 %{?with_avc1394:BuildRequires: libavc1394-devel} @@ -198,6 +200,7 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib %setup -q %patch0 -p1 %patch1 -p1 +%{!?with_ffmpeg:%patch2 -p1} %build %{__libtoolize} -- 2.44.0