* [gentoo-commits] gentoo-x86 commit in media-libs/mediastreamer/files: mediastreamer-2.9.0-underlinking.patch mediastreamer-2.9.0-v4l-automagic.patch mediastreamer-2.9.0-libav9.patch
@ 2013-10-09 18:52 Julian Ospald (hasufell)
0 siblings, 0 replies; only message in thread
From: Julian Ospald (hasufell) @ 2013-10-09 18:52 UTC (permalink / raw
To: gentoo-commits
hasufell 13/10/09 18:52:30
Added: mediastreamer-2.9.0-underlinking.patch
mediastreamer-2.9.0-v4l-automagic.patch
mediastreamer-2.9.0-libav9.patch
Log:
version bump wrt #486500
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.9.0-underlinking.patch?rev=1.1&content-type=text/plain
Index: mediastreamer-2.9.0-underlinking.patch
===================================================================
From 497ad9c27385c02f4f038b6e787ada9c7b6f8373 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@gentoo.org>
Date: Wed, 9 Oct 2013 18:24:28 +0200
Subject: [PATCH] fix underlinking
---
configure.ac | 20 ++++++++++++++++++++
src/Makefile.am | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 9f402bd..4b923a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,6 +893,26 @@ fi
AM_CONDITIONAL(BUILD_TESTS,test x$found_cunit = xyes)
+dnl Check for clock_gettime, in libc for FreeBSD, in rt for linux,
+dnl in rt for Solaris 7, in posix4 for Solaris 2.5.1
+LIB_CLOCK_GETTIME=
+clk_saved_libs=$LIBS
+AC_SEARCH_LIBS([clock_gettime], [rt posix4],
+ [test "$ac_cv_search_clock_gettime" = "none required" ||
+ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+AC_SUBST([LIB_CLOCK_GETTIME])
+
+AC_MSG_CHECKING([for working clock_gettime])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
+ [[clock_gettime(CLOCK_REALTIME, 0);]])], [gnupg_cv_clock_gettime=yes], [gnupg_cv_clock_gettime=no])
+AC_MSG_RESULT($gnupg_cv_clock_gettime)
+
+if test x"$gnupg_cv_clock_gettime" = xyes; then
+ AC_DEFINE([HAVE_CLOCK_GETTIME], 1,
+ [Define to 1 if you have the `clock_gettime' function.])
+fi
+LIBS=$clk_saved_libs
+
dnl ##################################################
dnl # Check for doxygen
diff --git a/src/Makefile.am b/src/Makefile.am
index a315e92..a5e144c 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -266,7 +266,7 @@ voipdescs.h: Makefile $(libmediastreamer_voip_la_SOURCES)
awk 'BEGIN { print("MSFilterDesc * ms_voip_filter_descs[]={") } { printf("&%s,\n",$$1) } END{ print("NULL\n};\n") } ' $$builddir/voipdescs.txt >> $$builddir/$@
-libmediastreamer_base_la_LIBADD= $(ORTP_LIBS)
+libmediastreamer_base_la_LIBADD= $(ORTP_LIBS) @LIB_CLOCK_GETTIME@
libmediastreamer_base_la_LDFLAGS= -no-undefined -version-info $(LIBMEDIASTREAMER_SO_VERSION)
if !BUILD_WIN32
--
1.8.3.2
1.1 media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.9.0-v4l-automagic.patch?rev=1.1&content-type=text/plain
Index: mediastreamer-2.9.0-v4l-automagic.patch
===================================================================
From b99ddff6f322c8b466f3cdfd71b0d629cea33aac Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@gentoo.org>
Date: Wed, 9 Oct 2013 18:12:46 +0200
Subject: [PATCH] Support disabling V4L support completely
---
configure.ac | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 94b6f18..9f402bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -746,6 +746,16 @@ PACKAGE_DATA_DIR="$prefix/share"
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${package_prefix}/share" ,[path of data])
AC_SUBST(PACKAGE_DATA_DIR)
+AC_ARG_ENABLE(v4l,
+ [ --disable-v4l Disable usage of v4l],
+ [case "${enableval}" in
+ yes) v4l=yes ;;
+ no) v4l=no ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-v4l) ;;
+ esac],[v4l=yes])
+
+if test "$v4l" = "yes" ; then
+
dnl check for video4linux headers
AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h)
if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then
@@ -759,9 +769,6 @@ else
found_v4l2=no
fi
-AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
-AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
-
AC_ARG_ENABLE(libv4l1,
[AS_HELP_STRING([--disable-libv4l1], [Disable usage of libv4l1, really discouraged])],
[case "${enableval}" in
@@ -805,6 +812,11 @@ this check.
fi
fi
+fi
+
+AM_CONDITIONAL(BUILD_V4L1, test x$found_v4l1 = xyes )
+AM_CONDITIONAL(BUILD_V4L2, test x$found_v4l2 = xyes )
+
AC_PATH_PROG(PCAP,pcap-config,false)
AM_CONDITIONAL(HAVE_PCAP, test $PCAP != false)
--
1.8.3.2
1.1 media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mediastreamer/files/mediastreamer-2.9.0-libav9.patch?rev=1.1&content-type=text/plain
Index: mediastreamer-2.9.0-libav9.patch
===================================================================
diff --git a/src/videofilters/h264dec.c b/src/videofilters/h264dec.c
index 38881c1..f306723 100644
--- a/src/videofilters/h264dec.c
+++ b/src/videofilters/h264dec.c
@@ -58,10 +58,10 @@ static void dec_open(DecData *d){
int error;
codec=avcodec_find_decoder(CODEC_ID_H264);
if (codec==NULL) ms_fatal("Could not find H264 decoder in ffmpeg.");
- avcodec_get_context_defaults(&d->av_context);
- error=avcodec_open(&d->av_context,codec);
+ avcodec_get_context_defaults3(&d->av_context, NULL);
+ error=avcodec_open2(&d->av_context,codec, NULL);
if (error!=0){
- ms_fatal("avcodec_open() failed.");
+ ms_fatal("avcodec_open2() failed.");
}
}
diff --git a/src/videofilters/jpegwriter.c b/src/videofilters/jpegwriter.c
index 891f618..96f5d7f 100644
--- a/src/videofilters/jpegwriter.c
+++ b/src/videofilters/jpegwriter.c
@@ -90,7 +90,7 @@ static void jpg_process(MSFilter *f){
mblk_t *jpegm;
struct SwsContext *sws_ctx;
- AVCodecContext *avctx=avcodec_alloc_context();
+ AVCodecContext *avctx=avcodec_alloc_context3(NULL);
avctx->width=yuvbuf.w;
avctx->height=yuvbuf.h;
@@ -98,9 +98,9 @@ static void jpg_process(MSFilter *f){
avctx->time_base.den =1;
avctx->pix_fmt=PIX_FMT_YUVJ420P;
- error=avcodec_open(avctx,s->codec);
+ error=avcodec_open2(avctx,s->codec,NULL);
if (error!=0) {
- ms_error("avcodec_open() failed: %i",error);
+ ms_error("avcodec_open2() failed: %i",error);
cleanup(s,NULL);
av_free(avctx);
return;
diff --git a/src/videofilters/nowebcam.c b/src/videofilters/nowebcam.c
index 60e3853..329c453 100644
--- a/src/videofilters/nowebcam.c
+++ b/src/videofilters/nowebcam.c
@@ -68,9 +68,9 @@ static mblk_t *jpeg2yuv(uint8_t *jpgbuf, int bufsize, MSVideoSize *reqsize){
return NULL;
}
- avcodec_get_context_defaults(&av_context);
- if (avcodec_open(&av_context,codec)<0){
- ms_error("jpeg2yuv: avcodec_open failed");
+ avcodec_get_context_defaults3(&av_context, NULL);
+ if (avcodec_open2(&av_context,codec,NULL)<0){
+ ms_error("jpeg2yuv: avcodec_open2 failed");
return NULL;
}
av_init_packet(&pkt);
diff --git a/src/videofilters/videodec.c b/src/videofilters/videodec.c
index 494debf..c52e207 100644
--- a/src/videofilters/videodec.c
+++ b/src/videofilters/videodec.c
@@ -53,7 +53,7 @@ static void dec_init(MSFilter *f, enum CodecID cid){
DecState *s=(DecState *)ms_new0(DecState,1);
ms_ffmpeg_check_init();
- avcodec_get_context_defaults(&s->av_context);
+ avcodec_get_context_defaults3(&s->av_context, NULL);
s->av_codec=NULL;
s->codec=cid;
s->input=NULL;
@@ -135,8 +135,8 @@ static void dec_preprocess(MSFilter *f){
if (s->av_context.codec==NULL){
/* we must know picture size before initializing snow decoder*/
if (s->codec!=CODEC_ID_SNOW){
- error=avcodec_open(&s->av_context, s->av_codec);
- if (error!=0) ms_error("avcodec_open() failed: %i",error);
+ error=avcodec_open2(&s->av_context, s->av_codec,NULL);
+ if (error!=0) ms_error("avcodec_open2() failed: %i",error);
if (s->codec==CODEC_ID_MPEG4 && s->dci_size>0){
s->av_context.extradata=s->dci;
s->av_context.extradata_size=s->dci_size;
@@ -225,8 +225,8 @@ static mblk_t * parse_snow_header(DecState *s,mblk_t *inm){
int error;
s->av_context.width=h>>16;
s->av_context.height=h&0xffff;
- error=avcodec_open(&s->av_context, s->av_codec);
- if (error!=0) ms_error("avcodec_open() failed for snow: %i",error);
+ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
+ if (error!=0) ms_error("avcodec_open2() failed for snow: %i",error);
else {
s->snow_initialized=TRUE;
ms_message("Snow decoder initialized,size=%ix%i",
diff --git a/src/videofilters/videoenc.c b/src/videofilters/videoenc.c
index da35592..09dcc9d 100644
--- a/src/videofilters/videoenc.c
+++ b/src/videofilters/videoenc.c
@@ -242,7 +242,7 @@ static void prepare(EncState *s){
AVCodecContext *c=&s->av_context;
const int max_br_vbv=128000;
- avcodec_get_context_defaults(c);
+ avcodec_get_context_defaults3(c, NULL);
if (s->codec==CODEC_ID_MJPEG)
{
ms_message("Codec bitrate set to %i",c->bit_rate);
@@ -348,9 +348,9 @@ static void enc_preprocess(MSFilter *f){
ms_error("could not find encoder for codec id %i",s->codec);
return;
}
- error=avcodec_open(&s->av_context, s->av_codec);
+ error=avcodec_open2(&s->av_context, s->av_codec, NULL);
if (error!=0) {
- ms_error("avcodec_open() failed: %i",error);
+ ms_error("avcodec_open2() failed: %i",error);
return;
}
video_starter_init(&s->starter);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-10-09 18:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-09 18:52 [gentoo-commits] gentoo-x86 commit in media-libs/mediastreamer/files: mediastreamer-2.9.0-underlinking.patch mediastreamer-2.9.0-v4l-automagic.patch mediastreamer-2.9.0-libav9.patch Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox