[arch-commits] Commit in opal/trunk (PKGBUILD opal-ffmpeg.patch)
Jan de Groot
jgc at archlinux.org
Tue Aug 28 18:49:49 UTC 2012
Date: Tuesday, August 28, 2012 @ 14:49:49
Author: jgc
Revision: 165671
Update to 3.10.7, fix patch
Modified:
opal/trunk/PKGBUILD
opal/trunk/opal-ffmpeg.patch
-------------------+
PKGBUILD | 6 +++-
opal-ffmpeg.patch | 77 ++++++++++++++++++++++++++--------------------------
2 files changed, 44 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-08-28 15:59:06 UTC (rev 165670)
+++ PKGBUILD 2012-08-28 18:49:49 UTC (rev 165671)
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jan at archlinux.org>
# Contributor: Tom K <tomk at runbox.com>
pkgname=opal
-pkgver=3.10.5
+pkgver=3.10.7
pkgrel=1
pkgdesc="Open Phone Abstraction Library"
arch=(i686 x86_64)
@@ -28,3 +28,7 @@
make DESTDIR="${pkgdir}" install
chmod 644 "${pkgdir}/usr/lib/libopal_s.a"
}
+md5sums=('8686bb930668067eefadab115d2ee1c2'
+ '53bb06a376fb57a306522bfa6a573217')
+md5sums=('8686bb930668067eefadab115d2ee1c2'
+ '0f05c01dada644b37805667ba9e81aa5')
Modified: opal-ffmpeg.patch
===================================================================
--- opal-ffmpeg.patch 2012-08-28 15:59:06 UTC (rev 165670)
+++ opal-ffmpeg.patch 2012-08-28 18:49:49 UTC (rev 165671)
@@ -1,7 +1,7 @@
-diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx 2012-04-26 06:56:01.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-06-10 16:39:35.447021150 +0200
-@@ -51,6 +51,7 @@
+diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx
+--- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx 2012-08-23 04:18:42.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-08-28 19:53:12.080918973 +0200
+@@ -48,6 +48,7 @@
#endif
#include "h263-1998.h"
@@ -9,7 +9,7 @@
#include <limits>
#include <iomanip>
#include <stdio.h>
-@@ -324,9 +325,9 @@
+@@ -317,9 +318,9 @@
// Level 2+
// works with eyeBeam, signaled via non-standard "D"
if (atoi(value) == 1)
@@ -21,7 +21,7 @@
return;
}
-@@ -335,9 +336,9 @@
+@@ -328,9 +329,9 @@
// Annex F: Advanced Prediction Mode
// does not work with eyeBeam
if (atoi(value) == 1)
@@ -33,7 +33,7 @@
return;
}
#endif
-@@ -367,9 +368,9 @@
+@@ -360,9 +361,9 @@
// Annex K: Slice Structure
// does not work with eyeBeam
if (atoi(value) != 0)
@@ -45,7 +45,7 @@
return;
}
-@@ -377,9 +378,9 @@
+@@ -370,9 +371,9 @@
// Annex S: Alternative INTER VLC mode
// does not work with eyeBeam
if (atoi(value) == 1)
@@ -56,8 +56,8 @@
+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
return;
}
- }
-@@ -445,15 +446,6 @@
+
+@@ -450,15 +451,6 @@
PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
@@ -73,7 +73,7 @@
return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
}
-@@ -516,7 +508,7 @@
+@@ -521,7 +513,7 @@
// Need to copy to local buffer to guarantee 16 byte alignment
memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
@@ -82,7 +82,7 @@
/*
m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -598,13 +590,13 @@
+@@ -603,13 +595,13 @@
m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
m_context->opaque = this; // used to separate out packets from different encode threads
@@ -99,21 +99,23 @@
return true;
}
-diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx 2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-06-10 16:49:11.210568639 +0200
-@@ -25,6 +25,7 @@
+Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx
+--- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx 2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-08-28 19:53:12.080918973 +0200
+@@ -27,6 +27,7 @@
#include <fstream>
#include <stdlib.h>
#include <sys/stat.h>
+#include <unistd.h>
-
- #ifndef PLUGINCODEC_TRACING
-diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.5/plugins/video/H.264/h264-x264.cxx 2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx 2012-06-10 17:04:19.695646950 +0200
-@@ -1035,13 +1035,10 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx
+--- opal-3.10.7/plugins/video/H.264/h264-x264.cxx 2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx 2012-08-28 19:53:12.080918973 +0200
+@@ -1071,13 +1071,10 @@
return false;
m_context->workaround_bugs = FF_BUG_AUTODETECT;
@@ -128,32 +130,31 @@
CODEC_FLAG2_SKIP_RD |
CODEC_FLAG2_CHUNKS;
-diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx 2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-06-10 17:04:46.012171051 +0200
+Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig
+diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx
+--- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx 2012-08-23 04:18:41.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-08-28 19:53:12.084252306 +0200
@@ -33,6 +33,7 @@
#include <codec/opalplugin.hpp>
#include <stdio.h>
+#include <unistd.h>
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig
+diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
+--- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-08-23 04:18:44.000000000 +0200
++++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-08-28 19:54:35.460923804 +0200
+@@ -103,6 +103,7 @@
- #if defined(X264_LICENSED) || defined(GPL_HELPER_APP)
-diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-04-26 06:56:02.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-06-10 16:46:33.498089705 +0200
-@@ -101,8 +101,10 @@
- #include <libavutil/bswap.h>
- #include <libavcodec/mpegvideo.h>
-
-+
#else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include LIBAVCODEC_HEADER
+ #include "../common/ffmpeg.h"
+#include <libavutil/opt.h>
#endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
}
-@@ -589,17 +591,17 @@
+@@ -589,17 +590,17 @@
m_avpicture->quality = m_videoQMin;
#ifdef USE_ORIG
@@ -174,7 +175,7 @@
#endif
m_avcontext->opaque = this; // for use in RTP callback
}
-@@ -804,7 +806,7 @@
+@@ -804,7 +805,7 @@
// Should the next frame be an I-Frame?
if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
{
@@ -183,7 +184,7 @@
}
else // No IFrame requested, let avcodec decide what to do
{
-@@ -1325,7 +1327,7 @@
+@@ -1325,7 +1326,7 @@
void MPEG4DecoderContext::SetStaticDecodingParams() {
m_avcontext->flags |= CODEC_FLAG_4MV;
More information about the arch-commits
mailing list