Browse Source

disable ssl dependency

Waldemar Brodkorb 10 years ago
parent
commit
f213d44553

+ 2 - 2
package/rtmpdump/Makefile

@@ -8,8 +8,8 @@ PKG_VERSION:=		2.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		61509a2ae8987691f1fa28175461be96
 PKG_DESCR:=		toolkit for rtmp streams
-PKG_DEPENDS:=		librtmp zlib libopenssl
-PKG_BUILDDEP:=		openssl zlib
+PKG_DEPENDS:=		librtmp zlib
+PKG_BUILDDEP:=		zlib
 PKG_SECTION:=		mm/video
 PKG_URL:=		http://rtmpdump.mplayerhq.hu/
 PKG_SITES:=		http://www.openadk.org/distfiles

+ 15 - 3
package/rtmpdump/patches/patch-Makefile

@@ -1,6 +1,6 @@
 --- rtmpdump-2.4.orig/Makefile	2013-12-15 14:24:48.000000000 +0100
-+++ rtmpdump-2.4/Makefile	2013-12-15 15:18:27.000000000 +0100
-@@ -1,9 +1,9 @@
++++ rtmpdump-2.4/Makefile	2014-12-19 20:43:08.000000000 +0100
+@@ -1,28 +1,31 @@
  VERSION=v2.4
  
 -prefix=/usr/local
@@ -13,7 +13,19 @@
  
  SYS=posix
  #SYS=mingw
-@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
+ 
+-CRYPTO=OPENSSL
++#CRYPTO=OPENSSL
+ #CRYPTO=POLARSSL
+ #CRYPTO=GNUTLS
+ LIBZ=-lz
+ LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
+ LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
+ LIB_POLARSSL=-lpolarssl $(LIBZ)
++LIB_=$(LIBZ)
+ CRYPTO_LIB=$(LIB_$(CRYPTO))
+ DEF_=-DNO_CRYPTO
+ CRYPTO_DEF=$(DEF_$(CRYPTO))
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
  OPT=-O2

+ 7 - 3
package/rtmpdump/patches/patch-librtmp_Makefile

@@ -1,5 +1,5 @@
 --- rtmpdump-2.4.orig/librtmp/Makefile	2013-12-15 14:24:48.000000000 +0100
-+++ rtmpdump-2.4/librtmp/Makefile	2013-12-15 15:20:13.000000000 +0100
++++ rtmpdump-2.4/librtmp/Makefile	2014-12-19 20:44:42.000000000 +0100
 @@ -1,6 +1,6 @@
  VERSION=v2.4
  
@@ -8,7 +8,7 @@
  
  incdir=$(prefix)/include/librtmp
  bindir=$(prefix)/bin
-@@ -11,9 +11,9 @@ INCDIR=$(DESTDIR)$(incdir)
+@@ -11,12 +11,12 @@ INCDIR=$(DESTDIR)$(incdir)
  LIBDIR=$(DESTDIR)$(libdir)
  MANDIR=$(DESTDIR)$(mandir)
  
@@ -20,7 +20,11 @@
 +AR?=$(CROSS_COMPILE)ar
  
  SYS=posix
- CRYPTO=OPENSSL
+-CRYPTO=OPENSSL
++#CRYPTO=OPENSSL
+ #CRYPTO=GNUTLS
+ DEF_POLARSSL=-DUSE_POLARSSL
+ DEF_OPENSSL=-DUSE_OPENSSL
 @@ -74,8 +74,10 @@ SO_INST=$(SOINST_$(SHARED))
  
  DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)