From owner-svn-ports-head@FreeBSD.ORG Thu Oct 31 02:03:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4FE78D1A; Thu, 31 Oct 2013 02:03:04 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2E75324B1; Thu, 31 Oct 2013 02:03:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9V2341O053809; Thu, 31 Oct 2013 02:03:04 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9V231RH053784; Thu, 31 Oct 2013 02:03:01 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201310310203.r9V231RH053784@svn.freebsd.org> From: Hiroki Sato Date: Thu, 31 Oct 2013 02:03:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332194 - in head: . ftp/curl multimedia multimedia/ffmpeg multimedia/ffmpeg0 multimedia/libav multimedia/librtmp multimedia/librtmp/files multimedia/rtmpdump multimedia/rtmpdump/files ... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Oct 2013 02:03:04 -0000 Author: hrs Date: Thu Oct 31 02:03:01 2013 New Revision: 332194 URL: http://svnweb.freebsd.org/changeset/ports/332194 Log: - Split the library part of multimedia/rtmpdump into multimedia/librtmp. - Update ports depending on librtmp. - Add instruction to avoid a build error in multimedia/rtmpdump under a specific condition. Added: head/multimedia/librtmp/ - copied from r332193, head/multimedia/rtmpdump/ Deleted: head/multimedia/librtmp/files/patch-Makefile head/multimedia/rtmpdump/files/patch-librtmp-Makefile head/multimedia/rtmpdump/files/patch-librtmp-librtmp.pc.in Modified: head/UPDATING head/ftp/curl/Makefile head/multimedia/Makefile head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg0/Makefile head/multimedia/libav/Makefile head/multimedia/librtmp/Makefile head/multimedia/librtmp/pkg-descr head/multimedia/librtmp/pkg-plist head/multimedia/rtmpdump/Makefile head/multimedia/rtmpdump/files/patch-Makefile head/multimedia/rtmpdump/pkg-plist head/multimedia/xbmc-pvr/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Oct 31 01:26:14 2013 (r332193) +++ head/UPDATING Thu Oct 31 02:03:01 2013 (r332194) @@ -5,6 +5,18 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20131031: + AFFECTS: users of multimedia/rtmpdump + AUTHOR: hrs@FreeBSD.org + + The library part of multimedia/rtmpdump is split into multimedia/librtmp. + multimedia/rtmpdump now depends on the library port. + + A build error can occur if you built and installed old rtmpdump by + using stock OpenSSL, and then install security/openssl and try to build + multimedia/rtmpdump without deinstalling the installed one. Please + make sure if the old rtmpdump is removed before building the new version. + 20131028: AFFECTS: users of comms/dcf77pi AUTHOR: rene@FreeBSD.org Modified: head/ftp/curl/Makefile ============================================================================== --- head/ftp/curl/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/ftp/curl/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -103,7 +103,7 @@ PROXY_CONFIGURE_OFF= --disable-proxy PROXY_CONFIGURE_ON= --enable-proxy RTMP_CONFIGURE_OFF= --without-librtmp RTMP_CONFIGURE_ON= --with-librtmp=${LOCALBASE} -RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/rtmpdump +RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp SPNEGO_CONFIGURE_OFF= --without-spnego SPNEGO_CONFIGURE_ON= --with-spnego=${LOCALBASE}/lib SPNEGO_CPPFLAGS= -I${LOCALBASE}/include/fbopenssl Modified: head/multimedia/Makefile ============================================================================== --- head/multimedia/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -178,6 +178,7 @@ SUBDIR += libquicktime-lame SUBDIR += libquvi SUBDIR += libquvi-scripts + SUBDIR += librtmp SUBDIR += libsmacker SUBDIR += libtheora SUBDIR += libtuner Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/ffmpeg/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -143,7 +143,7 @@ PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PO PULSEAUDIO_CONFIGURE_ENABLE= libpulse # rtmp -RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/rtmpdump +RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp # schroedinger Modified: head/multimedia/ffmpeg0/Makefile ============================================================================== --- head/multimedia/ffmpeg0/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/ffmpeg0/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -274,7 +274,7 @@ CONFIGURE_ARGS+= --disable-libopenjpeg # rtmp .if ${PORT_OPTIONS:MRTMP} -LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/rtmpdump +LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp CONFIGURE_ARGS+= --enable-librtmp . if ${OPENSSLBASE} != "/usr" FFMPEG_CFLAGS+= -I${OPENSSLINC} Modified: head/multimedia/libav/Makefile ============================================================================== --- head/multimedia/libav/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/libav/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -101,7 +101,7 @@ OPUS_CONFIGURE_ENABLE= libopus PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse -RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/rtmpdump +RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger Modified: head/multimedia/librtmp/Makefile ============================================================================== --- head/multimedia/rtmpdump/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/librtmp/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -1,32 +1,21 @@ # $FreeBSD$ -PORTNAME= rtmpdump +PORTNAME= librtmp PORTVERSION= 2.4.20130923 -PORTREVISION= 1 CATEGORIES= multimedia net MASTER_SITES= LOCAL/hrs +DISTNAME= rtmpdump-${PORTVERSION} MAINTAINER= hrs@FreeBSD.org -COMMENT= A tool to download RTMP streams +COMMENT= RTMP stream library LICENSE= GPLv2 USES= pkgconfig USE_LDCONFIG= yes USE_OPENSSL= yes -MAKE_ENV= THREADLIB="${PTHREAD_LIBS}" CFLAGS+= ${PTHREAD_CFLAGS} -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} -PORTDOCS= ChangeLog README - -OPTIONS_DEFINE= DOCS - -.include - -.if ${PORT_OPTIONS:MDOCS} -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif +WRKSRC= ${WRKDIR}/${DISTNAME}/librtmp .include Modified: head/multimedia/librtmp/pkg-descr ============================================================================== --- head/multimedia/rtmpdump/pkg-descr Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/librtmp/pkg-descr Thu Oct 31 02:03:01 2013 (r332194) @@ -1,4 +1,3 @@ -rtmpdump is a tool to download RTMP streams. All forms of RTMP are supported, -including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. +librtmp is the library part of rtmpdump. WWW: http://rtmpdump.mplayerhq.hu/ Modified: head/multimedia/librtmp/pkg-plist ============================================================================== --- head/multimedia/rtmpdump/pkg-plist Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/librtmp/pkg-plist Thu Oct 31 02:03:01 2013 (r332194) @@ -1,8 +1,4 @@ @comment $FreeBSD$ -bin/rtmpdump -sbin/rtmpgw -sbin/rtmpsrv -sbin/rtmpsuck include/librtmp/amf.h include/librtmp/http.h include/librtmp/log.h @@ -12,6 +8,4 @@ lib/librtmp.a lib/librtmp.so lib/librtmp.so.0 libdata/pkgconfig/librtmp.pc -man/man1/rtmpdump.1.gz man/man3/librtmp.3.gz -man/man8/rtmpgw.8.gz Modified: head/multimedia/rtmpdump/Makefile ============================================================================== --- head/multimedia/rtmpdump/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/rtmpdump/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -2,21 +2,22 @@ PORTNAME= rtmpdump PORTVERSION= 2.4.20130923 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia net MASTER_SITES= LOCAL/hrs MAINTAINER= hrs@FreeBSD.org -COMMENT= A tool to download RTMP streams +COMMENT= RTMP streams download utility LICENSE= GPLv2 +LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp + USES= pkgconfig -USE_LDCONFIG= yes USE_OPENSSL= yes MAKE_ENV= THREADLIB="${PTHREAD_LIBS}" CFLAGS+= ${PTHREAD_CFLAGS} -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} +LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} PORTDOCS= ChangeLog README OPTIONS_DEFINE= DOCS Modified: head/multimedia/rtmpdump/files/patch-Makefile ============================================================================== --- head/multimedia/rtmpdump/files/patch-Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/rtmpdump/files/patch-Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -1,5 +1,5 @@ --- Makefile.orig 2013-10-07 03:52:05.000000000 +0900 -+++ Makefile 2013-10-20 14:37:46.000000000 +0900 ++++ Makefile 2013-10-30 15:30:57.000000000 +0900 @@ -1,9 +1,9 @@ VERSION=v2.4 @@ -25,7 +25,14 @@ bindir=$(prefix)/bin sbindir=$(prefix)/sbin -@@ -41,7 +42,7 @@ +@@ -35,13 +36,13 @@ + LIBS_posix= + LIBS_darwin= + LIBS_mingw=-lws2_32 -lwinmm -lgdi32 +-LIB_RTMP=-Llibrtmp -lrtmp ++LIB_RTMP=-lrtmp + LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) + THREADLIB_posix=-lpthread THREADLIB_darwin=-lpthread THREADLIB_mingw= @@ -34,3 +41,26 @@ SLIBS=$(THREADLIB) $(LIBS) LIBRTMP=librtmp/librtmp.a +@@ -54,9 +55,7 @@ + + PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck + +-all: $(LIBRTMP) $(PROGS) +- +-$(PROGS): $(LIBRTMP) ++all: $(PROGS) + + install: $(PROGS) + -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8 +@@ -64,11 +63,9 @@ + cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR) + cp rtmpdump.1 $(MANDIR)/man1 + cp rtmpgw.8 $(MANDIR)/man8 +- @cd librtmp; $(MAKE) install + + clean: + rm -f *.o rtmpdump$(EXT) rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) +- @cd librtmp; $(MAKE) clean + + FORCE: + Modified: head/multimedia/rtmpdump/pkg-plist ============================================================================== --- head/multimedia/rtmpdump/pkg-plist Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/rtmpdump/pkg-plist Thu Oct 31 02:03:01 2013 (r332194) @@ -3,15 +3,5 @@ bin/rtmpdump sbin/rtmpgw sbin/rtmpsrv sbin/rtmpsuck -include/librtmp/amf.h -include/librtmp/http.h -include/librtmp/log.h -include/librtmp/rtmp.h -@dirrm include/librtmp -lib/librtmp.a -lib/librtmp.so -lib/librtmp.so.0 -libdata/pkgconfig/librtmp.pc man/man1/rtmpdump.1.gz -man/man3/librtmp.3.gz man/man8/rtmpgw.8.gz Modified: head/multimedia/xbmc-pvr/Makefile ============================================================================== --- head/multimedia/xbmc-pvr/Makefile Thu Oct 31 01:26:14 2013 (r332193) +++ head/multimedia/xbmc-pvr/Makefile Thu Oct 31 02:03:01 2013 (r332194) @@ -175,7 +175,7 @@ CONFIGURE_ARGS+= --disable-pulse .if ${PORT_OPTIONS:MRTMP} CONFIGURE_ARGS+= --enable-rtmp -LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump +LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/librtmp .else CONFIGURE_ARGS+= --disable-rtmp .endif