[tvheadend] Fix build with FFmpeg 3.5
by Mohamed ElMorabity
commit 4100402de83e8113208bf226eaacd34ebba9d7ff
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Jan 23 14:53:12 2018 +0100
Fix build with FFmpeg 3.5
tvheadend-4.2.5-ffmpeg_3.5.patch | 115 +++++++++++++++++++++++++++++++++++++++
tvheadend.spec | 7 ++-
2 files changed, 121 insertions(+), 1 deletion(-)
---
diff --git a/tvheadend-4.2.5-ffmpeg_3.5.patch b/tvheadend-4.2.5-ffmpeg_3.5.patch
new file mode 100644
index 0000000..eaec90e
--- /dev/null
+++ b/tvheadend-4.2.5-ffmpeg_3.5.patch
@@ -0,0 +1,115 @@
+diff -up ./src/muxer/muxer_libav.c.orig ./src/muxer/muxer_libav.c
+--- ./src/muxer/muxer_libav.c.orig 2017-12-18 09:57:28.000000000 +0100
++++ ./src/muxer/muxer_libav.c 2018-01-23 14:24:07.923509542 +0100
+@@ -174,7 +174,7 @@ lav_muxer_add_stream(lav_muxer_t *lm,
+ }
+
+ if(lm->lm_oc->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ return 0;
+ }
+diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
+--- ./src/plumbing/transcoding.c.orig 2017-12-18 09:57:28.000000000 +0100
++++ ./src/plumbing/transcoding.c 2018-01-23 14:43:14.873964416 +0100
+@@ -19,7 +19,7 @@
+ #include <unistd.h>
+ #include <libavformat/avformat.h>
+ #include <libavcodec/avcodec.h>
+-#include <libavfilter/avfiltergraph.h>
++#include <libavfilter/avfilter.h>
+ #include <libavfilter/buffersink.h>
+ #include <libavfilter/buffersrc.h>
+ #include <libavutil/opt.h>
+@@ -574,7 +574,7 @@ transcoder_stream_audio(transcoder_t *t,
+ octx->channels = as->aud_channels ? as->aud_channels : ictx->channels;
+ octx->channel_layout = transcode_get_channel_layout(&octx->channels, ocodec);
+ octx->bit_rate = as->aud_bitrate ? as->aud_bitrate : 0;
+- octx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ if (!octx->sample_rate) {
+ tvherror(LS_TRANSCODE, "%04X: audio encoder has no suitable sample rate!", shortid(t));
+@@ -619,7 +619,7 @@ transcoder_stream_audio(transcoder_t *t,
+ break;
+
+ case SCT_AAC:
+- octx->flags |= CODEC_FLAG_BITEXACT;
++ octx->flags |= AV_CODEC_FLAG_BITEXACT;
+ // use 64 kbit per channel as default
+ if (octx->bit_rate == 0) {
+ octx->bit_rate = octx->channels * 64000;
+@@ -630,10 +630,10 @@ transcoder_stream_audio(transcoder_t *t,
+ // use vbr with quality setting as default
+ // and also use a user specified bitrate < 16 kbit as quality setting
+ if (octx->bit_rate == 0) {
+- octx->flags |= CODEC_FLAG_QSCALE;
++ octx->flags |= AV_CODEC_FLAG_QSCALE;
+ octx->global_quality = 4 * FF_QP2LAMBDA;
+ } else if (t->t_props.tp_abitrate < 16) {
+- octx->flags |= CODEC_FLAG_QSCALE;
++ octx->flags |= AV_CODEC_FLAG_QSCALE;
+ octx->global_quality = t->t_props.tp_abitrate * FF_QP2LAMBDA;
+ octx->bit_rate = 0;
+ }
+@@ -1048,7 +1048,7 @@ create_video_filter(video_stream_t *vs,
+ AVCodecContext *ictx, AVCodecContext *octx)
+ {
+ AVFilterInOut *flt_inputs, *flt_outputs;
+- AVFilter *flt_bufsrc, *flt_bufsink;
++ const AVFilter *flt_bufsrc, *flt_bufsink;
+ enum AVPixelFormat pix_fmts[] = { 0, AV_PIX_FMT_NONE };
+ char opt[128];
+ int err;
+@@ -1289,12 +1289,12 @@ transcoder_stream_video(transcoder_t *t,
+ else
+ octx->pix_fmt = AV_PIX_FMT_YUV420P;
+
+- octx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ if (t->t_props.tp_vbitrate < 64) {
+ // encode with specified quality and optimize for low latency
+ // valid values for quality are 2-31, smaller means better quality, use 5 as default
+- octx->flags |= CODEC_FLAG_QSCALE;
++ octx->flags |= AV_CODEC_FLAG_QSCALE;
+ octx->global_quality = FF_QP2LAMBDA *
+ (t->t_props.tp_vbitrate == 0 ? 5 : MINMAX(t->t_props.tp_vbitrate, 2, 31));
+ } else {
+@@ -1340,7 +1340,7 @@ transcoder_stream_video(transcoder_t *t,
+ else
+ octx->pix_fmt = AV_PIX_FMT_YUV420P;
+
+- octx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ // Default = "medium". We gain more encoding speed compared to the loss of quality when lowering it _slightly_.
+ // select preset according to system performance and codec type
+@@ -1371,7 +1371,7 @@ transcoder_stream_video(transcoder_t *t,
+
+ case SCT_HEVC:
+ octx->pix_fmt = AV_PIX_FMT_YUV420P;
+- octx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ // on all hardware ultrafast (or maybe superfast) should be safe
+ // select preset according to system performance
+@@ -2177,7 +2177,7 @@ transcoder_get_capabilities(int experime
+ if (!WORKING_ENCODER(p->id))
+ continue;
+
+- if (((p->capabilities & CODEC_CAP_EXPERIMENTAL) && !experimental) ||
++ if (((p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && !experimental) ||
+ (p->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) {
+ continue;
+ }
+@@ -2192,7 +2192,7 @@ transcoder_get_capabilities(int experime
+ htsmsg_add_str(m, "name", p->name);
+ snprintf(buf, sizeof(buf), "%s%s",
+ p->long_name ?: "",
+- (p->capabilities & CODEC_CAP_EXPERIMENTAL) ?
++ (p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) ?
+ " (Experimental)" : "");
+ if (buf[0] != '\0')
+ htsmsg_add_str(m, "long_name", buf);
diff --git a/tvheadend.spec b/tvheadend.spec
index 56891f1..551c2fb 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -3,7 +3,7 @@
Name: tvheadend
Version: 4.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: TV streaming server and digital video recorder
Group: Applications/Multimedia
@@ -24,6 +24,8 @@ Patch3: %{name}-4.2.2-dtv_scan_tables.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
Patch4: %{name}-4.2.1-crypto_policies.patch
+# Fix build with FFmpeg 3.5
+Patch5: %{name}-4.2.5-ffmpeg_3.5.patch
BuildRequires: bzip2
BuildRequires: gcc
@@ -148,6 +150,9 @@ exit 0
%changelog
+* Tue Jan 23 2018 root - 4.2.5-3
+- Fix build with FFmpeg 3.5
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 4.2.5-2
- Rebuilt for ffmpeg-3.5 git
6 years, 10 months
[libquicktime] Update to 1.2.4-93-g4d45177 Upstream have the official patches for ffmpeg_2.9.patch libav10.patch li
by Sérgio M. Basto
commit 8c09fe02a3c512c24da2dbc0ef48e3f2e0dd616f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 21 23:27:20 2018 +0000
Update to 1.2.4-93-g4d45177
Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch
This release have some security fixes
.gitignore | 1 +
ChangeLog | 583 +++++++++++++++++++++++++++++++++++++++
converttogit.sh | 16 ++
ffmpeg_2.9.patch | 351 ------------------------
libav10.patch | 654 --------------------------------------------
libquicktime-backport.patch | 250 -----------------
libquicktime.spec | 33 ++-
sources | 2 +-
update_libquicktime.sh | 31 +++
9 files changed, 653 insertions(+), 1268 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8774481..0578870 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libquicktime-1.2.4.tar.gz
+/libquicktime-1.2.4-4d451774b8.tar.gz
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b542036
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,583 @@
+commit 4d451774b89fbdd2f53204f92b71837af7b06761
+Author: gmerlin <gmerlin>
+Date: Tue Sep 26 11:46:13 2017 +0000
+
+ * Support for version 1 of the mdhd atom (patch by Erik Johansson)
+
+commit f32646eb76a6d2b2768442bd78afb65e7cb5867e
+Author: gmerlin <gmerlin>
+Date: Tue Jul 18 14:15:30 2017 +0000
+
+ * Applied udta.patch
+
+commit bfe392e31eea480d7c4507663395ca483a5abb67
+Author: gmerlin <gmerlin>
+Date: Fri Jun 23 13:46:41 2017 +0000
+
+ * Fixed CVE-2017-9125
+
+commit 3a7b5017e5d803dbe82eddd08a2804be3fda0c5d
+Author: gmerlin <gmerlin>
+Date: Fri Jun 23 13:00:36 2017 +0000
+
+ * Fixed allocation-failed-in_quicktime_read_ftyp and
+ allocation-failed-in_quicktime_read_info
+
+commit bf6e842131fb013a087df6d7c5069a7d3646b199
+Author: gmerlin <gmerlin>
+Date: Mon Mar 6 10:16:11 2017 +0000
+
+ * Fix security hole
+
+commit 2ea10548de96c3379da6264e6ca21ee3cdc06f0c
+Author: gmerlin <gmerlin>
+Date: Tue Apr 26 18:04:01 2016 +0000
+
+ * Security fix
+
+commit c166ad0b5d00265d6a0a708ed1d39772bfaa8a91
+Author: gmerlin <gmerlin>
+Date: Tue Apr 26 17:51:07 2016 +0000
+
+ * Fix the types of some integer i/o functions (patch by Erik Johansson)
+
+commit 0b908b27ac3acd25a73f72a25ac1b6ffc86d0567
+Author: gmerlin <gmerlin>
+Date: Tue Apr 26 17:47:30 2016 +0000
+
+ * Fix issue with stps-atom and packetindex (patch by Erik Johansson)
+
+commit 1698b8b3f46c46a46e5efb856e19ec952b4f8b92
+Author: sms00 <sms00>
+Date: Sun Dec 6 18:49:50 2015 +0000
+
+ Remove unused functions.
+
+commit 18487486657ba752bf38656509e719b5c5b2c51b
+Author: sms00 <sms00>
+Date: Sat Dec 5 18:52:43 2015 +0000
+
+ ffmpeg's neverending api changes - they went AV crazy (again/still). Needed to add AV_ or AV in front of items used from avcodec
+
+commit 12a6d2878e63d2c602e6f00612450fa8e377f322
+Author: gmerlin <gmerlin>
+Date: Wed Oct 21 15:38:33 2015 +0000
+
+ * Fix Integer over flow in stts.c and quicktime_stsdtable_read_timecode
+ patch by Erik Johansson
+
+commit f224f75ee4a33c565ddfb2db82c8ea3d38bbb517
+Author: gmerlin <gmerlin>
+Date: Fri Mar 20 10:00:56 2015 +0000
+
+ * Fix stsd atom termination (patch by Balázs Oroszi)
+
+commit 3407dafde9dc28b796059f5932b0be097626fd22
+Author: sms00 <sms00>
+Date: Fri Mar 6 20:40:23 2015 +0000
+
+ annotate the new additions for rear surround and matrixed (Prologic) channels
+
+commit d20fd20cb0f274a0f34371583e745f23021c20f1
+Author: sms00 <sms00>
+Date: Fri Mar 6 15:14:09 2015 +0000
+
+ Add mappings from 'chan atom' to lqt for: rear surround left/right, mono and left/right total (prologic matrix'd)
+
+commit 531270f7db23760e6ebbd6cab493550b4ca1c7fd
+Author: gmerlin <gmerlin>
+Date: Tue Feb 3 15:45:59 2015 +0000
+
+ * Read reserved gmin bits (patch by Derek Chow)
+
+commit 8e22e547d68b048e2936cdaab792a812e4b53941
+Author: sms00 <sms00>
+Date: Mon Nov 3 20:48:22 2014 +0000
+
+ Prevent crash if audio Decoder doesn't exist - example is 'drms'
+ [codecs] Warning: Could not find audio Decoder for fourcc drms
+ for soundtracks in iTunes movies would crash qtinfo.
+
+commit 28412a2a639b5ff2078f52c253c8c23810a11bbd
+Author: sms00 <sms00>
+Date: Fri Oct 24 15:14:27 2014 +0000
+
+ returning 0 from the decode initialization causes lqt_ensure_stream_cmodel_decode to not fill in the color model.
+
+ qtinfo would print "Native colormodel: Undefined" before. Now qtinfo prints
+ "Native colormodel: YUV 4:2:2 packed (YUY2)"
+
+commit 54513401b82b6c4dd5f2484420933ff71862e5f2
+Author: gmerlin <gmerlin>
+Date: Thu Oct 23 15:12:09 2014 +0000
+
+ * Fixed stts generation
+
+commit 06cc79271551b43551d13fa27175ada88461126d
+Author: gmerlin <gmerlin>
+Date: Thu May 1 22:54:30 2014 +0000
+
+ * More cleanups
+
+commit 2a9ca087b733aa4922d110c99b28e5c3c3227798
+Author: gmerlin <gmerlin>
+Date: Thu May 1 21:15:34 2014 +0000
+
+ * Remove quicktime_chunk_to_offset
+
+commit 5d2cf083a9e2f70b88403984ed9a3ed060c43953
+Author: gmerlin <gmerlin>
+Date: Thu May 1 18:58:38 2014 +0000
+
+ * More cleanups
+
+commit 7819adf04207d52757237ffec7f87ebb8f6f84a4
+Author: gmerlin <gmerlin>
+Date: Thu May 1 18:54:00 2014 +0000
+
+ * Let the text tracks also use the packet index
+ * Removed lots of old cruft
+
+commit e3b9f0fe2691f1bf491c94821e5c92b78d1524ba
+Author: gmerlin <gmerlin>
+Date: Thu May 1 12:58:16 2014 +0000
+
+ * Move most video specific functions to video.c
+
+commit 9cb33b4813cd8fb1743b7a8e00299dfef3df703a
+Author: gmerlin <gmerlin>
+Date: Thu May 1 12:07:28 2014 +0000
+
+ * Removed old decode_audio function
+
+commit 1c63349eeedbfc8de05f71513cb3d729983cdd5a
+Author: gmerlin <gmerlin>
+Date: Tue Apr 29 22:21:55 2014 +0000
+
+ * Converted core and all codecs for new Audio demuxing API
+
+commit 223e3c392d29ac8f59a3d2533ce08cfb85226865
+Author: gmerlin <gmerlin>
+Date: Sun Apr 27 22:59:54 2014 +0000
+
+ * Introduce quicktime_trak_read_packet()
+ * New codec function: decode_audio_packet() which decodes just one
+ single packet and leaves buffering and seeking to the core
+ * Audio seeking is not adapted yet but will be ASAP, so it might not work
+ ATM
+
+commit 73b6a91c7f589e0ff67e9861fa24e5b2c3b6d3fe
+Author: gmerlin <gmerlin>
+Date: Fri Apr 25 21:55:28 2014 +0000
+
+ * Remove old ffmpeg cruft and increase the minimum lavc version
+
+commit d92d1917f06e877d46a5a61159d6228e02f92967
+Author: gmerlin <gmerlin>
+Date: Wed Apr 23 22:24:04 2014 +0000
+
+ * New decoding API works somehow
+
+commit 1a6fbf08be64eca0842095cf7005f475c51e40cb
+Author: gmerlin <gmerlin>
+Date: Wed Apr 23 20:45:45 2014 +0000
+
+ * More API conversions
+
+commit 6e91b8b1cb9255cdefbf5462bc2b6288f4b6b216
+Author: sms00 <sms00>
+Date: Wed Apr 23 20:35:32 2014 +0000
+
+ Accidentally commented AC_LANG_SOURCE(C) out - it causes errors with older
+ versions of libtool (used on OSX 10.6.8) but other folks perhaps need it.
+ libquicktime build fine with or without it - not sure why it was added.
+
+commit 766fd107dbe03cfad9b5d03ea1803802214d0729
+Author: sms00 <sms00>
+Date: Wed Apr 23 20:33:04 2014 +0000
+
+ lqt_packet_index_get_next_display_frame needs to be visible/extern'd on OSX 10.6.8 to avoid and undefined error from lqt_ffmpeg plugin:
+ qtinfo Disc1.mov
+ [codecinfo] Error: dlopen failed for /usr/local/lib/libquicktime/lqt_ffmpeg.so: dlopen(/usr/local/lib/libquicktime/lqt_ffmpeg.so, 2): Symbol not found: _lqt_packet_index_get_next_display_frame
+ Referenced from: /usr/local/lib/libquicktime/lqt_ffmpeg.so
+
+commit 4ed5f10623b438f959697b03a56ec94a76b25271
+Author: gmerlin <gmerlin>
+Date: Wed Apr 23 20:31:17 2014 +0000
+
+ * Converted more codecs
+
+commit 4ee0b65979fa2a405727f8ce0f6372c5e3767f91
+Author: gmerlin <gmerlin>
+Date: Tue Apr 22 19:14:48 2014 +0000
+
+ * Convert more codecs for the new API
+
+commit f12c0601b1fd6edca13cdf2d96987d569dd7682a
+Author: gmerlin <gmerlin>
+Date: Mon Apr 21 06:39:17 2014 +0000
+
+ * More updates for the new demuxing API
+
+commit bd67b98a7d0f7f53a22c8467b765c5e181358ab1
+Author: gmerlin <gmerlin>
+Date: Fri Apr 18 12:30:19 2014 +0000
+
+ * Converted pcm and ima4
+
+commit e987e5901de61ef0f0f784eb4fc83c5eeca498b9
+Author: gmerlin <gmerlin>
+Date: Fri Apr 18 00:55:12 2014 +0000
+
+ * Make the pcm codecs use the packet index
+
+commit d6b9f1c25189302b1fce2e0a69e0a8538b82752b
+Author: gmerlin <gmerlin>
+Date: Wed Apr 16 22:20:52 2014 +0000
+
+ * Use new demuxing API for reading video packets
+
+commit a7e10e7b8a6a16939c2b5f6bd33f010ec42942d7
+Author: gmerlin <gmerlin>
+Date: Tue Apr 15 18:46:42 2014 +0000
+
+ * Export the stsd ID in the packet index
+
+commit 37553b919395e48b5db643da29667bb094f5dbdc
+Author: gmerlin <gmerlin>
+Date: Fri Apr 11 22:15:09 2014 +0000
+
+ * generate packet index for audio tracks also
+
+commit dfcacedaafb89817fde58f48e4e44890274e0778
+Author: gmerlin <gmerlin>
+Date: Sun Apr 6 22:35:50 2014 +0000
+
+ * Generate the packet index for Quicktime and AVI video streams
+
+commit 2ef27c3d2bfaf642622734176e25a005a20a92d1
+Author: gmerlin <gmerlin>
+Date: Tue Apr 1 19:57:30 2014 +0000
+
+ * Introduce a runtime generated packet index for more efficient
+ demultiplexing
+
+commit 0c25e15dc829e69c9f9eb406f856ec0721dd6aaa
+Author: gmerlin <gmerlin>
+Date: Tue Mar 25 16:57:33 2014 +0000
+
+ * Update
+
+commit edb79560e0d5c895e23ea048a8444b521a039547
+Author: gmerlin <gmerlin>
+Date: Fri Mar 21 13:30:41 2014 +0000
+
+ * Initialize tcmi flags to zero as recommended
+
+commit fee30f795236298e8c9548e09da99c3fd7c446de
+Author: gmerlin <gmerlin>
+Date: Fri Mar 21 11:58:28 2014 +0000
+
+ * Skip null blocks patch by Erik Johansson
+
+commit f4a7b6aded4f44bf6d9896a5e5df4d1a2c875e29
+Author: gmerlin <gmerlin>
+Date: Mon Dec 9 16:03:40 2013 +0000
+
+ * Better price calculation for colormodel conversions
+ (patch by Erik Johansson)
+
+commit 0ce3b70a3858eac940aae4e47b1ea3a0e5f8c237
+Author: gmerlin <gmerlin>
+Date: Fri Dec 6 15:59:34 2013 +0000
+
+ * yuvj420 -> yuvj422 Conversion patch by Erik Johansson
+
+commit 78f4862934b495e7bbaf8452ec247630a6f2bf89
+Author: gmerlin <gmerlin>
+Date: Wed Nov 27 17:15:31 2013 +0000
+
+ * Flush more delayed frames (patch by Erik Johansson)
+
+commit 0bede77253913493c52b76a1e3d793ce92130326
+Author: gmerlin <gmerlin>
+Date: Wed Nov 27 17:09:30 2013 +0000
+
+ * Mingw fixes for utf-8 and 64 bit stat (patch by Derek Chow)
+
+commit 4773c54f5de8ab896cf329d160ec5f6476e37f37
+Author: gmerlin <gmerlin>
+Date: Thu Nov 21 15:10:54 2013 +0000
+
+ * More mingw patches by Derek Chow
+
+commit b292819f366e0446afcb3c2428590acfd63616fe
+Author: gmerlin <gmerlin>
+Date: Tue Nov 19 16:46:23 2013 +0000
+
+ * mingw patch by Derek Chow
+
+commit 8b73d511668e71c3c1f6c57f629df556593b7fd1
+Author: gmerlin <gmerlin>
+Date: Tue Oct 29 08:57:05 2013 +0000
+
+ * Set LDFLAGS for modules in configure.ac
+ * Fix some crashes (patch by Paul J. Taggart)
+
+commit 400e1e4e03f79bd2bf362ecf7fdd133d5075968f
+Author: sms00 <sms00>
+Date: Tue Oct 29 03:02:17 2013 +0000
+
+ Older versions of autoconf (2.61) sometimes need [] around the 'else' in AC_CHECK_FUNCS to avoid an error
+ ./configure: line 24695: syntax error: unexpected end of file
+
+commit f317d4ce065a61a95c28f70765fa4f740d875867
+Author: gmerlin <gmerlin>
+Date: Mon Oct 7 14:38:02 2013 +0000
+
+ * Add -no-undefined to libtool flags
+ * Simplified *localtime* ifdefs
+
+commit 6dd6c14f7eac41b62f4fb6a7ad64ac435828f968
+Author: gmerlin <gmerlin>
+Date: Fri Sep 27 13:46:43 2013 +0000
+
+ * mingw patches by Derek Chow
+
+commit 2afeae7edc5d45c6b835fa5bcf7b821b5c72b212
+Author: gmerlin <gmerlin>
+Date: Fri Sep 27 13:23:39 2013 +0000
+
+ * bzero, bcopy -> memset, memcpy
+
+commit 3d30c039370c7d9893b2990e006641f6daea565a
+Author: gmerlin <gmerlin>
+Date: Fri Jun 7 14:36:20 2013 +0000
+
+ * Prores codec name patch by Boris Maksalov
+
+commit 823d5938a5bd0996882ea467ab25015f79958540
+Author: gmerlin <gmerlin>
+Date: Wed Jun 5 15:10:48 2013 +0000
+
+ * Another API update patch by Erik Johansson
+
+commit ac79fc2ee5361bbb49a6fb337d0f23e02fdf7fdf
+Author: gmerlin <gmerlin>
+Date: Tue May 21 13:49:26 2013 +0000
+
+ * AVPacket handling patch by Joseph Artsimovich
+
+commit 220a1bd3cf1502fdb755be3a3771575f484b3e8b
+Author: gmerlin <gmerlin>
+Date: Tue May 21 13:42:20 2013 +0000
+
+ * 8 bit sowt seems to be signed
+
+commit 8d832fabb420fc42edacd914a560943ae9f069ba
+Author: gmerlin <gmerlin>
+Date: Tue May 7 09:30:01 2013 +0000
+
+ * Fix potential crash
+
+commit f23facd94acd3ff0c3be4efd6de82f69dd44fe87
+Author: gmerlin <gmerlin>
+Date: Tue May 7 09:18:51 2013 +0000
+
+ * Latest ffmpeg patch by Joseph Artsimovich
+
+commit ab32b84dd1e6e5b100d22aeeffbafe67e02edb31
+Author: gmerlin <gmerlin>
+Date: Mon Apr 29 08:30:54 2013 +0000
+
+ * Prime sample support patch by Erik Johansson
+
+commit eb0458dd42f28b094e2a4695758865109fb73669
+Author: gmerlin <gmerlin>
+Date: Tue Apr 23 15:11:53 2013 +0000
+
+ * avid imx fix by Joseph Artsimovich
+
+commit 0b8adf13d39b8ba3717a6e8c86d6d59f3d68f711
+Author: gmerlin <gmerlin>
+Date: Tue Apr 23 15:11:05 2013 +0000
+
+ * autotools fix proposed by Christian Ebert
+
+commit 44662bf4f5e1364140f08b26126f097986475435
+Author: sms00 <sms00>
+Date: Sun Apr 21 21:54:58 2013 +0000
+
+ ffmpeg/libavcodec breakage again/still - define AVCODEC_MAX_AUDIO_FRAME_SIZE
+ using value from libavcodec/avcodec.h dated Dec 23 2012
+
+commit 2158ea2e436cc5d635215078e6bcd7ec8aa7872c
+Author: gmerlin <gmerlin>
+Date: Fri Apr 19 16:59:59 2013 +0000
+
+ * Add avid IMX fourccs (patch by Joseph Artsimovich)
+
+commit 55f5d4523a96cdf2a45a3af81b8d251337c5d020
+Author: gmerlin <gmerlin>
+Date: Tue Mar 19 10:29:58 2013 +0000
+
+ * libpng16 support patch by pgajdos [at] suse.cz
+
+commit 25ebfb6ae1a88586469d7524a82093ead13a3043
+Author: gmerlin <gmerlin>
+Date: Tue Feb 12 17:34:23 2013 +0000
+
+ * Fix qmax for imx30 (patch by Joseph Artsimovich)
+
+commit d001f6e756cd9134b878d870686241fb4bddf4e9
+Author: gmerlin <gmerlin>
+Date: Tue Feb 12 17:32:53 2013 +0000
+
+ * Better handling of broken frames (patch by Joseph Artsimovich)
+
+commit d0388b8915dd34fb3cb2e76978b1d9df6a5dc436
+Author: stscheff <stscheff>
+Date: Sat Jan 12 13:02:30 2013 +0000
+
+ force movie timescale to qtvr timescale
+
+commit b31b4db0497e37aa07320022a71ea2544ea24b44
+Author: gmerlin <gmerlin>
+Date: Fri Dec 21 13:37:09 2012 +0000
+
+ * Compatibility patch
+
+commit a63f3af8467bbd4fc6bb6384d0ca5902c2c46411
+Author: gmerlin <gmerlin>
+Date: Tue Nov 27 15:52:47 2012 +0000
+
+ * Change vendor back to appl to work around broken decoders
+
+commit 812fb9a441592915a416dde10bf559b7162f4f51
+Author: gmerlin <gmerlin>
+Date: Tue Nov 27 15:46:40 2012 +0000
+
+ * Fix pts handling for some codecs, which rely on a constant framerate
+
+commit b4691242da7909b3643e50c78dc03317a2c9c1ef
+Author: gmerlin <gmerlin>
+Date: Tue Nov 20 09:51:21 2012 +0000
+
+ * Forgot this file
+
+commit 3df140a62c0ea17307ea83b5fdae454d3df95ed5
+Author: gmerlin <gmerlin>
+Date: Mon Nov 19 16:59:29 2012 +0000
+
+ * sdtp support patch by Joseph Artsimovich
+
+commit 1436e47438e8d4c40ade2fc1b98eddfef6f1e452
+Author: gmerlin <gmerlin>
+Date: Mon Nov 19 16:50:48 2012 +0000
+
+ * uninitialized read patch by Joseph Artsimovich
+ * Updated schroedinger settings extraction
+
+commit b68705b23f206513220c625fc2b35241c6e62d9f
+Author: gmerlin <gmerlin>
+Date: Fri Nov 9 10:24:12 2012 +0000
+
+ * Let the codec initialization know if we are en- or decoding
+ (patch by Joseph Artsimovich)
+
+commit dbf163d577d78f974356ab2cad33fdf9ac3eaae6
+Author: gmerlin <gmerlin>
+Date: Thu Nov 8 12:53:45 2012 +0000
+
+ * Fixed YUV10 to RGB888 conversion
+
+commit 6bb0b58264504ace379917be456f348f287dbaf1
+Author: gmerlin <gmerlin>
+Date: Tue Nov 6 11:07:01 2012 +0000
+
+ * Use codec specific defaults
+
+commit bdacab2a502311ac858923a54347af727af3f07f
+Author: gmerlin <gmerlin>
+Date: Mon Oct 8 18:50:15 2012 +0000
+
+ * Fix crash
+
+commit a5a04a249493c2cb44c18024e84f5dcce73fb910
+Author: gmerlin <gmerlin>
+Date: Mon Sep 24 09:17:25 2012 +0000
+
+ * Gop size patch by Joseph Artsimovich
+
+commit d5aad041e938f4484a7e5d034043834569e2545c
+Author: gmerlin <gmerlin>
+Date: Fri Sep 14 21:12:57 2012 +0000
+
+ * Simplify seeking and consider B-frames used as references
+
+commit 06ff9b12330b77e8aad95da5d0b4997d3eb1823f
+Author: gmerlin <gmerlin>
+Date: Tue Aug 7 17:36:11 2012 +0000
+
+ * ProRes support patch by Boris Maksalov
+
+commit 4d45f43a2ea5c598be9b700789b9f03fc88db806
+Author: gmerlin <gmerlin>
+Date: Thu Jun 28 14:30:21 2012 +0000
+
+ * Support thread_count for more ffmpeg codecs (patch by Joseph Artsimovich)
+
+commit b9f7bf8f201208abe7c992370b19e1659246e862
+Author: gmerlin <gmerlin>
+Date: Thu Jun 28 14:28:40 2012 +0000
+
+ * Delay the colormodel detection such that it happens after setting the
+ parameters
+
+commit a6dfc1c04cc6a9236613a26c1b9e21bbbc385af3
+Author: gmerlin <gmerlin>
+Date: Tue Jun 12 16:30:57 2012 +0000
+
+ * Works also for mp4
+
+commit adb2dc5b7305d0dfc9a65ea0d8fc4d914f2afac7
+Author: gmerlin <gmerlin>
+Date: Tue Jun 12 16:27:58 2012 +0000
+
+ * Unified seeking patch by Joseph Artsimovich
+
+commit cdb2262a36c518b7b1d10b8a4c50e6e3a8131a92
+Author: gmerlin <gmerlin>
+Date: Fri Jun 8 13:56:39 2012 +0000
+
+ * stps support by Joseph Artsimovich
+
+commit 962af75c8bae8493fd5f8aef3afac041c907b041
+Author: gmerlin <gmerlin>
+Date: Fri Jun 8 13:56:13 2012 +0000
+
+ * stps and xdcam support patch by Joseph Artsimovich
+
+commit 7fac464e1d9220ace2a3f93d4cee3108cd62a0eb
+Author: gmerlin <gmerlin>
+Date: Fri Jun 8 12:25:42 2012 +0000
+
+ * Reverted last patch
+
+commit 59838700eec97a2e07d124b06be80b3c5b09001f
+Author: gmerlin <gmerlin>
+Date: Fri Jun 8 12:12:47 2012 +0000
+
+ * stps support patch by Joseph Artsimovich
+
+commit f36768d87314b85c7e84e6b8bfcdf6a6bedfd77c
+Author: gmerlin <gmerlin>
+Date: Thu May 24 16:01:13 2012 +0000
+
+ * Speed up seeking in long GOP video (patch by Joseph Artsimovich)
+
+commit e6294ee27c9a616f5ea8ce5b5778f0c3e77d258d
+Author: gmerlin <gmerlin>
+Date: Fri Apr 27 15:19:52 2012 +0000
+
+ * Get rid of PATH_MAX in the library
diff --git a/converttogit.sh b/converttogit.sh
new file mode 100644
index 0000000..dead042
--- /dev/null
+++ b/converttogit.sh
@@ -0,0 +1,16 @@
+
+
+cvs -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime login
+cvs -z3 -d:pserver:anonymous@libquicktime.cvs.sourceforge.net:/cvsroot/libquicktime co -P libquicktime
+cd libquicktime
+git cvsimport -v
+
+In github.com press + and new repository, choose repository name: libquicktime
+without "Initialize this repository with a README" .
+and run:
+
+git remote add origin git@github.com:sergiomb2/libquicktime.git
+git push -u origin master
+
+and I got this :
+https://github.com/sergiomb2/libquicktime/commits/master
diff --git a/libquicktime.spec b/libquicktime.spec
index 4667637..6f11cc3 100644
--- a/libquicktime.spec
+++ b/libquicktime.spec
@@ -1,14 +1,18 @@
+%define vers_string 1.2.4-93-g4d45177
+%define rel_string .20170926.93.g4d45177
+%define githash 4d451774b89fbdd2f53204f92b71837af7b06761
+%define shorthash %(c=%{githash}; echo ${c:0:10})
+
+
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.4
-Release: 27%{?dist}
+Release: 28%{?rel_string}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
-Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
-Patch0: libquicktime-backport.patch
-Patch1: libav10.patch
-Patch2: ffmpeg_2.9.patch
+#Source0: http://downloads.sourceforge.net/libquicktime/%{name}-%{version}.tar.gz
+Source0: https://github.com/sergiomb2/%{name}/archive/%{githash}/%{name}-%{version...
BuildRequires: libdv-devel
BuildRequires: libpng-devel libjpeg-devel libGLU-devel
@@ -22,6 +26,9 @@ BuildRequires: schroedinger-devel
BuildRequires: gettext-devel
%{?_with_faac:BuildRequires: faac-devel}
+# Packages for re-configuration
+BuildRequires: autoconf, automake, libtool
+
%package utils
Summary: Utilities for working with Quicktime files
Group: Applications/Multimedia
@@ -58,15 +65,12 @@ enhancements. This package contains development files for %{name}.
# --------------------------------------------------------------------
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
+%setup -q -n %{name}-%{githash}
# --------------------------------------------------------------------
%build
+./autogen.sh
%configure \
--enable-gpl \
--disable-rpath \
@@ -81,12 +85,12 @@ enhancements. This package contains development files for %{name}.
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+%make_build
# --------------------------------------------------------------------
%install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%make_install
find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
@@ -126,6 +130,11 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
# --------------------------------------------------------------------
%changelog
+* Sun Jan 21 2018 Sérgio Basto <sergio(a)serjux.com> - 1.2.4-28.20170926.93.g4d45177
+- Update to 1.2.4-93-g4d45177
+- Upstream have the official patches for ffmpeg_2.9.patch libav10.patch libquicktime-backport.patch
+- This release have some security fixes
+
* Wed Jan 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.2.4-27
- Rebuilt for ffmpeg-3.5 git
diff --git a/sources b/sources
index 60c733c..0b5e84a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81cfcebad9b7ee7e7cfbefc861d6d61b libquicktime-1.2.4.tar.gz
+a6d79eb99e6e6e35eead1cdb32cee9ea libquicktime-1.2.4-4d451774b8.tar.gz
diff --git a/update_libquicktime.sh b/update_libquicktime.sh
new file mode 100755
index 0000000..556d147
--- /dev/null
+++ b/update_libquicktime.sh
@@ -0,0 +1,31 @@
+git clone git://github.com/sergiomb2/libquicktime.git
+version=1.2.4
+tag=$version
+pushd libquicktime
+git checkout master
+git pull
+git log $tag..HEAD > ../ChangeLog
+newdescrib=$(git describe --tags)
+date=$(git log -1 --format=%cd --date=short | tr -d \-)
+relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/")
+githash=$(git rev-parse HEAD)
+shorthash=$(echo $githash | cut -b -10)
+popd
+#git checkout libquicktime.spec
+sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" libquicktime.spec
+sed -i "s|^%define rel_string .*|%define rel_string $relversion|" libquicktime.spec
+sed -i "s|^%define githash .*|%define githash $githash|" libquicktime.spec
+rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" libquicktime.spec
+spectool -g libquicktime.spec
+echo Press enter to run: rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz; read dummy;
+rfpkg new-sources libquicktime-${version}-${shorthash}.tar.gz
+echo Press enter to continue; read dummy;
+rfpkg ci -c && git show
+echo Press enter to continue; read dummy;
+rfpkg push && rfpkg build --nowait
+echo Press enter to continue; read dummy;
+git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to continue; read dummy;
+git checkout f26 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to continue; read dummy;
+git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
6 years, 10 months
[mythtv] fixes on update_fixes.sh and mythtv.spec cleanup
by Sérgio M. Basto
commit b283f4ec9ecd7a3853709d3d5aef117f0bf32b99
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 21 23:39:54 2018 +0000
fixes on update_fixes.sh and mythtv.spec cleanup
mythtv.spec | 3 ---
update_fixes.sh | 6 ++++--
2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index d2ffe3a..8b819b9 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -67,9 +67,6 @@
%define branch fixes/29.0
-# Git revision and branch ID
-%define _gitrev g5b917e8
-
# Harden build as mythbackend is long running.
%global _hardened_build 1
diff --git a/update_fixes.sh b/update_fixes.sh
index 1443c27..a9c0ef0 100755
--- a/update_fixes.sh
+++ b/update_fixes.sh
@@ -11,16 +11,18 @@ relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/^/.$date/")
githash=$(git rev-parse HEAD)
shorthash=$(echo $githash | cut -b -10)
popd
+# Clean previous modifications on mythtv.spec
+echo Press enter to run: Clean previous modifications on mythtv.spec; read dummy;
+git checkout mythtv.spec
sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" mythtv.spec
sed -i "s|^%define rel_string .*|%define rel_string $relversion|" mythtv.spec
sed -i "s|^%define githash .*|%define githash $githash|" mythtv.spec
-git checkout mythtv.spec
rpmdev-bumpspec -c "Update to $newdescrib from branch $branch" mythtv.spec
spectool -g mythtv.spec
echo Press enter to run: rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz; read dummy;
rfpkg new-sources mythtv-${version}-${shorthash}.tar.gz
echo Press enter to continue; read dummy;
-rfpkg clog && rfpkg ci -c && git show
+rfpkg ci -c && git show
echo Press enter to continue; read dummy;
rfpkg push && rfpkg build --nowait
echo Press enter to continue; read dummy;
6 years, 10 months
[mlt-freeworld] MLT doesn't needs or use libquicktime
by Sérgio M. Basto
commit 94aabd404995a21d63616febefec96153c7dad09
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 21 23:35:18 2018 +0000
MLT doesn't needs or use libquicktime
mlt-freeworld.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index 25a9db6..c357470 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -37,8 +37,6 @@ BuildRequires: libexif-devel
BuildRequires: fftw-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: ffmpeg-devel
-# libquicktime is FTBFS with ffmpep-3.5
-#BuildRequires: libquicktime-devel
BuildRequires: xine-lib-devel
BuildRequires: alsa-lib-devel
BuildRequires: movit-devel
@@ -109,7 +107,7 @@ find %{buildroot} -type d -empty -delete
%changelog
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 6.5.0-0.7.20171213gitea973eb
- Rebuilt for ffmpeg-3.5 git
-- libquicktime is FTBFS with ffmpep-3.5
+- MLT doesn't needs or use libquicktime
* Sun Dec 24 2017 Sérgio Basto <sergio(a)serjux.com> - 6.5.0-0.6.20171213gitea973eb
- Update snapshot
6 years, 10 months
[xpra-codecs-freeworld] Patched for ffmpeg-3.5
by Antonio
commit d2a41bd978a6b385669d9409bdf6629538770e8a
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Jan 21 17:58:42 2018 +0100
Patched for ffmpeg-3.5
xpra-codecs-freeworld-ffmpeg35.patch | 189 +++++++++++++++++++++++++++++++++++
xpra-codecs-freeworld.spec | 11 +-
2 files changed, 199 insertions(+), 1 deletion(-)
---
diff --git a/xpra-codecs-freeworld-ffmpeg35.patch b/xpra-codecs-freeworld-ffmpeg35.patch
new file mode 100644
index 0000000..4772089
--- /dev/null
+++ b/xpra-codecs-freeworld-ffmpeg35.patch
@@ -0,0 +1,189 @@
+--- src/xpra/codecs/dec_avcodec2/decoder.pyx (revision 18085)
++++ src/xpra/codecs/dec_avcodec2/decoder.pyx (revision 18086)
+@@ -53,5 +53,5 @@
+
+ cdef extern from "libavcodec/avcodec.h":
+- int CODEC_FLAG2_FAST
++ int AV_CODEC_FLAG2_FAST
+
+ ctypedef struct AVFrame:
+@@ -359,5 +359,5 @@
+ self.codec_ctx.thread_type = 2 #FF_THREAD_SLICE: allow more than one thread per frame
+ self.codec_ctx.thread_count = 0 #auto
+- self.codec_ctx.flags2 |= CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
++ self.codec_ctx.flags2 |= AV_CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
+ r = avcodec_open2(self.codec_ctx, self.codec, NULL)
+ if r<0:
+--- src/xpra/codecs/enc_ffmpeg/encoder.pyx (revision 18087)
++++ src/xpra/codecs/enc_ffmpeg/encoder.pyx (revision 18088)
+@@ -135,42 +135,34 @@
+ int FF_PROFILE_H264_CAVLC_444
+
+- int CODEC_FLAG_UNALIGNED
+- int CODEC_FLAG_QSCALE
+- int CODEC_FLAG_4MV
+- int CODEC_FLAG_OUTPUT_CORRUPT
+- int CODEC_FLAG_QPEL
+- int CODEC_FLAG_GMC
+- int CODEC_FLAG_MV0
+- int CODEC_FLAG_INPUT_PRESERVED
+- int CODEC_FLAG_PASS1
+- int CODEC_FLAG_PASS2
+- int CODEC_FLAG_GRAY
+- int CODEC_FLAG_EMU_EDGE
+- int CODEC_FLAG_PSNR
+- int CODEC_FLAG_TRUNCATED
+- int CODEC_FLAG_NORMALIZE_AQP
+- int CODEC_FLAG_INTERLACED_DCT
+- int CODEC_FLAG_GLOBAL_HEADER
+-
+- int CODEC_FLAG2_FAST
+-
+- int CODEC_CAP_DRAW_HORIZ_BAND
+- int CODEC_CAP_DR1
+- int CODEC_CAP_TRUNCATED
+- int CODEC_CAP_HWACCEL
+- int CODEC_CAP_DELAY
+- int CODEC_CAP_SMALL_LAST_FRAME
+- int CODEC_CAP_HWACCEL_VDPAU
+- int CODEC_CAP_SUBFRAMES
+- int CODEC_CAP_EXPERIMENTAL
+- int CODEC_CAP_CHANNEL_CONF
+- int CODEC_CAP_NEG_LINESIZES
+- int CODEC_CAP_FRAME_THREADS
+- int CODEC_CAP_SLICE_THREADS
+- int CODEC_CAP_PARAM_CHANGE
+- int CODEC_CAP_AUTO_THREADS
+- int CODEC_CAP_VARIABLE_FRAME_SIZE
+- int CODEC_CAP_INTRA_ONLY
+- int CODEC_CAP_LOSSLESS
++ int AV_CODEC_FLAG_UNALIGNED
++ int AV_CODEC_FLAG_QSCALE
++ int AV_CODEC_FLAG_4MV
++ int AV_CODEC_FLAG_OUTPUT_CORRUPT
++ int AV_CODEC_FLAG_QPEL
++ int AV_CODEC_FLAG_PASS1
++ int AV_CODEC_FLAG_PASS2
++ int AV_CODEC_FLAG_GRAY
++ int AV_CODEC_FLAG_PSNR
++ int AV_CODEC_FLAG_TRUNCATED
++ int AV_CODEC_FLAG_INTERLACED_DCT
++ int AV_CODEC_FLAG_GLOBAL_HEADER
++
++ int AV_CODEC_FLAG2_FAST
++
++ int AV_CODEC_CAP_DRAW_HORIZ_BAND
++ int AV_CODEC_CAP_DR1
++ int AV_CODEC_CAP_TRUNCATED
++ int AV_CODEC_CAP_DELAY
++ int AV_CODEC_CAP_SMALL_LAST_FRAME
++ int AV_CODEC_CAP_SUBFRAMES
++ int AV_CODEC_CAP_EXPERIMENTAL
++ int AV_CODEC_CAP_CHANNEL_CONF
++ int AV_CODEC_CAP_FRAME_THREADS
++ int AV_CODEC_CAP_SLICE_THREADS
++ int AV_CODEC_CAP_PARAM_CHANGE
++ int AV_CODEC_CAP_AUTO_THREADS
++ int AV_CODEC_CAP_VARIABLE_FRAME_SIZE
++ int AV_CODEC_CAP_INTRA_ONLY
++ int AV_CODEC_CAP_LOSSLESS
+
+ ctypedef struct AVFrame:
+@@ -386,5 +378,4 @@
+ int AVFMT_NEEDNUMBER #Needs '%d' in filename
+ int AVFMT_SHOW_IDS #Show format stream IDs numbers
+- int AVFMT_RAWPICTURE #Format wants AVPicture structure for raw picture data. @deprecated Not used anymore
+ int AVFMT_GLOBALHEADER #Format wants global header
+ int AVFMT_NOTIMESTAMPS #Format does not need / have any timestamps
+@@ -490,25 +481,20 @@
+
+ CODEC_FLAGS = {
+- CODEC_FLAG_UNALIGNED : "UNALIGNED",
+- CODEC_FLAG_QSCALE : "QSCALE",
+- CODEC_FLAG_4MV : "4MV",
+- CODEC_FLAG_OUTPUT_CORRUPT : "OUTPUT_CORRUPT",
+- CODEC_FLAG_QPEL : "QPEL",
+- CODEC_FLAG_GMC : "GMC",
+- CODEC_FLAG_MV0 : "MV0",
+- CODEC_FLAG_INPUT_PRESERVED : "INPUT_PRESERVED",
+- CODEC_FLAG_PASS1 : "PASS1",
+- CODEC_FLAG_PASS2 : "PASS2",
+- CODEC_FLAG_GRAY : "GRAY",
+- CODEC_FLAG_EMU_EDGE : "EMU_EDGE",
+- CODEC_FLAG_PSNR : "PSNR",
+- CODEC_FLAG_TRUNCATED : "TRUNCATED",
+- CODEC_FLAG_NORMALIZE_AQP : "NORMALIZE_AQP",
+- CODEC_FLAG_INTERLACED_DCT : "INTERLACED_DCT",
+- CODEC_FLAG_GLOBAL_HEADER : "GLOBAL_HEADER",
++ AV_CODEC_FLAG_UNALIGNED : "UNALIGNED",
++ AV_CODEC_FLAG_QSCALE : "QSCALE",
++ AV_CODEC_FLAG_4MV : "4MV",
++ AV_CODEC_FLAG_OUTPUT_CORRUPT : "OUTPUT_CORRUPT",
++ AV_CODEC_FLAG_QPEL : "QPEL",
++ AV_CODEC_FLAG_PASS1 : "PASS1",
++ AV_CODEC_FLAG_PASS2 : "PASS2",
++ AV_CODEC_FLAG_GRAY : "GRAY",
++ AV_CODEC_FLAG_PSNR : "PSNR",
++ AV_CODEC_FLAG_TRUNCATED : "TRUNCATED",
++ AV_CODEC_FLAG_INTERLACED_DCT : "INTERLACED_DCT",
++ AV_CODEC_FLAG_GLOBAL_HEADER : "GLOBAL_HEADER",
+ }
+
+ CODEC_FLAGS2 = {
+- CODEC_FLAG2_FAST : "FAST",
++ AV_CODEC_FLAG2_FAST : "FAST",
+ }
+
+@@ -536,5 +522,4 @@
+ AVFMT_NEEDNUMBER : "NEEDNUMBER",
+ AVFMT_SHOW_IDS : "SHOW_IDS",
+- AVFMT_RAWPICTURE : "RAWPICTURE",
+ AVFMT_GLOBALHEADER : "GLOBALHEADER",
+ AVFMT_NOTIMESTAMPS : "NOTIMESTAMPS",
+@@ -555,22 +540,19 @@
+
+ CAPS = {
+- CODEC_CAP_DRAW_HORIZ_BAND : "DRAW_HORIZ_BAND",
+- CODEC_CAP_DR1 : "DR1",
+- CODEC_CAP_TRUNCATED : "TRUNCATED",
+- CODEC_CAP_HWACCEL : "HWACCEL",
+- CODEC_CAP_DELAY : "DELAY",
+- CODEC_CAP_SMALL_LAST_FRAME : "SMALL_LAST_FRAME",
+- CODEC_CAP_HWACCEL_VDPAU : "HWACCEL_VDPAU",
+- CODEC_CAP_SUBFRAMES : "SUBFRAMES",
+- CODEC_CAP_EXPERIMENTAL : "EXPERIMENTAL",
+- CODEC_CAP_CHANNEL_CONF : "CHANNEL_CONF",
+- CODEC_CAP_NEG_LINESIZES : "NEG_LINESIZES",
+- CODEC_CAP_FRAME_THREADS : "FRAME_THREADS",
+- CODEC_CAP_SLICE_THREADS : "SLICE_THREADS",
+- CODEC_CAP_PARAM_CHANGE : "PARAM_CHANGE",
+- CODEC_CAP_AUTO_THREADS : "AUTO_THREADS",
+- CODEC_CAP_VARIABLE_FRAME_SIZE : "VARIABLE_FRAME_SIZE",
+- CODEC_CAP_INTRA_ONLY : "INTRA_ONLY",
+- CODEC_CAP_LOSSLESS : "LOSSLESS",
++ AV_CODEC_CAP_DRAW_HORIZ_BAND : "DRAW_HORIZ_BAND",
++ AV_CODEC_CAP_DR1 : "DR1",
++ AV_CODEC_CAP_TRUNCATED : "TRUNCATED",
++ AV_CODEC_CAP_DELAY : "DELAY",
++ AV_CODEC_CAP_SMALL_LAST_FRAME : "SMALL_LAST_FRAME",
++ AV_CODEC_CAP_SUBFRAMES : "SUBFRAMES",
++ AV_CODEC_CAP_EXPERIMENTAL : "EXPERIMENTAL",
++ AV_CODEC_CAP_CHANNEL_CONF : "CHANNEL_CONF",
++ AV_CODEC_CAP_FRAME_THREADS : "FRAME_THREADS",
++ AV_CODEC_CAP_SLICE_THREADS : "SLICE_THREADS",
++ AV_CODEC_CAP_PARAM_CHANGE : "PARAM_CHANGE",
++ AV_CODEC_CAP_AUTO_THREADS : "AUTO_THREADS",
++ AV_CODEC_CAP_VARIABLE_FRAME_SIZE : "VARIABLE_FRAME_SIZE",
++ AV_CODEC_CAP_INTRA_ONLY : "INTRA_ONLY",
++ AV_CODEC_CAP_LOSSLESS : "LOSSLESS",
+ }
+ log("CODEC_CAP:")
+@@ -891,6 +873,6 @@
+ self.video_ctx.thread_count = THREAD_COUNT #0=auto
+ #if oformat.flags & AVFMT_GLOBALHEADER:
+- self.video_ctx.flags |= CODEC_FLAG_GLOBAL_HEADER
+- self.video_ctx.flags2 |= CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
++ self.video_ctx.flags |= AV_CODEC_FLAG_GLOBAL_HEADER
++ self.video_ctx.flags2 |= AV_CODEC_FLAG2_FAST #may cause "no deblock across slices" - which should be fine
+ if self.encoding.startswith("h264") and profile:
+ r = av_dict_set(&opts, b"vprofile", strtobytes(profile), 0)
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 2554539..21d710a 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -26,6 +26,11 @@ License: GPLv2+
URL: http://www.xpra.org/
Source0: http://xpra.org/src/xpra-%{version}.tar.xz
+# http://xpra.org/trac/changeset/18086/xpra
+# http://xpra.org/trac/changeset/18088/xpra
+# Build fix for ffmpeg-3.5
+Patch0: %{name}-ffmpeg35.patch
+
BuildRequires: python2-devel pygobject2-devel pygtk2-devel
BuildRequires: libXtst-devel, uglify-js
BuildRequires: libxkbfile-devel, libvpx-devel
@@ -50,6 +55,9 @@ x264 and ffmpeg.
%prep
%setup -q -n xpra-%{version}
+%if 0%{?fedora} > 27
+%patch0 -p1
+%endif
%build
CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \
@@ -102,8 +110,9 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
-* Thu Jan 18 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.2.3-1
+* Sun Jan 21 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.2.3-1
- Update to 2.2.3
+- Patched for ffmpeg-3.5
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.2-2
- Rebuilt for ffmpeg-3.5 git
6 years, 10 months
[mythtv/el7] Fix build in rawhide
by Sérgio M. Basto
Summary of changes:
a8f74a1... Fix build in rawhide (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 10 months
[transcode/f26] readd libquicktime
by Leigh Scott
Summary of changes:
b774635... readd libquicktime (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 10 months
[transcode/f27] readd libquicktime
by Leigh Scott
Summary of changes:
b774635... readd libquicktime (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 10 months
[transcode] readd libquicktime
by Leigh Scott
commit b774635f1d00b53e7f5dda15940ce447331181a5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Jan 21 10:44:50 2018 +0000
readd libquicktime
transcode.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/transcode.spec b/transcode.spec
index c924a36..6d3174a 100644
--- a/transcode.spec
+++ b/transcode.spec
@@ -37,6 +37,7 @@ BuildRequires: lzo-devel >= 2
BuildRequires: mjpegtools-devel
BuildRequires: libdv-devel
BuildRequires: xvidcore-devel
+BuildRequires: libquicktime-devel >= 0.9.8
BuildRequires: lame-devel >= 3.89
BuildRequires: SDL-devel >= 1.1.6
BuildRequires: ffmpeg-devel
@@ -113,6 +114,7 @@ done
--enable-vorbis \
--enable-theora \
--enable-libdv \
+ --enable-libquicktime \
--enable-a52 \
--enable-lzo \
%{?_with_faac:--enable-faac} \
6 years, 10 months
