From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 15 09:10:07 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5AD0106568B for ; Sat, 15 Aug 2009 09:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B14C78FC64 for ; Sat, 15 Aug 2009 09:10:07 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n7F9A78e086193 for ; Sat, 15 Aug 2009 09:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n7F9A7en086192; Sat, 15 Aug 2009 09:10:07 GMT (envelope-from gnats) Resent-Date: Sat, 15 Aug 2009 09:10:07 GMT Resent-Message-Id: <200908150910.n7F9A7en086192@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Dima Panov" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75718106568E for ; Sat, 15 Aug 2009 09:03:29 +0000 (UTC) (envelope-from fluffy@fluffy.khv.ru) Received: from ns.ael.RU (ns.ael.ru [62.76.207.226]) by mx1.freebsd.org (Postfix) with ESMTP id C8EDC8FC15 for ; Sat, 15 Aug 2009 09:03:28 +0000 (UTC) Received: from Fluffy.Khv.RU ([80.83.238.238]) by ns.ael.RU (8.14.3/8.14.3/Fluffy/5.3) with ESMTP id n7F93FmZ042248 for ; Sat, 15 Aug 2009 20:03:20 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Received: from Fluffy.Khv.RU (localhost [127.0.0.1]) by Fluffy.Khv.RU (8.14.3/8.14.3/Fluffy/5.4.1) with ESMTP id n7F930nL037188 for ; Sat, 15 Aug 2009 20:03:00 +1100 (VLAST) (envelope-from fluffy@fluffy.khv.ru) Message-Id: <1250326980.97385@Fluffy.Khv.RU> Date: Sat, 15 Aug 2009 20:03:00 +1100 From: "Dima Panov" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/137792: multimedia/libxine: unbroke with FFMpeg-0.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Aug 2009 09:10:07 -0000 >Number: 137792 >Category: ports >Synopsis: multimedia/libxine: unbroke with FFMpeg-0.5 >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 15 09:10:06 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 8.0-800107-BETA2 amd64 >Organization: Fluffy.Khv.RU >Environment: System: FreeBSD 8.0-800107-BETA2 #0: Thu Aug 13 10:09:45 VLAST 2009 root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: multimedia/libxine: unbroke with FFMpeg-0.5 Idea from: Alberto Villa >How-To-Repeat: install multimedia/ffmpeg try to build libxine with external ffmpeg support (currently port use very outdated buldled ffmpeg) >Fix: --- libxine.diff begins here --- Index: multimedia/libxine/Makefile =================================================================== RCS file: /home/ncvs/ports/multimedia/libxine/Makefile,v retrieving revision 1.145 diff -u -r1.145 Makefile --- multimedia/libxine/Makefile 6 Jul 2009 21:25:55 -0000 1.145 +++ multimedia/libxine/Makefile 15 Aug 2009 08:54:20 -0000 @@ -64,6 +64,7 @@ JACK "Enable JACK support" off \ GNOMEVFS2 "Enable GnomeVFS2 support" off \ PULSEAUDIO "Enable PulseAudio support" off \ + FFMPEG "Enable external FFMpeg" off \ XVMC "Enable XvMC support" off \ SMB "Enable SMB protocol support" off \ AALIB "Enable aalib support" off \ @@ -133,6 +134,13 @@ CONFIGURE_ARGS+= --without-pulseaudio .endif +.if defined(WITH_FFMPEG) +LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+= --with-external-ffmpeg +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include/ffmeg" \ + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/ffmpeg" +.endif + .if defined(WITH_XVMC) .if defined(WITH_NVIDIA_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1) CONFIGURE_ARGS+= --with-xvmc-lib=XvMCNVIDIA Index: multimedia/libxine/files/patch-configure =================================================================== RCS file: /home/ncvs/ports/multimedia/libxine/files/patch-configure,v retrieving revision 1.11 diff -u -r1.11 patch-configure --- multimedia/libxine/files/patch-configure 10 May 2009 05:51:11 -0000 1.11 +++ multimedia/libxine/files/patch-configure 15 Aug 2009 08:00:30 -0000 @@ -22,6 +22,19 @@ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" +@@ -19693,12 +19693,6 @@ + + done + +- if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then +- { { $as_echo "$as_me:$LINENO: error: old & new ffmpeg headers found - you need to clean up!" >&5 +-$as_echo "$as_me: error: old & new ffmpeg headers found - you need to clean up!" >&2;} +- { (exit 1); exit 1; }; } +- fi +- + { $as_echo "$as_me:$LINENO: result: using external ffmpeg" >&5 + $as_echo "using external ffmpeg" >&6; } + else @@ -27953,12 +27959,12 @@ pkg_cv_CACA_CFLAGS="$CACA_CFLAGS" else --- libxine.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: