diff options
| -rw-r--r-- | .SRCINFO | 83 | ||||
| -rw-r--r-- | .gitignore | 37 | ||||
| -rw-r--r-- | PKGBUILD | 103 | ||||
| -rw-r--r-- | linphone-desktop-submodules.patch | 71 |
4 files changed, 209 insertions, 85 deletions
@@ -1,7 +1,7 @@ pkgbase = linphone-desktop-all-git pkgdesc = A free VoIP and video softphone based on the SIP protocol (Installed in /opt with all deps included). - pkgver = 4.1.1.r522.578e1a27 - pkgrel = 4 + pkgver = 4.1.1.r525.b717d2ed + pkgrel = 1 url = https://www.linphone.org/ arch = x86_64 license = GPL2 @@ -13,19 +13,92 @@ pkgbase = linphone-desktop-all-git makedepends = nasm makedepends = python-pystache makedepends = yasm - depends = qt5-base depends = qt5-graphicaleffects depends = qt5-quickcontrols depends = qt5-quickcontrols2 depends = qt5-svg depends = qt5-tools conflicts = linphone-desktop - source = linphone-desktop::git://git.linphone.org/linphone-desktop + source = linphone-desktop::git+https://gitlab.linphone.org/BC/public/linphone-desktop + source = bcg729::git+https://gitlab.linphone.org/BC/public/bcg729.git + source = bcmatroska2::git+https://gitlab.linphone.org/BC/public/bcmatroska2.git + source = bctoolbox::git+https://gitlab.linphone.org/BC/public/bctoolbox.git + source = bcunit::git+https://gitlab.linphone.org/BC/public/bcunit.git + source = belcard::git+https://gitlab.linphone.org/BC/public/belcard.git + source = belle-msrp::git+https://gitlab.linphone.org/BC/public/belle-msrp.git + source = belle-sip::git+https://gitlab.linphone.org/BC/public/belle-sip.git + source = belr::git+https://gitlab.linphone.org/BC/public/belr.git + source = bzrtp::git+https://gitlab.linphone.org/BC/public/bzrtp.git + source = cmake-builder::git+https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git + source = bv16-floatingpoint::git+https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git + source = ffmpeg::git+https://gitlab.linphone.org/BC/public/external/ffmpeg.git + source = gsm::git+https://gitlab.linphone.org/BC/public/external/gsm.git + source = libjpeg-turbo::git+https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git + source = libvpx::git+https://gitlab.linphone.org/BC/public/external/libvpx.git + source = libxml2::git+https://gitlab.linphone.org/BC/public/external/libxml2.git + source = libxsd::git+https://gitlab.linphone.org/BC/public/external/libxsd.git + source = mbedtls::git+https://gitlab.linphone.org/BC/public/external/mbedtls.git + source = minizip::git+https://gitlab.linphone.org/BC/public/external/minizip.git + source = openh264::git+https://gitlab.linphone.org/BC/public/external/openh264.git + source = opus::git+https://gitlab.linphone.org/BC/public/external/opus.git + source = soci::git+https://gitlab.linphone.org/BC/public/external/soci.git + source = speex::git+https://gitlab.linphone.org/BC/public/external/speex.git + source = srtp::git+https://gitlab.linphone.org/BC/public/external/srtp.git + source = v4l-utils::git+https://gitlab.linphone.org/BC/public/external/v4l-utils.git + source = xerces-c::git+https://gitlab.linphone.org/BC/public/external/xerces-c.git + source = zlib::git+https://gitlab.linphone.org/BC/public/external/zlib.git + source = linphone::git+https://gitlab.linphone.org/BC/public/linphone.git + source = mediastreamer2::git+https://gitlab.linphone.org/BC/public/mediastreamer2.git + source = msamr::git+https://gitlab.linphone.org/BC/public/msamr.git + source = msopenh264::git+https://gitlab.linphone.org/BC/public/msopenh264.git + source = mssilk::git+https://gitlab.linphone.org/BC/public/mssilk.git + source = mswasapi::git+https://gitlab.linphone.org/BC/public/mswasapi.git + source = mswebrtc::git+https://gitlab.linphone.org/BC/public/mswebrtc.git + source = msx264::git+https://gitlab.linphone.org/BC/public/msx264.git + source = ortp::git+https://gitlab.linphone.org/BC/public/ortp.git + source = webrtc::git+https://gitlab.linphone.org/BC/public/external/webrtc.git source = linphone.desktop source = linphone-desktop-submodules.patch sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP sha256sums = 346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544 - sha256sums = 8567795fb402655fb4a86efdbe6a14c2d071b3d15a3b9e0ca4946eb128226a74 + sha256sums = c7971bd9866873218a429fb41ed0ce320513d34cf715d7b9967f67b4485fe2a0 pkgname = linphone-desktop-all-git diff --git a/.gitignore b/.gitignore index 7cc20f699f34..f163296f8f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,41 @@ linphone-desktop-all-git-*.pkg.tar.xz +bcg729/ +bcmatroska2/ +bctoolbox/ +bcunit/ +belcard/ +belle-msrp/ +belle-sip/ +belr/ +bv16-floatingpoint/ +bzrtp/ +cmake-builder/ +ffmpeg/ +gsm/ +libjpeg-turbo/ +libvpx/ +libxml2/ +libxsd/ +linphone/ linphone-desktop/ +mbedtls/ +mediastreamer2/ +minizip/ +msamr/ +msopenh264/ +mssilk/ +mswasapi/ +mswebrtc/ +msx264/ +openh264/ +opus/ +ortp/ pkg/ +soci/ +speex/ src/ +srtp/ +v4l-utils/ +xerces-c/ +webrtc/ +zlib/ @@ -1,33 +1,118 @@ # Maintainer: Fredy García <frealgagu at gmail dot com> pkgname=linphone-desktop-all-git -pkgver=4.1.1.r522.578e1a27 -pkgrel=4 +pkgver=4.1.1.r525.b717d2ed +pkgrel=1 pkgdesc="A free VoIP and video softphone based on the SIP protocol (Installed in /opt with all deps included)." arch=("x86_64") url="https://www.${pkgname%-desktop-all-git}.org/" license=("GPL2") -depends=("qt5-base" "qt5-graphicaleffects" "qt5-quickcontrols" "qt5-quickcontrols2" "qt5-svg" "qt5-tools") +depends=("qt5-graphicaleffects" "qt5-quickcontrols" "qt5-quickcontrols2" "qt5-svg" "qt5-tools") makedepends=("cmake" "doxygen" "git" "graphviz" "ladspa" "nasm" "python-pystache" "yasm") conflicts=("${pkgname%-all-git}") -source=("${pkgname%-all-git}::git://git.${pkgname%-desktop-all-git}.org/${pkgname%-all-git}" +source=("${pkgname%-all-git}::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-all-git}" + "bcg729::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bcg729.git" + "bcmatroska2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bcmatroska2.git" + "bctoolbox::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bctoolbox.git" + "bcunit::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bcunit.git" + "belcard::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belcard.git" + "belle-msrp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belle-msrp.git" + "belle-sip::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belle-sip.git" + "belr::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/belr.git" + "bzrtp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/bzrtp.git" + "cmake-builder::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-desktop-all-git}-cmake-builder.git" + "bv16-floatingpoint::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/bv16-floatingpoint.git" + "ffmpeg::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/ffmpeg.git" + "gsm::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/gsm.git" + "libjpeg-turbo::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libjpeg-turbo.git" + "libvpx::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libvpx.git" + "libxml2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libxml2.git" + "libxsd::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/libxsd.git" + "mbedtls::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/mbedtls.git" + "minizip::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/minizip.git" + "openh264::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/openh264.git" + "opus::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/opus.git" + "soci::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/soci.git" + "speex::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/speex.git" + "srtp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/srtp.git" + "v4l-utils::git+https://gitlab.linphone.org/BC/public/external/v4l-utils.git" + "xerces-c::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/xerces-c.git" + "zlib::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/zlib.git" + "${pkgname%-desktop-all-git}::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/${pkgname%-desktop-all-git}.git" + "mediastreamer2::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mediastreamer2.git" + "msamr::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/msamr.git" + "msopenh264::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/msopenh264.git" + "mssilk::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mssilk.git" + "mswasapi::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mswasapi.git" + "mswebrtc::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/mswebrtc.git" + "msx264::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/msx264.git" + "ortp::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/ortp.git" + "webrtc::git+https://gitlab.${pkgname%-desktop-all-git}.org/BC/public/external/webrtc.git" "${pkgname%-desktop-all-git}.desktop" "${pkgname%-all-git}-submodules.patch") sha256sums=("SKIP" + "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" + "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" + "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" + "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" "SKIP" + "SKIP" "346d983f503873811b3a4f72772e5afe4990275526c9e15c1b5cde2ad69a0544" - "8567795fb402655fb4a86efdbe6a14c2d071b3d15a3b9e0ca4946eb128226a74") + "c7971bd9866873218a429fb41ed0ce320513d34cf715d7b9967f67b4485fe2a0") prepare() { cd "${srcdir}/${pkgname%-all-git}" - git submodule sync - git submodule update --init --recursive + git submodule init + git config submodule.submodules/bcg729.url "${srcdir}/bcg729" + git config submodule.submodules/bcmatroska2.url "${srcdir}/bcmatroska2" + git config submodule.submodules/bctoolbox.url "${srcdir}/bctoolbox" + git config submodule.submodules/bcunit.url "${srcdir}/bcunit" + git config submodule.submodules/belcard.url "${srcdir}/belcard" + git config submodule.submodules/belle-msrp.url "${srcdir}/belle-msrp" + git config submodule.submodules/belle-sip.url "${srcdir}/belle-sip" + git config submodule.submodules/belr.url "${srcdir}/belr" + git config submodule.submodules/bzrtp.url "${srcdir}/bzrtp" + git config submodule.submodules/cmake-builder.url "${srcdir}/cmake-builder" + git config submodule.submodules/externals/bv16-floatingpoint.url "${srcdir}/bv16-floatingpoint" + git config submodule.submodules/externals/ffmpeg.url "${srcdir}/ffmpeg" + git config submodule.submodules/externals/gsm.url "${srcdir}/gsm" + git config submodule.submodules/externals/libjpeg-turbo.url "${srcdir}/libjpeg-turbo" + git config submodule.submodules/externals/libvpx.url "${srcdir}/libvpx" + git config submodule.submodules/externals/libxml2.url "${srcdir}/libxml2" + git config submodule.submodules/externals/libxsd.url "${srcdir}/libxsd" + git config submodule.submodules/externals/mbedtls.url "${srcdir}/mbedtls" + git config submodule.submodules/externals/minizip.url "${srcdir}/minizip" + git config submodule.submodules/externals/openh264.url "${srcdir}/openh264" + git config submodule.submodules/externals/opus.url "${srcdir}/opus" + git config submodule.submodules/externals/soci.url "${srcdir}/soci" + git config submodule.submodules/externals/speex.url "${srcdir}/speex" + git config submodule.submodules/externals/srtp.url "${srcdir}/srtp" + git config submodule.submodules/externals/v4l-utils.url "${srcdir}/v4l-utils" + git config submodule.submodules/externals/xerces-c.url "${srcdir}/xerces-c" + git config submodule.submodules/externals/zlib.url "${srcdir}/zlib" + git config submodule.submodules/${pkgname%-desktop-all-git}.url "${srcdir}/${pkgname%-desktop-all-git}" + git config submodule.submodules/mediastreamer2.url "${srcdir}/mediastreamer2" + git config submodule.submodules/msamr.url "${srcdir}/msamr" + git config submodule.submodules/msopenh264.url "${srcdir}/msopenh264" + git config submodule.submodules/mssilk.url "${srcdir}/mssilk" + git config submodule.submodules/mswasapi.url "${srcdir}/mswasapi" + git config submodule.submodules/mswebrtc.url "${srcdir}/mswebrtc" + git config submodule.submodules/msx264.url "${srcdir}/msx264" + git config submodule.submodules/ortp.url "${srcdir}/ortp" + git submodule update --init + + cd "${srcdir}/${pkgname%-all-git}/submodules/mswebrtc" + + git config submodule.webrtc.url "${srcdir}/webrtc" + git submodule update --init + + cd "${srcdir}/${pkgname%-all-git}" + + patch -Np1 -i "../${pkgname%-all-git}-submodules.patch" #Patch generated via: #git diff --ignore-submodules > ../submodules.patch #git submodule --quiet foreach --recursive 'git diff --src-prefix=a/${name}/ --dst-prefix=b/${name}/' >> ../submodules.patch - - patch -Np1 -i "../${pkgname%-all-git}-submodules.patch" } pkgver() { diff --git a/linphone-desktop-submodules.patch b/linphone-desktop-submodules.patch index 368f6ffcfa60..ea83dad5f414 100644 --- a/linphone-desktop-submodules.patch +++ b/linphone-desktop-submodules.patch @@ -164,77 +164,6 @@ index 4a894e6..81917b7 100644 option(ENABLE_TESTS "Enable compilation of unit tests." NO) -diff --git a/submodules/externals/v4l-utils/lib/libv4lconvert/control/libv4lcontrol.c b/submodules/externals/v4l-utils/lib/libv4lconvert/control/libv4lcontrol.c -index 85d312d6..ad506bf8 100644 ---- a/submodules/externals/v4l-utils/lib/libv4lconvert/control/libv4lcontrol.c -+++ b/submodules/externals/v4l-utils/lib/libv4lconvert/control/libv4lcontrol.c -@@ -385,7 +385,9 @@ static int v4lcontrol_get_usb_info(struct v4lcontrol_data *data, - fclose(f); - - if (s && sscanf(buf, "%*d:%d%c", &minor, &c) == 2 && -- c == '\n' && minor == minor(st.st_rdev)) -+ c == '\n' -+ //&& minor == minor(st.st_rdev) -+) - break; - } - if (i == 256) -diff --git a/submodules/externals/v4l-utils/utils/libmedia_dev/get_media_devices.c b/submodules/externals/v4l-utils/utils/libmedia_dev/get_media_devices.c -index 82d51083..689dbca4 100644 ---- a/submodules/externals/v4l-utils/utils/libmedia_dev/get_media_devices.c -+++ b/submodules/externals/v4l-utils/utils/libmedia_dev/get_media_devices.c -@@ -505,7 +505,7 @@ const char *fget_associated_device(void *opaque, - struct media_devices *md = opaque; - struct media_device_entry *md_ptr = md->md_entry; - struct stat f_status; -- unsigned int dev_major, dev_minor; -+ //unsigned int dev_major, dev_minor; - int i, found = 0; - char *prev; - -@@ -517,22 +517,24 @@ const char *fget_associated_device(void *opaque, - fprintf(stderr, "File descriptor is not a char device\n"); - return NULL; - } -- dev_major = major(f_status.st_rdev); -- dev_minor = minor(f_status.st_rdev); -+ //dev_major = major(f_status.st_rdev); -+ //dev_minor = minor(f_status.st_rdev); - - /* Step 1: Find the seek node */ - for (i = 0; i < md->md_size; i++, md_ptr++) { - if (last_seek && md_ptr->type == seek_type -- && md_ptr->major == dev_major -- && md_ptr->minor == dev_minor) { -+ //&& md_ptr->major == dev_major -+ //&& md_ptr->minor == dev_minor -+ ) { - found = 1; - continue; - } - if (last_seek && !found) - continue; - if (md_ptr->type == seek_type -- && md_ptr->major == dev_major -- && md_ptr->minor == dev_minor) -+ //&& md_ptr->major == dev_major -+ //&& md_ptr->minor == dev_minor -+ ) - break; - } - if (i == md->md_size) -@@ -543,8 +545,9 @@ const char *fget_associated_device(void *opaque, - /* Step 2: find the associated node */ - for (; i < md->md_size && !strcmp(prev, md_ptr->device); i++, md_ptr++) { - if (last_seek && md_ptr->type == seek_type -- && md_ptr->major == dev_major -- && md_ptr->minor == dev_minor) { -+ //&& md_ptr->major == dev_major -+ //&& md_ptr->minor == dev_minor -+ ) { - found = 1; - continue; - } diff --git a/submodules/linphone/CMakeLists.txt b/submodules/linphone/CMakeLists.txt index 60350bc42..5bd142835 100644 --- a/submodules/linphone/CMakeLists.txt |