From e360474002083a2cddc9b39c6dae3a454f75f464 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 7 Oct 2012 05:07:29 +0200 Subject: [PATCH] Revert "rtmpdump: build with GnuTLS support, fix usage of *FLAGS" This reverts commit 629525b9318e052bda60f1e63f47bf7dc7792da7. --- packages/multimedia/rtmpdump/build | 12 ++++-------- packages/multimedia/rtmpdump/meta | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/multimedia/rtmpdump/build b/packages/multimedia/rtmpdump/build index 6042d21ffe..ca31be07eb 100755 --- a/packages/multimedia/rtmpdump/build +++ b/packages/multimedia/rtmpdump/build @@ -31,10 +31,8 @@ make prefix=/usr \ CC="$CC" \ LD="$LD" \ AR="$AR" \ - CRYPTO="GNUTLS" \ - OPT="" \ - XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS -lm" + CRYPTO="OPENSSL" \ + XCFLAGS="$CFLAGS $LDFLAGS" $MAKEINSTALL prefix=/usr \ incdir=/usr/include/librtmp \ @@ -43,7 +41,5 @@ $MAKEINSTALL prefix=/usr \ CC="$CC" \ LD="$LD" \ AR="$AR" \ - CRYPTO="GNUTLS" \ - OPT="" \ - XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS -lm" + CRYPTO="OPENSSL" \ + XCFLAGS="$CFLAGS $LDFLAGS" diff --git a/packages/multimedia/rtmpdump/meta b/packages/multimedia/rtmpdump/meta index b26f7cd7d7..3ac76c51c8 100644 --- a/packages/multimedia/rtmpdump/meta +++ b/packages/multimedia/rtmpdump/meta @@ -26,8 +26,8 @@ PKG_LICENSE="GPL" PKG_SITE="http://rtmpdump.mplayerhq.hu/" #PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="zlib gnutls" -PKG_BUILD_DEPENDS="toolchain zlib gnutls" +PKG_DEPENDS="zlib openssl" +PKG_BUILD_DEPENDS="toolchain zlib openssl" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="rtmpdump: a toolkit for RTMP streams."