Request 5454 (accepted)

Overview

Request 5454 (accepted)

- Update to version 31.0+git20210808.5da2523154:
* https://www.mythtv.org/wiki/Release_Notes_-_31
- Rebase remove-unwanted-dependency-and-xnvctrl-support.patch
to remove-unwanted-dependency.patch
- Add BuildRequire python-simplejson
- Drop plugin mythgallery, because it is dropped upstream
* https://github.com/MythTV/mythtv/commit/fce4029a6b
- Drop libXNVCtrl support, because it is dropped upstream
* https://github.com/MythTV/mythtv/commit/bd6c1ef459

Created by Kieltux about 3 years ago
In state accepted
Package maintainer: awissu

Submit mythtv

Submit package home:Kieltux:branches:Multimedia / mythtv to package Multimedia / mythtv

mythtv.changes Changed

mythtv.spec Changed

@@ -1,6 +1,7 @@
 #
 # spec file for package mythtv
 #
+# Copyright (c) 2021 Packman Team <packman@links2linux.de>
 # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010,2011,2012,2013 Herbert Graeber <herbert@links2linux.de>
 #
@@ -19,7 +20,7 @@
 
 %define _lto_cflags %{nil}
 
-%define manjor 30
+%define manjor 31
 %define soname libmyth
 %define sover 29-29
 %define SYSUSER mythtv
@@ -41,7 +42,7 @@
 # Fix: suse-filelist-forbidden-sysconfig
 %{!?_fillupdir:%global _fillupdir /var/adm/fillup-templates}
 Name:           mythtv
-Version:        30.0+git20200802.622c94965e
+Version:        31.0+git20210808.5da2523154
 Release:        0
 Summary:        A personal video recorder (PVR/DVR) application
 License:        GPL-2.0-or-later
@@ -59,7 +60,7 @@
 Source99:       mythfrontend.svg
 Source100:      mythtv.rpmlintrc
 Patch0:         mythtv-perl-install.patch
-Patch1:         remove-unwanted-dependency-and-xnvctrl-support.patch
+Patch1:         remove-unwanted-dependency.patch
 BuildRequires:  avahi-compat-mDNSResponder-devel
 BuildRequires:  dcraw
 BuildRequires:  fdupes
@@ -85,6 +86,7 @@
 BuildRequires:  python-future
 BuildRequires:  python-lxml
 BuildRequires:  python-mysql
+BuildRequires:  python-simplejson
 BuildRequires:  python-urlgrabber
 BuildRequires:  python-requests-cache
 BuildRequires:  update-desktop-files
@@ -193,12 +195,6 @@
 BuildRequires:  pkgconfig(glesv1_cm)
 BuildRequires:	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
@@ -448,25 +444,6 @@
 MythBrowser also contains a BookmarkManager to manage the website links in
 a simple mythplugin.
 
-%package -n     mythplugins-mythgallery%{?pkgmanjor}
-Summary:        Image gallery plugin for %{name}
-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
-
-%description -n mythplugins-mythgallery%{?pkgmanjor}
-A personal video recorder (PVR/DVR) application.
-
-The MythGallery plug-in allows you to view all your photos as well as short
-movies from your digital camera. Myth Gallery will show your photos as they
-are organised in your file system. Myth will generate thumbnails of both
-folders as well as individual photos.
-
 %package -n     mythplugins-mythgame%{?pkgmanjor}
 Summary:        A game frontend (xmame, nes, snes, pc) for %{name}
 Group:          Productivity/Multimedia/Video/Players
@@ -585,7 +562,7 @@
 %patch1 -p1
 
 # Check app version
-_newversion=$(grep -os '[0-9]\+\.[.0-9]\+\?[0-9]' mythtv/VERSION | grep -m1 .)
+_newversion=$(grep -os '[0-9]\+\.[.0-9]\+\?[0-9]' mythtv/SRC_VERSION | grep -m1 .)
 _oldversion=$(echo %{version} | grep -o '[0-9]\+\.[.0-9]\+\?[0-9]' | grep -m1 .)
 if [ -n "$_newversion" ]; then
     if [ -f %_sourcedir/_service ]; then
