[packages/opal] - removed outdated patches
baggins
baggins at pld-linux.org
Tue Oct 16 22:48:23 CEST 2012
commit dbe236e401c999827e1c7251a73c979b4fc489da
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Oct 16 22:47:41 2012 +0200
- removed outdated patches
opal-ac.patch | 26 --------
opal-ffmpeg08.patch | 178 ---------------------------------------------------
opal-libname.patch | 29 ---------
opal-mak_files.patch | 39 -----------
opal.spec | 6 --
5 files changed, 278 deletions(-)
---
diff --git a/opal.spec b/opal.spec
index 24cd85a..c7a389c 100644
--- a/opal.spec
+++ b/opal.spec
@@ -26,9 +26,6 @@ Group: Libraries
URL: http://www.opalvoip.org
Source0: http://downloads.sourceforge.net/opalvoip/%{name}-%{version}.tar.bz2
# Source0-md5: b4907073e00889a9e7c6c49d41e4e2d4
-Patch0: %{name}-libname.patch
-Patch1: %{name}-mak_files.patch
-Patch2: %{name}-ac.patch
Patch3: %{name}-build.patch
Patch4: opal-3.10.8-svn-revision.patch
BuildRequires: autoconf
@@ -96,9 +93,6 @@ Biblioteki statyczne OPAL.
%prep
%setup -q
-#patch0 -p1
-#patch1 -p1
-#patch2 -p1
%patch3 -p1
%patch4 -p1
diff --git a/opal-ac.patch b/opal-ac.patch
deleted file mode 100644
index 1138c2f..0000000
--- a/opal-ac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- opal-3.4.2/opal.m4.orig 2008-11-05 01:14:05.259153713 +0100
-+++ opal-3.4.2/opal.m4 2008-11-05 01:19:20.237505967 +0100
-@@ -364,12 +364,13 @@
- [
- old_CXXFLAGS="$CXXFLAGS"
- old_LDFLAGS="$LDFLAGS"
-+ old_LIBS="$LIBS"
-
- CXXFLAGS="$CXXFLAGS $PTLIB_CFLAGS $PTLIB_CXXFLAGS"
- if test "x${DEBUG_BUILD}" = xyes; then
-- LDFLAGS="$LDFLAGS $DEBUG_LIBS"
-+ LIBS="$LIBS $DEBUG_LIBS"
- else
-- LDFLAGS="$LDFLAGS $RELEASE_LIBS"
-+ LIBS="$LIBS $RELEASE_LIBS"
- fi
-
- AC_LANG(C++)
-@@ -388,6 +389,7 @@
-
- CXXFLAGS="$old_CXXFLAGS"
- LDFLAGS="$old_LDFLAGS"
-+ LIBS="$old_LIBS"
-
- OPAL_MSG_CHECK([PTLIB has $1], [$opal_ptlib_option])
- $4="$opal_ptlib_option"
diff --git a/opal-ffmpeg08.patch b/opal-ffmpeg08.patch
deleted file mode 100644
index 6db9c25..0000000
--- a/opal-ffmpeg08.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Index: opal-3.6.8/plugins/configure.ac
-===================================================================
---- opal-3.6.8.orig/plugins/configure.ac
-+++ opal-3.6.8/plugins/configure.ac
-@@ -237,9 +237,9 @@ PKG_CHECK_MODULES([LIBAVCODEC],
- HAVE_H264_DECODER=yes
- ;;
- * )
-- AC_CHECK_LIB(avcodec, h263p_encoder, [HAVE_H263P=yes], [HAVE_H263P=no])
-- AC_CHECK_LIB(avcodec, mpeg4_encoder, [HAVE_MPEG4=yes], [HAVE_MPEG4=no])
-- AC_CHECK_LIB(avcodec, h264_decoder, [HAVE_H264_DECODER=yes], [HAVE_H264_DECODER=no])
-+ OPAL_CODEC_CHECK(HAVE_H263P, encoder, CODEC_ID_H263P)
-+ OPAL_CODEC_CHECK(HAVE_MPEG4, encoder, CODEC_ID_MPEG4)
-+ OPAL_CODEC_CHECK(HAVE_H264_DECODER, decoder, CODEC_ID_H264)
- ;;
- esac
- AC_SUBST(HAVE_H263P)
-Index: opal-3.6.8/plugins/video/common/dyna.cxx
-===================================================================
---- opal-3.6.8.orig/plugins/video/common/dyna.cxx
-+++ opal-3.6.8/plugins/video/common/dyna.cxx
-@@ -240,43 +240,7 @@ bool FFMPEGLibrary::Load(int ver)
- return false;
- }
-
-- if (_codec==CODEC_ID_H264) {
-- if (!libAvcodec.GetFunction("h264_decoder", (DynaLink::Function &)Favcodec_h264_decoder)) {
-- TRACE (1, _codecString << "\tDYNA\tFailed to load h264_decoder");
-- return false;
-- }
-- }
--
-- if (_codec==CODEC_ID_H263P) {
-- if (!libAvcodec.GetFunction("h263_encoder", (DynaLink::Function &)Favcodec_h263_encoder)) {
-- TRACE (1, _codecString << "\tDYNA\tFailed to load h263_encoder" );
-- return false;
-- }
--
-- if (!libAvcodec.GetFunction("h263p_encoder", (DynaLink::Function &)Favcodec_h263p_encoder)) {
-- TRACE (1, _codecString << "\tDYNA\tFailed to load h263p_encoder" );
-- return false;
-- }
--
-- if (!libAvcodec.GetFunction("h263_decoder", (DynaLink::Function &)Favcodec_h263_decoder)) {
-- TRACE (1, _codecString << "\tDYNA\tFailed to load h263_decoder" );
-- return false;
-- }
-- }
--
-- if (_codec==CODEC_ID_MPEG4) {
-- if (!libAvcodec.GetFunction("mpeg4_encoder", (DynaLink::Function &)mpeg4_encoder)) {
-- TRACE (1, _codecString << "\tDYNA\tFailed to load mpeg4_encoder");
-- return false;
-- }
--
-- if (!libAvcodec.GetFunction("mpeg4_decoder", (DynaLink::Function &)mpeg4_decoder)) {
-- TRACE (1, _codecString << "\tDYNA\tFailed to load mpeg4_decoder");
-- return false;
-- }
-- }
--
-- if (!libAvcodec.GetFunction("register_avcodec", (DynaLink::Function &)Favcodec_register)) {
-+ if (!libAvcodec.GetFunction("avcodec_register_all", (DynaLink::Function &)Favcodec_register_all)) {
- TRACE (1, _codecString << "\tDYNA\tFailed to load register_avcodec");
- return false;
- }
-@@ -370,20 +334,13 @@ bool FFMPEGLibrary::Load(int ver)
- }
-
- Favcodec_init();
-+ Favcodec_register_all();
-
-- // register only the codecs needed (to have smaller code)
-- if (_codec==CODEC_ID_H264)
-- Favcodec_register(Favcodec_h264_decoder);
--
-- if (_codec==CODEC_ID_H263P) {
-- Favcodec_register(Favcodec_h263_encoder);
-- Favcodec_register(Favcodec_h263p_encoder);
-- Favcodec_register(Favcodec_h263_decoder);
-- }
--
-- if (_codec==CODEC_ID_MPEG4) {
-- Favcodec_register(mpeg4_encoder);
-- Favcodec_register(mpeg4_decoder);
-+ /* check for the codec */
-+ if (Favcodec_find_decoder(_codec) == NULL &&
-+ Favcodec_find_encoder(_codec) == NULL) {
-+ TRACE (1, _codecString << "\tDYNA\tFailed to load codec");
-+ return false;
- }
-
- if (FFCheckAlignment() != 0) {
-Index: opal-3.6.8/plugins/video/common/dyna.h
-===================================================================
---- opal-3.6.8.orig/plugins/video/common/dyna.h
-+++ opal-3.6.8/plugins/video/common/dyna.h
-@@ -187,14 +187,8 @@ class FFMPEGLibrary
- char _codecString [32];
-
- void (*Favcodec_init)(void);
-- AVCodec *Favcodec_h263_encoder;
-- AVCodec *Favcodec_h263p_encoder;
-- AVCodec *Favcodec_h263_decoder;
-- AVCodec *Favcodec_h264_decoder;
-- AVCodec *mpeg4_encoder;
-- AVCodec *mpeg4_decoder;
-
-- void (*Favcodec_register)(AVCodec *format);
-+ void (*Favcodec_register_all)(void);
- AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
- AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
- AVCodecContext *(*Favcodec_alloc_context)(void);
-Index: opal-3.6.8/opal.m4
-===================================================================
---- opal-3.6.8.orig/opal.m4
-+++ opal-3.6.8/opal.m4
-@@ -1055,3 +1055,26 @@ AC_DEFUN([OPAL_DETERMINE_ILBC],
- OPAL_MSG_CHECK([System iLBC], [$has_ilbc])
- fi
- ])
-+
-+dnl OPAL_CODEC_CHECK
-+dnl check for a codec presence in ffmpeg
-+dnl Arguments: $1 name of configure option
-+dnl $2 'encode' or 'decode'
-+dnl $3 name of codec to check for (define in ffmpeg)
-+AC_DEFUN([OPAL_CODEC_CHECK],
-+ [
-+ AC_MSG_CHECKING(checking for codec $3 in libavcodec)
-+ AC_LANG([C])
-+ LIBS=-lavcodec
-+ AC_RUN_IFELSE(
-+ [AC_LANG_PROGRAM([[
-+ #include <libavcodec/avcodec.h>
-+ ]],
-+ [[
-+ avcodec_init();
-+ avcodec_register_all();
-+ return avcodec_find_$2($3) == NULL;
-+ ]]
-+ )], [$1=yes], [$1=no], [$1=no])
-+ AC_MSG_RESULT($$1)
-+ ])
-diff --git a/include/h323/h323ep.h b/include/h323/h323ep.h
---- a/include/h323/h323ep.h
-+++ b/include/h323/h323ep.h
-@@ -60,6 +60,7 @@ class H225_H221NonStandard;
- class H225_H221NonStandard;
- class H225_ServiceControlDescriptor;
- class H225_FeatureSet;
-+class H225_ArrayOf_SupportedProtocols;
-
- class H235SecurityInfo;
-
-diff --git a/plugins/video/H.264/shared/h264frame.cxx b/plugins/video/H.264/shared/h264frame.cxx
---- a/plugins/video/H.264/shared/h264frame.cxx
-+++ b/plugins/video/H.264/shared/h264frame.cxx
-@@ -86,7 +86,6 @@ H264Frame::~H264Frame ()
-
- #ifndef LICENCE_MPL
- void H264Frame::SetFromFrame (x264_nal_t *NALs, int numberOfNALs) {
-- int vopBufferLen;
- int currentNAL = 0;
-
- uint8_t* currentPositionInFrame=(uint8_t*) _encodedFrame;
-@@ -99,8 +98,9 @@ void H264Frame::SetFromFrame (x264_nal_t
-
- // read the nals out of the encoder and create meta data about their location and size in the frame
- for (currentNAL = 0; currentNAL < numberOfNALs; currentNAL++) {
-- int currentNALLen;
-- currentNALLen = X264_NAL_ENCODE(currentPositionInFrame, &vopBufferLen, 1, &NALs[currentNAL]);
-+ int currentNALLen = NALs[currentNAL].i_payload;
-+ memcpy(currentPositionInFrame, NALs[currentNAL].p_payload, NALs[currentNAL].i_payload);
-+
- if (currentNALLen > 0)
- {
- _NALs[_numberOfNALsInFrame].length = currentNALLen;
diff --git a/opal-libname.patch b/opal-libname.patch
deleted file mode 100644
index 1b8bf0f..0000000
--- a/opal-libname.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urNad opal-2.1.3/opal_inc.mak.in /tmp/dpep.vc5Q70/opal-2.1.3/opal_inc.mak.in
---- opal-2.1.3/opal_inc.mak.in 2006-01-31 09:10:37.000000000 +0100
-+++ /tmp/dpep.vc5Q70/opal-2.1.3/opal_inc.mak.in 2006-02-06 21:22:59.966232274 +0100
-@@ -103,11 +103,11 @@
- endif
-
-
--OPAL_BASE = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
--OPAL_FILE = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
-+OPAL_BASE = opal
-+OPAL_FILE = lib$(OPAL_BASE).$(LIB_SUFFIX)
-
- LDFLAGS += -L$(OPAL_LIBDIR)
--LDLIBS := -l$(OPAL_BASE)$(LIB_TYPE) $(LDLIBS)
-+LDLIBS := -l$(OPAL_BASE) $(LDLIBS)
-
- STDCCFLAGS += -I$(OPAL_INCDIR)
-
---- opal-2.2.1/Makefile.in~ 2006-02-01 23:45:40.000000000 +0100
-+++ opal-2.2.1/Makefile.in 2006-05-18 18:45:26.569385000 +0200
-@@ -697,7 +697,7 @@
- ifneq ($(P_SHAREDLIB),1)
- STATIC_LIB_FILE = $(LIBDIR)/$(OPAL_FILE)
- else
-- STATIC_LIB_FILE = $(LIBDIR)/$(subst .$(LIB_SUFFIX),_s.$(STATICLIBEXT),$(OPAL_FILE))
-+ STATIC_LIB_FILE = $(LIBDIR)/$(subst .$(LIB_SUFFIX),.$(STATICLIBEXT),$(OPAL_FILE))
- endif
-
- $(LIBDIR)/$(OPAL_FILE) : $(TARGETLIB)
diff --git a/opal-mak_files.patch b/opal-mak_files.patch
deleted file mode 100644
index 8994467..0000000
--- a/opal-mak_files.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur opal-2.2.8/opal_inc.mak.in opal-2.2.8-mak/opal_inc.mak.in
---- opal-2.2.8/opal_inc.mak.in 2007-04-18 19:16:36.345473082 +0200
-+++ opal-2.2.8-mak/opal_inc.mak.in 2007-04-18 19:17:46.448447452 +0200
-@@ -67,7 +67,9 @@
- HAS_SANGOMA=@HAS_SANGOMA@
-
-
--OPALDIR=@OPALDIR@
-+ifndef OPALDIR
-+OPALDIR = /usr
-+endif
- PWLIBDIR=@PWLIBDIR@
-
- LIBDIRS += $(OPALDIR)
-@@ -106,7 +108,7 @@
- OPAL_BASE = opal
- OPAL_FILE = lib$(OPAL_BASE).$(LIB_SUFFIX)
-
--LDFLAGS += -L$(OPAL_LIBDIR)
-+LDFLAGS := -L$(OPAL_LIBDIR) $(LDFLAGS)
- LDLIBS := -l$(OPAL_BASE) $(LDLIBS)
-
- STDCCFLAGS += -I$(OPAL_INCDIR)
-@@ -114,6 +116,7 @@
-
- $(TARGET) : $(OPAL_LIBDIR)/$(OPAL_FILE)
-
-+ifdef OPAL_BUILD
- ifndef LIBRARY_MAKEFILE
-
- ifdef DEBUG
-@@ -127,6 +130,7 @@
- libs :: $(OPAL_LIBDIR)/$(OPAL_FILE)
-
- endif
-+endif
-
-
- # End of file
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opal.git/commitdiff/e377535f18e6cafef3d03d70a1174942b0f45505
More information about the pld-cvs-commit
mailing list