[smplayer/f36] (3 commits) ...Update smplayer to 22.7.0
by Sérgio M. Basto
Summary of changes:
cb1299c... el9 don't have qtsingleapplication-qt5 package (*)
f749dc5... I think smplayer don't need Qt5WebKitWidgets to build (*)
f6f8350... Update smplayer to 22.7.0 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 4 months
[smplayer/el9] (3 commits) ...Update smplayer to 22.7.0
by Sérgio M. Basto
Summary of changes:
cb1299c... el9 don't have qtsingleapplication-qt5 package (*)
f749dc5... I think smplayer don't need Qt5WebKitWidgets to build (*)
f6f8350... Update smplayer to 22.7.0 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 4 months
[smplayer] Update smplayer to 22.7.0
by Sérgio M. Basto
commit f6f8350cdfdcbd5b731814e0731a960f285cb341
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jul 14 23:00:40 2022 +0100
Update smplayer to 22.7.0
.gitignore | 1 +
smplayer.spec | 5 ++++-
sources | 2 +-
update_smplayer.sh | 10 +++++-----
4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 608aea5..e13e2ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ smtube-16.3.0.tar.bz2
/smplayer-21.8.0.tar.bz2
/smplayer-21.10.0.tar.bz2
/smplayer-22.2.0.tar.bz2
+/smplayer-22.7.0.tar.bz2
diff --git a/smplayer.spec b/smplayer.spec
index 2599bd7..18423bb 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -8,7 +8,7 @@
%global smplayer_skins_ver 20.11.0
Name: smplayer
-Version: 22.2.0
+Version: 22.7.0
Release: 1%{?dist}
Summary: A graphical frontend for mplayer and mpv
@@ -196,6 +196,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Thu Jul 14 2022 Sérgio Basto <sergio(a)serjux.com> - 22.7.0-1
+- Update smplayer to 22.7.0
+
* Tue Mar 01 2022 Sérgio Basto <sergio(a)serjux.com> - 22.2.0-1
- Update smplayer to 22.2.0
diff --git a/sources b/sources
index ae684fc..527d18b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (smplayer-22.2.0.tar.bz2) = 62916d9df8493efbe810a5de36c2d45fd2e39173e061060c749c87ac498f43ca08caa073bd04b05e3e9de72c5efdf9bece8e08f4c57a0d283d9f78b7687e2d14
+SHA512 (smplayer-22.7.0.tar.bz2) = 4c38dded9cd97187a7c7d79524ef5ebf7d9a1b74b1e344d62cc44e8684d23d6124ecd93bef98f127f447362f5c04c37543d847ee5315788fb2511d4643ebee06
SHA512 (smplayer-themes-20.11.0.tar.bz2) = 4e64c3f44fc3529d980751618cd30fcc395a21701ba7481ad0a6dffc1fa770c13a3414d0853f94cd6163738702a0a75060a92e5c1c426e79902a68d8f8336575
SHA512 (smplayer-skins-20.11.0.tar.bz2) = a52464b3b0aca82caf3762fde0ad7f1084e7e37b936f97d05f758554f84188cee11cb4d4630575ec10ed3970f0b77bceabb3f90fe4e43ff7d29b5c2725741a7d
diff --git a/update_smplayer.sh b/update_smplayer.sh
index 8fabfa7..b42b1fb 100755
--- a/update_smplayer.sh
+++ b/update_smplayer.sh
@@ -1,8 +1,7 @@
-version=21.10.0
-#stube_ver=19.6.0
+version=22.7.0
themes_ver=20.11.0
skins_ver=20.11.0
-REPOS="f35 f34 f33 el8 el7"
+REPOS="f36 f35 el9 el8 el7"
if [ -z "$1" ]
then
@@ -16,7 +15,6 @@ then
echo STAGE 0
git checkout master && git pull || exit 2
-#sed -i "s|^%global smtube_ver .*|%global smtube_ver $stube_ver|" smplayer.spec
sed -i "s|^%global smplayer_themes_ver .*|%global smplayer_themes_ver $themes_ver|" smplayer.spec
sed -i "s|^%global smplayer_skins_ver .*|%global smplayer_skins_ver $skins_ver|" smplayer.spec
@@ -47,7 +45,9 @@ fi
if test $stage -le 2
then
for repo in $REPOS ; do
-echo Press enter to build on branch $repo; read dummy;
+echo Press enter to build on branch $repo or n to skip; read dummy;
+if [[ "$dummy" != "n" ]]; then
git checkout $repo && git merge master && git push && rfpkg build --nowait; git checkout master
+fi
done
fi
2 years, 4 months
[smplayer] I think smplayer don't need Qt5WebKitWidgets to build
by Sérgio M. Basto
commit f749dc5472bdc9ff4c8319d8a82ff402adb949e4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jul 14 22:59:39 2022 +0100
I think smplayer don't need Qt5WebKitWidgets to build
smplayer.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/smplayer.spec b/smplayer.spec
index e42ab71..2599bd7 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -35,7 +35,7 @@ BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Sql)
-BuildRequires: pkgconfig(Qt5WebKitWidgets)
+#BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(xext)
2 years, 4 months
[smplayer] el9 don't have qtsingleapplication-qt5 package
by Sérgio M. Basto
commit cb1299cb1b1899660e483e1088edccb4ae7e6c4f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jul 14 22:56:51 2022 +0100
el9 don't have qtsingleapplication-qt5 package
(at least some weeks ago)
smplayer.spec | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/smplayer.spec b/smplayer.spec
index 12c69cf..e42ab71 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -1,7 +1,14 @@
-Name: smplayer
-Version: 22.2.0
+%if 0%{?rhel} >= 9
+%bcond_with system_qtsingleapplication
+%else
+%bcond_without system_qtsingleapplication
+%endif
+
%global smplayer_themes_ver 20.11.0
%global smplayer_skins_ver 20.11.0
+
+Name: smplayer
+Version: 22.2.0
Release: 1%{?dist}
Summary: A graphical frontend for mplayer and mpv
@@ -33,7 +40,9 @@ BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(xext)
# for unbundle sources
+%if %{with system_qtsingleapplication}
BuildRequires: qtsingleapplication-qt5-devel
+%endif
BuildRequires: pkgconfig(zlib)
Requires: hicolor-icon-theme
# smplayer without mplayer is quite useless
@@ -78,12 +87,16 @@ A set of themes for SMPlayer and a set of skins for SMPlayer.
%setup -q -a3 -a4
#remove some bundle sources
rm -rf zlib
+%if %{with system_qtsingleapplication}
rm -rf src/qtsingleapplication/
+%endif
#TODO unbundle libmaia
#rm -rf src/findsubtitles/libmaia
%patch0 -p1 -b .desktop-files
+%if %{with system_qtsingleapplication}
%patch2 -p1 -b .qtsingleapplication
+%endif
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
2 years, 4 months
[dvbcut] fix
by Leigh Scott
commit 7785e90d63c859396f81887a154a7dbfb8ca95bd
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jul 14 17:49:40 2022 +0100
fix
dvbcut.spec | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/dvbcut.spec b/dvbcut.spec
index 9680f1f..1672dd6 100644
--- a/dvbcut.spec
+++ b/dvbcut.spec
@@ -51,15 +51,13 @@ dvbcut can use Mplayer if available.
%prep
%autosetup -p1 -n %{name}-deb-%{version}
-
+rm config.guess config.sub install-sh
+autoreconf -fiv
%build
-autoreconf -i
%configure
-
%make_build
-
%install
%make_install
2 years, 4 months
[dvbcut/f35] (7 commits) ...Update to 0.7.4
by Leigh Scott
Summary of changes:
95b1255... Rebuilt for new ffmpeg snapshot (*)
623cb87... Update to 0.7.3 (*)
1ac0ed8... Delete old patches and scripts (*)
6f4c065... - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass (*)
6ea6e00... Switch to compat-ffmpeg4 (*)
7491cac... Fix build (*)
9568a3a... Update to 0.7.4 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 4 months