- use libsrtp2 instead of srtp; partial ffmpeg update

[packages/opal.git] / opal-build.patch

diff --git a/opal-build.patch b/opal-build.patch
index 25bd3acafadc0c3941bf2fd0be8130161bfda4ce..ce2304010fae8e0e45ca0fd2dd493b6c3628fb90 100644 (file)
--- a/opal-build.patch
+++ b/opal-build.patch
@@ -1,11 +1,11 @@
 --- opal-3.4.2/samples/simple/Makefile.orig    2008-11-05 17:42:13.403269358 +0100
 +++ opal-3.4.2/samples/simple/Makefile 2008-11-05 17:58:28.336264433 +0100
 @@ -53,13 +53,13 @@
- endif
- # Get required flags from library
  
+ # The -I option allows to build the simple application in the same time as opal
+ # (as used by distribution packagers)
 -CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --cflags opal) -I../../include
--LDFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --libs opal) -L ../../lib*
+-LDFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --libs opal)
 +CFLAGS += 
 +LDFLAGS += 
  
@@ -17,3 +17,35 @@
  
  vpath %.o   $(OBJDIR)
  
+--- opal-3.10.8/plugins/LID/IxJ/Makefile.in~   2012-10-05 08:19:44.000000000 +0200
++++ opal-3.10.8/plugins/LID/IxJ/Makefile.in    2012-10-16 22:15:37.582438492 +0200
+@@ -31,7 +31,6 @@
+ #
+ #
+ 
+-STDCCFLAGS =@STDCCFLAGS@
+ CXXFLAGS   =@CXXFLAGS@
+ 
+ LID_PLUGIN_DIR=@LID_PLUGIN_DIR@
+@@ -65,7 +64,7 @@
+ 
+ $(OBJDIR)/%.o : %.cxx
+       @mkdir -p $(OBJDIR) >/dev/null 2>&1
+-      $(Q_CC)$(CXX) -I../../../include $(STDCCFLAGS) $(OPTCCFLAGS) $(CXXFLAGS) -c $< -o $@
++      $(Q_CC)$(CXX) -I../../../include $(OPTCCFLAGS) $(CXXFLAGS) -c $< -o $@
+ 
+ PLUGIN        = ./ixj_lid_pwplugin.so
+ 
+--- opal-3.10.11/plugins/video/common/mpi.cxx.orig     2017-07-12 19:15:10.396689138 +0000
++++ opal-3.10.11/plugins/video/common/mpi.cxx  2017-07-12 19:18:02.036496397 +0000
+@@ -132,8 +132,8 @@
+   // to the desired one or matches it
+   for (i=0; i < MPIs.size(); i++) {
+     // we square the value in order to get absolute distances
+-    distance = ( abs(MPIs[i].width  - desiredWidth ) *
+-                 abs(MPIs[i].height - desiredHeight) );
++    distance = ( abs((int)(MPIs[i].width  - desiredWidth) ) *
++                 abs((int)(MPIs[i].height - desiredHeight) ) );
+ 
+     if (distance < minDistance) {
+       minDistance = distance;