diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-31 08:45:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-07 16:46:12 +0000 |
| commit | 1f2c339bdf9888b2aec001df83c8d0e12c0a4113 (patch) | |
| tree | 9e33913eb2b6aedd90ef0d6c07f0971cd7e351e4 | |
| parent | 1071e5913bb4650500a86baefbeb660976085127 (diff) | |
| download | aports-1f2c339bdf9888b2aec001df83c8d0e12c0a4113.tar.bz2 aports-1f2c339bdf9888b2aec001df83c8d0e12c0a4113.tar.xz | |
main/rtmpdump: rebuild against gnutls
upstream has no support for openssl 1.1
| -rw-r--r-- | main/rtmpdump/APKBUILD | 11 | ||||
| -rw-r--r-- | main/rtmpdump/gnutls.patch | 31 |
2 files changed, 38 insertions, 4 deletions
diff --git a/main/rtmpdump/APKBUILD b/main/rtmpdump/APKBUILD index b74e1187ce..d7760422ab 100644 --- a/main/rtmpdump/APKBUILD +++ b/main/rtmpdump/APKBUILD @@ -3,7 +3,7 @@ pkgname=rtmpdump verbase=2.4 pkgver=2.4_git20160909 -pkgrel=5 +pkgrel=6 pkgdesc="A tool to download rtmp:// and rtmpe:// streams" url="http://rtmpdump.mplayerhq.hu/" arch="all" @@ -11,13 +11,15 @@ options="!check" # No test suite. license="GPL-2.0+" depends= depends_dev="zlib-dev" -makedepends="$depends_dev linux-headers libressl-dev" +makedepends="$depends_dev linux-headers gnutls-dev" subpackages="$pkgname-dev $pkgname-doc librtmp" giturl="git://git.ffmpeg.org/rtmpdump" disturl="dev.alpinelinux.org:/archive/rtmpdump" source="https://dev.alpinelinux.org/archive/rtmpdump/rtmpdump-${pkgver}.tar.gz - fix-chunk-size.patch" + fix-chunk-size.patch + gnutls.patch + " builddir="$srcdir"/$pkgname-$pkgver @@ -39,4 +41,5 @@ librtmp() { } sha512sums="e42eda75679addb6f919f42ddce2d27a6988f505602bb70ecb4d071324b59f21d573f8b73fda3b29960c095e20303b84f6eb6254cd327803430d8065cf5d172b rtmpdump-2.4_git20160909.tar.gz -f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d fix-chunk-size.patch" +f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d fix-chunk-size.patch +4ceeca738be76824b57ee29840af258097bc9d6ed562ddacc843e03bfbc577533053adc7eb4d00b2365884e9d0fb5fb17d96f0644156df2863f19ed61ac09f27 gnutls.patch" diff --git a/main/rtmpdump/gnutls.patch b/main/rtmpdump/gnutls.patch new file mode 100644 index 0000000000..2901d24246 --- /dev/null +++ b/main/rtmpdump/gnutls.patch @@ -0,0 +1,31 @@ +diff --git a/Makefile b/Makefile +index a1595a8..9894586 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,9 +8,9 @@ LD=$(CROSS_COMPILE)ld + SYS=posix + #SYS=mingw + +-CRYPTO=OPENSSL ++#CRYPTO=OPENSSL + #CRYPTO=POLARSSL +-#CRYPTO=GNUTLS ++CRYPTO=GNUTLS + LIBZ=-lz + LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ) + LIB_OPENSSL=-lssl -lcrypto $(LIBZ) +diff --git a/librtmp/Makefile b/librtmp/Makefile +index 2c1c790..3e84e33 100644 +--- a/librtmp/Makefile ++++ b/librtmp/Makefile +@@ -16,8 +16,8 @@ LD=$(CROSS_COMPILE)ld + AR=$(CROSS_COMPILE)ar + + SYS=posix +-CRYPTO=OPENSSL +-#CRYPTO=GNUTLS ++#CRYPTO=OPENSSL ++CRYPTO=GNUTLS + DEF_POLARSSL=-DUSE_POLARSSL + DEF_OPENSSL=-DUSE_OPENSSL + DEF_GNUTLS=-DUSE_GNUTLS |