Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 92 insertions, 0 deletions

diff --git a/package/rtmpdump/patches/patch-Makefile b/package/rtmpdump/patches/patch-Makefile
new file mode 100644
index 000000000..64f950750
--- /dev/null
+++ b/package/rtmpdump/patches/patch-Makefile
@@ -0,0 +1,28 @@
+--- 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 @@
+ VERSION=v2.4
+ 
+-prefix=/usr/local
++prefix=/usr
+ 
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
++CC?=$(CROSS)gcc
++LD?=$(CROSS)ld
+ 
+ SYS=posix
+ #SYS=mingw
+@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
+ 
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
+-LDFLAGS=-Wall $(XLDFLAGS)
++CFLAGS?=
++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF)
++LDFLAGS?=
++LDFLAGS+=-Wall $(XLDFLAGS)
+ 
+ bindir=$(prefix)/bin
+ sbindir=$(prefix)/sbin
diff --git a/package/rtmpdump/patches/patch-Makefile.orig b/package/rtmpdump/patches/patch-Makefile.orig
new file mode 100644
index 000000000..9b10246bb
--- /dev/null
+++ b/package/rtmpdump/patches/patch-Makefile.orig
@@ -0,0 +1,28 @@
+--- rtmpdump-2.4.orig/Makefile	2013-12-15 14:24:48.000000000 +0100
++++ rtmpdump-2.4/Makefile	2013-12-15 15:17:36.000000000 +0100
+@@ -1,9 +1,9 @@
+ VERSION=v2.4
+ 
+-prefix=/usr/local
++prefix=/usr
+ 
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
++CC=$(CROSS)gcc
++LD=$(CROSS)ld
+ 
+ SYS=posix
+ #SYS=mingw
+@@ -21,8 +21,10 @@ CRYPTO_DEF=$(DEF_$(CRYPTO))
+ 
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
+-LDFLAGS=-Wall $(XLDFLAGS)
++CFLAGS?=
++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF)
++LDFLAGS?=
++LDFLAGS+=-Wall $(XLDFLAGS)
+ 
+ bindir=$(prefix)/bin
+ sbindir=$(prefix)/sbin
diff --git a/package/rtmpdump/patches/patch-librtmp_Makefile b/package/rtmpdump/patches/patch-librtmp_Makefile
new file mode 100644
index 000000000..8efd7ecb8
--- /dev/null
+++ b/package/rtmpdump/patches/patch-librtmp_Makefile
@@ -0,0 +1,36 @@
+--- 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
+@@ -1,6 +1,6 @@
+ VERSION=v2.4
+ 
+-prefix=/usr/local
++prefix=/usr
+ 
+ incdir=$(prefix)/include/librtmp
+ bindir=$(prefix)/bin
+@@ -11,9 +11,9 @@ INCDIR=$(DESTDIR)$(incdir)
+ LIBDIR=$(DESTDIR)$(libdir)
+ MANDIR=$(DESTDIR)$(mandir)
+ 
+-CC=$(CROSS_COMPILE)gcc
+-LD=$(CROSS_COMPILE)ld
+-AR=$(CROSS_COMPILE)ar
++CC?=$(CROSS_COMPILE)gcc
++LD?=$(CROSS_COMPILE)ld
++AR?=$(CROSS_COMPILE)ar
+ 
+ SYS=posix
+ CRYPTO=OPENSSL
+@@ -74,8 +74,10 @@ SO_INST=$(SOINST_$(SHARED))
+ 
+ DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF)
+ OPT=-O2
+-CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF)
+-LDFLAGS=$(XLDFLAGS)
++CFLAGS?=
++CFLAGS+=-Wall $(XCFLAGS) $(INC) $(DEF) $(SO_DEF)
++LDFLAGS?=
++LDFLAGS+=$(XLDFLAGS)
+ 
+ 
+ OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o