* [gentoo-commits] gentoo-x86 commit in net-libs/opal/files: opal-3.10.9-svn_revision_override.patch opal-3.10.9-disable-h323-workaround.patch opal-3.10.9-java-ruby-swig-fix.patch opal-3.10.9-labs_is_in_stdlib.patch opal-3.10.9-avoid_cflags_mixup.patch opal-3.10.8-labs_is_in_stdlib.patch opal-3.10.8-svn_revision_override.patch opal-3.10.8-avoid_cflags_mixup.patch opal-3.10.8-disable-h323-workaround.patch
@ 2012-12-03 23:25 Jesus Rivero (neurogeek)
0 siblings, 0 replies; only message in thread
From: Jesus Rivero (neurogeek) @ 2012-12-03 23:25 UTC (permalink / raw
To: gentoo-commits
neurogeek 12/12/03 23:25:28
Added: opal-3.10.9-svn_revision_override.patch
opal-3.10.9-disable-h323-workaround.patch
opal-3.10.9-java-ruby-swig-fix.patch
opal-3.10.9-labs_is_in_stdlib.patch
opal-3.10.9-avoid_cflags_mixup.patch
Removed: opal-3.10.8-labs_is_in_stdlib.patch
opal-3.10.8-svn_revision_override.patch
opal-3.10.8-avoid_cflags_mixup.patch
opal-3.10.8-disable-h323-workaround.patch
Log:
Version bump. Fixes to bugs #439498 and #440184
(Portage version: 2.2.0_alpha138/cvs/Linux i686, signed Manifest commit with key 748B2C601F6F0683)
Revision Changes Path
1.1 net-libs/opal/files/opal-3.10.9-svn_revision_override.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-svn_revision_override.patch?rev=1.1&content-type=text/plain
Index: opal-3.10.9-svn_revision_override.patch
===================================================================
diff -uNr opal-3.10.8.orig/src/opal/manager.cxx opal-3.10.8/src/opal/manager.cxx
--- opal-3.10.8.orig/src/opal/manager.cxx 2012-10-22 07:50:36.000000000 -0400
+++ opal-3.10.8/src/opal/manager.cxx 2012-10-22 08:30:45.000000000 -0400
@@ -56,7 +56,10 @@
#include <ptclib/url.h>
#include "../../version.h"
-#include "../../revision.h"
+
+# define SVN_REVISION 0
+//#include "../../revision.h"
+
static const char * const DefaultMediaFormatOrder[] = {
1.1 net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch?rev=1.1&content-type=text/plain
Index: opal-3.10.9-disable-h323-workaround.patch
===================================================================
# Sent to upstream on 2012-10-23
# By Jesus Rivero <neurogeek@gentoo.org>
diff -uNr opal-3.10.8.orig/include/h323/h323.h opal-3.10.8/include/h323/h323.h
--- opal-3.10.8.orig/include/h323/h323.h 2012-10-22 07:50:37.000000000 -0400
+++ opal-3.10.8/include/h323/h323.h 2012-10-23 14:10:37.000000000 -0400
@@ -40,6 +40,7 @@
#include <h323/h323con.h>
#include <h323/gkclient.h>
#include <opal/buildopts.h>
+#include <ptlib.h>
PString OpalGetVersion();
unsigned OpalGetMajorVersion();
1.1 net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch?rev=1.1&content-type=text/plain
Index: opal-3.10.9-java-ruby-swig-fix.patch
===================================================================
diff -uNr opal-3.10.9.orig/Makefile.in opal-3.10.9/Makefile.in
--- opal-3.10.9.orig/Makefile.in 2012-12-03 11:09:17.000000000 -0500
+++ opal-3.10.9/Makefile.in 2012-12-03 11:09:35.000000000 -0500
@@ -371,9 +371,9 @@
ifeq ($(OPAL_JAVA), yes)
JAVA_SRCDIR = $(OPAL_SRCDIR)/java
-JAVA_WRAPPER = $(JAVA_SRCDIR)/java_swig_wrapper.c
+JAVA_WRAPPER = $(JAVA_SRCDIR)/java_swig_wrapper.cxx
-VPATH_C += $(JAVA_SRCDIR)
+VPATH_CXX += $(JAVA_SRCDIR)
SOURCES += $(JAVA_WRAPPER)
endif
@@ -384,10 +384,10 @@
ifeq ($(OPAL_RUBY), yes)
-RUBY_SRCDIR = $(OPAL_SRCDIR)/ruby
-RUBY_WRAPPER = $(JAVA_SRCDIR)/ruby_swig_wrapper.c
+RUBY_SRCDIR = $(OPAL_SRCDIR)/Ruby
+RUBY_WRAPPER = $(JAVA_SRCDIR)/ruby_swig_wrapper.cxx
-VPATH_C += $(RUBY_SRCDIR)
+VPATH_CXX += $(RUBY_SRCDIR)
SOURCES += $(RUBY_WRAPPER)
endif
1.1 net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-labs_is_in_stdlib.patch?rev=1.1&content-type=text/plain
Index: opal-3.10.9-labs_is_in_stdlib.patch
===================================================================
diff -uNr opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c
--- opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c 2012-10-22 07:50:37.000000000 -0400
+++ opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c 2012-10-22 10:20:49.000000000 -0400
@@ -3,6 +3,7 @@
* 3GPP AMR Wideband Floating-point Speech Codec
*===================================================================
*/
+#include <stdlib.h>
#include <math.h>
#include "typedef.h"
#include "dec_util.h"
1.1 net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/opal/files/opal-3.10.9-avoid_cflags_mixup.patch?rev=1.1&content-type=text/plain
Index: opal-3.10.9-avoid_cflags_mixup.patch
===================================================================
diff -uNr opal-3.10.8.orig/plugins/plugin-inc.mak.in opal-3.10.8/plugins/plugin-inc.mak.in
--- opal-3.10.8.orig/plugins/plugin-inc.mak.in 2012-10-24 12:07:31.000000000 -0400
+++ opal-3.10.8/plugins/plugin-inc.mak.in 2012-10-24 12:09:22.000000000 -0400
@@ -31,11 +31,13 @@
CC := @CC@
CXX := @CXX@
CFLAGS += @CFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
+CXXFLAGS += @CXXFLAGS@ -I@prefix@/include -I$(PLUGINDIR)/../include -I$(PLUGINDIR)
LDFLAGS += @LDFLAGS@ @LDSO@
PLUGINEXT :=@PLUGINEXT@
ifneq ($(DEBUG),)
CFLAGS += -g
+CXXFLAGS += -g
endif
OBJDIR := $(PLUGINDIR)/../lib_@OSTYPE@_@MACHTYPE@/plugins/$(BASENAME)
@@ -64,11 +66,11 @@
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
+ $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
$(OBJDIR)/%.o : %.cpp
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CXX) -c $(CXXFLAGS) $(CFLAGS) -o $@ $<
+ $(Q_CC)$(CXX) -c $(CXXFLAGS) -o $@ $<
OBJECTS = $(addprefix $(OBJDIR)/,$(patsubst %.cxx,%.o,$(patsubst %.cpp,%.o,$(patsubst %.c,%.o,$(notdir $(SRCS))))))
diff -uNr opal-3.10.8.orig/plugins/video/H.261-vic/Makefile.in opal-3.10.8/plugins/video/H.261-vic/Makefile.in
--- opal-3.10.8.orig/plugins/video/H.261-vic/Makefile.in 2012-10-24 12:07:46.000000000 -0400
+++ opal-3.10.8/plugins/video/H.261-vic/Makefile.in 2012-10-24 12:04:10.000000000 -0400
@@ -39,7 +39,7 @@
$(SRCDIR)/bv.c \
-CFLAGS += -I$(COMMONDIR)
+CXXFLAGS += -I$(COMMONDIR)
INSTALL_DIR := @VC_PLUGIN_DIR@
PLUGINDIR := @PLUGINDIR@
diff -uNr opal-3.10.8.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.8/plugins/video/H.263-1998/Makefile.in
--- opal-3.10.8.orig/plugins/video/H.263-1998/Makefile.in 2012-10-24 12:08:02.000000000 -0400
+++ opal-3.10.8/plugins/video/H.263-1998/Makefile.in 2012-10-24 12:04:00.000000000 -0400
@@ -34,12 +34,12 @@
$(COMMONDIR)/mpi.cxx \
$(COMMONDIR)/dyna.cxx
-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
LIBS += @DL_LIBS@
HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
-CFLAGS += -DLIBAVCODEC_RTP_MODE=1
+CXXFLAGS += -DLIBAVCODEC_RTP_MODE=1
endif
vpath %.cxx $(COMMONDIR)
diff -uNr opal-3.10.8.orig/plugins/video/H.264/gpl/Makefile.in opal-3.10.8/plugins/video/H.264/gpl/Makefile.in
--- opal-3.10.8.orig/plugins/video/H.264/gpl/Makefile.in 2012-10-24 12:06:15.000000000 -0400
+++ opal-3.10.8/plugins/video/H.264/gpl/Makefile.in 2012-10-24 12:11:11.000000000 -0400
@@ -47,6 +47,7 @@
CC =@CC@
CXX =@CXX@
CFLAGS =@X264_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
+CXXFLAGS =@X264_CFLAGS@ -I.. -I$(PLUGINDIR) -I$(OPALDIR)/include -DGPL_HELPER_APP -DPLUGINCODEC_TRACING
LDFLAGS =@LDFLAGS@ @X264_LIBS@
@@ -59,7 +60,7 @@
$(OBJDIR)/%.o : %.cxx
@mkdir -p $(OBJDIR) >/dev/null 2>&1
- $(Q_CC)$(CXX) $(CFLAGS) -c $< -o $@
+ $(Q_CC)$(CXX) $(CXXFLAGS) -c $< -o $@
$(OBJDIR)/%.o : %.c
@mkdir -p $(OBJDIR) >/dev/null 2>&1
diff -uNr opal-3.10.8.orig/plugins/video/H.264/Makefile.in opal-3.10.8/plugins/video/H.264/Makefile.in
--- opal-3.10.8.orig/plugins/video/H.264/Makefile.in 2012-10-24 12:08:17.000000000 -0400
+++ opal-3.10.8/plugins/video/H.264/Makefile.in 2012-10-24 12:04:29.000000000 -0400
@@ -34,12 +34,12 @@
$(SHAREDDIR)/x264wrap.cxx \
$(COMMONDIR)/dyna.cxx \
-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
+CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"'
LIBS += @DL_LIBS@
IS_H264_LICENSED:=@IS_H264_LICENSED@
ifeq ($(IS_H264_LICENSED),yes)
- CFLAGS += @X264_CFLAGS@ -DX264_LICENSED
+ CXXFLAGS += @X264_CFLAGS@ -DX264_LICENSED
LIBS += @X264_LIBS@
else
SUBDIRS := gpl
diff -uNr opal-3.10.8.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.8/plugins/video/MPEG4-ffmpeg/Makefile.in
--- opal-3.10.8.orig/plugins/video/MPEG4-ffmpeg/Makefile.in 2012-10-24 12:08:36.000000000 -0400
+++ opal-3.10.8/plugins/video/MPEG4-ffmpeg/Makefile.in 2012-10-24 12:04:45.000000000 -0400
@@ -30,14 +30,14 @@
SRCDIR := .
SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx
-CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
+CXXFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
LIBS += @DL_LIBS@
# Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
# Also add libavutil, so ffmpeg headers can #include "log.h".
LIBAVCODEC_SOURCE_DIR := @LIBAVCODEC_SOURCE_DIR@
ifneq (,$(LIBAVCODEC_SOURCE_DIR))
-CFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
+CXXFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil
endif
vpath %.cxx $(COMMONDIR)
diff -uNr opal-3.10.8.orig/plugins/video/THEORA/Makefile.in opal-3.10.8/plugins/video/THEORA/Makefile.in
--- opal-3.10.8.orig/plugins/video/THEORA/Makefile.in 2012-10-24 12:08:47.000000000 -0400
+++ opal-3.10.8/plugins/video/THEORA/Makefile.in 2012-10-24 12:05:00.000000000 -0400
@@ -30,7 +30,7 @@
SRCDIR := .
SRCS := theora_frame.cxx theora_plugin.cxx
-CFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
+CXXFLAGS += @THEORA_CFLAGS@ -I$(COMMONDIR)
LIBS += @THEORA_LIBS@
INSTALL_DIR := @VC_PLUGIN_DIR@
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-03 23:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-03 23:25 [gentoo-commits] gentoo-x86 commit in net-libs/opal/files: opal-3.10.9-svn_revision_override.patch opal-3.10.9-disable-h323-workaround.patch opal-3.10.9-java-ruby-swig-fix.patch opal-3.10.9-labs_is_in_stdlib.patch opal-3.10.9-avoid_cflags_mixup.patch opal-3.10.8-labs_is_in_stdlib.patch opal-3.10.8-svn_revision_override.patch opal-3.10.8-avoid_cflags_mixup.patch opal-3.10.8-disable-h323-workaround.patch Jesus Rivero (neurogeek)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox