mirror of
https://abf.rosa.ru/djam/linphone.git
synced 2025-02-24 02:12:52 +00:00
Updated to 3.10.2
This commit is contained in:
Denis Silakov
parent
08d32579ec
commit
b8e0031351
7 changed files with 90 additions and 105 deletions
3
.abf.yml
3
.abf.yml
|
|
@ -1,7 +1,8 @@
|
|||
removed_sources:
|
||||
linphone-3.5.2.tar.gz: d0dde9d421b7cf6893c8e5acb969d5bd4a04a231
|
||||
sources:
|
||||
linphone-3.6.1.tar.gz: 3bba40df89443326261e2688f599c31ff156580e
|
||||
sources:
|
||||
linphone-3.10.2.tar.gz: a7566bac17ed341ef3f286f9688e71b17523a97b
|
||||
linphone16.png: 671958aafa4d1710c2f5b80c46d35a8b79349576
|
||||
linphone32.png: 042549a93b9616ff9345bf15525a66e38733b150
|
||||
linphone48.png: fc62e118a2fcc94f16fca136241a81591a0bb0ef
|
||||
|
|
|
|||
46
linphone-3.10.2-imagedir.patch
Normal file
46
linphone-3.10.2-imagedir.patch
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
diff -Naur linphone-3.10.2.orig/mediastreamer2/src/Makefile.am linphone-3.10.2/mediastreamer2/src/Makefile.am
|
||||
--- linphone-3.10.2.orig/mediastreamer2/src/Makefile.am 2016-10-31 12:24:39.802955809 +0300
|
||||
+++ linphone-3.10.2/mediastreamer2/src/Makefile.am 2016-10-31 12:51:41.904189161 +0300
|
||||
@@ -452,7 +452,7 @@
|
||||
|
||||
AM_OBJCFLAGS=$(AM_CFLAGS)
|
||||
|
||||
-imgdir=$(datadir)/images/
|
||||
+imgdir=$(datadir)/images/linphone/
|
||||
|
||||
img_DATA=voip/nowebcamCIF.jpg
|
||||
|
||||
diff -Naur linphone-3.10.2.orig/mediastreamer2/src/Makefile.in linphone-3.10.2/mediastreamer2/src/Makefile.in
|
||||
--- linphone-3.10.2.orig/mediastreamer2/src/Makefile.in 2016-10-31 12:24:39.802955809 +0300
|
||||
+++ linphone-3.10.2/mediastreamer2/src/Makefile.in 2016-10-31 12:51:45.321179175 +0300
|
||||
@@ -983,7 +983,7 @@
|
||||
$(ORTP_CFLAGS)
|
||||
|
||||
AM_OBJCFLAGS = $(AM_CFLAGS)
|
||||
-imgdir = $(datadir)/images/
|
||||
+imgdir = $(datadir)/images/linphone/
|
||||
img_DATA = voip/nowebcamCIF.jpg
|
||||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
diff -Naur linphone-3.10.2.orig/mediastreamer2/src/videofilters/nowebcam.c linphone-3.10.2/mediastreamer2/src/videofilters/nowebcam.c
|
||||
--- linphone-3.10.2.orig/mediastreamer2/src/videofilters/nowebcam.c 2016-10-31 12:24:39.800955815 +0300
|
||||
+++ linphone-3.10.2/mediastreamer2/src/videofilters/nowebcam.c 2016-10-31 12:52:08.210112288 +0300
|
||||
@@ -333,15 +333,15 @@
|
||||
|
||||
static char *def_image=NULL;
|
||||
|
||||
-static const char *def_image_path=PACKAGE_DATA_DIR "/images/" NOWEBCAM_JPG ".jpg";
|
||||
+static const char *def_image_path=PACKAGE_DATA_DIR "/images/linphone/" NOWEBCAM_JPG ".jpg";
|
||||
|
||||
|
||||
mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){
|
||||
char tmp[256];
|
||||
if (idx<0)
|
||||
- snprintf(tmp, sizeof(tmp), "%s/images/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
|
||||
+ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
|
||||
else
|
||||
- snprintf(tmp, sizeof(tmp), "%s/images/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
|
||||
+ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
|
||||
return ms_load_jpeg_as_yuv(tmp,reqsize);
|
||||
}
|
||||
|
||||
12
linphone-3.10.2-link.patch
Normal file
12
linphone-3.10.2-link.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur linphone-3.10.2.orig/mediastreamer2/src/Makefile.am linphone-3.10.2/mediastreamer2/src/Makefile.am
|
||||
--- linphone-3.10.2.orig/mediastreamer2/src/Makefile.am 2016-10-31 12:24:39.802955809 +0300
|
||||
+++ linphone-3.10.2/mediastreamer2/src/Makefile.am 2016-10-31 12:25:33.771796441 +0300
|
||||
@@ -57,7 +57,7 @@
|
||||
$(PCAP_LIBS) \
|
||||
$(OPUS_LIBS) \
|
||||
$(SRTP_LIBS) \
|
||||
- $(BCTOOLBOX_LIBS)
|
||||
+ $(BCTOOLBOX_LIBS) -lXext
|
||||
|
||||
|
||||
if LIBBZRTP
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
--- mediastreamer2/src/videofilters/nowebcam.c.image 2009-07-13 11:25:33.000000000 +0200
|
||||
+++ mediastreamer2/src/videofilters/nowebcam.c 2009-09-19 03:16:14.000000000 +0200
|
||||
@@ -1668,9 +1668,9 @@
|
||||
mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){
|
||||
char tmp[256];
|
||||
if (idx<0)
|
||||
- snprintf(tmp, sizeof(tmp), "%s/images/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
|
||||
+ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
|
||||
else
|
||||
- snprintf(tmp, sizeof(tmp), "%s/images/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
|
||||
+ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
|
||||
return ms_load_jpeg_as_yuv(tmp,reqsize);
|
||||
}
|
||||
|
||||
--- mediastreamer2/src/Makefile.am.image-dir 2013-05-30 16:09:06.000000000 +0800
|
||||
+++ mediastreamer2/src/Makefile.am 2013-06-28 11:42:41.023215683 +0800
|
||||
@@ -363,7 +363,7 @@
|
||||
|
||||
AM_OBJCFLAGS=$(AM_CFLAGS)
|
||||
|
||||
-imgdir=$(datadir)/images/
|
||||
+imgdir=$(datadir)/images/linphone/
|
||||
|
||||
img_DATA=voip/nowebcamCIF.jpg
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
--- a/mediastreamer2/src/utils/ffmpeg-priv.c
|
||||
+++ b/mediastreamer2/src/utils/ffmpeg-priv.c
|
||||
@@ -20,20 +20,14 @@
|
||||
|
||||
#include "ffmpeg-priv.h"
|
||||
|
||||
-#ifdef FF_API_ALLOC_CONTEXT
|
||||
-#if !FF_API_ALLOC_CONTEXT
|
||||
+#if LIBAVCODEC_VERSION_MAJOR >= 54
|
||||
AVCodecContext *avcodec_alloc_context(void) {
|
||||
return avcodec_alloc_context3(NULL);
|
||||
}
|
||||
void avcodec_get_context_defaults(AVCodecContext *s) {
|
||||
avcodec_get_context_defaults3(s, NULL);
|
||||
}
|
||||
-#endif
|
||||
-#endif
|
||||
-#ifdef FF_API_AVCODEC_OPEN
|
||||
-#if !FF_API_AVCODEC_OPEN
|
||||
int avcodec_open(AVCodecContext *avctx, AVCodec *codec) {
|
||||
return avcodec_open2(avctx, codec, NULL);
|
||||
}
|
||||
#endif
|
||||
-#endif
|
||||
--- a/mediastreamer2/src/utils/ffmpeg-priv.h
|
||||
+++ b/mediastreamer2/src/utils/ffmpeg-priv.h
|
||||
@@ -75,15 +75,9 @@
|
||||
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,25,0)
|
||||
#define CodecID AVCodecID
|
||||
#endif
|
||||
-#ifdef FF_API_ALLOC_CONTEXT
|
||||
-#if !FF_API_ALLOC_CONTEXT
|
||||
+#if LIBAVCODEC_VERSION_MAJOR >= 54
|
||||
AVCodecContext *avcodec_alloc_context(void);
|
||||
void avcodec_get_context_defaults(AVCodecContext *s);
|
||||
-#endif
|
||||
-#endif
|
||||
-#ifdef FF_API_AVCODEC_OPEN
|
||||
-#if !FF_API_AVCODEC_OPEN
|
||||
int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
|
||||
#endif
|
||||
-#endif
|
||||
#endif /* FFMPEG_PRIV_H */
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- mediastreamer2/src/Makefile.am.link 2013-06-28 11:43:20.000000000 +0800
|
||||
+++ mediastreamer2/src/Makefile.am 2013-06-28 11:44:29.066170084 +0800
|
||||
@@ -331,7 +331,7 @@
|
||||
$(LIBV4L2_LIBS) \
|
||||
$(SPANDSP_LIBS) \
|
||||
$(PCAP_LIBS) \
|
||||
- $(OPUS_LIBS)
|
||||
+ $(OPUS_LIBS) -lXext
|
||||
|
||||
if BUILD_VP8
|
||||
AM_CFLAGS+=$(VP8_CFLAGS)
|
||||
|
|
@ -1,30 +1,29 @@
|
|||
%define linphone_major 5
|
||||
%define mediastreamer_base_major 3
|
||||
%define mediastreamer_voip_major 3
|
||||
%define lpcxml_major 0
|
||||
%define linphone_major 9
|
||||
%define mediastreamer_base_major 7
|
||||
%define mediastreamer_voip_major 7
|
||||
%define linphone_tester_major 0
|
||||
%define liblinphone %mklibname %{name} %{linphone_major}
|
||||
%define liblinphone_tester %mklibname %{name}_tester %{linphone_tester_major}
|
||||
%define libmediastreamer_base %mklibname mediastreamer_base %{mediastreamer_base_major}
|
||||
%define libmediastreamer_voip %mklibname mediastreamer_voip %{mediastreamer_voip_major}
|
||||
%define liblpcxml %mklibname lpc2xml %{lpcxml_major}
|
||||
%define devname %mklibname -d %{name}
|
||||
|
||||
Summary: Voice over IP Application
|
||||
Name: linphone
|
||||
Version: 3.6.1
|
||||
Release: 9
|
||||
Version: 3.10.2
|
||||
Release: 1
|
||||
License: GPLv2+
|
||||
Group: Communications
|
||||
Url: http://www.linphone.org/
|
||||
Source0: http://download.savannah.gnu.org/releases/linphone/stable/sources/linphone-%{version}.tar.gz
|
||||
# Source1: http://download.savannah.gnu.org/releases/linphone/stable/sources/linphone-%{version}.tar.gz.sig
|
||||
#Source1: http://download.savannah.gnu.org/releases/linphone/stable/sources/linphone-%{version}.tar.gz.sig
|
||||
Source2: %{name}48.png
|
||||
Source3: %{name}32.png
|
||||
Source4: %{name}16.png
|
||||
Patch0: linphone-3.6.1-imagedir.patch
|
||||
Patch1: linphone-3.6.1-link.patch
|
||||
Patch0: linphone-3.10.2-imagedir.patch
|
||||
Patch1: linphone-3.10.2-link.patch
|
||||
# We don't have exosip-4.0 atm
|
||||
# Patch2: linphone-exosip-4.0.0.patch
|
||||
Patch3: linphone-3.6.1-libav9.patch
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gtk-doc
|
||||
|
|
@ -32,11 +31,12 @@ BuildRequires: intltool
|
|||
# http://lists.gnu.org/archive/html/linphone-developers/2013-04/msg00016.html
|
||||
BuildRequires: vim-common
|
||||
BuildRequires: exosip-devel
|
||||
BuildRequires: ffmpeg-devel
|
||||
#BuildRequires: ffmpeg-devel
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: gsm-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(belle-sip)
|
||||
BuildRequires: pkgconfig(glew)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-2.0)
|
||||
|
|
@ -44,7 +44,7 @@ BuildRequires: pkgconfig(libosip2)
|
|||
BuildRequires: pkgconfig(libpulse)
|
||||
BuildRequires: pkgconfig(libv4l1)
|
||||
BuildRequires: pkgconfig(libv4l2)
|
||||
BuildRequires: pkgconfig(ortp) >= 0.17.0
|
||||
BuildRequires: pkgconfig(ortp) >= 0.27.0
|
||||
BuildRequires: pkgconfig(speex)
|
||||
BuildRequires: pkgconfig(theora)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
|
|
@ -58,7 +58,11 @@ such as SIP and RTP to make the communications.
|
|||
%files -f %{name}.lang
|
||||
%doc COPYING README AUTHORS BUGS INSTALL ChangeLog
|
||||
%doc %{_datadir}/gnome/help/%{name}
|
||||
%doc %{_datadir}/tutorials
|
||||
%{_bindir}/linphone*
|
||||
%{_bindir}/liblinphone_tester
|
||||
%{_bindir}/lp-*
|
||||
%{_bindir}/msaudiocmp
|
||||
%{_bindir}/mediastream
|
||||
%{_bindir}/lpc2xml_test
|
||||
%{_bindir}/xml2lpc_test
|
||||
|
|
@ -67,7 +71,10 @@ such as SIP and RTP to make the communications.
|
|||
%{_datadir}/sounds/%{name}/
|
||||
%{_datadir}/images/linphone/nowebcamCIF.jpg
|
||||
%{_datadir}/applications/*
|
||||
%{_iconsdir}/hicolor/*/apps/linphone2.png
|
||||
%{_datadir}/appdata/*
|
||||
%{_iconsdir}/hicolor/*/apps/linphone*.png
|
||||
%{_iconsdir}/hicolor/*/actions/linphone*
|
||||
%{_iconsdir}/hicolor/*/status/linphone*
|
||||
%{_liconsdir}/linphone2.png
|
||||
%{_iconsdir}/linphone2.png
|
||||
%{_miconsdir}/linphone2.png
|
||||
|
|
@ -87,16 +94,16 @@ Primary library for %{name}.
|
|||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %{liblpcxml}
|
||||
Summary: Shared libs for %{name}
|
||||
%package -n %{liblinphone_tester}
|
||||
Summary: Tester library for %{name}
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{liblpcxml}
|
||||
Shared libs for %{name}
|
||||
%description -n %{liblinphone_tester}
|
||||
Tester library for %{name}.
|
||||
|
||||
%files -n %{liblpcxml}
|
||||
%{_libdir}/liblpc2xml.so.%{lpcxml_major}*
|
||||
%{_libdir}/libxml2lpc.so.%{lpcxml_major}*
|
||||
%files -n %{liblinphone_tester}
|
||||
%{_libdir}/liblinphonetester.so.%{linphone_tester_major}*
|
||||
%{_datadir}/liblinphone_tester
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
|
|
@ -148,10 +155,8 @@ Libraries and includes files for developing programs based on %{name}.
|
|||
%prep
|
||||
%setup -q
|
||||
find '(' -name '*.c' -o -name '*.h' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
|
||||
%patch0 -p0 -b .image-dir
|
||||
%patch1 -p0 -b .link
|
||||
# %%patch2 -p1 -b .exosip~
|
||||
%patch3 -p1 -b .ffmpeg
|
||||
%patch0 -p1 -b .image-dir
|
||||
%patch1 -p1 -b .link
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue