- fix building with ffmpeg 0.6

Changed files:
    opal-ffmpeg06.patch -> 1.1
    opal.spec -> 1.58

diff --git a/opal-ffmpeg06.patch b/opal-ffmpeg06.patch
new file mode 100644 (file)
index 0000000..9fe6e01
--- /dev/null
+++ b/opal-ffmpeg06.patch
@@ -0,0 +1,49 @@
+diff -ur opal-3.6.8.orig//plugins/video/common/dyna.h opal-3.6.8/plugins/video/common/dyna.h
+--- opal-3.6.8.orig//plugins/video/common/dyna.h       2010-05-27 08:52:47.000000000 +0200
++++ opal-3.6.8/plugins/video/common/dyna.h     2010-08-25 12:47:40.040727761 +0200
+@@ -41,6 +41,8 @@
+ #ifndef __DYNA_H__
+ #define __DYNA_H__ 1
+ 
++#define __STDC_CONSTANT_MACROS
++
+ #include "plugin-config.h"
+ 
+ #include <codec/opalplugin.h>
+diff -ur opal-3.6.8.orig//plugins/video/H.263-1998/h263-1998.h opal-3.6.8/plugins/video/H.263-1998/h263-1998.h
+--- opal-3.6.8.orig//plugins/video/H.263-1998/h263-1998.h      2010-05-27 08:52:46.000000000 +0200
++++ opal-3.6.8/plugins/video/H.263-1998/h263-1998.h    2010-08-25 12:48:00.781349611 +0200
+@@ -48,6 +48,9 @@
+ 
+ #ifndef __H263P_1998_H__
+ #define __H263P_1998_H__ 1
++
++#define __STDC_CONSTANT_MACROS
++
+ #include <codec/opalplugin.h>
+ #include "h263pframe.h"
+ #include "rfc2190.h"
+diff -ur opal-3.6.8.orig//plugins/video/H.263-1998/h263pframe.h opal-3.6.8/plugins/video/H.263-1998/h263pframe.h
+--- opal-3.6.8.orig//plugins/video/H.263-1998/h263pframe.h     2010-05-27 08:52:46.000000000 +0200
++++ opal-3.6.8/plugins/video/H.263-1998/h263pframe.h   2010-08-25 12:48:22.311139161 +0200
+@@ -23,6 +23,8 @@
+ #ifndef __H263PFrame_H__
+ #define __H263PFrame_H__ 1
+ 
++#define __STDC_CONSTANT_MACROS
++
+ #include "plugin-config.h"
+ 
+ #include <stdint.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 6c52393acc0e769464b3fd5556d13e5d855f02f0..ebe30729e5b1ea3bfb9719aef915b6b2db1d6513 100644 (file)
--- a/opal.spec
+++ b/opal.spec
@@ -16,7 +16,7 @@ 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:       2
+Release:       3
 License:       MPL
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/opal/3.6/%{name}-%{version}.tar.bz2
@@ -26,6 +26,7 @@ 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/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -96,6 +97,7 @@ Biblioteki statyczne OPAL.
 #patch1 -p1
 #%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 PWLIBDIR=%{_prefix}; export PWLIBDIR