From a59f6885799375360b68f46f013f7bd3a9093f95278e651d85d4e742d02e7941 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 28 Jan 2023 06:28:40 +0000 Subject: [PATCH 1/2] Accepting request 1061600 from home:wolfi323:branches:multimedia:xine - Update to version 1.2.13 - Remove xine-lib-ffmpeg5.patch, fixed upstream - Upstream changes: * Add dav1d 1.0.0 support. * Add user video frame rate limiter. * Add xine_query_stream_info (). * Add user OpenGL2 scale modes. * Add xine timespec tools. * FFmpeg compatibility update. * Update german translation. * Improved DVB subtitle support. * Improved HLS input. * Improved AAC demux. * Fix clang build. * Fix build with libcaca. * Fix fine time display. * Fix .mp4 audio. * Fix wav demuxer. * Work around broken Mesa vdpau drivers. * Fix OpenGL2 deep color display. * Various small fixes. * Optimize OpenGL2 video output. * Optimize audio out. * Optimize OSD. * Small engine optimizations. OBS-URL: https://build.opensuse.org/request/show/1061600 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=144 --- xine-lib-1.2.12.tar.xz | 3 --- xine-lib-1.2.13.tar.xz | 3 +++ xine-lib-ffmpeg5.patch | 22 ---------------------- xine-lib.changes | 29 +++++++++++++++++++++++++++++ xine-lib.spec | 9 ++++----- 5 files changed, 36 insertions(+), 30 deletions(-) delete mode 100644 xine-lib-1.2.12.tar.xz create mode 100644 xine-lib-1.2.13.tar.xz delete mode 100644 xine-lib-ffmpeg5.patch diff --git a/xine-lib-1.2.12.tar.xz b/xine-lib-1.2.12.tar.xz deleted file mode 100644 index be376df..0000000 --- a/xine-lib-1.2.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098 -size 5341212 diff --git a/xine-lib-1.2.13.tar.xz b/xine-lib-1.2.13.tar.xz new file mode 100644 index 0000000..778cbf8 --- /dev/null +++ b/xine-lib-1.2.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3def43d3c0597f0f23cbf73e9d4b1dcd328852f2100fcff89fe925ad7cdd0251 +size 5004148 diff --git a/xine-lib-ffmpeg5.patch b/xine-lib-ffmpeg5.patch deleted file mode 100644 index 6b942e6..0000000 --- a/xine-lib-ffmpeg5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur orig-xine-lib-1.2.12/src/combined/ffmpeg/demux_avformat.c xine-lib-1.2.12/src/combined/ffmpeg/demux_avformat.c ---- orig-xine-lib-1.2.12/src/combined/ffmpeg/demux_avformat.c 2022-03-06 17:31:23.000000000 +0100 -+++ xine-lib-1.2.12/src/combined/ffmpeg/demux_avformat.c 2022-09-08 08:02:04.756525710 +0200 -@@ -30,6 +30,7 @@ - #include - - #include -+#include - #include - - #define LOG_MODULE "libavformat" -diff -Nur orig-xine-lib-1.2.12/src/combined/ffmpeg/input_avio.c xine-lib-1.2.12/src/combined/ffmpeg/input_avio.c ---- orig-xine-lib-1.2.12/src/combined/ffmpeg/input_avio.c 2022-03-06 17:31:23.000000000 +0100 -+++ xine-lib-1.2.12/src/combined/ffmpeg/input_avio.c 2022-09-08 08:02:39.896994849 +0200 -@@ -29,6 +29,7 @@ - #include - - #include -+#include - - #define LOG_MODULE "libavio" - #define LOG_VERBOSE diff --git a/xine-lib.changes b/xine-lib.changes index df55165..49f52bb 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Fri Jan 27 09:15:38 UTC 2023 - Wolfgang Bauer + +- Update to version 1.2.13 +- Remove xine-lib-ffmpeg5.patch, fixed upstream +- Upstream changes: + * Add dav1d 1.0.0 support. + * Add user video frame rate limiter. + * Add xine_query_stream_info (). + * Add user OpenGL2 scale modes. + * Add xine timespec tools. + * FFmpeg compatibility update. + * Update german translation. + * Improved DVB subtitle support. + * Improved HLS input. + * Improved AAC demux. + * Fix clang build. + * Fix build with libcaca. + * Fix fine time display. + * Fix .mp4 audio. + * Fix wav demuxer. + * Work around broken Mesa vdpau drivers. + * Fix OpenGL2 deep color display. + * Various small fixes. + * Optimize OpenGL2 video output. + * Optimize audio out. + * Optimize OSD. + * Small engine optimizations. + ------------------------------------------------------------------- Thu Sep 8 06:05:38 UTC 2022 - Bjørn Lie diff --git a/xine-lib.spec b/xine-lib.spec index 62b0375..4626a87 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,7 +1,7 @@ # # spec file for package xine-lib # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -94,9 +94,9 @@ BuildRequires: pkgconfig(sdl) BuildRequires: libjack-devel %endif BuildRequires: libmodplug-devel -Version: 1.2.12 +Version: 1.2.13 Release: 0 -%define abiversion 2.10 +%define abiversion 2.11 Summary: Video Player with Plug-Ins License: GPL-2.0-or-later AND SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players @@ -110,7 +110,6 @@ Patch0: xine-lib-libdvdread_udf.diff Patch1: xine-lib-v4l-2.6.38.patch # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch -Patch5: xine-lib-ffmpeg5.patch %description

Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...

You need a frontend for xine-lib like xine-ui, gxine, kaffeine or totem.

Since 1-rc6 the package number is reduced, all you may miss, is in the base package

If you want to play css encrypted Video-DVD's, you need to install libdvdcss.

@@ -361,7 +360,7 @@ Autoren: %if %{with distributable} && %{with onlynondistributable} %error need --without distributable for --with onlynondistributable %endif -%autosetup -p1 +%autosetup -p1 -n %{name}.%{version} %build cat < Date: Sat, 28 Jan 2023 15:57:10 +0000 Subject: [PATCH 2/2] Accepting request 1061757 from home:plater - Prevent Leap:15.4 building with ffmpeg-3 OBS-URL: https://build.opensuse.org/request/show/1061757 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=145 --- xine-lib.changes | 5 +++++ xine-lib.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xine-lib.changes b/xine-lib.changes index 49f52bb..a4ae75e 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 28 15:41:11 UTC 2023 - Dave Plater + +- Prevent Leap:15.4 building with ffmpeg-3 + ------------------------------------------------------------------- Fri Jan 27 09:15:38 UTC 2023 - Wolfgang Bauer diff --git a/xine-lib.spec b/xine-lib.spec index 4626a87..a1e1b31 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -62,8 +62,9 @@ BuildRequires: pkgconfig(dvdnav) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(liba52) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) +#Prevent building against ffmpeg 3 +BuildRequires: pkgconfig(libavcodec) >= 58 +BuildRequires: pkgconfig(libavformat) >= 58 BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libbluray) BuildRequires: pkgconfig(libpostproc)