Packman Build Service PMBS

mythtv.changes Changed

mythtv.spec Changed

@@ -19,7 +19,7 @@
 
 %define _lto_cflags %{nil}
 
-%define manjor 29
+%define manjor 30
 %define soname libmyth
 %define sover 29-29
 %define SYSUSER mythtv
@@ -32,6 +32,7 @@
 # You can add the manjor macro in the name tag
 # See: Conflicts Tag
 %define pkgmanjor %(echo %{name} | sed -ne '/-/s/[^-]*//p' -ne '/-/!s/[^0-9]*//p')
+%define statusrelease %(test -n '%{?pkgmanjor}' && echo legacy || echo current)
 
 %if 0%{?suse_version} <= 1500
 %define mythnetvision 1
@@ -40,7 +41,7 @@
 # Fix: suse-filelist-forbidden-sysconfig
 %{!?_fillupdir:%global _fillupdir /var/adm/fillup-templates}
 Name:           mythtv
-Version:        29.1+git20190912.4c432df737
+Version:        30.0+git20190912.0c9abf30c8
 Release:        0
 Summary:        A personal video recorder (PVR/DVR) application
 License:        GPL-2.0-or-later
@@ -58,6 +59,7 @@
 Source99:       mythfrontend.svg
 Source100:      mythtv.rpmlintrc
 Patch0:         mythtv-perl-install.patch
+Patch1:         remove-unwanted-dependency-and-xnvctrl-support.patch
 BuildRequires:  avahi-compat-mDNSResponder-devel
 BuildRequires:  dcraw
 BuildRequires:  fdupes
@@ -137,12 +139,16 @@
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libiec61883)
 BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(libraw1394)
 BuildRequires:  pkgconfig(libva)
 BuildRequires:  pkgconfig(libva-glx)
 BuildRequires:  pkgconfig(libvisual-0.4)
 BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(lzo2)
 BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(minizip)
 BuildRequires:  pkgconfig(mjpegtools)
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(phonon4qt5)
@@ -164,6 +170,8 @@
 BuildRequires:  pkgconfig(zlib)
 # FIXME: use proper Requires(pre/post/preun/...)
 PreReq:         coreutils
+Provides:       mythtv-%{statusrelease}
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}
 Conflicts:      mythtv-0_28
 Conflicts:      mythtv-0_27
 %{?systemd_requires}
@@ -183,6 +191,11 @@
 #!BuildIgnore:	Mesa-libGL-devel
 %endif
 # /SECTION
+# SECTION system/external dependencies:
+%ifarch %{ix86} x86_64
+BuildRequires:  libXNVCtrl-devel
+%endif
+# /SECTION
 
 %description
 MythTV provides a unified graphical interface for recording and viewing
@@ -208,6 +221,8 @@
 %package        docs
 Summary:        MythTV documentation
 Group:          Documentation/HTML
+Provides:       mythtv-%{statusrelease}-docs
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}-docs
 Conflicts:      mythtv-0_28-docs
 Conflicts:      mythtv-0_27-docs
 BuildArch:      noarch
@@ -231,6 +246,8 @@
 Summary:        Development files for %{soname}
 Group:          Development/Libraries/C and C++
 Requires:       %{soname}-%{sover} = %{version}
+Provides:       mythtv-%{statusrelease}-devel
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}-devel
 Conflicts:      mythtv-0_28-devel
 Conflicts:      mythtv-0_27-devel
 
@@ -244,6 +261,8 @@
 Summary:        Core user interface themes for %{name}
 Group:          Productivity/Multimedia/Video/Players
 Recommends:     droid-fonts
+Provides:       mythtv-%{statusrelease}-base-themes
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}-base-themes
 Conflicts:      mythtv-0_28-base-themes
 Conflicts:      mythtv-0_27-base-themes
 BuildArch:      noarch
@@ -258,6 +277,8 @@
 Group:          Productivity/Multimedia/Video/Players
 Requires:       python-%{name}%{?pkgmanjor} = %{version}
 Requires:       transcode
+Provides:       mythtv-%{statusrelease}-common
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}-common
 Conflicts:      mythtv-0_28-common
 Conflicts:      mythtv-0_27-common
 
@@ -274,6 +295,8 @@
 Requires:       %{name}-base-themes = %{version}
 Requires:       %{name}-common = %{version}
 Requires:       %{soname}-%{sover} = %{version}
+Provides:       mythtv-%{statusrelease}-frontend
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}-frontend
 Conflicts:      mythtv-0_28-frontend
 Conflicts:      mythtv-0_27-frontend
 
@@ -295,6 +318,8 @@
 Requires(pre):  system-group-hardware
 Requires(pre):  util-linux-systemd
 Recommends:     logrotate
+Provides:       mythtv-%{statusrelease}-backend
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}-backend
 Conflicts:      mythtv-0_28-backend
 Conflicts:      mythtv-0_27-backend
 
@@ -312,6 +337,8 @@
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-backend = %{version}
 Requires:       %{name}-base-themes = %{version}
+Provides:       mythtv-%{statusrelease}-setup
+Conflicts:      mythtv%{!?pkgmanjor:-legacy}-setup
 Conflicts:      mythtv-0_28-setup
 Conflicts:      mythtv-0_27-setup
 
@@ -321,12 +348,14 @@
 This package contains the program which sets up the database to use a
 machine as a backend server.
 
-%package -n     perl-%{name}%{?pkgmanjor}
+%package -n     perl-%{name}
 Summary:        Perl bindings for %{name}
 Group:          Development/Libraries/Perl
 Requires:       perl(DBD::mysql)
 Requires:       perl(Net::UPnP)
 Requires:       perl(Net::UPnP::ControlPoint)
+Provides:       perl-mythtv-%{statusrelease}
+Conflicts:      perl-mythtv%{!?pkgmanjor:-legacy}
 Conflicts:      perl-mythtv-0_28
 Conflicts:      perl-MythTV-0_27
 BuildArch:      noarch
@@ -337,7 +366,7 @@
 
 Provides a perl-based interface to interacting with %{name}.
 
-%package -n     python-%{name}%{?pkgmanjor}
+%package -n     python-%{name}
 Summary:        Python bindings for %{name}
 Group:          Development/Libraries/Python
 Requires:       python-future
@@ -345,8 +374,10 @@
 Requires:       python-mysql
 Requires:       python-requests-cache
 Requires:       python-urllib3
-Conflicts:      python-MythTV-0_27
+Provides:       python-mythtv-%{statusrelease}
+Conflicts:      python-mythtv%{!?pkgmanjor:-legacy}
 Conflicts:      python-mythtv-0_28
+Conflicts:      python-MythTV-0_27
 BuildArch:      noarch
 
 %description -n python-%{name}
@@ -354,10 +385,12 @@
 
 Provides a python-based interface to interacting with %{name}.
 
-%package -n     php-%{name}%{?pkgmanjor}
+%package -n     php-%{name}
 Summary:        PHP bindings for %{name}
 Group:          Development/Libraries/Other
 Requires:       perl-%{name}
+Provides:       php-mythtv-%{statusrelease}
+Conflicts:      php-mythtv%{!?pkgmanjor:-legacy}
 Conflicts:      php-mythtv-0_28
 Conflicts:      php-MythTV-0_27
 BuildArch:      noarch
@@ -378,7 +411,9 @@
 Requires:       mjpegtools
 Requires:       python-imaging
 Requires:       transcode
+Provides:       mytharchive-%{statusrelease}
 Provides:       mytharchive%{?pkgmanjor} = %{version}
+Conflicts:      mytharchive%{!?pkgmanjor:-legacy}
 Conflicts:      mytharchive-0_28
 Conflicts:      mytharchive-0_27
 
@@ -393,7 +428,9 @@
 Summary:        A small web browser module for %{name}
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-frontend = %{version}
+Provides:       mythbrowser-%{statusrelease}
 Provides:       mythbrowser%{?pkgmanjor} = %{version}
+Conflicts:      mythbrowser%{!?pkgmanjor:-legacy}
 Conflicts:      mythbrowser-0_28
 Conflicts:      mythbrowser-0_27
 
@@ -413,7 +450,9 @@
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-frontend = %{version}
 Requires:       dcraw
+Provides:       mythgallery-%{statusrelease}
 Provides:       mythgallery%{?pkgmanjor} = %{version}
+Conflicts:      mythgallery%{!?pkgmanjor:-legacy}
 Conflicts:      mythgallery-0_28
 Conflicts:      mythgallery-0_27
 
@@ -429,7 +468,9 @@
 Summary:        A game frontend (xmame, nes, snes, pc) for %{name}
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-frontend = %{version}
+Provides:       mythgame-%{statusrelease}
 Provides:       mythgame%{?pkgmanjor} = %{version}
+Conflicts:      mythgame%{!?pkgmanjor:-legacy}
 Conflicts:      mythgame-0_28
 Conflicts:      mythgame-0_27
 
@@ -443,7 +484,9 @@
 Summary:        The music player add-on module for %{name}
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-frontend = %{version}
+Provides:       mythmusic-%{statusrelease}
 Provides:       mythmusic%{?pkgmanjor} = %{version}
+Conflicts:      mythmusic%{!?pkgmanjor:-legacy}
 Conflicts:      mythmusic-0_28
 Conflicts:      mythmusic-0_27
 
@@ -464,7 +507,9 @@
 Requires:       python-curl
 Requires:       python-oauth
 Requires:       python-xml
+Provides:       mythnetvision-%{statusrelease}
 Provides:       mythnetvision%{?pkgmanjor} = %{version}
+Conflicts:      mythnetvision%{!?pkgmanjor:-legacy}
 Conflicts:      mythnetvision-0_28
 Conflicts:      mythnetvision-0_27
 
@@ -481,7 +526,9 @@
 Summary:        An RSS news feed plugin for %{name}
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-frontend = %{version}
+Provides:       mythnews-%{statusrelease}
 Provides:       mythnews%{?pkgmanjor} = %{version}
+Conflicts:      mythnews%{!?pkgmanjor:-legacy}
 Conflicts:      mythnews-0_28
 Conflicts:      mythnews-0_27
 
@@ -500,7 +547,9 @@
 Requires:       perl(SOAP::Lite)
 Requires:       perl(XML::SAX::Base)
 Requires:       perl(XML::XPath)
+Provides:       mythweather-%{statusrelease}
 Provides:       mythweather%{?pkgmanjor} = %{version}
+Conflicts:      mythweather%{!?pkgmanjor:-legacy}
 Conflicts:      mythweather-0_28
 Conflicts:      mythweather-0_27
 
@@ -513,7 +562,9 @@
 Summary:        A module for %{name} for camera security and surveillance
 Group:          Productivity/Multimedia/Video/Players
 Requires:       %{name}-frontend = %{version}
+Provides:       mythzoneminder-%{statusrelease}
 Provides:       mythzoneminder%{?pkgmanjor} = %{version}
+Conflicts:      mythzoneminder%{!?pkgmanjor:-legacy}
 Conflicts:      mythzoneminder-0_28
 Conflicts:      mythzoneminder-0_27
 
@@ -527,6 +578,8 @@
 
 %prep
 %setup -q -n mythtv-fixes-%{version}
+%patch0 -p1
+%patch1 -p1
 
 # Check app version
 _newversion=$(grep -os '[0-9]\+\.[.0-9]\+\?[0-9]' mythtv/VERSION | grep -m1 .)
@@ -557,7 +610,6 @@
 find -regex ".*\.$html\|js\|xsl$" -type f -executable -exec chmod 644 {} \; || :
 
 pushd mythtv
-%patch0 -p1
 
 # Remove unnecessary ldconfig call
 sed -i 's/\-ldconfig//' $(grep -rl '\-ldconfig')
@@ -635,7 +687,6 @@
     --enable-firewire                           \
     --enable-dvb                                \
     --enable-libmp3lame                         \
-    --enable-libtheora --enable-libvorbis       \
     --enable-libxvid                            \
     --enable-vdpau                              \
     --enable-vaapi                              \
@@ -651,7 +702,12 @@
     --disable-stripping                         \
     --enable-symbol-visibility                  \
     --enable-pic                                \
-    --python=python2
+    --python=python2                            \
+%ifarch %{arm} aarch64
+    --disable-xnvctrl
+%else
+    --enable-xnvctrl
+%endif
 
 %make_jobs OPTFLAGS="%{optflags}"
 popd
@@ -836,8 +892,6 @@
 %{_bindir}/mythutil
 %{_bindir}/mythpreviewgen
 %{_bindir}/mythffprobe
-%{_bindir}/mythffserver
-%{_bindir}/mythhdhomerun_config
 %{_bindir}/mythscreenwizard
 %{_bindir}/mythfilerecorder
 %dir %{_datadir}/mythtv

mythtv-downgrade-from-unicable-support.diff Changed

mythtv-perl-install.patch Changed

@@ -1,29 +1,29 @@
 diff -up mythtv-0.24rc2/bindings/perl/Makefile.perl-install mythtv-0.24rc2/bindings/perl/Makefile
---- mythtv-0.24rc2/bindings/perl/Makefile.perl-install	2010-11-07 17:34:04.256035523 +0100
-+++ mythtv-0.24rc2/bindings/perl/Makefile	2010-11-07 21:43:43.321274345 +0100
+---  a/mythtv/bindings/perl/Makefile.perl-install	2010-11-07 17:34:04.256035523 +0100
++++  b/mythtv/bindings/perl/Makefile	2010-11-07 21:43:43.321274345 +0100
 @@ -1,14 +1,10 @@
  include ../../config.mak
- 
+
  ifdef INSTALL_ROOT
 -ROOT_FLAGS = PERL_INSTALL_ROOT="$(INSTALL_ROOT)"
