Mailinglist Archive: opensuse-commit (869 mails)
| < Previous | Next > |
commit opal for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 15 Oct 2010 16:53:11 +0200
- Message-id: <20101015145311.5583C202AD@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package opal for openSUSE:Factory
checked in at Fri Oct 15 16:53:11 CEST 2010.
--------
--- opal/opal.changes 2010-08-12 11:58:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/opal/opal.changes 2010-10-14
10:00:48.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Oct 7 05:28:20 UTC 2010 - reddwarf@xxxxxxxxxxxx
+
+- Add opal-missing_links.patch:
+ + Ensure correct openSSL version is used
+ + Link against libraries that incorrect command order and
+ openSUSE's --as-needed removed without notice
+ + Make CAPI plugin able to load
+ + Enable IxJ plugin installation
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
opal-missing_links.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opal.spec ++++++
--- /var/tmp/diff_new_pack.LsxsGq/_old 2010-10-15 16:52:45.000000000 +0200
+++ /var/tmp/diff_new_pack.LsxsGq/_new 2010-10-15 16:52:45.000000000 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
%bcond_with ffmpeg
%bcond_with x264
@@ -51,7 +50,7 @@
License: MPLv1.0
Group: System/Libraries
Version: 3.6.8
-Release: 1
+Release: 2
# FIXME: we should probably list all plugins in %files to make sure we don't
lose some when updating the package.
%define _version 3_6_8
Source0: %{name}-%{version}.tar.bz2
@@ -68,6 +67,8 @@
Patch5: %{name}-codecs.patch
# PATCH-FIX-UPSTREAM %{name}-x264.patch bgo#596006 reddwarf@xxxxxxxxxxxx --
Makes H.264 work, but the quality is worse than should. Check the bug from time
to time for a better fix.
Patch6: %{name}-x264.patch
+# PATCH-FIX-UPSTREAM %{name}-missing_links.patch sf#3082716
reddwarf@xxxxxxxxxxxx -- Fix underlinking and makes IxJ plugin installable
+Patch7: %{name}-missing_links.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -79,6 +80,7 @@
%package -n lib%{name}%{_version}
+
License: MPLv1.0
Summary: Open Phone Abstraction Library
Group: System/Libraries
@@ -92,6 +94,7 @@
%package -n lib%{name}-devel
+
License: MPLv1.0
Summary: Development package for %{name}
Group: Development/Libraries/C and C++
@@ -114,6 +117,7 @@
%patch4
%patch5
%patch6 -p1
+%patch7
# this subdir contains GPL - to avoid license issues delete it before build
rm -rf plugins/LID/VPB
@@ -128,7 +132,7 @@
--enable-sbc \
--enable-ixj \
--enable-capi
-make %{?jobs:-j%jobs} VERBOSE=1
+make %{?_smp_mflags} VERBOSE=1
%install
%makeinstall
++++++ opal-missing_links.patch ++++++
Index: plugins/audio/LPC_10/Makefile.in
===================================================================
--- plugins/audio/LPC_10/Makefile.in.orig
+++ plugins/audio/LPC_10/Makefile.in
@@ -129,9 +129,9 @@ $(PLUGIN): $(OBJECTS)
ifeq (solaris,$(findstring solaris,$(target_os)))
- $(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS)
+ $(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ $(EXTRALIBS) -lm
else
- $(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS)
+ $(Q_LD)$(CC) $(LDSO) -o $@ $^ $(EXTRALIBS) -lm
endif
Index: plugins/audio/gsm-amr/Makefile.in
===================================================================
--- plugins/audio/gsm-amr/Makefile.in.orig
+++ plugins/audio/gsm-amr/Makefile.in
@@ -60,9 +60,9 @@ $(PLUGIN): $(OBJECTS)
ifeq (solaris,$(findstring solaris,$(target_os)))
- $(Q_LD)$(CC) $(LDSO) $@ -o $@ $^
+ $(Q_LD)$(CC) $(LDSO) $@ -o $@ $^ -lm
else
- $(Q_LD)$(CC) $(LDSO) -o $@ $^
+ $(Q_LD)$(CC) $(LDSO) -o $@ $^ -lm
endif
Index: Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
@@ -201,6 +201,7 @@ endif
ifdef OPAL_PTLIB_SSL
SOURCES += $(OPAL_SRCDIR)/h235auth1.cxx
+LIBS += -lcrypto
endif
SOURCES += $(OPAL_SRCDIR)/t120/t120proto.cxx \
Index: plugins/video/H.261-vic/Makefile.in
===================================================================
--- plugins/video/H.261-vic/Makefile.in.orig
+++ plugins/video/H.261-vic/Makefile.in
@@ -103,11 +103,11 @@ endif
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CXX) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+ $(Q_CC)$(CXX) -pthread -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
$(OBJDIR)/%.o : %.c
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CC) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+ $(Q_CC)$(CC) -pthread -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
PLUGIN = ./$(BASENAME)_video_pwplugin.$(PLUGINEXT)
STATIC = ./lib$(BASENAME)_video_s.a
@@ -116,7 +116,7 @@ OBJECTS = $(addprefix $(OBJDIR)/,$(patsu
$(PLUGIN): $(OBJECTS)
ifeq (,$(findstring solaris,$(target_os)))
- $(Q_LD)$(CXX) $(LDSO) -o $@ $^
+ $(Q_LD)$(CXX) $(LDSO) -pthread -o $@ $^
else
$(Q_LD)$(CXX) $(LDSO) $@ -o $@ $^
endif
Index: plugins/video/H.264/Makefile.in
===================================================================
--- plugins/video/H.264/Makefile.in.orig
+++ plugins/video/H.264/Makefile.in
@@ -120,7 +120,7 @@ endif
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CXX) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+ $(Q_CC)$(CXX) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -pthread -c $< -o $@
PLUGIN = ./$(BASENAME)_video_pwplugin.$(PLUGINEXT)
STATIC = ./lib$(BASENAME)_video_s.a
@@ -130,9 +130,9 @@ 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) -pthread $(LDFLAGS) -o $@ $^ $(DL_LIBS)
else
- $(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $(DL_LIBS) $@ -o $@ $^
+ $(Q_LD)$(CXX) $(LDSO) $(LDFLAGS) $@ -o $@ $^ $(DL_LIBS)
endif
Index: plugins/video/H.263-1998/Makefile.in
===================================================================
--- plugins/video/H.263-1998/Makefile.in.orig
+++ plugins/video/H.263-1998/Makefile.in
@@ -77,7 +77,7 @@ SRCS += h263-1998.cxx \
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CXX) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) $(EXTRACFLAGS) -c $< -o $@
+ $(Q_CC)$(CXX) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) $(EXTRACFLAGS) -pthread -c $< -o $@
PLUGIN = ./$(BASENAME)_video_pwplugin.$(PLUGINEXT)
STATIC = ./lib$(BASENAME)_video_s.a
@@ -86,9 +86,9 @@ OBJECTS = $(addprefix $(OBJDIR)/,$(patsu
$(PLUGIN): $(OBJECTS)
ifeq (,$(findstring solaris,$(target_os)))
- $(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^ $(LDFLAGS)
+ $(Q_LD)$(CXX) $(LDSO) -pthread -o $@ $^ $(LDFLAGS) $(DL_LIBS)
else
- $(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) $@ -o $@ $^ $(LDFLAGS)
+ $(Q_LD)$(CXX) $(LDSO) $@ -o $@ $^ $(LDFLAGS) $(DL_LIBS)
endif
install: $(PLUGIN)
Index: plugins/video/MPEG4-ffmpeg/Makefile.in
===================================================================
--- plugins/video/MPEG4-ffmpeg/Makefile.in.orig
+++ plugins/video/MPEG4-ffmpeg/Makefile.in
@@ -92,7 +92,7 @@ endif
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CXX) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+ $(Q_CC)$(CXX) -I../../../include $(EXTRACCFLAGS) $(STDCCFLAGS)
$(OPTCCFLAGS) $(CFLAGS) -pthread -c $< -o $@
PLUGIN = ./$(BASENAME)_video_pwplugin.$(PLUGINEXT)
STATIC = ./lib$(BASENAME)_video_s.a
@@ -101,9 +101,9 @@ OBJECTS = $(addprefix $(OBJDIR)/,$(patsu
$(PLUGIN): $(OBJECTS)
ifeq (,$(findstring solaris,$(target_os)))
- $(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) -o $@ $^
+ $(Q_LD)$(CXX) $(LDSO) -pthread -o $@ $^ $(DL_LIBS)
else
- $(Q_LD)$(CXX) $(LDSO) $(DL_LIBS) $@ -o $@ $^
+ $(Q_LD)$(CXX) $(LDSO) $@ -o $@ $^ $(DL_LIBS)
endif
install:
Index: plugins/video/THEORA/Makefile.in
===================================================================
--- plugins/video/THEORA/Makefile.in.orig
+++ plugins/video/THEORA/Makefile.in
@@ -42,7 +42,7 @@ STDCCFLAGS =@STDCCFLAGS@
LDFLAGS =@LDFLAGS@
THEORA_LIBS =@THEORA_LIBS@
-EXTRACCFLAGS += -I$(COMMONDIR) -I$(PLUGINDIR)
+EXTRACCFLAGS += -I$(COMMONDIR) -I$(PLUGINDIR) -pthread
vpath %.cxx $(COMMONDIR)
vpath %.o $(OBJDIR)
@@ -73,7 +73,7 @@ OBJECTS = $(addprefix $(OBJDIR)/,$(patsu
$(PLUGIN): $(OBJECTS)
ifeq (,$(findstring solaris,$(target_os)))
- $(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) -o $@ $^ $(THEORA_LIBS)
+ $(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) -pthread -o $@ $^ $(THEORA_LIBS)
else
$(Q_LD)$(CXX) $(LDFLAGS) $(LDSO) $@ -o $@ $^ $(THEORA_LIBS)
endif
Index: plugins/LID/IxJ/Makefile.in
===================================================================
--- plugins/LID/IxJ/Makefile.in.orig
+++ plugins/LID/IxJ/Makefile.in
@@ -65,14 +65,14 @@ endif
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CC) -I../../../include $(STDCCFLAGS) $(OPTCCFLAGS) $(CXXFLAGS)
-c $< -o $@
+ $(Q_CC)$(CXX) -I../../../include $(STDCCFLAGS) $(OPTCCFLAGS)
$(CXXFLAGS) -c $< -o $@
PLUGIN = ./ixj_lid_pwplugin.so
OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
$(PLUGIN): $(OBJECTS)
- $(Q_LD)$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
+ $(Q_LD)$(CXX) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
install:
mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)
Index: plugins/LID/CAPI/Makefile.in
===================================================================
--- plugins/LID/CAPI/Makefile.in.orig
+++ plugins/LID/CAPI/Makefile.in
@@ -60,14 +60,14 @@ endif
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CC) -I../../../include $(STDCCFLAGS) $(OPTCCFLAGS) $(CXXFLAGS)
-c $< -o $@
+ $(Q_CC)$(CXX) -I../../../include $(STDCCFLAGS) $(OPTCCFLAGS)
$(CXXFLAGS) -pthread -c $< -o $@
-PLUGIN = ./ixj_lid_pwplugin.so
+PLUGIN = ./capi_lid_pwplugin.so
OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(notdir $(SRCS))))
$(PLUGIN): $(OBJECTS)
- $(Q_LD)$(CC) $(LDSO)$(SONAME) -o $@ $^ $(EXTRALIBS)
+ $(Q_LD)$(CXX) $(LDSO)$(SONAME) -pthread -o $@ $^ $(EXTRALIBS) -lrt
-lcapi20
install:
mkdir -p $(DESTDIR)$(libdir)/$(LID_PLUGIN_DIR)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |