forked from pool/xine-lib
Accepting request 1061758 from multimedia:xine
prevent 15.4 from building with ffmpeg-3 OBS-URL: https://build.opensuse.org/request/show/1061758 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
721c699e35
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098
|
||||
size 5341212
|
||||
3
xine-lib-1.2.13.tar.xz
Normal file
3
xine-lib-1.2.13.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3def43d3c0597f0f23cbf73e9d4b1dcd328852f2100fcff89fe925ad7cdd0251
|
||||
size 5004148
|
||||
@ -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 <errno.h>
|
||||
|
||||
#include <libavformat/avformat.h>
|
||||
+#include <libavcodec/version.h>
|
||||
#include <libavformat/avio.h>
|
||||
|
||||
#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 <pthread.h>
|
||||
|
||||
#include <libavformat/avio.h>
|
||||
+#include <libavutil/avutil.h>
|
||||
|
||||
#define LOG_MODULE "libavio"
|
||||
#define LOG_VERBOSE
|
||||
@ -1,3 +1,37 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 28 15:41:11 UTC 2023 - Dave Plater <davejplater@gmail.com>
|
||||
|
||||
- Prevent Leap:15.4 building with ffmpeg-3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 27 09:15:38 UTC 2023 - Wolfgang Bauer <wbauer@tmo.at>
|
||||
|
||||
- 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 <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
@ -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
|
||||
@ -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)
|
||||
@ -94,9 +95,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 +111,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
|
||||
<p>Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...</p><p>You need a frontend for xine-lib like <a href=http://packman.links2linux.de/package/xine-ui>xine-ui</a>, <a href=http://packman.links2linux.de/package/gxine>gxine</a>, <a href=http://packman.links2linux.de/package/kaffeine>kaffeine</a> or <a href=http://packman.links2linux.de/package/totem>totem</a>.</p><p>Since 1-rc6 the package number is reduced, all you may miss, is in the base package</p><p>If you want to play css encrypted Video-DVD's, you need to install <a href=http://packman.links2linux.de/package/libdvdcss2>libdvdcss</a>.</p>
|
||||
@ -361,7 +361,7 @@ Autoren:
|
||||
%if %{with distributable} && %{with onlynondistributable}
|
||||
%error need --without distributable for --with onlynondistributable
|
||||
%endif
|
||||
%autosetup -p1
|
||||
%autosetup -p1 -n %{name}.%{version}
|
||||
|
||||
%build
|
||||
cat <<EOF
|
||||
|
||||
Loading…
Reference in New Issue
Block a user