pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

linphone: Incomplete rebase of patches to newer versions

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Jul 4 22:42:42 2016 +0200
Changeset:	4e389ce85a552365a53dcbfb8b16675bcbe559ce

Modified Files:
	linphone/distinfo
	linphone/patches/patch-ac
	linphone/patches/patch-ae
Removed Files:
	linphone/patches/patch-ah
	linphone/patches/patch-ba
	linphone/patches/patch-bb
	linphone/patches/patch-mediastreamer2_configure
	linphone/patches/patch-mediastreamer2_tests_Makefile.in

Log Message:
linphone: Incomplete rebase of patches to newer versions

This linphone requires Java parts (antlr3) thar are currently absent in pkgsrc.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4e389ce85a552365a53dcbfb8b16675bcbe559ce

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 linphone/distinfo                                  | 10 +++-----
 linphone/patches/patch-ac                          | 10 --------
 linphone/patches/patch-ae                          | 11 ---------
 linphone/patches/patch-ah                          | 17 -------------
 linphone/patches/patch-ba                          | 28 ----------------------
 linphone/patches/patch-bb                          | 15 ------------
 linphone/patches/patch-mediastreamer2_configure    | 19 ---------------
 .../patches/patch-mediastreamer2_tests_Makefile.in | 13 ----------
 8 files changed, 3 insertions(+), 120 deletions(-)

diffs:
diff --git a/linphone/distinfo b/linphone/distinfo
index 3eb6d16..164e066 100644
--- a/linphone/distinfo
+++ b/linphone/distinfo
@@ -6,10 +6,6 @@ SHA512 (linphone-3.9.1.tar.gz) = 1824ef0012995985788b2a14dc886c82a05a6ad547d60be
 Size (linphone-3.9.1.tar.gz) = 13443595 bytes
 SHA1 (patch-aa) = d27f9fe2c7f86fbf30e9a8a76b8c2c23f001b331
 SHA1 (patch-ab) = fd1174da58b5610b6c92cae784f4623aaa03c71c
-SHA1 (patch-ac) = 9a5c1d478d3ce94cbbc1e19dd01c7fbea4639f9e
-SHA1 (patch-ae) = d4655225c52533e25d8ae0bf1e998afcc4965237
-SHA1 (patch-ah) = 508ffa2d7ffc97d7c202a94c672a8aec0b7cd42e
-SHA1 (patch-ba) = 0caaee9b8eb8957e079d11ed9d08f9af551812d3
-SHA1 (patch-bb) = f0f9eb7dffb4f5b29b4f659661b9544cb5f84178
-SHA1 (patch-mediastreamer2_configure) = 3faa17243fd1ac6867454788696a9a6c37913198
-SHA1 (patch-mediastreamer2_tests_Makefile.in) = e6530f576de41a5d5053afaca8a029f21412c58e
+SHA1 (patch-ac) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-ae) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-configure) = b7513bb52da1e7ee7c2f9d70d4b377b3e162c776
diff --git a/linphone/patches/patch-ac b/linphone/patches/patch-ac
index 2b1e4cf..7c6c053 100644
--- a/linphone/patches/patch-ac
+++ b/linphone/patches/patch-ac
@@ -1,12 +1,2 @@
 $NetBSD: patch-ac,v 1.7 2012/04/13 20:02:17 gschwarz Exp $
 
---- console/Makefile.in.orig	2012-04-06 20:28:35.000000000 +0200
-+++ console/Makefile.in	2012-04-06 20:28:39.000000000 +0200
-@@ -351,6 +351,7 @@
- @BUILD_CONSOLE_TRUE@		$(ORTP_LIBS) \
- @BUILD_CONSOLE_TRUE@		$(SPEEX_LIBS) \
- @BUILD_CONSOLE_TRUE@		$(OSIP_LIBS) \
-+@BUILD_CONSOLE_TRUE@		$(INTLLIBS) \
- @BUILD_CONSOLE_TRUE@		$(X11_LIBS)
- 
- 
diff --git a/linphone/patches/patch-ae b/linphone/patches/patch-ae
index 6b6a6a8..1934cb0 100644
--- a/linphone/patches/patch-ae
+++ b/linphone/patches/patch-ae
@@ -1,13 +1,2 @@
 $NetBSD: patch-ae,v 1.9 2012/04/13 20:02:17 gschwarz Exp $
 
