diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2014-11-27 02:23:53 +0530 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-11-27 09:41:11 +0100 |
| commit | c43658f4208fb68d9be279a4da6928c6fa4f5b94 (patch) | |
| tree | 3878169d98e95e709216e2c3e881f5ef050c10fd /recipes/libsrtp | |
| parent | c41b55be42e25fba80bb407b13bdebaf54f6a149 (diff) | |
libsrtp.recipe: Use 1.5.0 release instead of git master
When I made the recipe at first, there was no release. It's better to use one.
Diffstat (limited to 'recipes/libsrtp')
| -rw-r--r-- | recipes/libsrtp/shared-library.patch (renamed from recipes/libsrtp/0001-Makefile.in-Add-support-for-building-on-cross-compil.patch) | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/recipes/libsrtp/0001-Makefile.in-Add-support-for-building-on-cross-compil.patch b/recipes/libsrtp/shared-library.patch index f9a8bf87..255c311a 100644 --- a/recipes/libsrtp/0001-Makefile.in-Add-support-for-building-on-cross-compil.patch +++ b/recipes/libsrtp/shared-library.patch @@ -1,4 +1,4 @@ -From be28ff8570e186ddf81370c1f1b60992e38e28b5 Mon Sep 17 00:00:00 2001 +From e5b09be50553bae14f6e15806678657830d0e99e Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan <nirbheek@centricular.com> Date: Wed, 5 Nov 2014 18:35:14 +0530 Subject: [PATCH] Makefile.in: Add support for building on/cross-compiling for @@ -10,11 +10,11 @@ Also fix a bunch of problems with the build 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/Makefile.in b/Makefile.in -index eb4ce65..42f6d18 100644 +index 5a7fc21..5ca4453 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -18,7 +18,7 @@ USE_OPENSSL = @USE_OPENSSL@ - HAVE_PCAP = @HAVE_PCAP@ +@@ -17,7 +17,7 @@ + USE_OPENSSL = @USE_OPENSSL@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ -.PHONY: all test build_table_apps @@ -22,7 +22,7 @@ index eb4ce65..42f6d18 100644 all: test -@@ -44,10 +44,10 @@ endif +@@ -43,10 +43,10 @@ endif CC = @CC@ INCDIR = -Icrypto/include -I$(srcdir)/include -I$(srcdir)/crypto/include DEFS = @DEFS@ @@ -35,7 +35,7 @@ index eb4ce65..42f6d18 100644 COMPILE = $(CC) $(DEFS) $(INCDIR) $(CPPFLAGS) $(CFLAGS) SRTPLIB = -lsrtp -@@ -76,12 +76,33 @@ prefix = @prefix@ +@@ -75,12 +75,33 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ includedir = @includedir@ libdir = @libdir@ @@ -46,7 +46,7 @@ index eb4ce65..42f6d18 100644 pkgconfig_DATA = libsrtp.pc endif -+SHAREDLIBVERSION = 0 ++SHAREDLIBVERSION = 1 +ifeq (linux,$(findstring linux,@host@)) +SHAREDLIB_DIR = $(libdir) +SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@ @@ -55,7 +55,7 @@ index eb4ce65..42f6d18 100644 +else ifeq (mingw,$(findstring mingw,@host@)) +SHAREDLIB_DIR = $(bindir) +SHAREDLIB_LDFLAGS = -shared -Wl,--out-implib,libsrtp.dll.a -+SHAREDLIBVERSION = ++SHAREDLIBVERSION = +SHAREDLIBSUFFIXNOVER = dll +SHAREDLIBSUFFIX = $(SHAREDLIBSUFFIXNOVER) +else ifeq (darwin,$(findstring darwin,@host@)) @@ -69,7 +69,7 @@ index eb4ce65..42f6d18 100644 # implicit rules for object files and test apps %.o: %.c -@@ -122,9 +143,14 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi) +@@ -121,9 +142,14 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi) ar cr libsrtp.a $^ $(RANLIB) libsrtp.a @@ -87,7 +87,7 @@ index eb4ce65..42f6d18 100644 # libcryptomath.a contains general-purpose routines that are used to # generate tables and verify cryptoalgorithm implementations - this -@@ -224,16 +250,18 @@ libsrtpdoc: +@@ -212,16 +238,18 @@ libsrtpdoc: .PHONY: clean superclean distclean install install: @@ -110,7 +110,7 @@ index eb4ce65..42f6d18 100644 if [ "$(pkgconfig_DATA)" != "" ]; then \ $(INSTALL) -d $(DESTDIR)$(pkgconfigdir); \ cp $(srcdir)/$(pkgconfig_DATA) $(DESTDIR)$(pkgconfigdir)/; \ -@@ -241,8 +269,7 @@ install: +@@ -229,8 +257,7 @@ install: uninstall: rm -f $(DESTDIR)$(includedir)/srtp/*.h @@ -120,7 +120,7 @@ index eb4ce65..42f6d18 100644 -rmdir $(DESTDIR)$(includedir)/srtp if [ "$(pkgconfig_DATA)" != "" ]; then \ rm -f $(DESTDIR)$(pkgconfigdir)/$(pkgconfig_DATA); \ -@@ -250,7 +277,7 @@ uninstall: +@@ -238,7 +265,7 @@ uninstall: clean: rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \ |