Date: Mon, 28 Oct 2013 14:17:39 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331858 - head/devel/libdlna/files Message-ID: <201310281417.r9SEHdNO085558@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Oct 28 14:17:38 2013 New Revision: 331858 URL: http://svnweb.freebsd.org/changeset/ports/331858 Log: devel/libdlna: fix build with newer ffmpeg Reported by: marino Approved by: portmgr (bapt, implicit) Added: head/devel/libdlna/files/ head/devel/libdlna/files/patch-ffmpeg-header-move (contents, props changed) head/devel/libdlna/files/patch-src-profiles.c (contents, props changed) Added: head/devel/libdlna/files/patch-ffmpeg-header-move ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libdlna/files/patch-ffmpeg-header-move Mon Oct 28 14:17:38 2013 (r331858) @@ -0,0 +1,71 @@ +diff -up configure.ff configure +--- configure.ff 2008-09-27 22:29:07.000000000 +0200 ++++ configure 2008-09-27 22:29:31.000000000 +0200 +@@ -607,12 +607,15 @@ fi + if [ -n "$ffmpegdir" ]; then + check_cflags -I$ffmpegdir + check_ldflags -L$ffmpegdir ++elif [ ! `pkg-config --exists libavcodec libavformat` ]; then ++ check_cflags `pkg-config --cflags libavcodec libavformat` ++ check_ldflags `pkg-config --libs-only-L libavcodec libavformat` + fi + + echolog "Checking for libavformat ..." +-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" ++check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" + echolog "Checking for libavcodec ..." +-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" ++check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" + + ################################################# + # version +diff -up src/av_mpeg4_part10.c.ff src/av_mpeg4_part10.c +--- src/av_mpeg4_part10.c.ff 2007-11-26 21:47:43.000000000 +0100 ++++ src/av_mpeg4_part10.c 2008-09-27 22:29:07.000000000 +0200 +@@ -26,7 +26,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + + #include "dlna_internals.h" + #include "profiles.h" +diff -up src/av_mpeg4_part2.c.ff src/av_mpeg4_part2.c +--- src/av_mpeg4_part2.c.ff 2007-11-26 21:47:43.000000000 +0100 ++++ src/av_mpeg4_part2.c 2008-09-27 22:29:07.000000000 +0200 +@@ -26,7 +26,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + + #include "dlna_internals.h" + #include "profiles.h" +diff -up src/containers.c.ff src/containers.c +--- src/containers.c.ff 2007-11-26 21:47:43.000000000 +0100 ++++ src/containers.c 2008-09-27 22:29:07.000000000 +0200 +@@ -4,7 +4,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avformat.h> ++#include <libavformat/avformat.h> + + #include "containers.h" + #include "profiles.h" +diff -up src/profiles.h.ff src/profiles.h +--- src/profiles.h.ff 2007-11-26 21:47:43.000000000 +0100 ++++ src/profiles.h 2008-09-27 22:29:07.000000000 +0200 +@@ -22,8 +22,8 @@ + #ifndef _PROFILES_H_ + #define _PROFILES_H_ + +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> + + #include "dlna_internals.h" + #include "containers.h" Added: head/devel/libdlna/files/patch-src-profiles.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libdlna/files/patch-src-profiles.c Mon Oct 28 14:17:38 2013 (r331858) @@ -0,0 +1,45 @@ +--- 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 @@ + + for (i = 0; i < ctx->nb_streams; i++) + { ++#if LIBAVFORMAT_BUILD < 4621 + if (audio_stream == -1 && + ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++#else ++ if (audio_stream == -1 && ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) ++#endif + { + audio_stream = i; + continue; + } ++#if LIBAVFORMAT_BUILD < 4621 + else if (video_stream == -1 && + ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) ++#else ++ else if (video_stream == -1 && ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) ++#endif + { + video_stream = i; + continue; +@@ -280,7 +290,7 @@ + if (!dlna->inited) + dlna = dlna_init (); + +- if (av_open_input_file (&ctx, filename, NULL, 0, NULL) != 0) ++ if (avformat_open_input (&ctx, filename, NULL, NULL) != 0) + { + if (dlna->verbosity) + fprintf (stderr, "can't open file: %s\n", filename); +@@ -334,7 +344,7 @@ + p = p->next; + } + +- av_close_input_file (ctx); ++ avformat_close_input (ctx); + free (codecs); + return profile; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310281417.r9SEHdNO085558>