From c3c118187488d1ceaebdf21999d33cf7c5e76169 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:29:29 +0100 Subject: [PATCH] python-MythTV: fix requirement for recent python-mysqlclient-py3 [release 32.0-2mamba;Sat May 07 2022] --- mythtv-32.0-glibc-2.35.patch | 34 ++++++++++++++++++++++++++++++++++ mythtv.spec | 31 +++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 mythtv-32.0-glibc-2.35.patch diff --git a/mythtv-32.0-glibc-2.35.patch b/mythtv-32.0-glibc-2.35.patch new file mode 100644 index 0000000..b33c6c1 --- /dev/null +++ b/mythtv-32.0-glibc-2.35.patch @@ -0,0 +1,34 @@ +--- mythtv-32.0/mythtv/libs/libmythui/platforms/drm/mythdrmhdr.cpp.orig 2022-05-07 21:51:08.080325514 +0200 ++++ mythtv-32.0/mythtv/libs/libmythui/platforms/drm/mythdrmhdr.cpp 2022-05-07 21:52:22.596948499 +0200 +@@ -18,31 +18,7 @@ + HDMI_STATIC_METADATA_TYPE1 = 0, + }; + +-#if HAVE_STRUCT_HDR_METADATA_INFOFRAME + #include +-#else +-struct hdr_metadata_infoframe { +- __u8 eotf; +- __u8 metadata_type; +- struct { +- __u16 x, y; +- } display_primaries[3]; +- struct { +- __u16 x, y; +- } white_point; +- __u16 max_display_mastering_luminance; +- __u16 min_display_mastering_luminance; +- __u16 max_cll; +- __u16 max_fall; +-}; +- +-struct hdr_output_metadata { +- __u32 metadata_type; +- union { +- struct hdr_metadata_infoframe hdmi_metadata_type1; +- }; +-}; +-#endif + } + + #define LOC QString("HDR: ") diff --git a/mythtv.spec b/mythtv.spec index 7c209d6..fc6d67a 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -2,15 +2,14 @@ %define majver %(echo %version | cut -d. -f1-2) Name: mythtv Version: 32.0 -Release: 1mamba +Release: 2mamba Summary: A digital video recorder (DVR) application Group: Applications/Multimedia Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.mythtv.org/ -# FIXME: fetching commit from fixes/31 -Source0: https://github.com/MythTV/mythtv.git/master@bb507cf183e26b5c61fd12b4aa7b2d2434b2489a/mythtv-%{version}.tar.bz2 +Source0: https://github.com/MythTV/mythtv.git/v%{version}/mythtv-%{version}.tar.bz2 Source1: mythfrontend.desktop Source2: mythfrontend.png Source3: mythtv-setup.desktop @@ -26,6 +25,7 @@ Source12: mythtv-PACKAGE-LICENSING Patch0: mythtv-0.26.0-libva-1.2.1.patch Patch1: mythtv-31.0-gcc-11.patch Patch2: mythtv-31.0-qt5-5.12.patch +Patch3: mythtv-32.0-glibc-2.35.patch License: GPL, LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -33,17 +33,17 @@ BuildRequires: libQt5WebKit-devel BuildRequires: libSDL2-devel BuildRequires: libX11-devel BuildRequires: libXext-devel -BuildRequires: libXinerama-devel BuildRequires: libXrandr-devel BuildRequires: libXv-devel -BuildRequires: libXxf86vm-devel BuildRequires: libalsa-devel +BuildRequires: libaom-devel BuildRequires: libass-devel BuildRequires: libavc1394-devel BuildRequires: libbluray-devel BuildRequires: libbzip2-devel +BuildRequires: libdav1d-devel BuildRequires: libdrm-devel -BuildRequires: libexiv2-devel +BuildRequires: libexpat-devel BuildRequires: libfftw-devel BuildRequires: libfreetype-devel BuildRequires: libgcc @@ -60,17 +60,20 @@ BuildRequires: libpulseaudio-devel BuildRequires: libpython3-devel BuildRequires: libraw1394-devel BuildRequires: libsamplerate-devel +BuildRequires: libsoundtouch-devel BuildRequires: libstdc++6-devel BuildRequires: libsystemd-devel BuildRequires: libtag-devel BuildRequires: libva-devel BuildRequires: libvdpau-devel +BuildRequires: libwayland-devel BuildRequires: libx264-devel BuildRequires: libx265-devel BuildRequires: libxcb-devel BuildRequires: libxml2-devel BuildRequires: libxvidcore-devel BuildRequires: libz-devel +BuildRequires: libzip-devel BuildRequires: perl-DBD-mysql BuildRequires: perl-DBI BuildRequires: perl-DateTime @@ -85,6 +88,7 @@ BuildRequires: perl-XML-Simple BuildRequires: perl-XML-TreeBuilder BuildRequires: perl-devel BuildRequires: perl-libwww +BuildRequires: python3.7dist(mysqlclient) BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtscript-devel ## AUTOBUILDREQ-END @@ -140,7 +144,7 @@ This package provides a perl-based interface to interacting with MythTV. %package -n python-MythTV Group: Development/Libraries/Python Summary: Python bindings for MythTV -Requires: python-MySQL +Requires: python3.7dist(mysqlclient) %description -n python-MythTV MythTV provides a unified graphical interface for recording and viewing television programs. @@ -162,6 +166,7 @@ This package contains the documentation for %{name}, #:<< _EOF %patch1 -p1 #%patch2 -p1 +%patch3 -p1 rm -rf contrib/Win32 contrib/OSX #chmod -x themes/default/htmls/*.html @@ -199,9 +204,7 @@ cd mythtv --enable-libfftw3 \ --enable-x11 \ --x11-path=%{_includedir} \ - --enable-xrandr \ --enable-lirc \ - --enable-ivtv \ --enable-firewire \ --enable-dvb \ --enable-libmp3lame \ @@ -268,7 +271,7 @@ rm -rf %{buildroot}%{perl_sitearch}/auto/MythTV/.packlist rm -rf %{buildroot}%{_libdir}/libmyth*.*a rm -rf %{buildroot}%{_libdir}/mythtv/filters/*.*a -mv %{buildroot}%{_prefix}/MythTV/ttvdb %{buildroot}%{_datadir}/mythtv/ +#mv %{buildroot}%{_prefix}/MythTV/ttvdb %{buildroot}%{_datadir}/mythtv/ %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -308,14 +311,14 @@ mv %{buildroot}%{_prefix}/MythTV/ttvdb %{buildroot}%{_datadir}/mythtv/ %{_datadir}/mythtv/locales %{_datadir}/mythtv/metadata %{_datadir}/mythtv/themes -%{_datadir}/mythtv/ttvdb +#%{_datadir}/mythtv/ttvdb %{_datadir}/pixmaps/*.png %{_datadir}/applications/*.desktop %files -n libmythtv %defattr(-,root,root) %{_libdir}/libmyth*.so.* -%doc mythtv/AUTHORS mythtv/COPYING +%doc mythtv/AUTHORS LICENSE %files -n libmythtv-devel %defattr(-,root,root) @@ -324,6 +327,7 @@ mv %{buildroot}%{_prefix}/MythTV/ttvdb %{buildroot}%{_datadir}/mythtv/ %{_includedir}/mythtv/mythconfig.mak %{_includedir}/mythtv/dvdnav %{_includedir}/mythtv/dvdread +%{_includedir}/mythtv/exiv2 %{_includedir}/mythtv/goom %{_includedir}/mythtv/libavcodec %{_includedir}/mythtv/libavdevice @@ -369,6 +373,9 @@ mv %{buildroot}%{_prefix}/MythTV/ttvdb %{buildroot}%{_datadir}/mythtv/ ##%doc contrib database %changelog +* Sat May 07 2022 Silvan Calarco 32.0-2mamba +- python-MythTV: fix requirement for recent python-mysqlclient-py3 + * Fri Mar 04 2022 Automatic Build System 32.0-1mamba - automatic version update by autodist