- up to 0.16.5; disable Werror

Changed files:
    ortp-Werror.patch -> 1.2
    ortp-i486.patch -> 1.3
    ortp-libssl-not-required.patch -> 1.2
    ortp.spec -> 1.24

diff --git a/ortp-Werror.patch b/ortp-Werror.patch
index 00f04bc5f57ff86b54c346c7e4b5dfb7a85bcad6..4e17c01db42bc9d7e45895880cafc61d1297bc9c 100644 (file)
--- a/ortp-Werror.patch
+++ b/ortp-Werror.patch
@@ -25,3 +25,5 @@
        }
  #else
  #     error Need some way to seed the random number generator 
+
+

diff --git a/ortp-i486.patch b/ortp-i486.patch
index 6389c5ccfd9a4a5fe1c15659b863466541021d5a..7629e87d8edfc667e3d1758dac21537076aedfd3 100644 (file)
--- a/ortp-i486.patch
+++ b/ortp-i486.patch
@@ -1,11 +1,11 @@
---- ortp-0.13.1/src/stun.c.orig        2007-03-11 21:13:36.000000000 +0100
-+++ ortp-0.13.1/src/stun.c     2008-02-17 22:00:38.358282506 +0100
-@@ -756,7 +756,7 @@
-       tick <<= 32;
-       tick |= lowtick;
-       }
+--- ortp-0.16.5/src/stun.c~    2010-11-19 11:32:47.000000000 +0100
++++ ortp-0.16.5/src/stun.c     2011-07-26 13:00:04.172190285 +0200
+@@ -1184,7 +1184,7 @@
+                  read(fd,&tick,sizeof(tick));
+                  closesocket(fd);
+          }
 -#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) )
-+#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i586__) || defined(__pentium4__) || defined(__athlon__) )
++#elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) || defined(__pentium4__) || defined(__athlon__) )
        asm("rdtsc" : "=A" (tick));
  #elif defined(__GNUC__) && defined(__amd64__)
        asm("rdtsc" : "=A" (tick));

diff --git a/ortp-libssl-not-required.patch b/ortp-libssl-not-required.patch
index 0b9a1e5a8da7f278053e566083471b71c5252a30..171a76d89ea1d84bbda81438d9d1b14554c42364 100644 (file)
--- a/ortp-libssl-not-required.patch
+++ b/ortp-libssl-not-required.patch
@@ -1,12 +1,12 @@
---- ortp-0.16.1/configure.ac~  2009-09-07 15:55:21.000000000 +0200
-+++ ortp-0.16.1/configure.ac   2010-02-22 02:27:28.999527369 +0100
-@@ -255,8 +255,7 @@
+--- ortp-0.16.5/configure.ac~  2011-03-28 20:53:54.000000000 +0200
++++ ortp-0.16.5/configure.ac   2011-07-26 13:00:57.613550509 +0200
+@@ -280,8 +280,7 @@
+                               
+ if test "$ssl_hmac_enabled" = "yes" ; then
+       AC_CHECK_HEADERS(openssl/hmac.h openssl/md5.h)
+-      AC_CHECK_LIB(ssl,SSL_CTX_new,[SSL_LIBS="-lssl"])
+-      AC_CHECK_LIB(crypto,MD5,[SSL_LIBS="$SSL_LIBS -lcrypto"])
++      AC_CHECK_LIB(crypto,MD5,[SSL_LIBS="-lcrypto"])
+ fi
  
- AC_CHECK_HEADERS(openssl/hmac.h openssl/md5.h)
- 
--AC_CHECK_LIB(ssl,SSL_CTX_new,[SSL_LIBS="-lssl"])
--AC_CHECK_LIB(crypto,MD5,[SSL_LIBS="$SSL_LIBS -lcrypto"])
-+AC_CHECK_LIB(crypto,MD5,[SSL_LIBS="-lcrypto"])
- 
- AC_SUBST(SSL_LIBS)
  

diff --git a/ortp.spec b/ortp.spec
index 271dcc1ac60ae680ad3f6d02f26fed19573cd6fc..6ef90ed0b98dd3f49b4a3725fb5b5aa755a2a318 100644 (file)
--- a/ortp.spec
+++ b/ortp.spec
@@ -1,12 +1,12 @@
 Summary:       RTP/RTCP protocol library
 Summary(pl.UTF-8):     Biblioteka obsługująca protokół RTP/RTCP
 Name:          ortp
-Version:       0.16.1
-Release:       3
+Version:       0.16.5
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://download.savannah.nongnu.org/releases/linphone/ortp/sources/%{name}-%{version}.tar.gz
-# Source0-md5: bc96cdcb9c139d366a720a94200f92dd
+# Source0-md5: 94546901d14b85f97342f4ecf39489b1
 Patch0:                %{name}-i486.patch
 Patch1:                %{name}-Werror.patch
 Patch2:                %{name}-libssl-not-required.patch
@@ -70,7 +70,8 @@ Statyczna biblioteka ortp.
 %else
        --enable-mode64bit=no \
 %endif
-       --enable-ipv6
+       --enable-ipv6 \
+       --disable-strict
 %{__make}
 
 %install