- Up to 3.8.2, NFY

- Changed upstream project URLS
- Doesn't build yet. Still doesn't like celt 0.9.x

Changed files:
    opal-ffmpeg06.patch -> 1.3
    opal.spec -> 1.60

diff --git a/opal-ffmpeg06.patch b/opal-ffmpeg06.patch
deleted file mode 100644 (file)
index 4a7be35..0000000
--- a/opal-ffmpeg06.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- opal-3.8.1/plugins/video/common/dyna.h.orig        2010-05-07 08:01:09.000000000 +0300
-+++ opal-3.8.1/plugins/video/common/dyna.h     2010-11-11 13:11:19.387936827 +0200
-@@ -41,6 +41,8 @@
- #ifndef __DYNA_H__
- #define __DYNA_H__ 1
- 
-+#define __STDC_CONSTANT_MACROS
-+
- #include "ffmpeg.h"
-         
- /////////////////////////////////////////////////////////////////
---- opal-3.8.1/plugins/video/H.263-1998/h263-1998.h.orig       2010-05-07 08:01:09.000000000 +0300
-+++ opal-3.8.1/plugins/video/H.263-1998/h263-1998.h    2010-11-11 13:13:41.917936830 +0200
-@@ -49,6 +49,8 @@
- #ifndef __H263P_1998_H__
- #define __H263P_1998_H__ 1
- 
-+#define __STDC_CONSTANT_MACROS
-+
- #include <codec/opalplugin.h>
- #include "h263pframe.h"
- #include "rfc2190.h"
---- opal-3.8.1/plugins/video/H.263-1998/h263pframe.h.orig      2010-05-07 08:01:09.000000000 +0300
-+++ opal-3.8.1/plugins/video/H.263-1998/h263pframe.h   2010-11-11 13:15:24.184603496 +0200
-@@ -23,6 +23,8 @@
- #ifndef __H263PFrame_H__
- #define __H263PFrame_H__ 1
- 
-+#define __STDC_CONSTANT_MACROS
-+
- #include <vector>
- #include <string.h>
- #include "rtpframe.h"
-diff -ur opal-3.6.8.orig//plugins/video/H.264/h264-x264.h opal-3.6.8/plugins/video/H.264/h264-x264.h
---- opal-3.6.8.orig//plugins/video/H.264/h264-x264.h   2010-05-27 08:52:46.000000000 +0200
-+++ opal-3.6.8/plugins/video/H.264/h264-x264.h 2010-08-25 12:47:19.218239108 +0200
-@@ -39,6 +39,8 @@
- #ifndef __H264_X264_H__
- #define __H264_X264_H__ 1
- 
-+#define __STDC_CONSTANT_MACROS
-+
- #include "plugin-config.h"
- 
- #include <stdarg.h>

diff --git a/opal.spec b/opal.spec
index efe6c82a6dc8628ab8e97d20a82b80cfd13eff92..59ba20090c5c04482fb0b89d6cb4501c6db84dd2 100644 (file)
--- a/opal.spec
+++ b/opal.spec
@@ -15,28 +15,26 @@
 Summary:       Open Phone Abstraction Library (aka OpenH323 v2)
 Summary(pl.UTF-8):     Biblioteka Open Phone Abstraction Library (aka OpenH323 v2)
 Name:          opal
-Version:       3.6.8
-Release:       4
+Version:       3.8.2
+Release:       0.1
 License:       MPL
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/opal/3.6/%{name}-%{version}.tar.bz2
-# Source0-md5: a5f4ddc12c5aa34dc9407fe1daaf0f45
-#Source0:      http://www.ekiga.org/admin/downloads/latest/sources/sources/%{name}-%{version}.tar.gz
+URL:           http://www.opalvoip.org
+Source0:       http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
+# Source0-md5: dff4204187f4a43ea8c2be376ea6155b
 Patch0:                %{name}-libname.patch
 Patch1:                %{name}-mak_files.patch
 Patch2:                %{name}-ac.patch
 Patch3:                %{name}-build.patch
-Patch4:                %{name}-ffmpeg06.patch
-URL:           http://www.openh323.org/
-Requires:      celt <= 0.8.1
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: celt-devel <= 0.8.1
 BuildRequires: expat-devel
 BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
-BuildRequires: ptlib-devel >= 2.6.6
+BuildRequires: ptlib-devel = 2.8.2
 BuildRequires: sed >= 4.0
+Requires:      celt <= 0.8.1
 %if %{without sip_fax_only}
 BuildRequires: SDL-devel
 BuildRequires: ffmpeg-devel
@@ -97,7 +95,6 @@ Biblioteki statyczne OPAL.
 #patch1 -p1
 #%patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 PWLIBDIR=%{_prefix}; export PWLIBDIR