[xine-lib/f31] (8 commits) ...Disable currently missing features on EL8
by Xavier Bachelot
Summary of changes:
51c72b8... Fix typo from 1c7f3de (*)
0f881d0... New snapshot (*)
5c613af... Enable libpng based video decoder (*)
a840425... Add version to BR: where relevant (*)
d3601fd... Conditionally add XvMC support back (*)
10afe2f... Enable libdav1d based video decoder (F31+) (*)
51fad32... Rework features enablement (*)
6a24a42... Disable currently missing features on EL8 (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 4 months
[xine-lib] Disable currently missing features on EL8
by Xavier Bachelot
commit 6a24a42363ed733a86002209ce00f6f2147adb57
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Sep 3 18:02:03 2019 +0200
Disable currently missing features on EL8
xine-lib.spec | 11 +++++++++++
1 file changed, 11 insertions(+)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index eaf7258..289ba17 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -16,6 +16,16 @@
%global _without_png 1
%endif
+%if 0%{?el8}
+ %global _without_aom 1
+ %global _without_caca 1
+ %global _without_dav1d 1
+ %global _without_fame 1
+ %global _without_imagemagick 1
+ %global _without_jack 1
+ %global _without_nfs 1
+%endif
+
%if 0%{?fc29}%{?fc30}
%global _without_dav1d 1
%endif
@@ -349,6 +359,7 @@ mkdir -p %{buildroot}%{codecdir}
- Add XvMC support back.
- Enable libdav1d based video decoder (F31+).
- Rework features enablement.
+- Disable currently missing features on EL8.
* Wed Aug 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.9-17.20190525hg14404
- Rebuild for aom SONAME bump
5 years, 4 months
[xine-lib] Rework features enablement
by Xavier Bachelot
commit 51fad329e671c1c8043fb18a0f7a61c5f9646d45
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Sep 3 18:01:26 2019 +0200
Rework features enablement
xine-lib.spec | 72 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 43 insertions(+), 29 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 4e316ef..eaf7258 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,6 +1,25 @@
%global plugin_abi 2.7
%global codecdir %{_libdir}/codecs
+%if 0%{?el6}
+ %global _without_aom 1
+ %global _without_bluray 1
+ %global _without_dav1d 1
+ %global _without_nfs 1
+ %global _without_openssl 1
+ %global _without_png 1
+%endif
+
+%if 0%{?el7}
+ %global _without_aom 1
+ %global _without_dav1d 1
+ %global _without_png 1
+%endif
+
+%if 0%{?fc29}%{?fc30}
+ %global _without_dav1d 1
+%endif
+
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
%global _without_xvmc 1
%endif
@@ -50,26 +69,24 @@ BuildRequires: gcc
BuildRequires: gettext-devel
BuildRequires: gnutls-devel
BuildRequires: gtk2-devel
-BuildRequires: ImageMagick-devel
-BuildRequires: jack-audio-connection-kit-devel
-%{?fedora:BuildRequires: libaom-devel >= 1.0.0}
-%{!?el6:BuildRequires: libbluray-devel >= 0.2.1}
-BuildRequires: libcaca-devel
+%{!?_without_imagemagick:BuildRequires: ImageMagick-devel}
+%{!?_without_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{!?_without_aom:BuildRequires: libaom-devel >= 1.0.0}
+%{!?_without_bluray:BuildRequires: libbluray-devel >= 0.2.1}
+%{!?_without_caca:BuildRequires: libcaca-devel}
BuildRequires: libcdio-devel
-%if 0%{?fedora} >= 31
-BuildRequires: libdav1d-devel >= 0.3.1
-%endif
+%{!?_without_dav1d:BuildRequires: libdav1d-devel >= 0.3.1}
BuildRequires: libdca-devel
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel
-BuildRequires: libfame-devel
+%{!?_without_fame:BuildRequires: libfame-devel}
BuildRequires: libGLU-devel
BuildRequires: libmad-devel
BuildRequires: libmng-devel
BuildRequires: libmodplug-devel
BuildRequires: libmpcdec-devel
-%{!?el6:BuildRequires: libnfs-devel}
-%{?fedora:BuildRequires: libpng-devel >= 1.6.0}
+%{!?_without_nfs:BuildRequires: libnfs-devel}
+%{!?_without_png:BuildRequires: libpng-devel >= 1.6.0}
BuildRequires: libsmbclient-devel
BuildRequires: libssh2-devel
BuildRequires: libtheora-devel
@@ -87,7 +104,7 @@ BuildRequires: libXt-devel
BuildRequires: libXv-devel
%{!?_without_xvmc:BuildRequires: libXvMC-devel}
BuildRequires: mesa-libEGL-devel
-%{!?el6:BuildRequires: openssl-devel >= 1.0.2}
+%{!?_without_openssl:BuildRequires: openssl-devel >= 1.0.2}
BuildRequires: pkgconfig(libpulse)
%{?_with_rpi:BuildRequires: raspberrypi-vc-devel}
BuildRequires: SDL-devel
@@ -114,13 +131,13 @@ Summary: Additional plugins for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description extras
This package contains extra plugins for %{name}:
- - JACK
+%{!?_without_jack: - JACK}
- GDK-Pixbuf
- SMB
- SDL
- AA-lib
- - Libcaca
- - Image decoding
+%{!?_without_caca: - Libcaca}
+%{!?_without_imagemagick: - Image decoding}
%prep
@@ -145,7 +162,7 @@ autoreconf -ivf
--enable-antialiasing \
--with-freetype \
--with-fontconfig \
- --with-caca \
+%{!?_without_caca: --with-caca} \
--with-external-dvdnav \
--with-xv-path=%{_libdir} \
--with-libflac \
@@ -219,20 +236,16 @@ mkdir -p %{buildroot}%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_a52.so
-%if 0%{?fedora} >= 31
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dav1d.so
-%endif
+%{!?_without_dav1d:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dav1d.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dts.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dvaudio.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_faad.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_ff.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
-%if 0%{?fedora}
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libaom.so
-%endif
+%{!?_without_aom:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libaom.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libjpeg.so
%{?_with_rpi:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libmmal.so}
-%{?fedora:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libpng.so}
+%{!?_without_png:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libpng.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libvpx.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mad.so
@@ -266,13 +279,13 @@ mkdir -p %{buildroot}%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_video.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dxr3.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so
-%{!?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so}
+%{!?_without_bluray:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvd.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_mms.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_network.so
-%{!?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_nfs.so}
+%{!?_without_nfs:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_nfs.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_ssh.so
@@ -283,7 +296,7 @@ mkdir -p %{buildroot}%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_nsf.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_sputext.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_tls_gnutls.so
-%{!?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_tls_openssl.so}
+%{!?_without_openssl:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_tls_openssl.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vdr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
%{?_with_rpi:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_mmal.so}
@@ -308,12 +321,12 @@ mkdir -p %{buildroot}%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_xiph.so
%files extras
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so
+%{!?_without_jack:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
+%{!?_without_imagemagick:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so
+%{!?_without_caca:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so
%files devel
@@ -335,6 +348,7 @@ mkdir -p %{buildroot}%{codecdir}
- Enable libpng based video decoder.
- Add XvMC support back.
- Enable libdav1d based video decoder (F31+).
+- Rework features enablement.
* Wed Aug 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.9-17.20190525hg14404
- Rebuild for aom SONAME bump
5 years, 4 months
[xine-lib] Enable libdav1d based video decoder (F31+)
by Xavier Bachelot
commit 10afe2fbcec45e49a961eb240a738fd06034e708
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Jun 7 15:12:46 2019 +0200
Enable libdav1d based video decoder (F31+)
xine-lib.spec | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 52b0087..4e316ef 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -56,6 +56,9 @@ BuildRequires: jack-audio-connection-kit-devel
%{!?el6:BuildRequires: libbluray-devel >= 0.2.1}
BuildRequires: libcaca-devel
BuildRequires: libcdio-devel
+%if 0%{?fedora} >= 31
+BuildRequires: libdav1d-devel >= 0.3.1
+%endif
BuildRequires: libdca-devel
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel
@@ -216,6 +219,9 @@ mkdir -p %{buildroot}%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_a52.so
+%if 0%{?fedora} >= 31
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dav1d.so
+%endif
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dts.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dvaudio.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_faad.so
@@ -328,6 +334,7 @@ mkdir -p %{buildroot}%{codecdir}
- Update xine-lib snapshot.
- Enable libpng based video decoder.
- Add XvMC support back.
+- Enable libdav1d based video decoder (F31+).
* Wed Aug 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.9-17.20190525hg14404
- Rebuild for aom SONAME bump
5 years, 4 months
[xine-lib] Conditionally add XvMC support back
by Xavier Bachelot
commit d3601fdf7fd9f4f121a8897480614887f71c2375
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Aug 24 21:32:58 2019 +0200
Conditionally add XvMC support back
xine-lib.spec | 9 +++++++++
1 file changed, 9 insertions(+)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index e3d5342..52b0087 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,6 +1,10 @@
%global plugin_abi 2.7
%global codecdir %{_libdir}/codecs
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
+ %global _without_xvmc 1
+%endif
+
%ifarch %{ix86}
%global have_vidix 1
%else
@@ -78,6 +82,7 @@ BuildRequires: libXext-devel
BuildRequires: libXinerama-devel
BuildRequires: libXt-devel
BuildRequires: libXv-devel
+%{!?_without_xvmc:BuildRequires: libXvMC-devel}
BuildRequires: mesa-libEGL-devel
%{!?el6:BuildRequires: openssl-devel >= 1.0.2}
BuildRequires: pkgconfig(libpulse)
@@ -132,6 +137,7 @@ autoreconf -ivf
--enable-ipv6 \
--enable-v4l2 \
--enable-libv4l \
+%{!?_without_xvmc: --enable-xvmc} \
--disable-gnomevfs \
--enable-antialiasing \
--with-freetype \
@@ -290,6 +296,8 @@ mkdir -p %{buildroot}%{codecdir}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
+%{!?_without_xvmc:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so}
+%{!?_without_xvmc:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_xiph.so
@@ -319,6 +327,7 @@ mkdir -p %{buildroot}%{codecdir}
* Tue Sep 03 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-18.20190831hg14506
- Update xine-lib snapshot.
- Enable libpng based video decoder.
+- Add XvMC support back.
* Wed Aug 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.9-17.20190525hg14404
- Rebuild for aom SONAME bump
5 years, 4 months
[xine-lib] Add version to BR: where relevant
by Xavier Bachelot
commit a8404255323758ce99e2fea3a257134acb2beeac
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Jul 23 16:18:18 2019 +0200
Add version to BR: where relevant
xine-lib.spec | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 95729d4..e3d5342 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -48,10 +48,8 @@ BuildRequires: gnutls-devel
BuildRequires: gtk2-devel
BuildRequires: ImageMagick-devel
BuildRequires: jack-audio-connection-kit-devel
-# Not available on EL6 and EL7
-%{?fedora:BuildRequires: libaom-devel}
-# libbluray is too old on EL6
-%{!?el6:BuildRequires: libbluray-devel}
+%{?fedora:BuildRequires: libaom-devel >= 1.0.0}
+%{!?el6:BuildRequires: libbluray-devel >= 0.2.1}
BuildRequires: libcaca-devel
BuildRequires: libcdio-devel
BuildRequires: libdca-devel
5 years, 4 months
[xine-lib] Enable libpng based video decoder
by Xavier Bachelot
commit 5c613af3294fd3b52754fcbc4cc2aa1741ef5d88
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Jun 4 16:53:17 2019 +0200
Enable libpng based video decoder
xine-lib.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index cb4cf6c..95729d4 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -64,6 +64,7 @@ BuildRequires: libmng-devel
BuildRequires: libmodplug-devel
BuildRequires: libmpcdec-devel
%{!?el6:BuildRequires: libnfs-devel}
+%{?fedora:BuildRequires: libpng-devel >= 1.6.0}
BuildRequires: libsmbclient-devel
BuildRequires: libssh2-devel
BuildRequires: libtheora-devel
@@ -221,6 +222,7 @@ mkdir -p %{buildroot}%{codecdir}
%endif
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libjpeg.so
%{?_with_rpi:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libmmal.so}
+%{?fedora:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libpng.so}
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_libvpx.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mad.so
@@ -318,6 +320,7 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
* Tue Sep 03 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-18.20190831hg14506
- Update xine-lib snapshot.
+- Enable libpng based video decoder.
* Wed Aug 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.9-17.20190525hg14404
- Rebuild for aom SONAME bump
5 years, 4 months
[xine-lib] New snapshot
by Xavier Bachelot
commit 0f881d0aaafae131d28e78832334fb99fc65bec2
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri May 31 22:03:25 2019 +0200
New snapshot
.gitignore | 1 +
sources | 2 +-
xine-lib.spec | 9 ++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cde516a..45bb595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xine-lib-1.2.6.tar.xz
/xine-lib-1.2.9-20181129hg14263.tar.xz
/xine-lib-1.2.9-20190516hg14396.tar.xz
/xine-lib-1.2.9-20190525hg14404.tar.xz
+/xine-lib-1.2.9-20190831hg14506.tar.xz
diff --git a/sources b/sources
index 7feccb0..f539f05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93bada5ab531d612ee19a690c0301cf9 xine-lib-1.2.9-20190525hg14404.tar.xz
+ff4d0480195504d3c61aeb98fef5b08e xine-lib-1.2.9-20190831hg14506.tar.xz
diff --git a/xine-lib.spec b/xine-lib.spec
index 0e3a682..cb4cf6c 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -8,13 +8,13 @@
%endif # ix86
%global snapshot 1
-%global date 20190525
-%global revision 14404
+%global date 20190831
+%global revision 14506
Summary: A multimedia engine
Name: xine-lib
Version: 1.2.9
-Release: 17%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Release: 18%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -316,6 +316,9 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Tue Sep 03 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-18.20190831hg14506
+- Update xine-lib snapshot.
+
* Wed Aug 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1.2.9-17.20190525hg14404
- Rebuild for aom SONAME bump
- Drop XvMC support (rfbz #5328)
5 years, 4 months
[xine-lib] Fix typo from 1c7f3de
by Xavier Bachelot
commit 51c72b8632ef7300ef9a53ee410a57ba56006ec4
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Sep 3 17:21:14 2019 +0200
Fix typo from 1c7f3de
xine-lib.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 0dde9a0..0e3a682 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,4 +1,4 @@
- %global plugin_abi 2.7
+%global plugin_abi 2.7
%global codecdir %{_libdir}/codecs
%ifarch %{ix86}
5 years, 4 months
[kodi/f31] Fix Python 2 search and drop SDL/SDL2
by Michael Cronenworth
commit 42048a0d08d218e5c2342c5622c361bbb9414655
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Sep 3 09:51:23 2019 -0500
Fix Python 2 search and drop SDL/SDL2
kodi.spec | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index c69627e..1c8b2b0 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -87,10 +87,9 @@ Patch5: kodi-18-python3-0002.patch
# Upstream does not support ppc64
ExcludeArch: %{power64}
-BuildRequires: SDL2-devel
-BuildRequires: SDL_image-devel
BuildRequires: a52dec-devel
BuildRequires: afpfs-ng-devel
+BuildRequires: alsa-lib-devel
BuildRequires: avahi-devel
BuildRequires: bluez-libs-devel
BuildRequires: boost-devel
@@ -138,6 +137,7 @@ BuildRequires: lame-devel
BuildRequires: lcms2-devel
BuildRequires: libXinerama-devel
BuildRequires: libXmu-devel
+BuildRequires: libXrandr-devel
BuildRequires: libXtst-devel
BuildRequires: libass-devel >= 0.9.7
%if 0%{?_with_libbluray}
@@ -381,6 +381,11 @@ pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
tools/EventClients/Clients/KodiSend/kodi-send.py \
tools/EventClients/lib/python/xbmcclient.py
+%if 0%{?fedora} < 32
+# Fix python binary search
+sed -i 's/ pkg_check_modules(PC_PYTHON python>=2.7 QUIET)/ pkg_check_modules(PC_PYTHON python=2.7 QUIET)/' cmake/modules/FindPython.cmake
+%endif
+
%build
mkdir {fedora-gbm,fedora-wayland,fedora-x11}
5 years, 4 months