[vdr-softhddevice-openglosd] Update for new git snapshot
by Martin Gansser
commit 938f1f469b144d226b45c4095caba43987669ff6
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Sep 17 17:26:50 2017 +0200
Update for new git snapshot
.gitignore | 1 +
chartype.patch | 11 +
exit-crash.patch | 61 +++++
ffmpeg_2.9.patch | 575 ++++++++++++++++++++++++++++++++++++++++
sources | 1 +
vdr-softhddevice-openglosd.conf | 6 +
vdr-softhddevice-openglosd.spec | 109 ++++++++
7 files changed, 764 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..05253f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/vdr-softhddevice-openglosd-569fde5.tar.gz
diff --git a/chartype.patch b/chartype.patch
new file mode 100644
index 0000000..6fca02c
--- /dev/null
+++ b/chartype.patch
@@ -0,0 +1,11 @@
+--- softhddev.c.orig 2015-06-29 09:54:49.192694598 +0200
++++ softhddev.c 2015-06-29 09:55:25.527691030 +0200
+@@ -92,7 +92,7 @@
+ static signed char ConfigStartSuspended; ///< flag to start in suspend mode
+ static char ConfigFullscreen; ///< fullscreen modus
+ static const char *X11ServerArguments; ///< default command arguments
+-static char ConfigStillDecoder; ///< hw/sw decoder for still picture
++static signed char ConfigStillDecoder; ///< hw/sw decoder for still picture
+
+ static pthread_mutex_t SuspendLockMutex; ///< suspend lock mutex
+
diff --git a/exit-crash.patch b/exit-crash.patch
new file mode 100644
index 0000000..470920b
--- /dev/null
+++ b/exit-crash.patch
@@ -0,0 +1,61 @@
+diff --git a/video.c b/video.c
+index 56cae36..456a9ac 100644
+--- a/video.c
++++ b/video.c
+@@ -9458,6 +9458,41 @@ static void NoopReleaseSurface(
+ }
+
+ ///
++/// Set noop decoder video clock.
++///
++/// Can be called while exiting.
++///
++/// @param decoder noop hardware decoder
++/// @param pts audio presentation timestamp
++///
++void NoopSetClock(__attribute__ ((unused)) VideoHwDecoder * decoder,
++ __attribute__ ((unused)) int64_t pts)
++{
++}
++
++///
++/// Set noop decoder closing stream flag.
++///
++/// Can be called while exiting.
++///
++/// @param decoder noop hw decoder
++///
++static void NoopSetClosing(__attribute__ ((unused)) VideoHwDecoder * decoder)
++{
++}
++
++///
++/// Reset start of frame counter.
++///
++/// Can be called while exiting.
++///
++/// @param decoder noop decoder
++///
++static void NoopResetStart(__attribute__ ((unused)) VdpauDecoder * decoder)
++{
++}
++
++///
+ /// Set noop background color.
+ ///
+ /// @param rgba 32 bit RGBA color.
+@@ -9564,10 +9599,14 @@ static const VideoModule NoopModule = {
+ const AVCodecContext *, const AVFrame *))NoopSyncRenderFrame,
+ .GetHwAccelContext = (void *(*const)(VideoHwDecoder *))
+ DummyGetHwAccelContext,
++#endif
+ .SetClock = (void (*const) (VideoHwDecoder *, int64_t))NoopSetClock,
++#if 0
+ .GetClock = (int64_t(*const) (const VideoHwDecoder *))NoopGetClock,
++#endif
+ .SetClosing = (void (*const) (const VideoHwDecoder *))NoopSetClosing,
+ .ResetStart = (void (*const) (const VideoHwDecoder *))NoopResetStart,
++#if 0
+ .SetTrickSpeed =
+ (void (*const) (const VideoHwDecoder *, int))NoopSetTrickSpeed,
+ .GrabOutput = NoopGrabOutputSurface,
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 *,
diff --git a/sources b/sources
index e69de29..8f0674f 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e413f35d1a82cd5ec9b3d0b99745d07d vdr-softhddevice-openglosd-569fde5.tar.gz
diff --git a/vdr-softhddevice-openglosd.conf b/vdr-softhddevice-openglosd.conf
new file mode 100644
index 0000000..6d6b2ea
--- /dev/null
+++ b/vdr-softhddevice-openglosd.conf
@@ -0,0 +1,6 @@
+# Configuration snippet for vdr-softhddevice-openglosd -*- sh -*-
+#
+# Add command line options to pass to the softhddevice plugin to PLUGIN_OPTIONS.
+# See /usr/share/doc/vdr-softhddevice-openglosd/README for info about available options.
+
+PLUGIN_OPTIONS=""
diff --git a/vdr-softhddevice-openglosd.spec b/vdr-softhddevice-openglosd.spec
new file mode 100644
index 0000000..24b4565
--- /dev/null
+++ b/vdr-softhddevice-openglosd.spec
@@ -0,0 +1,109 @@
+# https://github.com/louisbraun/softhddevice-openglosd/commit/569fde5dce675...
+%global commit 569fde5dce6750eabcd889d07b3298d5764fce34
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global gitdate 20160717
+
+Name: vdr-softhddevice-openglosd
+Version: 0.6.1
+Release: 11.%{gitdate}git%{shortcommit}%{?dist}
+Summary: A software and GPU emulated HD output device plugin for VDR
+
+License: AGPLv3
+URL: http://projects.vdr-developer.org/projects/plg-softhddevice
+Source0: https://github.com/louisbraun/softhddevice-openglosd/archive/%{commit}/%{...
+# Configuration files for plugin parameters. These are Fedora specific and not in upstream.
+Source1: %{name}.conf
+# http://projects.vdr-developer.org/issues/1417
+Patch0: exit-crash.patch
+# http://projects.vdr-developer.org/issues/1916
+Patch1: chartype.patch
+# https://projects.vdr-developer.org/issues/2424
+Patch2: ffmpeg_2.9.patch
+
+BuildRequires: vdr-devel >= 1.7.22
+BuildRequires: gettext
+BuildRequires: libva-devel
+BuildRequires: libvdpau-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: ffmpeg-devel
+BuildRequires: freeglut-devel
+BuildRequires: libxcb-devel
+BuildRequires: xcb-util-devel
+BuildRequires: xcb-util-wm-devel
+BuildRequires: mesa-libGLU-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: glm-devel
+BuildRequires: glew-devel
+BuildRequires: freetype-devel
+Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
+Requires: xorg-x11-server-Xorg
+
+%description
+A software and GPU emulated HD output device plugin for VDR.
+With this version of the plugin softhddevice an OpenGL accelerated
+OSD output was added. That works only with VDPAU output on NVidia cards.
+
+ Video decoder CPU / VDPAU
+ Video output VDPAU
+ Audio FFMpeg / Alsa / Analog
+ Audio FFMpeg / Alsa / Digital
+ Audio FFMpeg / OSS / Analog
+ HDMI/SPDIF pass-through
+ Software volume, compression, normalize and channel resample
+ VDR ScaleVideo API
+ Software deinterlacer Bob (VA-API only)
+ Autocrop
+ Grab image (VDPAU only)
+ Suspend / Dettach
+ Letterbox, Stretch and Center cut-out video display modes
+ atmo light support with plugin http://github.com/durchflieger/DFAtmo
+ PIP (Picture-in-Picture) (VDPAU only)
+
+
+%prep
+%setup -qn softhddevice-openglosd-%{commit}
+%patch0 -p1
+%patch1 -p0
+%patch2 -p1
+
+# remove .git files and Gentoo files
+rm -f .indent.pro .gitignore .gitattributes
+rm -f vdr-softhddevice-9999.ebuild vdr-softhddevice-9999-pre1.7.36.ebuild
+
+for f in ChangeLog README.txt; do
+ iconv -f iso8859-1 -t utf-8 $f >$f.conv
+ touch -r $f $f.conv
+ mv $f.conv $f
+done
+mv README.txt README
+
+%build
+make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags}
+
+%install
+%make_install
+install -Dpm 644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/softhddevice.conf
+%find_lang vdr-softhddevice
+
+%files -f vdr-softhddevice.lang
+%{vdr_plugindir}/libvdr-softhddevice.so.%{vdr_apiversion}
+%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/softhddevice.conf
+%doc ChangeLog README
+%license AGPL-3.0.txt
+
+%changelog
+* Tue Jul 19 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-11.20160717git569fde5
+- update for new git snapshot
+
+* Tue Jun 28 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-10.20160607gitdc8740b
+- Added ffmpeg_2.9.patch
+
+* Fri Jun 10 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-9.20160607gitdc8740b
+- update for new git snapshot
+
+* Tue Mar 29 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-8.20160327gitfd3db0b
+- update for new git snapshot
+
+* Sun Jan 31 2016 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-7.20160131gitefd60c8
+- first build of softhddevice-openglosd version
7 years, 2 months
[audacious-plugins-freeworld] Update to 3.9 as in Fedora proper
by Leigh Scott
commit e188a4b3d76943e96bd96dd056f0c756916f0b91
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Sep 17 12:43:36 2017 +0100
Update to 3.9 as in Fedora proper
.gitignore | 1 +
audacious-plugins-freeworld.spec | 27 +++++++++++++++++----------
sources | 2 +-
3 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dbce551..aaac998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ audacious-plugins-3.6.1.tar.bz2
audacious-plugins-3.6.2.tar.bz2
audacious-plugins-3.7.2.tar.bz2
/audacious-plugins-3.8.tar.bz2
+/audacious-plugins-3.9.tar.bz2
diff --git a/audacious-plugins-freeworld.spec b/audacious-plugins-freeworld.spec
index fcaa223..c84095d 100644
--- a/audacious-plugins-freeworld.spec
+++ b/audacious-plugins-freeworld.spec
@@ -4,8 +4,8 @@
%endif
Name: audacious-plugins-freeworld
-Version: 3.8
-Release: 6%{?dist}
+Version: 3.9
+Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -13,21 +13,25 @@ License: GPLv3
URL: http://audacious-media-player.org/
Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{version}....
-BuildRequires: audacious-devel >= 3.8
-BuildRequires: zlib-devel, libxml2-devel
+BuildRequires: audacious-devel >= 3.9
+BuildRequires: zlib-devel
+BuildRequires: libxml2-devel
BuildRequires: taglib-devel >= 1.4
BuildRequires: libmms-devel
-BuildRequires: gettext, libbinio-devel
-BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
+BuildRequires: gettext
+BuildRequires: libbinio-devel
+BuildRequires: dbus-devel >= 0.60
+BuildRequires: dbus-glib-devel >= 0.60
# ffaudio plugin
-BuildRequires: faad2-devel ffmpeg-devel
+BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
# we need to have configure detect atleast one audio output to make it happy
BuildRequires: alsa-lib-devel
# require all the plugins
-Requires: %{name}-aac = %{version}-%{release}
-Requires: %{name}-mms = %{version}-%{release}
-Requires: %{name}-ffaudio = %{version}-%{release}
+Requires: %{name}-aac%{?_isa} = %{version}-%{release}
+Requires: %{name}-mms%{?_isa} = %{version}-%{release}
+Requires: %{name}-ffaudio%{?_isa} = %{version}-%{release}
%description
Audacious is a media player that currently uses a skinned
@@ -118,6 +122,9 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%changelog
+* Sun Sep 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.9-1
+- Update to 3.9 as in Fedora proper
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index e3c2f73..e091218 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21109ff3e74b62d6bb9cb89b249f7d02 audacious-plugins-3.8.tar.bz2
+fe467c4dcee8abbf571e69ed980a56b6 audacious-plugins-3.9.tar.bz2
7 years, 2 months
[VirtualBox-kmod: 2/2] Reenable buildsys-build-rpmfusion-kerneldevpkgs-current
by Sérgio M. Basto
commit f915f5456a4f540c70c1ca9bc37d8e1ad8499c62
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 16 23:40:51 2017 +0100
Reenable buildsys-build-rpmfusion-kerneldevpkgs-current
VirtualBox-kmod.spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 58e4e0b..0239156 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -3,11 +3,10 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#if 0%{?fedora}
+%if 0%{?fedora}
%global buildforkernels akmod
-
%global debug_package %{nil}
-#endif
+%endif
#akmods still generate debuginfo but have the wrong name:
#/var/cache/akmods/VirtualBox/VirtualBox-kmod-debuginfo-5.0.4-1.fc21.x86_64.rpm
#/var/cache/akmods/VirtualBox/kmod-VirtualBox-4.1.8-100.fc21.x86_64-5.0.4-1.fc21.x86_64.rpm
@@ -30,7 +29,7 @@
Name: VirtualBox-kmod
Version: 5.1.28
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -108,8 +107,11 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Sat Sep 16 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.28-3
+- Reenable buildsys-build-rpmfusion-kerneldevpkgs-current
+
* Sat Sep 16 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.28-2
-- Tempory disable broken dep of buildsys-build-rpmfusion-kerneldevpkgs-current
+- Temporary disable broken dep of buildsys-build-rpmfusion-kerneldevpkgs-current
* Fri Sep 15 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.28-1
- Update VBox to 5.1.28
7 years, 2 months
[e-uae] Dead upstream. Superseded by fs-uae.
by Andrea Musuruane
commit b2775a9eae69b6fd73a90c2c2a7822de4c4d09f6
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Sep 16 14:37:08 2017 +0200
Dead upstream. Superseded by fs-uae.
.gitignore | 1 -
dead.package | 1 +
e-uae-0.8.29-blitter.patch | 398 -------------------------------
e-uae-0.8.29-execstack.patch | 82 -------
e-uae-0.8.29-fix-do-while-0.patch | 64 -----
e-uae-0.8.29-fix-string-format-bug.patch | 48 ----
e-uae-0.8.29-gtk_64bit.patch | 203 ----------------
e-uae-0.8.29-hardfilefixes.patch | 46 ----
e-uae-0.8.29-irqfixes.patch | 266 ---------------------
e-uae.png | Bin 4710 -> 0 bytes
e-uae.spec | 282 ----------------------
sources | 1 -
12 files changed, 1 insertion(+), 1391 deletions(-)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..06bfd9b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Dead upstream. Superseded by fs-uae.
7 years, 2 months
