From owner-svn-ports-head@FreeBSD.ORG Tue Feb 11 07:54:12 2014 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 ESMTPS id 53A6245F; Tue, 11 Feb 2014 07:54:12 +0000 (UTC) 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 24BA01365; Tue, 11 Feb 2014 07:54:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1B7sCKt070887; Tue, 11 Feb 2014 07:54:12 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1B7sBUj070886; Tue, 11 Feb 2014 07:54:11 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201402110754.s1B7sBUj070886@svn.freebsd.org> From: Bernhard Froehlich Date: Tue, 11 Feb 2014 07:54:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343721 - head/multimedia/tvheadend 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.17 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: Tue, 11 Feb 2014 07:54:12 -0000 Author: decke Date: Tue Feb 11 07:54:11 2014 New Revision: 343721 URL: http://svnweb.freebsd.org/changeset/ports/343721 QAT: https://qat.redports.org/buildarchive/r343721/ Log: - Attempt to fix the port after the ffmpeg1 removal. The commit r331762 has only hidden the fact that tvheadend does not work with ffmpeg 2.x. Since ffmpeg1 has been removed already I can only rip out the ffmpeg option and dependency and disable libav for now. - While here move option variables before bsd.port.pre.mk to make them work. Reported by: Torfinn Ingolfsen Pointyhat to: wg Modified: head/multimedia/tvheadend/Makefile Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Tue Feb 11 07:43:45 2014 (r343720) +++ head/multimedia/tvheadend/Makefile Tue Feb 11 07:54:11 2014 (r343721) @@ -3,7 +3,7 @@ PORTNAME= tvheadend PORTVERSION= 3.4.0.20130726.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://people.freebsd.org/~decke/distfiles/ DISTNAME= decke-${PORTNAME}-8a8c1a8 @@ -33,15 +33,20 @@ GROUPS= ${TVHGROUP} SUB_LIST+= TVHUSER="${TVHUSER}" \ TVHGROUP="${TVHGROUP}" -OPTIONS_DEFINE= AVAHI DVBCSA FFMPEG -OPTIONS_DEFAULT=DVBCSA FFMPEG +OPTIONS_DEFINE= AVAHI DVBCSA +OPTIONS_DEFAULT=DVBCSA DVBCSA_DESC= Replace internal ffdecsa with dvbcsa CONFIGURE_ENV+= PLATFORM=freebsd -CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib +CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib --disable-libav CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lz +AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app + +DVBCSA_LIB_DEPENDS= libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa +DVBCSA_CONFIGURE_ENABLE= dvbcsa + .include .if ${OSVERSION} < 900000 @@ -58,16 +63,6 @@ CFLAGS+= -Wno-microsoft \ -Wno-tautological-constant-out-of-range-compare .endif -AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app - -DVBCSA_LIB_DEPENDS= libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa -DVBCSA_CONFIGURE_ON= --enable-dvbcsa -DVBCSA_CONFIGURE_OFF= --disable-dvbcsa - -FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg -FFMPEG_CONFIGURE_ON= --enable-libav -FFMPEG_CONFIGURE_OFF= --disable-libav - post-patch: @${REINPLACE_CMD} 's|-g||' \ ${WRKSRC}/Makefile