diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-05-28 14:52:31 +0200 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-05-28 14:52:31 +0200 |
| commit | 8e774a8bcd96c4f0c0e096c3bcefb0a80c365665 (patch) | |
| tree | 9189dc1e0a351dc3643663162f2c3b217938d439 /libsrtp | |
| parent | 1e49a2c804b127e2131f35bca4afa4f366658607 (diff) | |
| parent | 0c3059726f08457418f91d68efe368fe87b7138e (diff) | |
| download | contrib-8e774a8bcd96c4f0c0e096c3bcefb0a80c365665.tar.gz contrib-8e774a8bcd96c4f0c0e096c3bcefb0a80c365665.tar.xz | |
Merge remote-tracking branch 'origin/3.6' into 3.7
Diffstat (limited to 'libsrtp')
| -rw-r--r-- | libsrtp/libsrtp-2.3.0-shared-fix.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libsrtp/libsrtp-2.3.0-shared-fix.patch b/libsrtp/libsrtp-2.3.0-shared-fix.patch deleted file mode 100644 index 4ad0d34c0..000000000 --- a/libsrtp/libsrtp-2.3.0-shared-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up libsrtp-2.3.0/Makefile.in.sharedfix libsrtp-2.3.0/Makefile.in ---- libsrtp-2.3.0/Makefile.in.sharedfix 2020-01-07 09:48:36.004217062 -0500 -+++ libsrtp-2.3.0/Makefile.in 2020-01-07 09:53:08.117725096 -0500 -@@ -106,12 +106,14 @@ bindir = @bindir@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libsrtp2.pc - --SHAREDLIBVERSION = 1 -+SHAREDLIBMINIVER = 1 -+SHAREDLIBVERSION = $(SHAREDLIBMINIVER).0.0 - ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@))) - SHAREDLIB_DIR = $(libdir) --SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ - SHAREDLIBSUFFIXNOVER = so -+SHAREDLIBMINISUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBMINIVER) - SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER).$(SHAREDLIBVERSION) -+SHAREDLIB_LDFLAGS = -shared -Wl,-soname,libsrtp2.$(SHAREDLIBMINISUFFIX) - else ifneq (,$(or $(findstring cygwin,@host@), $(findstring mingw,@host@))) - SHAREDLIB_DIR = $(bindir) - SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp2.dll.a -@@ -166,6 +168,7 @@ libsrtp2.$(SHAREDLIBSUFFIX): $(srtpobj) - $(CC) -shared -o $@ $(SHAREDLIB_LDFLAGS) \ - $^ $(LDFLAGS) $(LIBS) - if [ -n "$(SHAREDLIBVERSION)" ]; then \ -+ ln -sfn $@ libsrtp2.$(SHAREDLIBMINISUFFIX); \ - ln -sfn $@ libsrtp2.$(SHAREDLIBSUFFIXNOVER); \ - fi - -@@ -288,6 +291,7 @@ install: - cp libsrtp2.$(SHAREDLIBSUFFIXNOVER) $(DESTDIR)$(SHAREDLIB_DIR)/; \ - if [ -n "$(SHAREDLIBVERSION)" ]; then \ - ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBSUFFIXNOVER); \ -+ ln -sfn libsrtp2.$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR)/libsrtp2.$(SHAREDLIBMINISUFFIX); \ - fi; \ - fi - $(INSTALL) -d $(DESTDIR)$(pkgconfigdir) |