[vdr-softhddevice] Added ffmpeg_2.9.patch
by Martin Gansser
commit ebbf72b551df4f69026a8f95dbf3a71bf3c2a566
Author: Martin Gansser <mgansser(a)alice.de>
Date: Thu Jun 30 17:39:06 2016 +0200
Added ffmpeg_2.9.patch
.gitignore | 3 +-
ffmpeg_2.9.patch | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 576 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7859139..a852493 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-vdr-plugin-softhddevice-ee2311d25237b9828c1423505e5d4055a836414d.tar.bz2
-/ffmpeg_2.9.patch
+/vdr-plugin-softhddevice-ee2311d25237b9828c1423505e5d4055a836414d.tar.bz2
/vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2
diff --git a/ffmpeg_2.9.patch b/ffmpeg_2.9.patch
new file mode 100644
index 0000000..412d54c
--- /dev/null
+++ b/ffmpeg_2.9.patch
@@ -0,0 +1,575 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com>
+Last-Update: <2015-11-02>
+
+--- a/codec.c
++++ b/codec.c
+@@ -151,7 +151,7 @@
+ //----------------------------------------------------------------------------
+
+ /**
+-** Callback to negotiate the PixelFormat.
++** Callback to negotiate the AVPixelFormat.
+ **
+ ** @param video_ctx codec context
+ ** @param fmt is the list of formats which are supported by
+@@ -159,8 +159,8 @@
+ ** valid format, the formats are ordered by
+ ** quality.
+ */
+-static enum PixelFormat Codec_get_format(AVCodecContext * video_ctx,
+- const enum PixelFormat *fmt)
++static enum AVPixelFormat Codec_get_format(AVCodecContext * video_ctx,
++ const enum AVPixelFormat *fmt)
+ {
+ VideoDecoder *decoder;
+
+@@ -187,6 +187,8 @@
+ return Video_get_format(decoder->HwDecoder, video_ctx, fmt);
+ }
+
++static void Codec_free_buffer(void *opaque, uint8_t *data);
++
+ /**
+ ** Video buffer management, get buffer for frame.
+ **
+@@ -195,7 +197,7 @@
+ ** @param video_ctx Codec context
+ ** @param frame Get buffer for this frame
+ */
+-static int Codec_get_buffer(AVCodecContext * video_ctx, AVFrame * frame)
++static int Codec_get_buffer2(AVCodecContext * video_ctx, AVFrame * frame, int flags)
+ {
+ VideoDecoder *decoder;
+
+@@ -205,19 +207,19 @@
+ // libav 0.8.5 53.35.0 still needs this
+ #endif
+ if (!decoder->GetFormatDone) { // get_format missing
+- enum PixelFormat fmts[2];
++ enum AVPixelFormat fmts[2];
+
+ fprintf(stderr, "codec: buggy libav, use ffmpeg\n");
+ Warning(_("codec: buggy libav, use ffmpeg\n"));
+ fmts[0] = video_ctx->pix_fmt;
+- fmts[1] = PIX_FMT_NONE;
++ fmts[1] = AV_PIX_FMT_NONE;
+ Codec_get_format(video_ctx, fmts);
+ }
+ #ifdef USE_VDPAU
+- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
+- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
+- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
++ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
++ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
++ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
++ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
+ unsigned surface;
+ struct vdpau_render_state *vrs;
+
+@@ -234,7 +236,8 @@
+ frame->age = 256 * 256 * 256 * 64;
+ #endif
+ // render
+- frame->data[0] = (void *)vrs;
++ frame->buf[0] = av_buffer_create((uint8_t*)vrs, 0, Codec_free_buffer, video_ctx, 0);
++ frame->data[0] = frame->buf[0]->data;
+ frame->data[1] = NULL;
+ frame->data[2] = NULL;
+ frame->data[3] = NULL;
+@@ -265,8 +268,9 @@
+ frame->age = 256 * 256 * 256 * 64;
+ #endif
+ // vaapi needs both fields set
+- frame->data[0] = (void *)(size_t) surface;
+- frame->data[3] = (void *)(size_t) surface;
++ frame->buf[0] = av_buffer_create((uint8_t*)(size_t)surface, 0, Codec_free_buffer, video_ctx, 0);
++ frame->data[0] = frame->buf[0]->data;
++ frame->data[3] = frame->data[0];
+
+ #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52,66,100)
+ // reordered frames
+@@ -279,29 +283,30 @@
+ return 0;
+ }
+ //Debug(3, "codec: fallback to default get_buffer\n");
+- return avcodec_default_get_buffer(video_ctx, frame);
++ return avcodec_default_get_buffer2(video_ctx, frame, flags);
+ }
+
+ /**
+ ** Video buffer management, release buffer for frame.
+ ** Called to release buffers which were allocated with get_buffer.
+ **
+-** @param video_ctx Codec context
+-** @param frame Release buffer for this frame
++** @param opaque opaque data
++** @param data buffer data
+ */
+-static void Codec_release_buffer(AVCodecContext * video_ctx, AVFrame * frame)
++static void Codec_free_buffer(void *opaque, uint8_t *data)
+ {
++ AVCodecContext *video_ctx = (AVCodecContext *)opaque;
+ #ifdef USE_VDPAU
+- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
+- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
+- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
++ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
++ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
++ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
++ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
+ VideoDecoder *decoder;
+ struct vdpau_render_state *vrs;
+ unsigned surface;
+
+ decoder = video_ctx->opaque;
+- vrs = (struct vdpau_render_state *)frame->data[0];
++ vrs = (struct vdpau_render_state *)data;
+ surface = vrs->surface;
+
+ //Debug(3, "codec: release surface %#010x\n", surface);
+@@ -309,7 +314,7 @@
+
+ av_freep(&vrs->bitstream_buffers);
+ vrs->bitstream_buffers_allocated = 0;
+- av_freep(&frame->data[0]);
++ av_freep(&data);
+
+ return;
+ }
+@@ -320,18 +325,13 @@
+ unsigned surface;
+
+ decoder = video_ctx->opaque;
+- surface = (unsigned)(size_t) frame->data[3];
++ surface = (unsigned)(size_t) data;
+
+ //Debug(3, "codec: release surface %#010x\n", surface);
+ VideoReleaseSurface(decoder->HwDecoder, surface);
+
+- frame->data[0] = NULL;
+- frame->data[3] = NULL;
+-
+ return;
+ }
+- //Debug(3, "codec: fallback to default release_buffer\n");
+- return avcodec_default_release_buffer(video_ctx, frame);
+ }
+
+ /// libav: compatibility hack
+@@ -358,10 +358,10 @@
+ int height)
+ {
+ #ifdef USE_VDPAU
+- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
+- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
+- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
++ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
++ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
++ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
++ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
+ VideoDecoder *decoder;
+ struct vdpau_render_state *vrs;
+
+@@ -523,9 +523,7 @@
+ if (video_codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) {
+ // FIXME: get_format never called.
+ decoder->VideoCtx->get_format = Codec_get_format;
+- decoder->VideoCtx->get_buffer = Codec_get_buffer;
+- decoder->VideoCtx->release_buffer = Codec_release_buffer;
+- decoder->VideoCtx->reget_buffer = Codec_get_buffer;
++ decoder->VideoCtx->get_buffer2 = Codec_get_buffer2;
+ decoder->VideoCtx->draw_horiz_band = Codec_draw_horiz_band;
+ decoder->VideoCtx->slice_flags =
+ SLICE_FLAG_CODED_ORDER | SLICE_FLAG_ALLOW_FIELD;
+@@ -540,9 +538,7 @@
+ // our pixel format video hardware decoder hook
+ if (decoder->VideoCtx->hwaccel_context) {
+ decoder->VideoCtx->get_format = Codec_get_format;
+- decoder->VideoCtx->get_buffer = Codec_get_buffer;
+- decoder->VideoCtx->release_buffer = Codec_release_buffer;
+- decoder->VideoCtx->reget_buffer = Codec_get_buffer;
++ decoder->VideoCtx->get_buffer2 = Codec_get_buffer2;
+ #if 0
+ decoder->VideoCtx->thread_count = 1;
+ decoder->VideoCtx->draw_horiz_band = NULL;
+--- a/video.c
++++ b/video.c
+@@ -259,8 +259,8 @@
+ void (*const DelHwDecoder) (VideoHwDecoder *);
+ unsigned (*const GetSurface) (VideoHwDecoder *, const AVCodecContext *);
+ void (*const ReleaseSurface) (VideoHwDecoder *, unsigned);
+- enum PixelFormat (*const get_format) (VideoHwDecoder *, AVCodecContext *,
+- const enum PixelFormat *);
++ enum AVPixelFormat (*const get_format) (VideoHwDecoder *, AVCodecContext *,
++ const enum AVPixelFormat *);
+ void (*const RenderFrame) (VideoHwDecoder *, const AVCodecContext *,
+ const AVFrame *);
+ void *(*const GetHwAccelContext)(VideoHwDecoder *);
+@@ -1552,7 +1552,7 @@
+ /// flags for put surface for different resolutions groups
+ unsigned SurfaceFlagsTable[VideoResolutionMax];
+
+- enum PixelFormat PixFmt; ///< ffmpeg frame pixfmt
++ enum AVPixelFormat PixFmt; ///< ffmpeg frame pixfmt
+ int WrongInterlacedWarned; ///< warning about interlace flag issued
+ int Interlaced; ///< ffmpeg interlaced flag
+ int TopFieldFirst; ///< ffmpeg top field displayed first
+@@ -2056,7 +2056,7 @@
+ decoder->OutputWidth = VideoWindowWidth;
+ decoder->OutputHeight = VideoWindowHeight;
+
+- decoder->PixFmt = PIX_FMT_NONE;
++ decoder->PixFmt = AV_PIX_FMT_NONE;
+
+ decoder->Stream = stream;
+ if (!VaapiDecoderN) { // FIXME: hack sync on audio
+@@ -2546,7 +2546,7 @@
+ /// FIXME: must check if put/get with this format is supported (see intel)
+ ///
+ static int VaapiFindImageFormat(VaapiDecoder * decoder,
+- enum PixelFormat pix_fmt, VAImageFormat * format)
++ enum AVPixelFormat pix_fmt, VAImageFormat * format)
+ {
+ VAImageFormat *imgfrmts;
+ int imgfrmt_n;
+@@ -2557,12 +2557,12 @@
+ // NV12, YV12, I420, BGRA
+ // intel: I420 is native format for MPEG-2 decoded surfaces
+ // intel: NV12 is native format for H.264 decoded surfaces
+- case PIX_FMT_YUV420P:
+- case PIX_FMT_YUVJ420P:
++ case AV_PIX_FMT_YUV420P:
++ case AV_PIX_FMT_YUVJ420P:
+ // fourcc = VA_FOURCC_YV12; // YVU
+ fourcc = VA_FOURCC('I', '4', '2', '0'); // YUV
+ break;
+- case PIX_FMT_NV12:
++ case AV_PIX_FMT_NV12:
+ fourcc = VA_FOURCC_NV12;
+ break;
+ default:
+@@ -2631,7 +2631,7 @@
+ #endif
+ // FIXME: PixFmt not set!
+ //VaapiFindImageFormat(decoder, decoder->PixFmt, format);
+- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
++ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
+
+ // FIXME: this image is only needed for software decoder and auto-crop
+ if (decoder->GetPutImage
+@@ -2901,7 +2901,7 @@
+ }
+
+ ///
+-/// Callback to negotiate the PixelFormat.
++/// Callback to negotiate the AVPixelFormat.
+ ///
+ /// @param fmt is the list of formats which are supported by the codec,
+ /// it is terminated by -1 as 0 is a valid format, the
+@@ -2909,10 +2909,10 @@
+ ///
+ /// @note + 2 surface for software deinterlace
+ ///
+-static enum PixelFormat Vaapi_get_format(VaapiDecoder * decoder,
+- AVCodecContext * video_ctx, const enum PixelFormat *fmt)
++static enum AVPixelFormat Vaapi_get_format(VaapiDecoder * decoder,
++ AVCodecContext * video_ctx, const enum AVPixelFormat *fmt)
+ {
+- const enum PixelFormat *fmt_idx;
++ const enum AVPixelFormat *fmt_idx;
+ VAProfile profiles[vaMaxNumProfiles(VaDisplay)];
+ int profile_n;
+ VAEntrypoint entrypoints[vaMaxNumEntrypoints(VaDisplay)];
+@@ -2996,16 +2996,16 @@
+ }
+ Debug(3, "codec: %d entrypoints\n", entrypoint_n);
+ // look through formats
+- for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
+- Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
++ for (fmt_idx = fmt; *fmt_idx != AV_PIX_FMT_NONE; fmt_idx++) {
++ Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_AV_PIX_FMT_name(*fmt_idx));
+ // check supported pixel format with entry point
+ switch (*fmt_idx) {
+- case PIX_FMT_VAAPI_VLD:
++ case AV_PIX_FMT_VAAPI_VLD:
+ e = VaapiFindEntrypoint(entrypoints, entrypoint_n,
+ VAEntrypointVLD);
+ break;
+- case PIX_FMT_VAAPI_MOCO:
+- case PIX_FMT_VAAPI_IDCT:
++ case AV_PIX_FMT_VAAPI_MOCO:
++ case AV_PIX_FMT_VAAPI_IDCT:
+ Debug(3, "codec: this VA-API pixel format is not supported\n");
+ default:
+ continue;
+@@ -3081,7 +3081,7 @@
+ }
+ #endif
+
+- Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
++ Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_AV_PIX_FMT_name(fmt_idx[0]));
+ return *fmt_idx;
+
+ slow_path:
+@@ -3090,7 +3090,7 @@
+ decoder->Entrypoint = VA_INVALID_ID;
+ decoder->VaapiContext->config_id = VA_INVALID_ID;
+ decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
+- decoder->PixFmt = PIX_FMT_NONE;
++ decoder->PixFmt = AV_PIX_FMT_NONE;
+
+ decoder->InputWidth = 0;
+ decoder->InputHeight = 0;
+@@ -3291,8 +3291,8 @@
+
+ // FIXME: PixFmt not set!
+ //VaapiFindImageFormat(decoder, decoder->PixFmt, format);
+- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
+- //VaapiFindImageFormat(decoder, PIX_FMT_YUV420P, format);
++ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
++ //VaapiFindImageFormat(decoder, AV_PIX_FMT_YUV420P, format);
+ if (vaCreateImage(VaDisplay, format, width, height,
+ decoder->Image) != VA_STATUS_SUCCESS) {
+ Error(_("video/vaapi: can't create image!\n"));
+@@ -3647,7 +3647,7 @@
+ if (decoder->Image->image_id == VA_INVALID_ID) {
+ VAImageFormat format[1];
+
+- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
++ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
+ status =
+ vaCreateImage(VaDisplay, format, VideoWindowWidth,
+ VideoWindowHeight, decoder->Image);
+@@ -4292,8 +4292,8 @@
+ // I420 Y U V 2x2
+
+ // Intel needs NV12
+- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
+- //VaapiFindImageFormat(decoder, PIX_FMT_YUV420P, format);
++ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
++ //VaapiFindImageFormat(decoder, AV_PIX_FMT_YUV420P, format);
+ for (i = 0; i < 5; ++i) {
+ if (vaCreateImage(decoder->VaDisplay, format, decoder->InputWidth,
+ decoder->InputHeight,
+@@ -4365,7 +4365,7 @@
+ if (decoder->Image->image_id == VA_INVALID_ID) {
+ VAImageFormat format[1];
+
+- VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
++ VaapiFindImageFormat(decoder, AV_PIX_FMT_NV12, format);
+ if (vaCreateImage(VaDisplay, format, decoder->InputWidth,
+ decoder->InputHeight, decoder->Image) != VA_STATUS_SUCCESS) {
+ Error(_("video/vaapi: can't create image!\n"));
+@@ -5706,8 +5706,8 @@
+ const AVCodecContext *))VaapiGetSurface,
+ .ReleaseSurface =
+ (void (*const) (VideoHwDecoder *, unsigned))VaapiReleaseSurface,
+- .get_format = (enum PixelFormat(*const) (VideoHwDecoder *,
+- AVCodecContext *, const enum PixelFormat *))Vaapi_get_format,
++ .get_format = (enum AVPixelFormat(*const) (VideoHwDecoder *,
++ AVCodecContext *, const enum AVPixelFormat *))Vaapi_get_format,
+ .RenderFrame = (void (*const) (VideoHwDecoder *,
+ const AVCodecContext *, const AVFrame *))VaapiSyncRenderFrame,
+ .GetHwAccelContext = (void *(*const)(VideoHwDecoder *))
+@@ -5748,8 +5748,8 @@
+ const AVCodecContext *))VaapiGetSurface,
+ .ReleaseSurface =
+ (void (*const) (VideoHwDecoder *, unsigned))VaapiReleaseSurface,
+- .get_format = (enum PixelFormat(*const) (VideoHwDecoder *,
+- AVCodecContext *, const enum PixelFormat *))Vaapi_get_format,
++ .get_format = (enum AVPixelFormat(*const) (VideoHwDecoder *,
++ AVCodecContext *, const enum AVPixelFormat *))Vaapi_get_format,
+ .RenderFrame = (void (*const) (VideoHwDecoder *,
+ const AVCodecContext *, const AVFrame *))VaapiSyncRenderFrame,
+ .GetHwAccelContext = (void *(*const)(VideoHwDecoder *))
+@@ -5804,7 +5804,7 @@
+ int OutputWidth; ///< real video output width
+ int OutputHeight; ///< real video output height
+
+- enum PixelFormat PixFmt; ///< ffmpeg frame pixfmt
++ enum AVPixelFormat PixFmt; ///< ffmpeg frame pixfmt
+ int WrongInterlacedWarned; ///< warning about interlace flag issued
+ int Interlaced; ///< ffmpeg interlaced flag
+ int TopFieldFirst; ///< ffmpeg top field displayed first
+@@ -6534,7 +6534,7 @@
+ decoder->OutputWidth = VideoWindowWidth;
+ decoder->OutputHeight = VideoWindowHeight;
+
+- decoder->PixFmt = PIX_FMT_NONE;
++ decoder->PixFmt = AV_PIX_FMT_NONE;
+
+ #ifdef USE_AUTOCROP
+ //decoder->AutoCropBuffer = NULL; // done by calloc
+@@ -7379,16 +7379,16 @@
+ }
+
+ ///
+-/// Callback to negotiate the PixelFormat.
++/// Callback to negotiate the AVPixelFormat.
+ ///
+ /// @param fmt is the list of formats which are supported by the codec,
+ /// it is terminated by -1 as 0 is a valid format, the
+ /// formats are ordered by quality.
+ ///
+-static enum PixelFormat Vdpau_get_format(VdpauDecoder * decoder,
+- AVCodecContext * video_ctx, const enum PixelFormat *fmt)
++static enum AVPixelFormat Vdpau_get_format(VdpauDecoder * decoder,
++ AVCodecContext * video_ctx, const enum AVPixelFormat *fmt)
+ {
+- const enum PixelFormat *fmt_idx;
++ const enum AVPixelFormat *fmt_idx;
+ VdpDecoderProfile profile;
+ int max_refs;
+
+@@ -7402,16 +7402,16 @@
+ // look through formats
+ //
+ Debug(3, "%s: codec %d fmts:\n", __FUNCTION__, video_ctx->codec_id);
+- for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
+- Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
++ for (fmt_idx = fmt; *fmt_idx != AV_PIX_FMT_NONE; fmt_idx++) {
++ Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_AV_PIX_FMT_name(*fmt_idx));
+ // check supported pixel format with entry point
+ switch (*fmt_idx) {
+- case PIX_FMT_VDPAU_H264:
+- case PIX_FMT_VDPAU_MPEG1:
+- case PIX_FMT_VDPAU_MPEG2:
+- case PIX_FMT_VDPAU_WMV3:
+- case PIX_FMT_VDPAU_VC1:
+- case PIX_FMT_VDPAU_MPEG4:
++ case AV_PIX_FMT_VDPAU_H264:
++ case AV_PIX_FMT_VDPAU_MPEG1:
++ case AV_PIX_FMT_VDPAU_MPEG2:
++ case AV_PIX_FMT_VDPAU_WMV3:
++ case AV_PIX_FMT_VDPAU_VC1:
++ case AV_PIX_FMT_VDPAU_MPEG4:
+ break;
+ default:
+ continue;
+@@ -7419,7 +7419,7 @@
+ break;
+ }
+
+- if (*fmt_idx == PIX_FMT_NONE) {
++ if (*fmt_idx == AV_PIX_FMT_NONE) {
+ Error(_("video/vdpau: no valid vdpau pixfmt found\n"));
+ goto slow_path;
+ }
+@@ -7526,14 +7526,14 @@
+ }
+ #endif
+
+- Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
++ Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_AV_PIX_FMT_name(fmt_idx[0]));
+ return *fmt_idx;
+
+ slow_path:
+ // no accelerated format found
+ decoder->Profile = VDP_INVALID_HANDLE;
+ decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
+- decoder->PixFmt = PIX_FMT_NONE;
++ decoder->PixFmt = AV_PIX_FMT_NONE;
+
+ decoder->InputWidth = 0;
+ decoder->InputHeight = 0;
+@@ -8119,10 +8119,10 @@
+ //
+ // Hardware render
+ //
+- // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
+- if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
+- && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
+- || video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
++ // VDPAU: AV_PIX_FMT_VDPAU_H264 .. AV_PIX_FMT_VDPAU_VC1 AV_PIX_FMT_VDPAU_MPEG4
++ if ((AV_PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
++ && video_ctx->pix_fmt <= AV_PIX_FMT_VDPAU_VC1)
++ || video_ctx->pix_fmt == AV_PIX_FMT_VDPAU_MPEG4) {
+ struct vdpau_render_state *vrs;
+
+ vrs = (struct vdpau_render_state *)frame->data[0];
+@@ -8165,11 +8165,11 @@
+ // Copy data from frame to image
+ //
+ switch (video_ctx->pix_fmt) {
+- case PIX_FMT_YUV420P:
+- case PIX_FMT_YUVJ420P: // some streams produce this
++ case AV_PIX_FMT_YUV420P:
++ case AV_PIX_FMT_YUVJ420P: // some streams produce this
+ break;
+- case PIX_FMT_YUV422P:
+- case PIX_FMT_YUV444P:
++ case AV_PIX_FMT_YUV422P:
++ case AV_PIX_FMT_YUV444P:
+ default:
+ Fatal(_("video/vdpau: pixel format %d not supported\n"),
+ video_ctx->pix_fmt);
+@@ -9545,8 +9545,8 @@
+ const AVCodecContext *))VdpauGetSurface,
+ .ReleaseSurface =
+ (void (*const) (VideoHwDecoder *, unsigned))VdpauReleaseSurface,
+- .get_format = (enum PixelFormat(*const) (VideoHwDecoder *,
+- AVCodecContext *, const enum PixelFormat *))Vdpau_get_format,
++ .get_format = (enum AVPixelFormat(*const) (VideoHwDecoder *,
++ AVCodecContext *, const enum AVPixelFormat *))Vdpau_get_format,
+ .RenderFrame = (void (*const) (VideoHwDecoder *,
+ const AVCodecContext *, const AVFrame *))VdpauSyncRenderFrame,
+ .GetHwAccelContext = (void *(*const)(VideoHwDecoder *))
+@@ -9712,8 +9712,8 @@
+ #endif
+ .ReleaseSurface = NoopReleaseSurface,
+ #if 0
+- .get_format = (enum PixelFormat(*const) (VideoHwDecoder *,
+- AVCodecContext *, const enum PixelFormat *))Noop_get_format,
++ .get_format = (enum AVPixelFormat(*const) (VideoHwDecoder *,
++ AVCodecContext *, const enum AVPixelFormat *))Noop_get_format,
+ .RenderFrame = (void (*const) (VideoHwDecoder *,
+ const AVCodecContext *, const AVFrame *))NoopSyncRenderFrame,
+ .GetHwAccelContext = (void *(*const)(VideoHwDecoder *))
+@@ -9950,7 +9950,7 @@
+
+ case MapNotify:
+ Debug(3, "video/event: MapNotify\n");
+- // �wm workaround
++ // \B5wm workaround
+ VideoThreadLock();
+ xcb_change_window_attributes(Connection, VideoWindow,
+ XCB_CW_CURSOR, &VideoBlankCursor);
+@@ -10284,7 +10284,7 @@
+ }
+
+ ///
+-/// Callback to negotiate the PixelFormat.
++/// Callback to negotiate the AVPixelFormat.
+ ///
+ /// @param hw_decoder video hardware decoder
+ /// @param video_ctx ffmpeg video codec context
+@@ -10293,8 +10293,8 @@
+ /// valid format, the formats are ordered by
+ /// quality.
+ ///
+-enum PixelFormat Video_get_format(VideoHwDecoder * hw_decoder,
+- AVCodecContext * video_ctx, const enum PixelFormat *fmt)
++enum AVPixelFormat Video_get_format(VideoHwDecoder * hw_decoder,
++ AVCodecContext * video_ctx, const enum AVPixelFormat *fmt)
+ {
+ #ifdef DEBUG
+ int ms_delay;
+--- a/video.h
++++ b/video.h
+@@ -59,9 +59,9 @@
+ /// Release a video hardware surface
+ extern void VideoReleaseSurface(VideoHwDecoder *, unsigned);
+
+- /// Callback to negotiate the PixelFormat.
+-extern enum PixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *,
+- const enum PixelFormat *);
++ /// Callback to negotiate the AVPixelFormat.
++extern enum AVPixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *,
++ const enum AVPixelFormat *);
+
+ /// Render a ffmpeg frame.
+ extern void VideoRenderFrame(VideoHwDecoder *, const AVCodecContext *,
8 years, 4 months
[mac/f24] Add WIP patch - please anyone finish the gcc patch
by Nicolas Chauvet
commit ff7fd31dc5616830a5dfca592e8ca3ab081bbc65
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 30 15:48:57 2016 +0200
Add WIP patch - please anyone finish the gcc patch
mac-3.99-u4-b5-gcc45.patch | 9 +++++++++
mac.spec | 20 ++++++++++++--------
2 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/mac-3.99-u4-b5-gcc45.patch b/mac-3.99-u4-b5-gcc45.patch
new file mode 100644
index 0000000..112d028
--- /dev/null
+++ b/mac-3.99-u4-b5-gcc45.patch
@@ -0,0 +1,9 @@
+diff -up mac-3.99-u4-b5/src/Shared/CircleBuffer.cpp.orig mac-3.99-u4-b5/src/Shared/CircleBuffer.cpp
+--- mac-3.99-u4-b5/src/Shared/CircleBuffer.cpp.orig 2016-06-30 15:39:29.057655407 +0200
++++ mac-3.99-u4-b5/src/Shared/CircleBuffer.cpp 2016-06-30 15:38:56.066671050 +0200
+@@ -1,3 +1,5 @@
++#include <limits>
++
+ #include "All.h"
+ #include "CircleBuffer.h"
+
diff --git a/mac.spec b/mac.spec
index 72c3dde..5e95507 100644
--- a/mac.spec
+++ b/mac.spec
@@ -1,6 +1,6 @@
Name: mac
Version: 3.99
-Release: 11.u4b5%{?dist}
+Release: 12.u4b5%{?dist}
Summary: Monkey's Audio Codec (MAC) utility
Group: Applications/Multimedia
@@ -10,12 +10,16 @@ Source0: http://supermmx.org/resources/linux/mac/mac-%{version}-u4-b5.tar
Source1: mac-permission_to_redistribute.txt
Patch0: mac-3.99-u4-b5-gcc44.patch
Patch1: mac-3.99-u4-b5-analyse.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: mac-3.99-u4-b5-gcc45.patch
%ifarch i686 x86_64
BuildRequires: yasm
%endif
+%if 0%{?fedora} > 22
+BuildRequires: execstack
+%else
BuildRequires: prelink
+%endif
Requires: %{name}-libs = %{version}-%{release}
@@ -54,6 +58,7 @@ developing applications that use %{name}.
%setup -q -n %{name}-%{version}-u4-b5
%patch0 -p1 -b .gcc44
%patch1 -p1 -b .an
+%patch2 -p1 -b .gcc45
#Copy permission to redistribute
cp -p %{SOURCE1} .
@@ -93,9 +98,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
execstack -c $RPM_BUILD_ROOT%{_libdir}/libmac.so.2.0.0
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post libs -p /sbin/ldconfig
@@ -103,18 +105,15 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/mac
%files libs
-%defattr(-,root,root,-)
%doc mac-permission_to_redistribute.txt
%doc src/License.htm
%{_libdir}/*.so.*
%files devel
-%defattr(-,root,root,-)
%doc TODO src/Readme.htm src/Credits.txt src/History.txt
%{_includedir}/mac/
%{_libdir}/*.so
@@ -122,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 30 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 3.99-12.u4b5
+- Spec clean-up
+- Use execstrack instead of prelink on fedora 23 and later
+- Fix build with newer gcc
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 3.99-11.u4b5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
8 years, 4 months
[unrar] Update to 5.4.2
by Nicolas Chauvet
Summary of changes:
4111703... Update to 5.4.2 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 4 months
[unrar/f24] Update to 5.4.2
by Nicolas Chauvet
commit 411170325e3a0f1e129b79f52adf44a74a743b43
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 30 14:57:55 2016 +0200
Update to 5.4.2
sources | 2 +-
unrar.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 235c8ae..931713f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c14a30052bf5e0b1a02fd9e3e638452 unrarsrc-5.2.3.tar.gz
+fb77bcbeac6953f563230634d74a87d7 unrarsrc-5.4.2.tar.gz
diff --git a/unrar.spec b/unrar.spec
index 2951cb2..c5aa120 100644
--- a/unrar.spec
+++ b/unrar.spec
@@ -1,5 +1,5 @@
Name: unrar
-Version: 5.2.3
+Version: 5.4.2
Release: 1%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
License: Freeware with further limitations
@@ -120,6 +120,9 @@ fi
%changelog
+* Thu Jun 30 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 5.4.2-1
+- Update to 5.4.2
+
* Sat Dec 06 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 5.2.3-1
- Update to 5.2.3
8 years, 4 months
[nvidia-340xx-kmod/f24] Avoid armhfp for now
by Nicolas Chauvet
commit 3f6204c2c4299d8ca40c162ff46ef6daa1e9a2ca
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 30 08:34:45 2016 +0200
Avoid armhfp for now
nvidia-340xx-kmod.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 92bff1e..005f7bf 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -9,7 +9,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.96
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,7 +21,8 @@ Patch0: nv-linux-arm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i686 x86_64 armv7hl
+#ExclusiveArch: i686 x86_64 armv7hl
+ExclusiveArch: i686 x86_64
# get the needed BuildRequires (in parts depending on what we build for)
%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-340xx-kmodsrc >= %{epoch}:%{version}
@@ -91,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 30 2016 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.96-2
+- Avoid armhfp for now
+
* Tue Nov 17 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1:340.96-1
- Update to 340.96
8 years, 4 months
[vdr-markad] replaced function avcodec_alloc_frame(); by av_frame_alloc(); due ffmpeg3 version
by Martin Gansser
commit f1b523516aea0d7156eb27a452e50816d73e14e2
Author: Martin Gansser <mgansser(a)alice.de>
Date: Wed Jun 29 18:37:35 2016 +0200
replaced function avcodec_alloc_frame(); by av_frame_alloc(); due ffmpeg3 version
vdr-markad.spec | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 88f6eef..8738ec5 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -1,17 +1,17 @@
-%global commit 74e2a8c5382fa8bfacd12274899112724a1e0d51
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit0 74e2a8c5382fa8bfacd12274899112724a1e0d51
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global gitdate 20151016
Name: vdr-markad
Version: 0.1.4
-Release: 8.%{gitdate}git%{shortcommit}%{?dist}
+Release: 9.%{gitdate}git%{shortcommit0}%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
# how to get the tarball
# go to http://projects.vdr-developer.org/git/vdr-plugin-markad.git/commit/
# click the link behind commit, then select the download links below.
URL: http://projects.vdr-developer.org/projects/plg-markad
-Source0: http://projects.vdr-developer.org/git/vdr-plugin-markad.git/snapshot/vdr-...
+Source0: http://projects.vdr-developer.org/git/vdr-plugin-markad.git/snapshot/vdr-...
Source1: %{name}.conf
BuildRequires: vdr-devel >= 1.7.30
@@ -22,7 +22,11 @@ Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
VDR-Plugin: markad - %{summary}
%prep
-%setup -qn vdr-plugin-markad-%{commit}
+%setup -qn vdr-plugin-markad-%{commit0}
+
+# ffmpeg3 patch
+# replaced function avcodec_alloc_frame(); by av_frame_alloc();
+sed -i -e 's|avcodec_alloc_frame()|av_frame_alloc()|g' command/decoder.cpp
%build
make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} \
@@ -68,6 +72,9 @@ fi
%{vdr_vardir}/markad/
%changelog
+* Wed Jun 29 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.1.4-9.20151016git74e2a8c
+- replaced function avcodec_alloc_frame(); by av_frame_alloc(); due ffmpeg3 version
+
* Sat Oct 17 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.1.4-8.20151016git74e2a8c
- rebuild for new git version
8 years, 4 months
[VirtualBox-kmod] Update VirtualBox to 5.0.24
by Sérgio M. Basto
commit c14771bf9f717d5866c564759e7bc95cad68823d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jun 29 02:09:58 2016 +0100
Update VirtualBox to 5.0.24
- No more obsolete VirtualBox-OSE , simplify snippets
VirtualBox-kmod.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 2aa7ca5..9460c97 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -20,9 +20,9 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 5.0.22
+Version: 5.0.24
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -100,7 +100,7 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
-* Wed Jun 29 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.22-2
+* Wed Jun 29 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.24-1
- Update VirtualBox to 5.0.24
- No more obsolete VirtualBox-OSE , simplify snippets
8 years, 4 months