- adjusted build-sanity patch to fix most of linking issues (one left, unfixable...

diff --git a/build-sanity.patch b/build-sanity.patch
index b7bf1eac850ce3e4a8b5b900d2adf1ab6e6abfa1..b35835f1ab0ec3d108c0fe7e86e1afdc8a9514b0 100644 (file)
--- a/build-sanity.patch
+++ b/build-sanity.patch
@@ -275,7 +275,7 @@ diff -up webrtc-20121218svn2718/src/common_video/jpeg/Makefile.am.SANITY webrtc-
 +libwebrtc_jpeg_la_SOURCES = data_manager.cc \
 +                            jpeg.cc
 +
-+libwebrtc_jpeg_la_LIBADD = $(JPEG_LIBS)
++libwebrtc_jpeg_la_LIBADD = ../libyuv/libwebrtc_libyuv.la $(JPEG_LIBS)
 +
 +libwebrtc_jpeg_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +
@@ -308,7 +308,7 @@ diff -up webrtc-20121218svn2718/src/common_video/Makefile.am.SANITY webrtc-20121
 --- webrtc-20121218svn2718/src/common_video/Makefile.am.SANITY 2012-12-18 21:36:22.481635843 -0500
 +++ webrtc-20121218svn2718/src/common_video/Makefile.am        2012-12-18 21:36:22.481635843 -0500
 @@ -0,0 +1,4 @@
-+SUBDIRS = jpeg libyuv .
++SUBDIRS = libyuv jpeg .
 +
 +libcommon_video_includedir = $(includedir)/webrtc/common_video/
 +nobase_libcommon_video_include_HEADERS = interface/video_image.h
@@ -656,7 +656,7 @@ diff -up webrtc-20121218svn2718/src/modules/audio_coding/codecs/isac/main/source
 +                     spectrum_ar_model_tables.c \
 +                     transform.c
 +
-+libiSAC_la_LIBADD = ../../../../../../common_audio/signal_processing/libsignal_processing.la
++libiSAC_la_LIBADD = ../../../../../../common_audio/signal_processing/libsignal_processing.la -lm
 +
 +libiSAC_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +
@@ -995,7 +995,7 @@ diff -up webrtc-20121218svn2718/src/modules/audio_processing/aec/Makefile.am.SAN
 +endif
 +
 +libaec_la_LIBADD = ../utility/libapm_util.la \
-+                   ../../../common_audio/signal_processing/libsignal_processing.la
++                   ../../../common_audio/signal_processing/libsignal_processing.la ../../../system_wrappers/source/libsystem_wrappers.la -lm
 +
 +libaec_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +
@@ -1119,7 +1119,7 @@ diff -up webrtc-20121218svn2718/src/modules/audio_processing/ns/Makefile.am.SANI
 +endif
 +
 +libns_la_LIBADD = ../utility/libapm_util.la \
-+                    ../../../common_audio/signal_processing/libsignal_processing.la
++                    ../../../common_audio/signal_processing/libsignal_processing.la -lm
 +
 +libns_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +
@@ -1141,7 +1141,7 @@ diff -up webrtc-20121218svn2718/src/modules/audio_processing/utility/Makefile.am
 +                         fft4g.c \
 +                         ring_buffer.c
 +
-+libapm_util_la_LIBADD = ../../../common_audio/signal_processing/libsignal_processing.la
++libapm_util_la_LIBADD = ../../../common_audio/signal_processing/libsignal_processing.la -lm
 +
 +libapm_util_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +
@@ -1467,7 +1467,7 @@ diff -up webrtc-20121218svn2718/src/modules/video_coding/codecs/i420/main/source
 +
 +libwebrtc_i420_la_SOURCES = i420.cc
 +
-+libwebrtc_i420_la_LIBADD = ../../../../../../system_wrappers/source/libsystem_wrappers.la
++libwebrtc_i420_la_LIBADD = ../../../../../../system_wrappers/source/libsystem_wrappers.la ../../../../../../common_video/libyuv/libwebrtc_libyuv.la
 +
 +libwebrtc_i420_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +
@@ -1700,7 +1700,7 @@ diff -up webrtc-20121218svn2718/src/modules/video_render/main/source/Makefile.am
 +
 +libvideo_render_module_la_LIBADD = ../../../../common_video/libyuv/libwebrtc_libyuv.la \
 +                                   ../../../../system_wrappers/source/libsystem_wrappers.la \
-+                                   ../../../utility/source/libwebrtc_utility.la
++                                   ../../../utility/source/libwebrtc_utility.la -lXext -lX11
 +
 +libvideo_render_module_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +
@@ -1789,7 +1789,7 @@ diff -up webrtc-20121218svn2718/src/system_wrappers/source/Makefile.am.SANITY we
 +                                trace_impl.cc \
 +                                trace_posix.cc
 +
-+libsystem_wrappers_la_LIBADD = -lrt
++libsystem_wrappers_la_LIBADD = -lrt -lpthread
 +
 +libsystem_wrappers_la_LDFLAGS = -version-info $(WEBRTC_LIBRARY_VERSION)
 +

diff --git a/webrtc.spec b/webrtc.spec
index 16dc81921caf3202351464e4119c33bad0a80231..dbb990d9a7157e692412453a5d5c8c496714fcce 100644 (file)
--- a/webrtc.spec
+++ b/webrtc.spec
@@ -22,7 +22,7 @@ Patch1:               libvpx2.patch
 Patch2:                %{name}-types.patch
 URL:           http://www.webrtc.org/
 BuildRequires: alsa-lib-devel
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libstdc++-devel
@@ -35,8 +35,9 @@ BuildRequires:        xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# various missing libs: -lpthread, -lm, -lX11 ...
-%define                skip_post_check_so      libsystem_wrappers.so.*.*.* libiSAC.so.*.*.* libwebrtc_utility.so.*.*.* libapm_util.so.*.*.* libaec.so.*.*.* libns.so.*.*.* libbitrate_controller.so.*.*.* libvideo_render_module.so.*.*.* libwebrtc_jpeg.so.*.*.* libwebrtc_i420.so.*.*.*
+# unresolved "webrtc::MediaFile::CreateMediaFile(int)", "webrtc::MediaFile::DestroyMediaFile(webrtc::MediaFile*)" in libwebrtc_utility.so
+# these symbols are defined in libmedia_file.so, but it's already linked with libwebrtc_utilities.so (dependency cycle)
+%define                skip_post_check_so      libwebrtc_utility.so.*.*.*
 
 %description
 WebRTC is a free, open project that enables web browsers with