---- configure.orig	2012-04-06 20:29:35.000000000 +0200
-+++ configure	2012-04-06 20:29:43.000000000 +0200
-@@ -10713,7 +10713,7 @@
- LIBTOOL_DEPS="$ltmain"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- 
- 
diff --git a/linphone/patches/patch-ah b/linphone/patches/patch-ah
deleted file mode 100644
index c524e18..0000000
--- a/linphone/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.8 2012/04/13 20:02:17 gschwarz Exp $
-
---- mediastreamer2/src/oss.c.orig	2012-04-06 20:30:29.000000000 +0200
-+++ mediastreamer2/src/oss.c	2012-04-06 20:30:35.000000000 +0200
-@@ -278,8 +278,12 @@
- 	ms_free(d);
- }
- 
-+#ifndef DSP_NAME
- #define DSP_NAME "/dev/dsp"
-+#endif
-+#ifndef MIXER_NAME
- #define MIXER_NAME "/dev/mixer"
-+#endif
- 
- static void oss_detect(MSSndCardManager *m);
- 
diff --git a/linphone/patches/patch-ba b/linphone/patches/patch-ba
deleted file mode 100644
index 1b08a6e..0000000
--- a/linphone/patches/patch-ba
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2013/04/20 19:08:46 noud4 Exp $
-
-ffmpeg API changes
-http://lists.gnu.org/archive/html/linphone-developers/2012-05/msg00038.html
-http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2012-April/123454.html
-
---- mediastreamer2/src/videoenc.c.orig	2012-02-22 11:54:58.000000000 +0000
-+++ mediastreamer2/src/videoenc.c	2013-04-20 17:43:41.000000000 +0000
-@@ -35,6 +35,11 @@
- 
- #include "rfc2429.h"
- 
-+#define CODEC_FLAG_PART 0x0080
-+#define CODEC_FLAG_H263P_UMV 0x02000000
-+#define CODEC_FLAG_H263P_SLICE_STRUCT 0x10000000
-+#define FF_I_TYPE 1
-+
- #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
- 
- static bool_t avcodec_initialized=FALSE;
-@@ -53,7 +58,6 @@
- 
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
--		avcodec_init();
- 		avcodec_register_all();
- 		avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
diff --git a/linphone/patches/patch-bb b/linphone/patches/patch-bb
deleted file mode 100644
index 0a6ede4..0000000
--- a/linphone/patches/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2013/04/20 19:08:46 noud4 Exp $
-
-ffmpeg API changes
-http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2012-April/123454.html
-
---- mediastreamer2/src/h264dec.c.orig	2013-04-20 17:49:24.000000000 +0000
-+++ mediastreamer2/src/h264dec.c	2013-04-20 17:50:05.000000000 +0000
-@@ -44,7 +44,6 @@
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
--		avcodec_init();
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
diff --git a/linphone/patches/patch-mediastreamer2_configure b/linphone/patches/patch-mediastreamer2_configure
deleted file mode 100644
index 6429710..0000000
--- a/linphone/patches/patch-mediastreamer2_configure
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-mediastreamer2_configure,v 1.2 2013/06/07 17:37:59 othyro Exp $
-
-Fix unportable test(1) construct.
-
---- mediastreamer2/configure.orig	2012-02-22 14:09:18.000000000 +0000
-+++ mediastreamer2/configure
-@@ -16132,10 +16132,10 @@
-      ;;
- esac
- 
--if test "$macosx_found" == "yes" ; then
-+if test "$macosx_found" = "yes" ; then
- 	LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio -framework AppKit"
- fi
--if test "$ios_found" == "yes" ; then
-+if test "$ios_found" = "yes" ; then
- 	LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio "
- fi
- 
diff --git a/linphone/patches/patch-mediastreamer2_tests_Makefile.in b/linphone/patches/patch-mediastreamer2_tests_Makefile.in
deleted file mode 100644
index 1f36a38..0000000
--- a/linphone/patches/patch-mediastreamer2_tests_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-mediastreamer2_tests_Makefile.in,v 1.1 2012/04/13 20:02:17 gschwarz Exp $
-
---- mediastreamer2/tests/Makefile.in.orig	2012-04-13 00:59:33.000000000 +0200
-+++ mediastreamer2/tests/Makefile.in	2012-04-13 22:34:01.000000000 +0200
-@@ -178,7 +178,7 @@
- am__v_OBJC_ = $(am__v_OBJC_$(AM_DEFAULT_VERBOSITY))
- am__v_OBJC_0 = @echo "  OBJC  " $@;
- OBJCLD = $(OBJC)
--OBJCLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+OBJCLINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- AM_V_OBJCLD = $(am__v_OBJCLD_$(V))
Home | Main Index | Thread Index | Old Index