From owner-svn-ports-all@FreeBSD.ORG Mon Sep 2 16:23:42 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 800EA37A; Mon, 2 Sep 2013 16:23:42 +0000 (UTC) (envelope-from wg@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 6BD732F70; Mon, 2 Sep 2013 16:23:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r82GNgVc073151; Mon, 2 Sep 2013 16:23:42 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r82GNgPw073149; Mon, 2 Sep 2013 16:23:42 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201309021623.r82GNgPw073149@svn.freebsd.org> From: William Grzybowski Date: Mon, 2 Sep 2013 16:23:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326026 - in head/multimedia/transcode: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Sep 2013 16:23:42 -0000 Author: wg Date: Mon Sep 2 16:23:41 2013 New Revision: 326026 URL: http://svnweb.freebsd.org/changeset/ports/326026 Log: multimedia/transcode: add V4L option - Add V4L option [1] - Remove support for OS < 7.x - Remove leading article from COMMENT - Add LICENSE (GPLv2) - USES gmake PR: ports/179460 Submitted by: Naram Qashat (maintainer) Added: head/multimedia/transcode/files/patch-import-v4l (contents, props changed) Modified: head/multimedia/transcode/Makefile Modified: head/multimedia/transcode/Makefile ============================================================================== --- head/multimedia/transcode/Makefile Mon Sep 2 16:21:38 2013 (r326025) +++ head/multimedia/transcode/Makefile Mon Sep 2 16:23:41 2013 (r326026) @@ -8,15 +8,17 @@ CATEGORIES= multimedia MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/ MAINTAINER= cyberbotx@cyberbotx.com -COMMENT= A text-console utility for video stream processing +COMMENT= Text-console utility for video stream processing -LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg +LICENSE= GPLv2 + +LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg USE_BZIP2= yes FAKEDIR= ${WRKDIR}/fake PLIST= ${WRKDIR}/plist -USE_GMAKE= yes USE_LDCONFIG= yes +USES= gmake WANT_SDL= yes WANT_GNOME= yes USE_AUTOTOOLS= libtool @@ -33,7 +35,7 @@ MAN1= avifix.1 aviindex.1 avimerge.1 avi NO_OPTIONS_SORT= yes OPTIONS_DEFINE= OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME XVID \ X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO LIBA52 \ - FAAC XML MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV + FAAC XML MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV V4L OPTIONS_DEFAULT= LAME DVDREAD JPEG ICONV BKTR_DESC= Bktr capture card support POSTPROC_DESC= Libpostproc support @@ -44,10 +46,6 @@ XML_DESC= Libxml2 XML support .include -.if ${OSVERSION} < 700000 -CONFIGURE_ENV+= LIBAVCODEC_EXTRA_LIBS="-pthread" -.endif - .if ${PORT_OPTIONS:MX11} USE_XORG= xv xaw xpm CONFIGURE_ARGS+= --with-x @@ -206,6 +204,16 @@ CONFIGURE_ARGS+= --with-iconv-prefix=${L CONFIGURE_ARGS+= --disable-iconv .endif +.if ${PORT_OPTIONS:MV4L} +BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat +CONFIGURE_ARGS+= --enable-v4l +.else +CONFIGURE_ARGS+= --disable-v4l +.endif + +post-extract: + @${RM} ${WRKSRC}/import/v4l/videodev* + post-patch: .if ${PORT_OPTIONS:MLZO} @${REINPLACE_CMD} -e 's|%%NUV%%|nuv|' ${WRKSRC}/import/Makefile.in Added: head/multimedia/transcode/files/patch-import-v4l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/transcode/files/patch-import-v4l Mon Sep 2 16:23:41 2013 (r326026) @@ -0,0 +1,30 @@ +--- import/v4l/import_v4l.c.orig 2011-11-19 11:50:27.000000000 -0500 ++++ import/v4l/import_v4l.c 2013-06-10 14:51:01.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + +-#include "videodev.h" ++#include + + #define MOD_NAME "import_v4l.so" + #define MOD_VERSION "v0.2.0 (2008-10-26)" +--- import/probe_v4l.c.orig 2011-11-19 11:50:27.000000000 -0500 ++++ import/probe_v4l.c 2013-06-10 14:54:28.000000000 -0400 +@@ -31,14 +31,12 @@ + + #include + +-#include "v4l/videodev.h" ++#include + + #if defined(HAVE_LINUX_VIDEODEV2_H) && defined(HAVE_STRUCT_V4L2_BUFFER) + #define _LINUX_TIME_H +-#include +-#else +-#include "v4l/videodev2.h" + #endif ++#include + + + void probe_v4l(info_t *ipipe)