- updated to 2.18.8

- added prefer-gst1 patch to check for gstreamer 1.x first
- added festival patch (fix speech_tools headers location)

diff --git a/ptlib-festival.patch b/ptlib-festival.patch
new file mode 100644 (file)
index 0000000..115e379
--- /dev/null
+++ b/ptlib-festival.patch
@@ -0,0 +1,21 @@
+--- ptlib-2.18.8/configure.ac.orig     2022-04-16 09:58:39.233407648 +0200
++++ ptlib-2.18.8/configure.ac  2022-04-16 14:18:13.325702214 +0200
+@@ -1982,14 +1982,14 @@ dnl MSWIN_CHECK_DIR  sapi,%ProgramW6432%
+ 
+ MY_LINK_IFELSE(
+    [for Festival support],
+-   [-I/usr/include/speech_tools -fopenmp],
++   [-I/usr/include/EST -fopenmp],
+    [-lFestival -lestools -lestbase -leststring],
+    [#include <festival/festival.h>],
+    [festival_initialize(1, 21000)],
+    [
+-      CPPFLAGS+=" -I/usr/include/speech_tools"
+-      CXXFLAGS+=" -fopenmp"
+-      LIBS+="-lFestival -lestools -lestbase -leststring"
++      CPPFLAGS="$CPPFLAGS -I/usr/include/EST"
++      CXXFLAGS="$CXXFLAGS -fopenmp"
++      LIBS="$LIBS -lFestival -lestools -lestbase -leststring"
+       PTLIB_SUBST(FESTIVAL, 1)
+    ]
+ )

diff --git a/ptlib-prefer-gst1.patch b/ptlib-prefer-gst1.patch
new file mode 100644 (file)
index 0000000..fa891c6
--- /dev/null
+++ b/ptlib-prefer-gst1.patch
@@ -0,0 +1,30 @@
+--- ptlib-2.18.8/configure.ac.orig     2022-03-27 15:56:49.000000000 +0200
++++ ptlib-2.18.8/configure.ac  2022-04-16 08:46:31.900184157 +0200
+@@ -2407,21 +2407,21 @@ dnl MSWIN_CHECK_DIR  gstreamer1,%Program
+ PTLIB_MODULE_OPTION(
+    [GSTREAMER], 
+    [gstreamer],
+-   [GStreamer 0.10 support],
+-   [gstreamer-app-0.10], 
++   [GStreamer 1.0 support],
++   [gio-2.0 gstreamer-app-1.0],
+    [],[],
+    [#include <gst/gst.h>],
+    [gst_version_string()],
+-   [],
++   [AC_DEFINE(P_GSTREAMER_1_0_API, 1)]
+    [PTLIB_MODULE_OPTION(
+       [GSTREAMER],
+       [gstreamer],
+-      [GStreamer 1.0 support],
+-      [gio-2.0 gstreamer-app-1.0],
++      [GStreamer 0.10 support],
++      [gstreamer-app-0.10], 
+       [],[],
+       [#include <gst/gst.h>],
+       [gst_version_string()],
+-      [AC_DEFINE(P_GSTREAMER_1_0_API, 1)]
++      [:]
+    )]
+ )
+ 

diff --git a/ptlib.spec b/ptlib.spec
index 671b81cce2216f8e467503e0ff12173d3e7705f9..5a1070f0aeb0dded656c31108e90bf991fbddc5f 100644 (file)
--- a/ptlib.spec
+++ b/ptlib.spec
@@ -7,6 +7,7 @@
 # Conditional build:
 %bcond_without http            # HTTP support
 %bcond_without ipv6            # IPv6 support
+%bcond_without festival        # Festival TTS support
 %bcond_without ldap            # LDAP support
 %bcond_without lua             # Lua script support
 %bcond_with    odbc            # ODBC support
@@ -22,39 +23,49 @@
 Summary:       Portable Tools Library
 Summary(pl.UTF-8):     Przenośna biblioteka narzędziowa
 Name:          ptlib
-Version:       2.18.6
-Release:       4
+Version:       2.18.8
+Release:       1
 Epoch:         1
 License:       MPL v1.0
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
-# Source0-md5: b0eeaef41e0bf8da8d046c22d9dd0c8d
-URL:           http://www.opalvoip.org/
+# Source0-md5: 207f40521cde54a9c4e1e31a9cd8a101
+Patch0:                %{name}-prefer-gst1.patch
+Patch1:                %{name}-festival.patch
+# domain suspended (2022.04)
+#URL:          http://www.opalvoip.org/
+URL:           https://sourceforge.net/projects/opalvoip/
+BuildRequires: ImageMagick-devel
 %{?with_video:BuildRequires:   SDL-devel}
-BuildRequires: autoconf >= 2.50
+BuildRequires: autoconf >= 2.71
 BuildRequires: automake
 BuildRequires: bison
 %{?with_sasl:BuildRequires:    cyrus-sasl-devel}
 %{?with_esd:BuildRequires:     esound-devel}
 BuildRequires: expat-devel
+%{?with_festival:BuildRequires:        festival-devel}
+BuildRequires: ffmpeg-devel
 BuildRequires: flex
-BuildRequires: gstreamer-devel
+BuildRequires: gstreamer-devel >= 1.0
 %{?with_avc1394:BuildRequires: libavc1394-devel}
 %{?with_dc1394:BuildRequires:  libdc1394-devel < 2.0.0}
-BuildRequires: libstdc++-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpcap-devel
+BuildRequires: libstdc++-devel >= 6:4.7
 %{?with_lua:BuildRequires:     lua-devel >= 5.4}
+BuildRequires: ncurses-devel
 %{?with_ldap:BuildRequires:    openldap-devel}
 %{?with_openssl:BuildRequires: openssl-devel}
 BuildRequires: pkgconfig
 %{?with_odbc:BuildRequires:    unixODBC-devel}
+BuildRequires: v8-devel
 %if %{with plugins}
 BuildRequires: alsa-lib-devel
 BuildRequires: libv4l-devel
 BuildRequires: pulseaudio-devel
 %endif
-BuildConflicts:        gstreamer0.10-devel
-%{!?with_esd:Obsoletes:        ptlib-sound-esd}
-Obsoletes:     ptlib-video-v4l
+%{!?with_esd:Obsoletes:        ptlib-sound-esd < %{epoch}:%{version}-%{release}}
+Obsoletes:     ptlib-video-v4l < 1:2.10.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -181,12 +192,19 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
 # note: --enable-opal influences most of the remaining enable/disable defaults
 %configure \
        STRIP=/bin/true \
        DSYMUTIL=/bin/true \
+       --enable-cpp11 \
+       %{!?with_festival:--disable-tts} \
        --disable-v4l \
 %if %{with plugins}
        --enable-plugins \
@@ -243,9 +261,9 @@ install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/%{name}}
        STRIP=/bin/true \
        DESTDIR=$RPM_BUILD_ROOT
 
-cp version.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -p version.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
-sed -i -e 's#PTLIBDIR=.*#PTLIBDIR=%{_datadir}/ptlib#g' $RPM_BUILD_ROOT%{_datadir}/ptlib/make/plugins.mak
+%{__sed} -i -e 's#PTLIBDIR=.*#PTLIBDIR=%{_datadir}/ptlib#g' $RPM_BUILD_ROOT%{_datadir}/ptlib/make/plugins.mak
 
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
 find $RPM_BUILD_ROOT%{_libdir}/ptlib-* -name '*.so' | xargs chmod a+x