[packages/ptlib] - up to 2.18.6
baggins
baggins at pld-linux.org
Sat Feb 13 23:01:26 CET 2021
commit f2f74e9587893397feb7c89b9fd14ed31d00bd01
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Feb 13 23:01:03 2021 +0100
- up to 2.18.6
bison3.patch | 39 ----------------
disable-sslv3.patch | 18 --------
gcc-5_support | 13 ------
glibc.patch | 11 -----
openssl-1.1.0.patch | 128 ----------------------------------------------------
ptlib-lua.patch | 26 -----------
ptlib.spec | 53 ++++++++--------------
7 files changed, 19 insertions(+), 269 deletions(-)
---
diff --git a/ptlib.spec b/ptlib.spec
index f1b9984..2c727d2 100644
--- a/ptlib.spec
+++ b/ptlib.spec
@@ -22,19 +22,13 @@
Summary: Portable Tools Library
Summary(pl.UTF-8): Przenośna biblioteka narzędziowa
Name: ptlib
-Version: 2.10.11
-Release: 4
+Version: 2.18.6
+Release: 1
Epoch: 1
License: MPL v1.0
Group: Libraries
Source0: http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
-# Source0-md5: eb2fb52c91224483c17dcea6df9c23a3
-Patch0: bison3.patch
-Patch1: %{name}-lua.patch
-Patch2: disable-sslv3.patch
-Patch3: openssl-1.1.0.patch
-Patch4: gcc-5_support
-Patch5: glibc.patch
+# Source0-md5: b0eeaef41e0bf8da8d046c22d9dd0c8d
URL: http://www.opalvoip.org/
%{?with_video:BuildRequires: SDL-devel}
BuildRequires: autoconf >= 2.50
@@ -47,7 +41,7 @@ BuildRequires: flex
%{?with_avc1394:BuildRequires: libavc1394-devel}
%{?with_dc1394:BuildRequires: libdc1394-devel < 2.0.0}
BuildRequires: libstdc++-devel
-%{?with_lua:BuildRequires: lua52-devel >= 5.2}
+%{?with_lua:BuildRequires: lua-devel >= 5.4}
%{?with_ldap:BuildRequires: openldap-devel}
%{?with_openssl:BuildRequires: openssl-devel}
BuildRequires: pkgconfig
@@ -185,20 +179,11 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
-%{__aclocal}
-%{__autoconf}
# note: --enable-opal influences most of the remaining enable/disable defaults
-CPPFLAGS="%{rpmcppflags} -Wno-misleading-indentation -std=gnu++98"
-%{?with_lua:CPPFLAGS="$CPPFLAGS -I/usr/include/lua5.2"}
%configure \
+ DSYMUTIL=/bin/true \
--disable-v4l \
%if %{with plugins}
--enable-plugins \
@@ -209,6 +194,7 @@ CPPFLAGS="%{rpmcppflags} -Wno-misleading-indentation -std=gnu++98"
--enable-lua%{!?with_lua:=no} \
--enable-oss \
--enable-v4l2 \
+ --enable-pulse \
%else
--disable-plugins \
--disable-alsa \
@@ -236,7 +222,7 @@ CPPFLAGS="%{rpmcppflags} -Wno-misleading-indentation -std=gnu++98"
--enable-video%{!?with_video:=no}
dir=$(pwd)
-%{__make} %{?debug:debugshared}%{!?debug:optshared} \
+%{__make} \
V=1 \
PTLIBMAKEDIR="$dir/make" \
PTLIBDIR="$dir" \
@@ -247,7 +233,7 @@ dir=$(pwd)
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/%{name}}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/%{name}}
%{__make} install \
V=1 \
@@ -271,22 +257,21 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libpt.so.*.*.*
%if %{with plugins}
%dir %{_libdir}/%{name}-%{version}
-%dir %{_libdir}/%{name}-%{version}/devices
-%dir %{_libdir}/%{name}-%{version}/devices/sound
-%dir %{_libdir}/%{name}-%{version}/devices/videoinput
+%dir %{_libdir}/%{name}-%{version}/device
+%dir %{_libdir}/%{name}-%{version}/device/sound
+%dir %{_libdir}/%{name}-%{version}/device/videoinput
%endif
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ptlib-config
%attr(755,root,root) %{_libdir}/libpt.so
%{_includedir}/ptclib
%{_includedir}/ptlib
-%{_includedir}/ptbuildopts.h
%{_includedir}/ptlib.h
+%{_includedir}/ptlib_config.h
+%{_includedir}/ptlib_wx.h
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/make
-%attr(755,root,root) %{_datadir}/%{name}/make/%{name}-config
%{_datadir}/%{name}/make/*.mak
%{_pkgconfigdir}/ptlib.pc
@@ -297,29 +282,29 @@ rm -rf $RPM_BUILD_ROOT
%if %{with plugins}
%files sound-alsa
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/alsa_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/device/sound/alsa_ptplugin.so
%if %{with esd}
%files sound-esd
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/esd_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/device/sound/esd_ptplugin.so
%endif
%files sound-oss
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/oss_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/device/sound/oss_ptplugin.so
%files sound-pulse
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/pulse_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/device/sound/pulse_ptplugin.so
%files video-v4l2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/device/videoinput/v4l2_ptplugin.so
%if %{with avc1394}
%files video-avc
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/avc_pwplugin.so
+%attr(755,root,root) %{_libdir}/%{name}-%{version}/device/videoinput/avc_ptplugin.so
%endif
%endif
diff --git a/bison3.patch b/bison3.patch
deleted file mode 100644
index c1fcf79..0000000
--- a/bison3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ptlib-2.10.11/src/ptlib/common/getdate.y~ 2013-08-15 01:20:26.000000000 +0200
-+++ ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100
-@@ -121,9 +121,9 @@
- static int yylex();
-
- #ifdef __GNUC__
--static int yyerror(char const *msg);
-+static int yyerror(void *, char const *msg);
- #else
--static void yyerror(char const *msg);
-+static void yyerror(void *, char const *msg);
- #endif
-
-
-@@ -132,7 +132,8 @@
-
- %}
-
--%pure_parser
-+%pure-parser
-+%parse-param {void *parseParam}
-
- %union {
- time_t Number;
-@@ -1018,12 +1019,12 @@
- #endif
-
- #ifdef __GNUC__
--int yyerror(const char * s)
-+int yyerror(void *var, const char * s)
- {
- return 0;
- }
- #else
--static void yyerror(const char * s)
-+static void yyerror(void *var, const char * s)
- {
- }
- #endif
diff --git a/disable-sslv3.patch b/disable-sslv3.patch
deleted file mode 100644
index 1728841..0000000
--- a/disable-sslv3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u -r ptlib-2.10.11/src/ptclib/pssl.cxx ptlib-2.10.11-nossl3/src/ptclib/pssl.cxx
---- ptlib-2.10.11/src/ptclib/pssl.cxx 2013-08-15 01:20:27.000000000 +0200
-+++ ptlib-2.10.11-nossl3/src/ptclib/pssl.cxx 2016-03-03 11:39:02.224835510 +0100
-@@ -805,13 +805,11 @@
- SSL_METHOD * meth;
-
- switch (method) {
-- case SSLv3:
-- meth = SSLv3_method();
-- break;
- case TLSv1:
- meth = TLSv1_method();
- break;
- case SSLv23:
-+ case SSLv3:
- default:
- meth = SSLv23_method();
- break;
diff --git a/gcc-5_support b/gcc-5_support
deleted file mode 100644
index 51ad209..0000000
--- a/gcc-5_support
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ptlib-2.10.10~dfsg/include/ptlib/critsec.h
-===================================================================
---- ptlib-2.10.10~dfsg.orig/include/ptlib/critsec.h
-+++ ptlib-2.10.10~dfsg/include/ptlib/critsec.h
-@@ -40,7 +40,7 @@
- #if P_HAS_ATOMIC_INT
-
- #if defined(__GNUC__)
--# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
-+# if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2) || __GNUC__ >= 5
- # include <ext/atomicity.h>
- # else
- # include <bits/atomicity.h>
diff --git a/glibc.patch b/glibc.patch
deleted file mode 100644
index 8bce8c2..0000000
--- a/glibc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ptlib-2.10.11/src/ptlib/unix/channel.cxx~ 2013-08-15 01:20:26.000000000 +0200
-+++ ptlib-2.10.11/src/ptlib/unix/channel.cxx 2018-09-27 10:58:43.468350379 +0200
-@@ -36,7 +36,7 @@
-
- #include <ptlib.h>
- #include <sys/ioctl.h>
--
-+#include <sys/uio.h>
-
- #include "../common/pchannel.cxx"
-
diff --git a/openssl-1.1.0.patch b/openssl-1.1.0.patch
deleted file mode 100644
index 20c4956..0000000
--- a/openssl-1.1.0.patch
+++ /dev/null
@@ -1,128 +0,0 @@
---- a/src/ptclib/pssl.cxx 2017-03-28 14:35:23.261060113 +0200
-+++ b/src/ptclib/pssl.cxx 2017-03-28 14:30:20.593853443 +0200
-@@ -140,7 +140,7 @@
- class PSSL_BIO
- {
- public:
-- PSSL_BIO(BIO_METHOD *method = BIO_s_file_internal())
-+ PSSL_BIO(const BIO_METHOD *method = BIO_s_file())
- { bio = BIO_new(method); }
-
- ~PSSL_BIO()
-@@ -627,9 +627,10 @@
- if (dh == NULL)
- return;
-
-- dh->p = BN_bin2bn(pData, pSize, NULL);
-- dh->g = BN_bin2bn(gData, gSize, NULL);
-- if (dh->p != NULL && dh->g != NULL)
-+ BIGNUM *p = BN_bin2bn(pData, pSize, NULL);
-+ BIGNUM *g = BN_bin2bn(gData, gSize, NULL);
-+ DH_set0_pqg(dh, p, NULL, g);
-+ if (p != NULL && p != NULL)
- return;
-
- DH_free(dh);
-@@ -1115,7 +1116,7 @@
- //
-
-
--#define PSSLCHANNEL(bio) ((PSSLChannel *)(bio->ptr))
-+#define PSSLCHANNEL(bio) ((PSSLChannel *)BIO_get_data(bio))
-
- extern "C" {
-
-@@ -1128,10 +1129,9 @@
-
- static int Psock_new(BIO * bio)
- {
-- bio->init = 0;
-- bio->num = 0;
-- bio->ptr = NULL; // this is really (PSSLChannel *)
-- bio->flags = 0;
-+ BIO_set_init(bio, 0);
-+ BIO_set_data(bio, NULL);
-+ BIO_clear_flags(bio, ~0);
-
- return(1);
- }
-@@ -1142,13 +1142,13 @@
- if (bio == NULL)
- return 0;
-
-- if (bio->shutdown) {
-- if (bio->init) {
-+ if (BIO_get_shutdown(bio)) {
-+ if (BIO_get_init(bio)) {
- PSSLCHANNEL(bio)->Shutdown(PSocket::ShutdownReadAndWrite);
- PSSLCHANNEL(bio)->Close();
- }
-- bio->init = 0;
-- bio->flags = 0;
-+ BIO_set_init(bio, 0);
-+ BIO_clear_flags(bio, ~0);
- }
- return 1;
- }
-@@ -1158,11 +1158,11 @@
- {
- switch (cmd) {
- case BIO_CTRL_SET_CLOSE:
-- bio->shutdown = (int)num;
-+ BIO_set_shutdown(bio, (int)num);
- return 1;
-
- case BIO_CTRL_GET_CLOSE:
-- return bio->shutdown;
-+ return BIO_get_shutdown(bio);
-
- case BIO_CTRL_FLUSH:
- return 1;
-@@ -1237,7 +1237,8 @@
- };
-
-
--static BIO_METHOD methods_Psock =
-+static BIO_METHOD *methods_Psock = NULL;
-+/*
- {
- BIO_TYPE_SOCKET,
- "PTLib-PSSLChannel",
-@@ -1259,19 +1260,33 @@
- Psock_free
- #endif
- };
--
-+*/
-
- PBoolean PSSLChannel::OnOpen()
- {
-- BIO * bio = BIO_new(&methods_Psock);
-+ if (methods_Psock == NULL) {
-+ methods_Psock = BIO_meth_new(BIO_TYPE_SOCKET | BIO_get_new_index(), "PTLib-PSSLChannel");
-+ if (methods_Psock == NULL ||
-+ BIO_meth_set_write(methods_Psock, Psock_write) ||
-+ BIO_meth_set_read(methods_Psock, Psock_read) ||
-+ BIO_meth_set_puts(methods_Psock, Psock_puts) ||
-+ BIO_meth_set_gets(methods_Psock, NULL) ||
-+ BIO_meth_set_ctrl(methods_Psock, Psock_ctrl) ||
-+ BIO_meth_set_create(methods_Psock, Psock_new) ||
-+ BIO_meth_set_destroy(methods_Psock, Psock_free)) {
-+ SSLerr(SSL_F_SSL_SET_FD,ERR_R_BUF_LIB);
-+ return PFalse;
-+ }
-+ }
-+ BIO * bio = BIO_new(methods_Psock);
- if (bio == NULL) {
- SSLerr(SSL_F_SSL_SET_FD,ERR_R_BUF_LIB);
- return PFalse;
- }
-
- // "Open" then bio
-- bio->ptr = this;
-- bio->init = 1;
-+ BIO_set_data(bio, this);
-+ BIO_set_init(bio, 1);
-
- SSL_set_bio(ssl, bio, bio);
- return PTrue;
diff --git a/ptlib-lua.patch b/ptlib-lua.patch
deleted file mode 100644
index 8ef789e..0000000
--- a/ptlib-lua.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ptlib-2.10.11/ptlib.m4.orig 2013-08-15 01:20:33.000000000 +0200
-+++ ptlib-2.10.11/ptlib.m4 2015-08-01 22:00:11.565907729 +0200
-@@ -472,17 +472,19 @@
-
- AC_CHECK_HEADERS([lua.h], [ptlib_lua=yes], [ptlib_lua=no])
- if test "x${ptlib_lua}" = "xyes" ; then
-- AC_CHECK_LIB([lua], [lua_newstate], [ptlib_lua=yes], [ptlib_lua=no])
-+ AC_CHECK_LIB([lua5.2], [lua_newstate], [ptlib_lua=lua5.2], [
-+ AC_CHECK_LIB([lua51], [lua_newstate], [ptlib_lua=lua51], [
-+ AC_CHECK_LIB([lua], [lua_newstate], [ptlib_lua=lua], [ptlib_lua=no])])])
- fi
-
- LIBS="$old_LIBS"
- CPPFLAGS="$old_CPPFLAGS"
-
-- if test "x${ptlib_lua}" = "xyes" ; then
-- LUA_LIBS="-llua ${ptlib_lua_libs}"
-+ if test "x${ptlib_lua}" != "xno" ; then
-+ LUA_LIBS="-l${ptlib_lua} ${ptlib_lua_libs}"
- LUA_CFLAGS="${ptlib_lua_cflags}"
- fi
-- AS_IF([test AS_VAR_GET([ptlib_lua]) = yes], [$1], [$2])[]
-+ AS_IF([test AS_VAR_GET([ptlib_lua]) != no], [$1], [$2])[]
- ])
-
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ptlib.git/commitdiff/f2f74e9587893397feb7c89b9fd14ed31d00bd01
More information about the pld-cvs-commit
mailing list