amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #927 from ZLMediaKit/feature/fix-compile-el7

Browse Source 
修正 CentOS 7 下编译问题
This commit is contained in:
夏楚 2021-06-23 11:56:08 +08:00 committed by GitHub
commit 0eecb3be6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/rpm/ZLMediaKit.spec
View File

@ -2,10 +2,12 @@
%global use_devtoolset 0 %global use_devtoolset 0
%bcond_without faac %bcond_without faac
%bcond_without x264 %bcond_without x264
%bcond_without webrtc
%else %else
%global use_devtoolset 1 %global use_devtoolset 1
%bcond_with faac %bcond_with faac
%bcond_with x264 %bcond_with x264
%bcond_with webrtc
%endif %endif
%bcond_without openssl %bcond_without openssl
@ -22,8 +24,12 @@ URL: https://github.com/xia-chu/ZLMediaKit
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
%if %{with openssl} %if %{with openssl}
%if 0%{?rhel} <= 7 && %{with webrtc}
BuildRequires: openssl11-devel
%else
BuildRequires: openssl-devel BuildRequires: openssl-devel
%endif %endif
%endif
%if %{with mysql} %if %{with mysql}
BuildRequires: mysql-devel BuildRequires: mysql-devel
@ -37,6 +43,10 @@ BuildRequires: faac-devel
BuildRequires: x264-devel BuildRequires: x264-devel
%endif %endif
%if %{with webrtc}
BuildRequires: libsrtp-devel >= 2.0
%endif
%if 0%{?use_devtoolset} %if 0%{?use_devtoolset}
BuildRequires: devtoolset-8-gcc-c++ BuildRequires: devtoolset-8-gcc-c++
%endif %endif
@ -88,6 +98,10 @@ pushd %{_target_platform}
-DENABLE_MYSQL:BOOL=%{with mysql} \ -DENABLE_MYSQL:BOOL=%{with mysql} \
-DENABLE_FAAC:BOOL=%{with faac} \ -DENABLE_FAAC:BOOL=%{with faac} \
-DENABLE_X264:BOOL=%{with x264} \ -DENABLE_X264:BOOL=%{with x264} \
-DENABLE_WEBRTC:BOOL=%{with webrtc} \
%if %{with webrtc} && 0%{?rhel} <= 7
-DOPENSSL_ROOT_DIR:STRING="/usr/lib64/openssl11;/usr/include/openssl11" \
%endif
-DENABLE_MP4:BOOL=ON \ -DENABLE_MP4:BOOL=ON \
-DENABLE_RTPPROXY:BOOL=ON \ -DENABLE_RTPPROXY:BOOL=ON \
-DENABLE_API:BOOL=ON \ -DENABLE_API:BOOL=ON \

2
webrtc/Sdp.cpp
View File

@ -10,7 +10,7 @@
#include "Sdp.h" #include "Sdp.h"
#include "Rtsp/Rtsp.h" #include "Rtsp/Rtsp.h"
#include <inttypes.h> #include <cinttypes>
using namespace mediakit; using namespace mediakit;
using onCreateSdpItem = function<SdpItem::Ptr(const string &key, const string &value)>; using onCreateSdpItem = function<SdpItem::Ptr(const string &key, const string &value)>;