@@ -683,8 +660,6 @@
     --enable-libfftw3                           \
     --enable-x11                                \
     --x11-path=%{_includedir}                   \
-    --enable-xv                                 \
-    --enable-opengl-video                       \
     --enable-xrandr                             \
     --enable-lirc                               \
     --enable-ivtv                               \
@@ -707,11 +682,6 @@
     --enable-symbol-visibility                  \
     --enable-pic                                \
     --python=python2                            \
-%ifarch %{arm} aarch64
-    --disable-xnvctrl
-%else
-    --enable-xnvctrl
-%endif
 
 %make_jobs OPTFLAGS="%{optflags}"
 popd
@@ -761,7 +731,6 @@
     --compile-type=release \
     --enable-mytharchive \
     --enable-mythbrowser \
-    --enable-mythgallery \
     --enable-mythgame \
     --enable-mythmusic \
     --enable-mythnews \
@@ -900,6 +869,8 @@
 %{_bindir}/mythfilerecorder
 %dir %{_datadir}/mythtv
 %{_datadir}/mythtv/mythconverg*.pl
+%dir %{_datadir}/mythtv/externrecorder/
+%{_datadir}/mythtv/externrecorder/*
 %dir %{_datadir}/mythtv/locales
 %{_datadir}/mythtv/locales/*
 %dir %{_datadir}/mythtv/metadata
@@ -950,7 +921,6 @@
 %{_bindir}/mythlcdserver
 %{_bindir}/mythshutdown
 %{_bindir}/mythwelcome
-%{_libdir}/mythtv/filters
 %dir %{_libdir}/mythtv
 %dir %{_libdir}/mythtv/plugins
 %dir %{_datadir}/mythtv/i18n
@@ -1007,11 +977,6 @@
 %{_libdir}/mythtv/plugins/%{soname}browser.so
 %{_datadir}/mythtv/i18n/mythbrowser_*.qm
 
-%files -n mythplugins-mythgallery%{?pkgmanjor}
-%{_libdir}/mythtv/plugins/%{soname}gallery.so
-%{_datadir}/mythtv/i18n/mythgallery_*.qm
-%{_localstatedir}/lib/pictures
-
 %files -n mythplugins-mythgame%{?pkgmanjor}
 %dir %{_sysconfdir}/mythgame
 %config(noreplace) %{_sysconfdir}/mythgame/gamelist.xml

remove-unwanted-dependency.patch Added

@@ -0,0 +1,67 @@
+diff -Nur mythtv-fixes-31.0+git20210808.5da2523154/mythtv/configure new/mythtv/configure
+--- mythtv-fixes-31.0+git20210808.5da2523154/mythtv/configure	2021-08-08 14:39:56.000000000 +0200
++++ new/mythtv/configure	2021-08-11 18:08:57.760086881 +0200
+@@ -5899,44 +5899,7 @@
+     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 8; 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
+ 
+@@ -6540,17 +6503,6 @@
+                 }
+ 
+ enable enforce_wshadow
+-case $target_os in
+-    android)
+-        disable enforce_wshadow
+-        ;;
+-    linux)
+-        . /etc/os-release
+-        if test $ID = "centos"; then
+-            disable enforce_wshadow
+-        fi
+-        ;;
+-esac
+ 
+ if $(pkg-config --exists Qt5WebKit) || $(pkg-config --exists QtWebKit) ; then
+     enable qtwebkit

_service Changed

_servicedata Changed

mythtv-fixes-30.0+git20200802.622c94965e.tar.gz Deleted

mythtv-fixes-31.0+git20210808.5da2523154.tar.gz Added

Build Results
RPM Lint

Refresh

Comments for request 5454 0

Request History

Kieltux created request about 3 years ago

awissu accepted request about 3 years ago