jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

dependencies: add libgit2 as a dependency

Browse Source 
Needed by the swarm chat in the future

Change-Id: Ic5802a0de8091c12b6f5ed666ee488c620723149
This commit is contained in:
Sébastien Blin
2019-10-09 17:06:36 -04:00
parent 92c9f3b760
commit c4e912dd89
7 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -160,10 +160,11 @@ if(MSVC)
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/pjproject/pjlib-util/include;"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/pjproject/pjsip/include;"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/pjproject/third_party;"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/pjproject/pjmedia/include"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/speexdsp/include;"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/webrtc-audio-processing"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/portaudio/include"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/webrtc-audio-processing;"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/portaudio/include;"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/pjproject/pjmedia/include;"
"${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/libgit2/include"
)
endif()
@ -272,10 +273,10 @@ if(MSVC)
${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/speexdsp/lib/libspeexdsp.lib
${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/webrtc-audio-processing/build/Release/webrtc-audio-processing.lib
${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/portaudio/build/Release/portaudio_static_x64.lib
${CMAKE_CURRENT_SOURCE_DIR}/contrib/build/libgit2/msvc/Release/git2.lib
/ignore:4006"
)
set ( CMAKE_STATIC_LINKER_FLAGS ${libAdditionalDependencies} )
endif()
endif()

3
compat/msvc/package.json
View File

@ -12,7 +12,8 @@
"upnp",
"yaml-cpp",
"libarchive",
"webrtc-audio-processing"
"webrtc-audio-processing",
"libgit2"
],
"configuration": "ReleaseLib_win32",
"project_paths": ["ring-daemon.vcxproj"]

2
configure.ac
View File

@ -262,6 +262,8 @@ AS_IF([test -d "${TOOLS_DIR}"],
dnl Check for zlib
PKG_CHECK_MODULES(ZLIB, zlib,, AC_MSG_ERROR([zlib not found]))
PKG_CHECK_MODULES(LIBGIT2, [libgit2 >= 1.1.0],, AC_MSG_ERROR([Missing libgit2 files]))
dnl Check for pjproject
PKG_CHECK_MODULES(PJPROJECT, libpjproject,,
AC_MSG_ERROR([Missing pjproject files]))

1
contrib/src/libgit2/SHA512SUMS Normal file
View File

@ -0,0 +1 @@
347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8 libgit2-v1.1.0.tar.gz

19
contrib/src/libgit2/package.json Normal file
View File

@ -0,0 +1,19 @@
{
"name": "libgit2",
"version": "v1.1.0",
"url": "https://github.com/libgit2/libgit2/archive/__VERSION__.tar.gz",
"deps": ["zlib"],
"patches": [],
"win_patches": [],
"project_paths": [
"msvc/src/git2.vcxproj"
],
"with_env" : "",
"custom_scripts": {
"pre_build": [
"mkdir msvc & cd msvc & cmake .. -G %CMAKE_GENERATOR% -DUSE_HTTPS=OFF -DCURL=OFF -DBUILD_CLAR=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_SSH=OFF -DWINHTTP=OFF"
],
"build": [],
"post_build": []
}
}

29
contrib/src/libgit2/rules.mak Normal file
View File

@ -0,0 +1,29 @@
# LIBGIT2
LIBGIT2_VERSION := 1.1.0
LIBGIT2_URL := https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz
PKGS += libgit2
ifeq ($(call need_pkg,"libgit2 >= 1.1.0"),)
PKGS_FOUND += libgit2
endif
DEPS_libgit2 += zlib http_parser
$(TARBALLS)/libgit2-v$(LIBGIT2_VERSION).tar.gz:
$(call download,$(LIBGIT2_URL))
.sum-libgit2: libgit2-v$(LIBGIT2_VERSION).tar.gz
libgit2: libgit2-v$(LIBGIT2_VERSION).tar.gz .sum-libgit2
$(UNPACK)
mv libgit2-$(LIBGIT2_VERSION) libgit2-v$(LIBGIT2_VERSION)
$(UPDATE_AUTOCONFIG)
$(MOVE)
# TODO windows pcre?
.libgit2: libgit2
cd $< && mkdir -p build && cd build \
&& $(CMAKE) -DCMAKE_C_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=$(PREFIX) -DUSE_HTTPS=OFF -DCURL=OFF -DUSE_HTTP_PARSER=system -DBUILD_CLAR=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_SSH=OFF -DREGEX_BACKEND=regcomp .. \
&& $(CMAKE) --build . \
&& $(MAKE) install
touch $@

4
src/Makefile.am
View File

@ -77,9 +77,10 @@ libring_la_LDFLAGS = \
@LIBSWRESAMPLE_LIBS@ \
@LIBSWSCALE_LIBS@ \
@LIBAVUTIL_LIBS@ \
@LIBGIT2_LIBS@ \
@LIBS@ \
@WEBRTC_LIBS@ \
$(AM_LDFLAGS)
$(AM_LDFLAGS)
if ENABLE_PLUGIN
libring_la_LDFLAGS+= \
@ -112,6 +113,7 @@ libring_la_CFLAGS = \
@LIBAVFILTER_CFLAGS@ \
@LIBSWRESAMPLE_CFLAGS@ \
@LIBSWSCALE_CFLAGS@ \
@LIBGIT2_CFLAGS@ \
@WEBRTC_CFLAGS@ \
$(AM_CFLAGS)