PR#1: Upgrade to 2.16.2 (#1674843) - rpms/ptlib

rpms / ptlib

#1 Upgrade to 2.16.2 (#1674843)

Closed 4 years ago by pbrobinson. Opened 4 years ago by robert.

Unknown source master into master

Upgrade to 2.16.2 (#1674843)

Robert Scheck • 4 years ago

217466c

.gitignore

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- /ptlib-2.*.tar.xz`
		`+ /ptlib-2..tar.`

ptlib-2.10.10-mga-bison-parameter.patch

file removed

-39

		`@@ -1,39 +0,0 @@`
		`- --- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200`
		`- +++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/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`

ptlib-gcc5.patch

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- --- ptlib-2.10.10/include/ptlib/critsec.h 2015-02-20 10:02:39.984901210 +0100`
		`- +++ ptlib-2.10.10/include/ptlib/critsec.h 2015-02-20 10:04:01.150897771 +0100`
		`- @@ -40,7 +40,7 @@`
		`- #if P_HAS_ATOMIC_INT`
		`-`
		`- #if defined(__GNUC__)`
		`- -# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2`
		`- +# if __GNUC__ > 4 \|\| (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)`
		`- # include <ext/atomicity.h>`
		`- # else`
		`- # include <bits/atomicity.h>`

ptlib-gcc8.patch

file removed

-12

		`@@ -1,12 +0,0 @@`
		`- --- ptlib-2.10.11/src/ptlib/unix/channel.cxx.orig 2018-07-23 18:25:26.300381968 +0100`
		`- +++ ptlib-2.10.11/src/ptlib/unix/channel.cxx 2018-07-23 18:26:07.244497346 +0100`
		`- @@ -36,7 +36,8 @@`
		`-`
		`- #include <ptlib.h>`
		`- #include <sys/ioctl.h>`
		`- -`
		`- +#include <sys/uio.h>`
		`- +#include <unistd.h>`
		`-`
		`- #include "../common/pchannel.cxx"`
		`-`

ptlib.spec

file modified

+43 -43

		`@@ -1,21 +1,26 @@`
		`Name: ptlib`
		`Summary: Portable Tools Library`
		`- Version: 2.10.11`
		`- Release: 2%{?dist}`
		`+ Version: 2.16.2`
		`+ Release: 0.1%{?dist}`
		`URL: http://www.opalvoip.org/`
		`License: MPLv1.0`

		`- Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.10/%{name}-%{version}.tar.xz`
		`- Patch1: ptlib-2.10.10-mga-bison-parameter.patch`
		`- Patch2: ptlib-gcc5.patch`
		`- Patch3: ptlib-gcc8.patch`
		`-`
		`- BuildRequires: gcc gcc-c++`
		`- BuildRequires: pkgconfig expat-devel flex bison`
		`- BuildRequires: alsa-lib-devel libv4l-devel`
		`- BuildRequires: openldap-devel SDL-devel compat-openssl10-devel`
		`- BuildRequires: boost-devel pulseaudio-libs-devel`
		`- BuildRequires: perl-interpreter`
		`+ Source0: https://downloads.sourceforge.net/opalvoip/V3.16%20Procyon/Stable%202/%{name}-%{version}.tar.bz2`
		`+`
		`+ BuildRequires: gcc`
		`+ BuildRequires: gcc-c++`
		`+ BuildRequires: bison`
		`+ BuildRequires: pkgconfig`
		`+ BuildRequires: expat-devel`
		`+ BuildRequires: alsa-lib-devel`
		`+ BuildRequires: pulseaudio-libs-devel`
		`+ BuildRequires: SDL-devel`
		`+ BuildRequires: openldap-devel`
		`+ BuildRequires: gstreamer1-plugins-base-devel`
		`+ BuildRequires: compat-openssl10-devel`
		`+ BuildRequires: libjpeg-turbo-devel`
		`+ BuildRequires: libpcap-devel`
		`+ BuildRequires: sed`

		`%description`
		`PTLib (Portable Tools Library) is a moderately large class library that`
		`@@ -29,62 +34,57 @@`

		`%package devel`
		`Summary: Development package for ptlib`
		`- Requires: ptlib = %{version}-%{release}`
		`+ Requires: %{name}%{?_isa} = %{version}-%{release}`
		`Requires: pkgconfig`
		`+ Requires: expat-devel`
		`+ Requires: SDL-devel`
		`+ Requires: openldap-devel`
		`+ Requires: gstreamer1-plugins-base-devel`
		`+ Requires: libjpeg-turbo-devel`
		`+ Requires: libpcap-devel`

		`%description devel`
		`The ptlib-devel package includes the libraries and header files for ptlib.`

		`%prep`
		`%setup -q`
		`- %patch1 -p1 -b .bison`
		`- %patch2 -p1 -b .gcc5`
		`- %patch3 -p1 -b .gcc8`
		`-`
		`- sed -i 's#bits/atomicity.h#ext/atomicity.h#g' configure*`
		`- sed -i 's#bits/atomicity.h#ext/atomicity.h#g' include/ptlib/critsec.h`

		`%build`
		`- export CFLAGS="%{optflags} -DLDAP_DEPRECATED"`
		`- export CXXFLAGS="%{optflags} -std=gnu++98"`
		`- export STDCXXFLAGS="%{optflags} -std=gnu++98"`
		`- %configure --prefix=%{_prefix} --disable-static --enable-plugins --disable-oss --enable-v4l2 --disable-avc --disable-v4l --enable-pulse`
		`- make %{?_smp_mflags} V=1`
		`+ %configure --disable-oss --enable-pulse`
		`+ # Avoid "-O3 -ggdb3" in CFLAGS and strip(1) usage`
		`+ sed -e '/^\(DEBUG_CFLAGS\\|OPT_CFLAGS\\|STRIP\)[[:space:]]/d' -i make/ptlib_config.mak`
		`+ %make_build V=1`

		`%install`
		`- make PREFIX=%{buildroot}%{_prefix} LIBDIR=%{buildroot}%{_libdir} install`
		`-`
		`- perl -pi -e 's@PTLIBDIR.=.@PTLIBDIR = /usr/share/ptlib@' %{buildroot}%{_datadir}/ptlib/make/ptbuildopts.mak`
		`-`
		`- # hack to fixup things for bug 197318`
		`- find %{buildroot}%{_libdir} -name '.so' -type f -exec chmod +x {} \;`
		`-`
		`- #Remove static libs`
		`- find %{buildroot} -name '*.a' -delete`
		`+ # Avoid installing static library`
		`+ %make_install PTLIB_OPT_STATIC_FILE=""`
		`+ chmod -R u+w %{buildroot}`

		`%ldconfig_scriptlets`

		`%files`
		`%license mpl-1.0.htm`
		`%doc History.txt ReadMe.txt`
		`- %attr(755,root,root) %{_libdir}/libpt.so.`
		`+ %{_libdir}/libpt.so.2*`
		`%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`
		`# List these explicitly so we don't get any surprises`
		`- %attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/alsa_pwplugin.so`
		`- %attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/sound/pulse_pwplugin.so`
		`- %attr(755,root,root) %{_libdir}/%{name}-%{version}/devices/videoinput/v4l2_pwplugin.so`
		`+ %{_libdir}/%{name}-%{version}/device/sound/alsa_ptplugin.so`
		`+ %{_libdir}/%{name}-%{version}/device/sound/pulse_ptplugin.so`
		`+ %{_libdir}/%{name}-%{version}/device/videoinput/v4l2_ptplugin.so`

		`%files devel`
		`- %{_libdir}/libpt*.so`
		`+ %{_libdir}/libpt.so`
		`%{_includedir}/*`
		`%{_datadir}/ptlib`
		`%{_libdir}/pkgconfig/ptlib.pc`
		`- %attr(755,root,root) %{_bindir}/*`

		`%changelog`
		`+ * Sun May 12 2019 Robert Scheck <robert@fedoraproject.org> - 2.16.2-0.1`
		`+ - Upgrade to 2.16.2 (#1674843)`
		`+`
		`* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.11-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (ptlib-2.10.11.tar.xz) = eefb1f9b69327518e3ad0678f189d5218529c5d2e60bd242af88736140e7feb1db09f11a7c768a2fb8f37ed74879464e0585ef9867add592f6d6a0cf92ca3655`
		`+ SHA512 (ptlib-2.16.2.tar.bz2) = 66b571f3f614f298c40b0828cfa5bcf624e129edaa697dcaf14c50d23baa89372f18a4b41386da4a1a8b208898abffb7b861297f16ed64869633ef56263f8320`

robert commented 4 years ago

Update ptlib to 2.16.2 (pre-release?) in order to hopefully build ekiga 4.1.0 (pre-release) at a later point…

rebased onto 217466c

4 years ago

pbrobinson commented 4 years ago

ekiga requires explicit versions of ptlib and opal because the API changes regularly, have you actually tested this or is it just hope as per your commit message, if it's the later NACK.

robert commented 4 years ago

ekiga requires explicit versions of ptlib and opal because the API changes regularly, have you actually tested this or is it just hope as per your commit message, if it's the later NACK.

Args, thank you very much for the pointer! Indeed, ekiga is not happy with 2.16.2, but needs 2.16.3. As of writing it seems like I've been able to satisfy ekiga dependencies, at least the build succeeds; once I've tested that, I'll update the PR in the next few days hopefully.

pbrobinson commented 4 years ago

Probably just better to submit a new one.