From owner-freebsd-multimedia@FreeBSD.ORG Fri Apr 6 22:55:28 2007 Return-Path: X-Original-To: multimedia@FreeBSD.org Delivered-To: freebsd-multimedia@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9611E16A408 for ; Fri, 6 Apr 2007 22:55:28 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from postfix1-g20.free.fr (postfix1-g20.free.fr [212.27.60.42]) by mx1.freebsd.org (Postfix) with ESMTP id 023F113C45B for ; Fri, 6 Apr 2007 22:55:27 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from smtp7-g19.free.fr (smtp7-g19.free.fr [212.27.42.64]) by postfix1-g20.free.fr (Postfix) with ESMTP id 627BFD2BEE0 for ; Sat, 7 Apr 2007 00:27:20 +0200 (CEST) Received: from graf.pompo.net (graf.pompo.net [81.56.186.139]) by smtp7-g19.free.fr (Postfix) with ESMTP id ED9B415C57 for ; Sat, 7 Apr 2007 00:27:18 +0200 (CEST) Received: by graf.pompo.net (Postfix, from userid 1001) id CF2A711449; Sat, 7 Apr 2007 00:27:08 +0200 (CEST) To: FreeBSD-gnats-submit@freebsd.org From: Thierry Thomas X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20070406222708.CF2A711449@graf.pompo.net> Date: Sat, 7 Apr 2007 00:27:08 +0200 (CEST) Cc: multimedia@FreeBSD.org Subject: multimedia/ffmpeg-devel: enable swscaler and threads support. X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thierry Thomas List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Apr 2007 22:55:28 -0000 >Submitter-Id: current-users >Originator: Thierry Thomas >Organization: Kabbale Eros >Confidential: no >Synopsis: multimedia/ffmpeg-devel: enable swscaler and threads support. >Severity: non-critical >Priority: medium >Category: ports >Class: change-request >Release: FreeBSD 6.2-STABLE i386 >Environment: System: FreeBSD graf.pompo.net 6.2-STABLE FreeBSD 6.2-STABLE #0: Sun Jan 28 10:29:56 CET 2007 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF060511 i386 >Description: The port sysutils/xvidcap uses its embedded ffmpeg, and I'd like to switch to the external ffmpeg-devel. But it won't be possible unless libswscale is enabled by default. The following patch: - enables libswscale by default; - enables threads by default; - sets CONFIGURE_LOG; - removes '-O3'; - changes WWW to the main site. >How-To-Repeat: N/A. >Fix: Please apply the following patch: --- ffmpeg-devel.diff begins here --- diff -urN multimedia/ffmpeg-devel.orig/Makefile multimedia/ffmpeg-devel/Makefile --- multimedia/ffmpeg-devel.orig/Makefile Fri Apr 6 22:07:53 2007 +++ multimedia/ffmpeg-devel/Makefile Fri Apr 6 23:12:25 2007 @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 2007-03-31 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= ahze @@ -31,6 +31,7 @@ --extra-libs="${PTHREAD_LIBS}" \ --disable-bktr \ --enable-gpl +CONFIGURE_LOG= config.err MAKE_ENV= INSTALL="${INSTALL}" SHLIB_VER= 1 PLIST_SUB= SHLIB_VER=${SHLIB_VER} @@ -181,6 +182,19 @@ CONFIGURE_ARGS+= --enable-xvid .endif +# libswscale +.if !defined(WITHOUT_SWSCALE) +CONFIGURE_ARGS+= --enable-swscaler +PLIST_SUB+= SWSCALE="" +.else +PLIST_SUB+= SWSCALE="@comment " +.endif + +# Threads +.if !defined(WITHOUT_THREADS) +CONFIGURE_ARGS+= --enable-pthreads +.endif + pre-everything:: .ifndef(WITHOUT_A52) @${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52' @@ -231,8 +245,16 @@ @${ECHO_MSG} 'Define WITH_XVID to enable XVID codec' @${ECHO_MSG} .endif +.ifndef(WITHOUT_SWSCALE) + @${ECHO_MSG} 'You can disable libswscale support by defining WITHOUT_SWSCALE' + @${ECHO_MSG} +.endif +.ifndef(WITHOUT_THREADS) + @${ECHO_MSG} 'You can disable threading by defining WITHOUT_THREADS' + @${ECHO_MSG} +.endif -post-patch: +pre-configure: # Faad compat @${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/faad.c # {C,LD}FLAGS safeness diff -urN multimedia/ffmpeg-devel.orig/files/patch-configure multimedia/ffmpeg-devel/files/patch-configure --- multimedia/ffmpeg-devel.orig/files/patch-configure Fri Apr 6 22:07:54 2007 +++ multimedia/ffmpeg-devel/files/patch-configure Fri Apr 6 23:13:56 2007 @@ -1,5 +1,28 @@ ---- configure.orig Sat Mar 31 00:25:05 2007 -+++ configure Sun Apr 1 18:59:07 2007 +--- configure.orig Sat Mar 31 06:25:05 2007 ++++ configure Fri Apr 6 23:13:32 2007 +@@ -1749,14 +1749,14 @@ + # not all compilers support -Os + test "$optimize" = "small" && check_cflags -Os + +-if enabled optimize; then +- if test -n "`$cc -v 2>&1 | grep xlc`"; then +- add_cflags "-O5" +- add_ldflags "-O5" +- else +- add_cflags "-O3" +- fi +-fi ++#if enabled optimize; then ++# if test -n "`$cc -v 2>&1 | grep xlc`"; then ++# add_cflags "-O5" ++# add_ldflags "-O5" ++# else ++# add_cflags "-O3" ++# fi ++#fi + + # PIC flags for shared library objects where they are needed + if enabled shared; then @@ -1966,15 +1966,15 @@ if enabled shared; then echo "BUILD_SHARED=yes" >> config.mak diff -urN multimedia/ffmpeg-devel.orig/pkg-descr multimedia/ffmpeg-devel/pkg-descr --- multimedia/ffmpeg-devel.orig/pkg-descr Tue Sep 25 21:27:10 2001 +++ multimedia/ffmpeg-devel/pkg-descr Fri Apr 6 23:39:59 2007 @@ -21,4 +21,4 @@ * ffserver: high performance live broadcast streaming server based on the ffmpeg core encoders. -WWW: http://ffmpeg.sourceforge.net/ +WWW: http://ffmpeg.org/ diff -urN multimedia/ffmpeg-devel.orig/pkg-plist multimedia/ffmpeg-devel/pkg-plist --- multimedia/ffmpeg-devel.orig/pkg-plist Fri Apr 6 22:07:54 2007 +++ multimedia/ffmpeg-devel/pkg-plist Sat Apr 7 00:08:44 2007 @@ -40,6 +40,10 @@ lib/libpostproc.so lib/libpostproc.so.%%SHLIB_VER%% lib/libpostproc.so.51.1.0 +%%SWSCALE%%lib/libswscale.a +%%SWSCALE%%lib/libswscale.so +%%SWSCALE%%lib/libswscale.so.%%SHLIB_VER%% +%%SWSCALE%%lib/libswscale.so.0.5.0 lib/vhook/fish.so lib/vhook/null.so lib/vhook/ppm.so --- ffmpeg-devel.diff ends here ---