Date: Sun, 8 Sep 2013 15:03:15 +0000 (UTC) From: Bernhard Froehlich <decke@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326739 - in head/multimedia/tvheadend: . files Message-ID: <201309081503.r88F3FWN044486@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: decke Date: Sun Sep 8 15:03:15 2013 New Revision: 326739 URL: http://svnweb.freebsd.org/changeset/ports/326739 Log: - Add ffmpeg/libav support - Add libdvbcsa support - Convert LIB_DEPENDS to new shlib format - Cleanup CONFIGURE_ENV/CFLAGS/LDFLAGS - The tvheadend port is mature enough so remove the warnings in pkg-message - Bump PORTREVISION Added: head/multimedia/tvheadend/files/patch-configure (contents, props changed) head/multimedia/tvheadend/files/patch-src__trap.c (contents, props changed) Modified: head/multimedia/tvheadend/Makefile head/multimedia/tvheadend/pkg-message Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Sun Sep 8 14:56:37 2013 (r326738) +++ head/multimedia/tvheadend/Makefile Sun Sep 8 15:03:15 2013 (r326739) @@ -3,7 +3,7 @@ PORTNAME= tvheadend PORTVERSION= 3.4.0.20130726.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://people.freebsd.org/~decke/distfiles/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} dvb-scan-tables-20130714.tar.gz @@ -16,8 +16,8 @@ LICENSE= GPLv3 BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ - curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ + libcurl.so:${PORTSDIR}/ftp/curl USE_GITHUB= yes GH_ACCOUNT= decke @@ -38,13 +38,14 @@ GROUPS= ${TVHGROUP} SUB_LIST+= TVHUSER="${TVHUSER}" \ TVHGROUP="${TVHGROUP}" -OPTIONS_DEFINE= AVAHI - -CONFIGURE_ENV+= PLATFORM=freebsd \ - CFLAGS+="-I${LOCALBASE}/include" \ - LDFLAGS+="-L${LOCALBASE}/lib -lexecinfo -lssl -lz" -CONFIGURE_ARGS+= --disable-dvbscan --disable-zlib -CFLAGS+= -Wno-conversion -Wno-int-to-pointer-cast +OPTIONS_DEFINE= AVAHI DVBCSA FFMPEG +OPTIONS_DEFAULT=DVBCSA FFMPEG +DVBCSA_DESC= Replace internal ffdecsa with dvbcsa + +CONFIGURE_ENV+= PLATFORM=freebsd +CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib +CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lz .include <bsd.port.pre.mk> @@ -63,7 +64,21 @@ CFLAGS+= -Wno-microsoft \ .endif .if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app +LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app +.endif + +.if ${PORT_OPTIONS:MDVBCSA} +LIB_DEPENDS+= libdvbcsa.so:${PORTSDIR}/multimedia/libdvbcsa +CONFIGURE_ARGS+= --enable-dvbcsa +.else +CONFIGURE_ARGS+= --disable-dvbcsa +.endif + +.if ${PORT_OPTIONS:MFFMPEG} +LIB_DEPENDS+= libavcodec1.so:${PORTSDIR}/multimedia/ffmpeg1 +CONFIGURE_ARGS+= --enable-libav +.else +CONFIGURE_ARGS+= --disable-libav .endif post-patch: Added: head/multimedia/tvheadend/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/tvheadend/files/patch-configure Sun Sep 8 15:03:15 2013 (r326739) @@ -0,0 +1,36 @@ +--- configure.bak 2013-07-26 18:17:22.000000000 +0200 ++++ configure 2013-08-11 16:45:03.066835565 +0200 +@@ -122,27 +122,27 @@ + if enabled_or_auto libav; then + has_libav=true + +- if $has_libav && ! check_pkg libavcodec "<=55.0.0"; then ++ if $has_libav && ! check_pkg libavcodec1 "<=55.0.0"; then + has_libav=false + fi + +- if $has_libav && ! check_pkg libavcodec ">=52.96.0"; then ++ if $has_libav && ! check_pkg libavcodec1 ">=52.96.0"; then + has_libav=false + fi + +- if $has_libav && ! check_pkg libavutil ">=50.43.0"; then ++ if $has_libav && ! check_pkg libavutil1 ">=50.43.0"; then + has_libav=false + fi + +- if $has_libav && ! check_pkg libavformat "<=55.0.0"; then ++ if $has_libav && ! check_pkg libavformat1 "<=55.0.0"; then + has_libav=false + fi + +- if $has_libav && ! check_pkg libavformat ">=53.10.0"; then ++ if $has_libav && ! check_pkg libavformat1 ">=53.10.0"; then + has_libav=false + fi + +- if $has_libav && ! check_pkg libswscale ">=0.13.0"; then ++ if $has_libav && ! check_pkg libswscale1 ">=0.13.0"; then + has_libav=false + fi + Added: head/multimedia/tvheadend/files/patch-src__trap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/tvheadend/files/patch-src__trap.c Sun Sep 8 15:03:15 2013 (r326739) @@ -0,0 +1,18 @@ +--- src/trap.c.orig 2013-07-26 18:17:22.000000000 +0200 ++++ src/trap.c 2013-09-01 16:07:04.247691694 +0200 +@@ -33,6 +33,7 @@ + #include <limits.h> + #if ENABLE_EXECINFO + #include <execinfo.h> ++#include <dlfcn.h> + #endif + #include <stdio.h> + #include <stdarg.h> +@@ -47,6 +48,7 @@ + + #define MAXFRAMES 100 + ++extern char **environ; + static char line1[200]; + static char tmpbuf[1024]; + static char libs[1024]; Modified: head/multimedia/tvheadend/pkg-message ============================================================================== --- head/multimedia/tvheadend/pkg-message Sun Sep 8 14:56:37 2013 (r326738) +++ head/multimedia/tvheadend/pkg-message Sun Sep 8 15:03:15 2013 (r326739) @@ -1,13 +1,5 @@ ============================================================================ -PLEASE BEWARE that tvheadend is quite new on FreeBSD and has -not received a lot of testing yet. It might break for you and -kill kenny or spill your beer so don't expect too much. - -Known issues: -- no libav support -- no libdvbcsa support - For the first start in your /etc/rc.conf: tvheadend_enable="YES" tvheadend_flags="-C"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309081503.r88F3FWN044486>