forked from hasufell/hasufell-repository
Compare commits
4 Commits
trickle-ar
...
sipsimple-
| Author | SHA1 | Date | |
|---|---|---|---|
|
1d1247a9c6
|
|||
| f34c398e30 | |||
| d93adebe95 | |||
|
b17e9702c7
|
@@ -0,0 +1,25 @@
|
|||||||
|
Upstream: Submitted
|
||||||
|
Source: https://github.com/AGProjects/python-sipsimple/pull/10
|
||||||
|
|
||||||
|
From 052f7301a0c906c4117dff5453222f12e768bb49 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tom Briden <tom@decompile.me.uk>
|
||||||
|
Date: Thu, 23 Jul 2020 19:22:30 +0100
|
||||||
|
Subject: [PATCH] Fix multiple definition of `PJ_ATTR_MAY_ALIAS' with GCC-10
|
||||||
|
|
||||||
|
---
|
||||||
|
deps/pjsip/pjlib/include/pj/list.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/deps/pjsip/pjlib/include/pj/list.h b/deps/pjsip/pjlib/include/pj/list.h
|
||||||
|
index 880f58d4..50510fe3 100644
|
||||||
|
--- a/deps/pjsip/pjlib/include/pj/list.h
|
||||||
|
+++ b/deps/pjsip/pjlib/include/pj/list.h
|
||||||
|
@@ -71,7 +71,7 @@ PJ_BEGIN_DECL
|
||||||
|
* must initialize the 'value' member to an appropriate value (typically the
|
||||||
|
* owner itself).
|
||||||
|
*/
|
||||||
|
-struct pj_list
|
||||||
|
+extern struct pj_list
|
||||||
|
{
|
||||||
|
PJ_DECL_LIST_MEMBER(void);
|
||||||
|
} PJ_ATTR_MAY_ALIAS; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */
|
||||||
@@ -12,7 +12,6 @@ SLOT="0"
|
|||||||
PLATFORMS="~amd64 ~x86"
|
PLATFORMS="~amd64 ~x86"
|
||||||
MYOPTIONS="
|
MYOPTIONS="
|
||||||
( providers: libressl openssl ) [[ number-selected = exactly-one ]]
|
( providers: libressl openssl ) [[ number-selected = exactly-one ]]
|
||||||
( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
|
|
||||||
"
|
"
|
||||||
|
|
||||||
DEPENDENCIES="
|
DEPENDENCIES="
|
||||||
@@ -23,12 +22,11 @@ DEPENDENCIES="
|
|||||||
dev-db/sqlite:3
|
dev-db/sqlite:3
|
||||||
dev-libs/icu:=
|
dev-libs/icu:=
|
||||||
dev-python/python-application[>=2.5.0][python_abis:*(-)?]
|
dev-python/python-application[>=2.5.0][python_abis:*(-)?]
|
||||||
|
media/ffmpeg[h264]
|
||||||
media-libs/libvpx
|
media-libs/libvpx
|
||||||
media-libs/v4l-utils
|
media-libs/v4l-utils
|
||||||
sys-apps/util-linux
|
sys-apps/util-linux
|
||||||
sys-sound/alsa-lib
|
sys-sound/alsa-lib
|
||||||
providers:ffmpeg? ( media/ffmpeg[h264] )
|
|
||||||
providers:libav? ( media/libav[h264] )
|
|
||||||
providers:libressl? ( dev-libs/libressl:= )
|
providers:libressl? ( dev-libs/libressl:= )
|
||||||
providers:openssl? ( dev-libs/openssl )
|
providers:openssl? ( dev-libs/openssl )
|
||||||
run:
|
run:
|
||||||
@@ -50,6 +48,7 @@ DEPENDENCIES="
|
|||||||
DEFAULT_SRC_PREPARE_PATCHES=(
|
DEFAULT_SRC_PREPARE_PATCHES=(
|
||||||
"${FILES}"/${PNV}-fix-build.patch
|
"${FILES}"/${PNV}-fix-build.patch
|
||||||
"${FILES}"/0001-Fix-build-with-LibreSSL-2.7.patch
|
"${FILES}"/0001-Fix-build-with-LibreSSL-2.7.patch
|
||||||
|
"${FILES}"/${PN}-gcc10-fix.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
src_compile() {
|
src_compile() {
|
||||||
|
|||||||
Reference in New Issue
Block a user