[packages/ptlib/DEVEL] - updated to 2.14.3 - updated lua patch - removed obsolete bison3 patch

qboosh qboosh at pld-linux.org
Sun Aug 2 21:54:05 CEST 2015 

commit 8794494bd425df4bf29c34693af7fbed38ad77ce
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Aug 2 21:53:52 2015 +0200

    - updated to 2.14.3
    - updated lua patch
    - removed obsolete bison3 patch

 bison3.patch    | 39 -----------------------------------
 ptlib-lua.patch | 38 +++++++++++-----------------------
 ptlib.spec      | 63 ++++++++++++++++++++++++++++++++-------------------------
 3 files changed, 47 insertions(+), 93 deletions(-)
---
diff --git a/ptlib.spec b/ptlib.spec
index d50f6aa..a8a977c 100644
--- a/ptlib.spec
+++ b/ptlib.spec
@@ -3,51 +3,58 @@
 #	Recommended versions of ptlib and opal can be found at:
 #	http://wiki.ekiga.org/index.php/Download_Ekiga_sources
 #	(for Ekiga 4.0.x it's ptlib 2.10.x + opal 3.10.x)
-# TODO: lua support (needs patching or some lua version packaged as default)
 #
 # Conditional build:
 %bcond_without	http		# HTTP support
 %bcond_without	ipv6		# IPv6 support
 %bcond_without	ldap		# LDAP support
-%bcond_without	lua		# Lua support
+%bcond_without	lua		# Lua script support
 %bcond_without	odbc		# ODBC support
 %bcond_without	openssl		# openssl support
 %bcond_without	plugins		# plugins support
 %bcond_without	resolver	# resolver support
+%bcond_without	sasl		# SASL support
+%bcond_without	v8		# V8 script support
 %bcond_without	video		# video support
 %bcond_with	esd		# EsounD audio support (obsolete)
-%bcond_with	avc1394		# AVC1394 video input plugin [requires old libraw1394]
+%bcond_without	avc1394		# AVC1394 video input plugin
 %bcond_with	dc1394		# DC1394 video input plugin [requires old libdc1394]
 #
 Summary:	Portable Tools Library
 Summary(pl.UTF-8):	Przenośna biblioteka narzędziowa
 Name:		ptlib
-Version:	2.10.11
+Version:	2.14.3
 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
+# Source0-md5:	aa461b9eae9762b515fdbfb07211549c
+Patch0:		%{name}-lua.patch
 URL:		http://www.opalvoip.org/
 %{?with_video:BuildRequires:	SDL-devel}
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	autoconf >= 2.66
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	cyrus-sasl-devel
+%{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 %{?with_esd:BuildRequires:	esound-devel}
-BuildRequires:	expat-devel
+BuildRequires:	expat-devel >= 1.95
 BuildRequires:	flex
+BuildRequires:	gstreamer0.10-plugins-base-devel >= 0.10
 %{?with_avc1394:BuildRequires:	libavc1394-devel}
 %{?with_dc1394:BuildRequires:	libdc1394-devel < 2.0.0}
+%{?with_avc1394:BuildRequires:	libdv-devel}
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpcap-devel
+%{?with_avc1394:BuildRequires:	libraw1394-devel}
 BuildRequires:	libstdc++-devel
 %{?with_lua:BuildRequires:	lua52-devel >= 5.2}
+BuildRequires:	ncurses-devel
 %{?with_ldap:BuildRequires:	openldap-devel}
 %{?with_openssl:BuildRequires:	openssl-devel}
 BuildRequires:	pkgconfig
 %{?with_odbc:BuildRequires:	unixODBC-devel}
+%{?with_v8:BuildRequires:	v8-devel}
 %if %{with plugins}
 BuildRequires:	alsa-lib-devel
 BuildRequires:	libv4l-devel
@@ -182,14 +189,13 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 # note: --enable-opal influences most of the remaining enable/disable defaults
-%{?with_lua:CPPFLAGS="%{rpmcppflags} -I/usr/include/lua5.2"}
 %configure \
+	%{?with_lua:LUA_PKG=lua5.2} \
 	--disable-v4l \
 %if %{with plugins}
 	--enable-plugins \
@@ -197,8 +203,8 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib
 	--enable-avc%{!?with_avc1394:=no} \
 	--enable-dc%{!?with_dc1394:=no} \
 	--enable-esd%{!?with_esd:=no} \
-	--enable-lua%{!?with_lua:=no} \
 	--enable-oss \
+	--enable-pulse \
 	--enable-v4l2 \
 %else
 	--disable-plugins \
@@ -207,6 +213,7 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib
 	--disable-dc \
 	--disable-esd \
 	--disable-oss \
+	--disable-pulse \
 	--disable-v4l2 \
 %endif
 %if %{with http}
@@ -219,15 +226,17 @@ Wtyczka wejścia obrazu AVC 1394 dla biblioteki PTLib
 	--disable-httpsvc \
 %endif
 	--enable-ipv6%{!?with_ipv6:=no} \
+	--enable-lua%{!?with_lua:=no} \
 	--enable-odbc%{!?with_odbc:=no} \
 	--enable-openldap%{!?with_ldap:=no} \
 	--enable-openssl%{!?with_openssl:=no} \
 	--enable-resolver%{!?with_resolver:=no} \
 	--enable-sasl%{!?with_sasl:=no} \
+	--enable-v8%{!?with_v8:=no} \
 	--enable-video%{!?with_video:=no}
 
 dir=$(pwd)
-%{__make} %{?debug:debugshared}%{!?debug:optshared} \
+%{__make} %{?debug:debug}%{!?debug:opt} \
 	V=1 \
 	PTLIBMAKEDIR="$dir/make" \
 	PTLIBDIR="$dir" \
@@ -237,8 +246,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 \
@@ -262,22 +270,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
 
@@ -288,29 +295,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/ptlib-lua.patch b/ptlib-lua.patch
index 8ef789e..1c6814a 100644
--- a/ptlib-lua.patch
+++ b/ptlib-lua.patch
@@ -1,26 +1,12 @@
---- 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])[]
-          ])
- 
- 
+--- ptlib-2.14.3/configure.ac.orig	2014-10-10 12:13:13.000000000 +0200
++++ ptlib-2.14.3/configure.ac	2015-08-02 17:06:37.913021043 +0200
+@@ -1558,7 +1558,9 @@
+ 
+ AC_LANG_PUSH(C)
+ 
++if test -z "$LUA_PKG" ; then
+ LUA_PKG=`pkg-config --list-all | sed -n "s/\(lua[[0-9\.-]]*\).*/\1/p" | head -1`
++fi
+ PTLIB_MODULE_OPTION(
+    [LUA],
+    [lua],
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ptlib.git/commitdiff/8794494bd425df4bf29c34693af7fbed38ad77ce

More information about the pld-cvs-commit mailing list