-+ROOT_FLAGS = PERL_INSTALL_ROOT="$(INSTALL_ROOT)" 
++ROOT_FLAGS = PERL_INSTALL_ROOT="$(INSTALL_ROOT)"
  endif
- 
+
 -ifneq ($(PREFIX:/=), /usr)
 -	ifneq ($(PREFIX:/=), /usr/local)
 -		PREFIX_FLAGS=PREFIX="$(PREFIX)"
 -	endif
 -endif
 +PREFIX_FLAGS=PREFIX="$(PREFIX)"
- 
+
  all: perl_build
- 
+
 @@ -19,7 +15,7 @@ distclean: clean
  	-rm -f Makefile.perl.old
- 
+
  Makefile.perl: Makefile.PL
 -	perl Makefile.PL MAKEFILE=Makefile.perl $(PREFIX_FLAGS) $(PERL_CONFIG_OPTS)
 +	perl Makefile.PL MAKEFILE=Makefile.perl $(PREFIX_FLAGS) $(PERL_CONFIG_OPTS) INSTALLDIRS=vendor
- 
+
  perl_build: Makefile.perl
  	@-$(MAKE) -f Makefile.perl

remove-unwanted-dependency-and-xnvctrl-support.patch Added

@@ -0,0 +1,92 @@
+ mythtv/configure | 71 ++------------------------------------------------------
+ 1 file changed, 2 insertions(+), 69 deletions(-)
+
+diff --git a/mythtv/configure b/mythtv/configure
+index 4f526864a5..7905327347 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -5925,44 +5925,7 @@ if enabled libbluray_external; then
+     if $(pkg-config --atleast-version="0.9.3" libbluray); then
+         use_pkg_config libbluray libbluray libbluray/bluray.h bd_open
+     else
+-        case $target_os in
+-            linux)
+-                # Some older supported linux versions don't have a
+-                # libbluray current enough to support MythTV.  Allow
+-                # only those systems to reach the bottom of the
+-                # following case statement.  This list should only
+-                # shrink over time.
+-                . /etc/os-release
+-                case $ID in
+-                    centos)
+-                        if test $VERSION_ID -gt 7; then
+-                            die "ERROR: can not find libbluray."
+-                        fi
+-                        ;;
+-                    ubuntu)
+-                        case $VERSION_ID in
+-                            17*|18*|19*|2*)
+-                                die "ERROR: can not find libbluray."
+-                                ;;
+-                        esac
+-                        ;;
+-                    debian)
+-                        if test $VERSION_ID -gt 8; then
+-                            die "ERROR: can not find libbluray."
+-                        fi
+-                        ;;
+-                    *)
+-                        die "ERROR: can not find libbluray."
+-                        ;;
+-                esac
+-                disable libbluray_external
+-                ;;
+-            *)
+-                # FreeBSD provides libbluray 1.0.2
+-                # All others unknown.
+-                die "ERROR: can not find libbluray."
+-                ;;
+-        esac
++        die "ERROR: can not find libbluray."
+     fi
+ fi
+ 
+@@ -6642,37 +6605,7 @@ if enabled x11; then
+     require libXinerama X11/extensions/Xinerama.h XineramaQueryExtension -lXinerama
+     require libXext "X11/Xdefs.h X11/Xlib.h X11/extensions/Xext.h" XMissingExtension -lXext
+     if enabled xnvctrl; then
+-        case $target_os in
+-            linux)
+-                # Bah. Suse linux doesn't have xnvctrl.
+-                . /etc/os-release
+-                case $ID in
+-                    *suse*)
+-			# This is hopefully temporary.
+-			disable xnvctrl_external
+-			;;
+-                    *gentoo*)
+-                        if [ -e "/usr/bin/nvidia-settings" ]
+-                        then
+-                            require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
+-                        else
+-                            disable xnvctrl_external
+-                        fi
+-                        ;;
+-		    *)
+-                        require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
+-                        ;;
+-                esac
+-                ;;
+-            freebsd)
+-                # This is hopefully temporary, and will eventually
+-                # check for a system library too.
+-                disable xnvctrl_external
+-                ;;
+-            *)
+-                disable xnvctrl
+-                ;;
+-        esac
++        require XNVctrl "X11/Xlib.h NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h" XNVCTRLIsNvScreen -lXNVCtrl || disable xnvctrl
+     fi
+ fi
+

_constraints Added

_service Changed

_servicedata Changed

mythtv-fixes-29.1+git20190912.4c432df737.tar.gz Deleted

mythtv-fixes-30.0+git20190912.0c9abf30c8.tar.gz Added

Changes of Revision 17