Sophie

Sophie

distrib > Mandriva > 9.1 > ppc > media > plf-free-src > by-pkgid > dc3ffe0387beb00f3994e97cec05f1e1 > files > 1

opal3-3.6.8-6plf.src.rpm

--- opal-3.6.8/Makefile.in.link	2010-05-27 08:53:06.000000000 +0200
+++ opal-3.6.8/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -538,7 +538,7 @@
 
   $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT): $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC)
 	@if [ ! -d $(OPAL_LIBDIR) ] ; then mkdir $(OPAL_LIBDIR) ; fi
-	$(Q_LD)$(LD) $(LDSOOPTS) -o $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(LIBS)
+	$(Q_LD)$(LD) $(LDSOOPTS) -o $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(LIBS) -lcrypto
 
 endif # OPAL_SHARED_LIB
 
--- opal-3.6.8/plugins/LID/CAPI/Makefile.in.link	2011-04-01 18:54:52.000000000 +0200
+++ opal-3.6.8/plugins/LID/CAPI/Makefile.in	2011-04-01 18:55:32.000000000 +0200
@@ -38,6 +38,7 @@
 CC=@CC@
 CXX=@CXX@
 LDSO=@LDSO@
+LDFLAGS=@LDFLAGS@
 
 ifndef PREFIX
 PREFIX=/usr/local
@@ -67,7 +68,7 @@
 OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
 
 $(PLUGIN): $(OBJECTS)
-	$(Q_LD)$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
+	$(Q_LD)$(CC) $(LDSO)$(SONAME) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) -pthread -lstdc++ -lrt -lcapi20
 
 install:
 	mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)
--- opal-3.6.8/plugins/audio/LPC_10/Makefile.in.link	2010-05-27 08:52:45.000000000 +0200
+++ opal-3.6.8/plugins/audio/LPC_10/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -129,9 +129,9 @@
 
 ifeq (solaris,$(findstring solaris,$(target_os)))
 
-	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
+	$(Q_LD)$(CC) $(LDSO) $(LDFLAGS) $@ -o $@ $^ $(EXTRALIBS) -lm
 else	
-	$(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)
+	$(Q_LD)$(CC) $(LDSO) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) -lm
 
 endif	
 
--- opal-3.6.8/plugins/audio/Speex/Makefile.in.link	2010-05-27 08:52:42.000000000 +0200
+++ opal-3.6.8/plugins/audio/Speex/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -167,9 +167,9 @@
 $(PLUGIN): $(OBJECTS)
 ifeq (solaris,$(findstring solaris,$(target_os)))
 
-	$(Q_LD)$(CXX) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $@ -o $@ $^ $(EXTRALIBS)
 else	
-	$(Q_LD)$(CXX) $(LDSO) -o $@ $^ $(EXTRALIBS)
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
 
 endif
 
--- opal-3.6.8/plugins/audio/gsm-amr/Makefile.in.link	2010-05-27 08:52:41.000000000 +0200
+++ opal-3.6.8/plugins/audio/gsm-amr/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -60,9 +60,9 @@
 
 ifeq (solaris,$(findstring solaris,$(target_os)))
 
-	$(Q_LD)$(CC) $(LDSO) $@ -o $@ $^
+	$(Q_LD)$(CC) $(LDSO) $(LDFLAGS) $@ -o $@ $^ -lm
 else	
-	$(Q_LD)$(CC) $(LDSO) -o $@ $^
+	$(Q_LD)$(CC) $(LDSO) $(LDFLAGS) -o $@ $^ -lm
 
 endif	
 
--- opal-3.6.8/plugins/video/H.261-vic/Makefile.in.link	2010-05-27 08:52:47.000000000 +0200
+++ opal-3.6.8/plugins/video/H.261-vic/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -116,9 +116,9 @@
 
 $(PLUGIN): $(OBJECTS)
 ifeq (,$(findstring solaris,$(target_os)))
-	$(Q_LD)$(CXX) $(LDSO) -o $@ $^
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) -o $@ $^ -pthread
 else	
-	$(Q_LD)$(CXX) $(LDSO) $@ -o $@ $^
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $@ -o $@ $^ -pthread
 endif
 
 install:
--- opal-3.6.8/plugins/video/H.263-1998/Makefile.in.link	2010-05-27 08:52:46.000000000 +0200
+++ opal-3.6.8/plugins/video/H.263-1998/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -86,9 +86,9 @@
 
 $(PLUGIN): $(OBJECTS)
 ifeq (,$(findstring solaris,$(target_os)))
-	$(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^ $(LDFLAGS)
+	$(Q_LD)$(CXX) $(LDSO) $(LDFALGS) -o $@ $^ $(DL_LIBS) -pthread
 else	
-	$(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) $@ -o $@ $^ $(LDFLAGS)
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $@ -o $@ $^ $(DL_LIBS) -pthread
 endif
     
 install: $(PLUGIN)
--- opal-3.6.8/plugins/video/MPEG4-ffmpeg/Makefile.in.link	2010-05-27 08:52:47.000000000 +0200
+++ opal-3.6.8/plugins/video/MPEG4-ffmpeg/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -101,9 +101,9 @@
 
 $(PLUGIN): $(OBJECTS)
 ifeq (,$(findstring solaris,$(target_os)))
-	$(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) -o $@ $^ -pthread $(DL_LIBS)
 else	
-	$(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) $@ -o $@ $^
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $@ -o $@ $^ -pthread $(DL_LIBS)
 endif
 
 install:
--- opal-3.6.8/plugins/video/THEORA/Makefile.in.link	2010-05-27 08:52:46.000000000 +0200
+++ opal-3.6.8/plugins/video/THEORA/Makefile.in	2011-04-01 18:42:37.000000000 +0200
@@ -73,9 +73,9 @@
 
 $(PLUGIN): $(OBJECTS)
 ifeq (,$(findstring solaris,$(target_os)))
-	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) -o $@ $^ $(THEORA_LIBS)
+	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) -o $@ $^ $(THEORA_LIBS) -pthread
 else	
-	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(THEORA_LIBS)
+	$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(THEORA_LIBS) -pthread
 endif
     
 install:
--- opal-3.6.8/plugins/video/H.264/Makefile.in.linking	2011-04-04 10:26:28.000000000 +0200
+++ opal-3.6.8/plugins/video/H.264/Makefile.in	2011-04-04 10:26:59.000000000 +0200
@@ -130,7 +130,7 @@ OBJECTS = $(addprefix $(OBJDIR)/,$(patsu
 $(PLUGIN): $(OBJECTS)
 	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir); fi ; )
 ifeq (,$(findstring solaris,$(target_os)))
-	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $(DL_LIBS) -o $@ $^
+	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) -o $@ $^ -pthread $(DL_LIBS)
 else
 	$(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $(DL_LIBS) $@ -o $@ $^
 endif