From owner-svn-ports-all@freebsd.org Fri Jul 3 21:36:08 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 48054993E8F; Fri, 3 Jul 2015 21:36:08 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F1EF2820; Fri, 3 Jul 2015 21:36:08 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t63La7oq059705; Fri, 3 Jul 2015 21:36:07 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t63La7Kc059703; Fri, 3 Jul 2015 21:36:07 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201507032136.t63La7Kc059703@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 3 Jul 2015 21:36:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391275 - in head/devel/libdlna: . 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.20 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: Fri, 03 Jul 2015 21:36:08 -0000 Author: riggs Date: Fri Jul 3 21:36:06 2015 New Revision: 391275 URL: https://svnweb.freebsd.org/changeset/ports/391275 Log: Fix build with ffmpeg 2.7 PR: 201318 Submitted by: riggs Approved by: portmgr (antoine) Modified: head/devel/libdlna/Makefile head/devel/libdlna/files/patch-src-profiles.c Modified: head/devel/libdlna/Makefile ============================================================================== --- head/devel/libdlna/Makefile Fri Jul 3 21:11:15 2015 (r391274) +++ head/devel/libdlna/Makefile Fri Jul 3 21:36:06 2015 (r391275) @@ -3,7 +3,7 @@ PORTNAME= libdlna PORTVERSION= 0.2.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://libdlna.geexbox.org/releases/ \ LOCAL/ehaupt @@ -25,8 +25,6 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" -- CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -BROKEN= Does not build with ffmpeg-2.7 - post-patch: @${REINPLACE_CMD} -e \ 's#\(PKGCONFIG_DIR = \).*#\1${STAGEDIR}${PREFIX}/libdata/pkgconfig#' \ Modified: head/devel/libdlna/files/patch-src-profiles.c ============================================================================== --- head/devel/libdlna/files/patch-src-profiles.c Fri Jul 3 21:11:15 2015 (r391274) +++ head/devel/libdlna/files/patch-src-profiles.c Fri Jul 3 21:36:06 2015 (r391275) @@ -1,6 +1,6 @@ ---- src/profiles.c.orig 2012-10-30 14:12:10.000000000 -0600 -+++ src/profiles.c 2012-10-30 14:13:49.000000000 -0600 -@@ -204,14 +204,24 @@ +--- src/profiles.c.orig 2007-11-26 21:47:43.000000000 +0100 ++++ src/profiles.c 2015-07-03 22:44:50.380315167 +0200 +@@ -204,14 +204,24 @@ av_profile_get_codecs (AVFormatContext * for (i = 0; i < ctx->nb_streams; i++) { @@ -25,7 +25,7 @@ { video_stream = i; continue; -@@ -280,7 +290,7 @@ +@@ -280,14 +290,14 @@ dlna_guess_media_profile (dlna_t *dlna, if (!dlna->inited) dlna = dlna_init (); @@ -34,7 +34,15 @@ { if (dlna->verbosity) fprintf (stderr, "can't open file: %s\n", filename); -@@ -334,7 +344,7 @@ + return NULL; + } + +- if (av_find_stream_info (ctx) < 0) ++ if (avformat_find_stream_info (ctx, NULL) < 0) + { + if (dlna->verbosity) + fprintf (stderr, "can't find stream info\n"); +@@ -334,7 +344,7 @@ dlna_guess_media_profile (dlna_t *dlna, p = p->next; }