Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xjadeo for openSUSE:Factory checked in at 2023-01-02 15:02:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xjadeo (Old) and /work/SRC/openSUSE:Factory/.xjadeo.new.1563 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xjadeo" Mon Jan 2 15:02:05 2023 rev:8 rq:1046037 version:0.8.12 Changes: -------- --- /work/SRC/openSUSE:Factory/xjadeo/xjadeo.changes 2022-09-04 22:11:59.376320693 +0200 +++ /work/SRC/openSUSE:Factory/.xjadeo.new.1563/xjadeo.changes 2023-01-02 15:02:07.277335074 +0100 @@ -1,0 +2,8 @@ +Sun Jan 1 19:00:19 UTC 2023 - Edgar Aichinger <edog...@aon.at> + +- Update to version 0.8.12: + * add compatibility for ffmpeg-5.1 + * fix UI scale when building on 10.15 or later +- Drop 973f0046.patch (now upstream) + +------------------------------------------------------------------- Old: ---- 973f0046.patch xjadeo-0.8.11.tar.gz New: ---- xjadeo-0.8.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xjadeo.spec ++++++ --- /var/tmp/diff_new_pack.9jBFpi/_old 2023-01-02 15:02:08.233340447 +0100 +++ /var/tmp/diff_new_pack.9jBFpi/_new 2023-01-02 15:02:08.241340492 +0100 @@ -18,15 +18,13 @@ Name: xjadeo -Version: 0.8.11 +Version: 0.8.12 Release: 0 Summary: Video player that gets sync from Jack License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Visualization URL: http://xjadeo.sourceforge.net/ Source0: https://sourceforge.net/projects/xjadeo/files/xjadeo/v%{version}/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM 973f0046.patch -- ffmpeg 5.1 compat -Patch0: https://github.com/x42/xjadeo/commit/973f0046.patch BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(alsa) ++++++ xjadeo-0.8.11.tar.gz -> xjadeo-0.8.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/ChangeLog new/xjadeo-0.8.12/ChangeLog --- old/xjadeo-0.8.11/ChangeLog 2022-04-01 03:05:19.000000000 +0200 +++ new/xjadeo-0.8.12/ChangeLog 2022-12-31 22:36:51.000000000 +0100 @@ -1,3 +1,7 @@ +2023-01-01 (0.8.12) Robin Gareus <ro...@gareus.org> +* add compatibility for ffmpeg-5.1 +* fix UI scale when building on 10.15 or later + 2022-04-01 (0.8.11) Robin Gareus <ro...@gareus.org> * add compatibility for ffmpeg-5.0 * update static-builder to use ffmpeg-5.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/config.h new/xjadeo-0.8.12/config.h --- old/xjadeo-0.8.11/config.h 2022-04-01 03:52:31.000000000 +0200 +++ new/xjadeo-0.8.12/config.h 2023-01-01 00:37:41.000000000 +0100 @@ -226,7 +226,7 @@ /* #undef TTFFONTFILE */ /* Version number of package */ -#define VERSION "0.8.11" +#define VERSION "0.8.12" /* enable xjadeo windows context-menu */ #define WINMENU 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/configure new/xjadeo-0.8.12/configure --- old/xjadeo-0.8.11/configure 2022-04-01 03:52:28.000000000 +0200 +++ new/xjadeo-0.8.12/configure 2023-01-01 00:37:38.000000000 +0100 @@ -2740,7 +2740,7 @@ VERSION_MAJOR=0 VERSION_MINOR=8 -VERSION_SUB=11 +VERSION_SUB=12 am__api_version='1.16' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/configure.ac new/xjadeo-0.8.12/configure.ac --- old/xjadeo-0.8.11/configure.ac 2022-04-01 03:02:55.000000000 +0200 +++ new/xjadeo-0.8.12/configure.ac 2022-12-31 22:35:56.000000000 +0100 @@ -8,7 +8,7 @@ VERSION_MAJOR=0 VERSION_MINOR=8 -VERSION_SUB=11 +VERSION_SUB=12 AM_INIT_AUTOMAKE(xjadeo, [${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_SUB}]) AM_CONFIG_HEADER(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/doc/xjadeo.1 new/xjadeo-0.8.12/doc/xjadeo.1 --- old/xjadeo-0.8.11/doc/xjadeo.1 2022-04-01 03:52:39.000000000 +0200 +++ new/xjadeo-0.8.12/doc/xjadeo.1 2023-01-01 00:37:50.000000000 +0100 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH XJADEO "1" "April 2022" "xjadeo version 0.8.11" "User Commands" +.TH XJADEO "1" "January 2023" "xjadeo version 0.8.12" "User Commands" .SH NAME xjadeo \- X Jack Video Monitor .SH SYNOPSIS @@ -362,7 +362,7 @@ Website: <http://xjadeo.sf.net/> .TP built from: -scm\-v0.8.11 +scm\-v0.8.12 .IP compiled with: AVFORMAT=0x3a2d64 AVCODEC=0x3a5b64 AVUTIL:0x383364 configuration: [ LTC JACK\-SESSION POSIX\-MQueue OSC ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/doc/xjremote.1 new/xjadeo-0.8.12/doc/xjremote.1 --- old/xjadeo-0.8.11/doc/xjremote.1 2022-04-01 03:52:39.000000000 +0200 +++ new/xjadeo-0.8.12/doc/xjremote.1 2023-01-01 00:37:50.000000000 +0100 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.1. -.TH XJREMOTE "1" "April 2022" "xjremote version 0.8.11" "User Commands" +.TH XJREMOTE "1" "January 2023" "xjremote version 0.8.12" "User Commands" .SH NAME xjremote \- X Jack Video Monitor Remote Control .SH SYNOPSIS @@ -54,7 +54,7 @@ Website: <https://github.com/x42/xjadeo> .TP built from: -scm\-v0.8.11 +scm\-v0.8.12 .TP configuration: [ POSIX\-MQueue ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/src/xjadeo/display_gl_osx.m new/xjadeo-0.8.12/src/xjadeo/display_gl_osx.m --- old/xjadeo-0.8.11/src/xjadeo/display_gl_osx.m 2021-01-06 16:06:22.000000000 +0100 +++ new/xjadeo-0.8.12/src/xjadeo/display_gl_osx.m 2022-07-30 23:17:17.000000000 +0200 @@ -174,6 +174,9 @@ self = [super initWithFrame:frame pixelFormat:pixelFormat]; [pixelFormat release]; if (self) { +#if defined(MAC_OS_X_VERSION_10_15) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15 + [self setWantsBestResolutionOpenGLSurface:NO]; +#endif [[self openGLContext] makeCurrentContext]; [self reshape]; } @@ -968,6 +971,9 @@ [window makeKeyAndOrderFront:window]; +#if defined(MAC_OS_X_VERSION_10_15) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15 + [osx_glview setWantsBestResolutionOpenGLSurface:NO]; +#endif gl_make_current(); gl_init (); gl_resize (ffctv_width, ffctv_height); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/src/xjadeo/ffcompat.h new/xjadeo-0.8.12/src/xjadeo/ffcompat.h --- old/xjadeo-0.8.11/src/xjadeo/ffcompat.h 2022-02-06 01:31:51.000000000 +0100 +++ new/xjadeo-0.8.12/src/xjadeo/ffcompat.h 2022-09-02 10:31:07.000000000 +0200 @@ -1,6 +1,6 @@ /* ffmpeg compatibility wrappers * - * Copyright 2012-2014 Robin Gareus <ro...@gareus.org> + * Copyright 2012-2021 Robin Gareus <ro...@gareus.org> * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,6 +26,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +// https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/HEAD:/doc/APIchanges + #ifndef FFCOMPAT_H #define FFCOMPAT_H @@ -59,49 +62,56 @@ #endif #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 63, 100) -static inline void avcodec_free_context (AVCodecContext ** avctx) +static inline void +avcodec_free_context (AVCodecContext** avctx) { avcodec_close (*avctx); } #endif #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 25, 100) -static inline void av_packet_unref (AVPacket *pkt) +static inline void +av_packet_unref (AVPacket* pkt) { av_free_packet (pkt); } #endif #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 63, 100) -static inline int av_image_get_buffer_size (enum AVPixelFormat pix_fmt, int width, int height, int align) +static inline int +av_image_get_buffer_size (enum AVPixelFormat pix_fmt, int width, int height, int align) { - return avpicture_get_size (pix_fmt, width, height) + return avpicture_get_size (pix_fmt, width, height); } +#else +#include <libavutil/imgutils.h> #endif #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 2, 0) -static inline int avformat_open_input(AVFormatContext **ps, const char *filename, void *fmt, void **options) +static inline int +avformat_open_input (AVFormatContext** ps, const char* filename, void* fmt, void** options) { - return av_open_input_file(ps, filename, NULL, 0, NULL); + return av_open_input_file (ps, filename, NULL, 0, NULL); } #endif /* avformat < 53.2.0 */ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 5, 0) -static inline AVCodecContext * -avcodec_alloc_context3(AVCodec *codec __attribute__((unused))) +static inline AVCodecContext* +avcodec_alloc_context3 (AVCodec* codec __attribute__ ((unused))) { - return avcodec_alloc_context(); + return avcodec_alloc_context (); } -static inline AVStream * -avformat_new_stream(AVFormatContext *s, AVCodec *c) { - return av_new_stream(s,0); +static inline AVStream* +avformat_new_stream (AVFormatContext* s, AVCodec* c) +{ + return av_new_stream (s, 0); } static inline int -avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec) +avcodec_get_context_defaults3 (AVCodecContext* s, AVCodec* codec) { - avcodec_get_context_defaults(s); + avcodec_get_context_defaults (s); return 0; } @@ -109,32 +119,33 @@ #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 7, 0) static inline int -avcodec_open2(AVCodecContext *avctx, AVCodec *codec, void **options __attribute__((unused))) +avcodec_open2 (AVCodecContext* avctx, AVCodec* codec, void** options __attribute__ ((unused))) { - return avcodec_open(avctx, codec); + return avcodec_open (avctx, codec); } #endif /* avcodec <= 53.7.0 */ #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 2, 0) static inline int -avformat_find_stream_info(AVFormatContext *ic, void **options) +avformat_find_stream_info (AVFormatContext* ic, void** options) { - return av_find_stream_info(ic); + return av_find_stream_info (ic); } #endif #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 5, 0) static inline void -avformat_close_input(AVFormatContext **s) +avformat_close_input (AVFormatContext** s) { - av_close_input_file(*s); + av_close_input_file (*s); } #endif /* avformat < 53.5.0 */ #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 92, 100) // since 7ecc2d40 -static inline AVFrame *av_frame_alloc() +static inline AVFrame* +av_frame_alloc () { - return avcodec_alloc_frame(); + return avcodec_alloc_frame (); } #endif @@ -142,12 +153,23 @@ register_codecs_compat () { #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) - av_register_all(); + av_register_all (); #endif #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100) - avcodec_register_all(); + avcodec_register_all (); #endif } +static inline void +maybe_avcodec_flush_buffers (AVCodecContext* avctx) +{ +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 26, 100) + if (avctx->codec->flush) { + avcodec_flush_buffers (avctx); + } +#else + avcodec_flush_buffers (avctx); +#endif +} #endif /* FFCOMPAT_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xjadeo-0.8.11/src/xjadeo/xjadeo.c new/xjadeo-0.8.12/src/xjadeo/xjadeo.c --- old/xjadeo-0.8.11/src/xjadeo/xjadeo.c 2022-02-06 03:14:58.000000000 +0100 +++ new/xjadeo-0.8.12/src/xjadeo/xjadeo.c 2022-09-02 10:23:55.000000000 +0200 @@ -575,9 +575,7 @@ seek = av_seek_frame (pFormatCtx, videoStream, fidx[framenumber].seekpts, AVSEEK_FLAG_BACKWARD); } - if (pCodecCtx->codec->flush) { - avcodec_flush_buffers (pCodecCtx); - } + maybe_avcodec_flush_buffers (pCodecCtx); if (seek < 0) { if (!want_quiet) @@ -915,9 +913,7 @@ error |= 16; break; } - if (pCodecCtx->codec->flush) { - avcodec_flush_buffers (pCodecCtx); - } + maybe_avcodec_flush_buffers (pCodecCtx); int err = 0; int bailout = 100; @@ -1053,9 +1049,7 @@ printf("NOBYTE 2\n"); break; } - if (pCodecCtx->codec->flush) { - avcodec_flush_buffers (pCodecCtx); - } + maybe_avcodec_flush_buffers (pCodecCtx); int64_t pts = AV_NOPTS_VALUE; while (!got_pic) { @@ -1118,9 +1112,7 @@ } else { av_seek_frame (pFormatCtx, videoStream, fidx[i].seekpts, AVSEEK_FLAG_BACKWARD); } - if (pCodecCtx->codec->flush) { - avcodec_flush_buffers (pCodecCtx); - } + maybe_avcodec_flush_buffers (pCodecCtx); while (!got_pic) { if (av_read_frame (pFormatCtx, &packet) < 0) { @@ -1192,9 +1184,7 @@ } av_seek_frame (pFormatCtx, videoStream, 0, AVSEEK_FLAG_BACKWARD); - if (pCodecCtx->codec->flush) { - avcodec_flush_buffers (pCodecCtx); - } + maybe_avcodec_flush_buffers (pCodecCtx); if (!error) { scan_complete = 1; } @@ -1271,8 +1261,12 @@ int open_movie (char* file_name) { int i; - AVCodec *pCodec; - AVStream *av_stream; +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 0, 100) + AVCodec* pCodec; +#else + AVCodec const* pCodec; +#endif + AVStream* av_stream; if (pFrameFMT) { close_movie ();
