[mpv/f35] Fixed build on F35+.
by Vitaly Zaitsev
commit 862b577287806fd58d9da70d10c9f26e508cda0b
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Nov 1 19:35:26 2021 +0100
Fixed build on F35+.
mpv.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index af648dc..b42ce44 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -136,10 +136,10 @@ sed -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.sta
--enable-cdda \
--enable-html-build \
%{?_with_rpi:--enable-rpi --disable-vaapi} \
- --enable-gl-x11 \
%if 0%{?fedora} < 35
- --enable-dvbin
+ --enable-dvbin \
%endif
+ --enable-gl-x11
%{_bindir}/waf -v build %{?_smp_mflags}
%install
3 years, 1 month
[smplayer] Update smplayer to 21.10.0
by Sérgio M. Basto
commit 1fb2f13bb5e27b9156ecb20a68224bb94350a843
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Nov 1 16:34:43 2021 +0000
Update smplayer to 21.10.0
.gitignore | 1 +
smplayer.spec | 7 +++++--
sources | 2 +-
update_smplayer.sh | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 939858a..3d7788e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@ smtube-16.3.0.tar.bz2
/smplayer-skins-20.11.0.tar.bz2
/smplayer-21.1.0.tar.bz2
/smplayer-21.8.0.tar.bz2
+/smplayer-21.10.0.tar.bz2
diff --git a/smplayer.spec b/smplayer.spec
index 6c1e1ec..9e8ee36 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -1,8 +1,8 @@
Name: smplayer
-Version: 21.8.0
+Version: 21.10.0
%global smplayer_themes_ver 20.11.0
%global smplayer_skins_ver 20.11.0
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: A graphical frontend for mplayer and mpv
License: GPLv2+
@@ -175,6 +175,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Mon Nov 01 2021 Sérgio Basto <sergio(a)serjux.com> - 21.10.0-1
+- Update smplayer to 21.10.0
+
* Tue Aug 17 2021 Sérgio Basto <sergio(a)serjux.com> - 21.8.0-2
- smplayer.appdata.xml also upstreamed, but not validate well on epel 7 and 8
diff --git a/sources b/sources
index 96bd7bc..b2610f2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (smplayer-21.8.0.tar.bz2) = 4513718ca8cf1529ef5e4b8595cba9d9177073acaada6f7e8aed242a1fd56cb8fdf932a757ae147aa645a5422c1e8f52863b562f7e697f643769b1c57f7e647e
+SHA512 (smplayer-21.10.0.tar.bz2) = 3e4a046c704eeb181570c56a819afbca939257df370c909dab3af448553702feeebba542f123d18cf6b786a19f92ee67ba60ba25a649d83f1f31411b715f7ae4
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 1ebd464..8fabfa7 100755
--- a/update_smplayer.sh
+++ b/update_smplayer.sh
@@ -1,4 +1,4 @@
-version=21.8.0
+version=21.10.0
#stube_ver=19.6.0
themes_ver=20.11.0
skins_ver=20.11.0
3 years, 1 month
[mpv] Updated to version 0.34.0.
by Vitaly Zaitsev
Summary of changes:
1e06772... Updated to version 0.34.0. (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 1 month
[mpv/f35] Updated to version 0.34.0.
by Vitaly Zaitsev
Summary of changes:
1e06772... Updated to version 0.34.0. (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 1 month
[mpv/f34] Updated to version 0.34.0.
by Vitaly Zaitsev
Summary of changes:
1e06772... Updated to version 0.34.0. (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 1 month
[mpv/f33] Updated to version 0.34.0.
by Vitaly Zaitsev
commit 1e06772dfd7a94a7bfe7c558f371b0c47d974f7c
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Mon Nov 1 18:34:45 2021 +0100
Updated to version 0.34.0.
7c4465cefb27d4e0d07535d368febdf77b579566.patch | 84 --------------------------
mpv-config.patch | 12 ----
mpv.spec | 59 ++++++++----------
sources | 2 +-
4 files changed, 27 insertions(+), 130 deletions(-)
---
diff --git a/mpv.spec b/mpv.spec
index b26fdc6..af648dc 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,23 +1,16 @@
-%global giturl https://github.com/mpv-player/mpv
-
Name: mpv
-Version: 0.33.1
-Release: 4%{?gitrelease}%{?dist}
-Summary: Movie player playing most video formats and DVDs
-License: GPLv2+ and LGPLv2+
-URL: http://mpv.io/
-Source0: %{giturl}/archive/v%{version}/%{name}-%{version}.tar.gz
+Version: 0.34.0
+Release: 1%{?dist}
-# set defaults for Fedora
-Patch0: %{name}-config.patch
+License: GPLv2+ and LGPLv2+
+Summary: Movie player playing most video formats and DVDs
+URL: https://%{name}.io/
+Source0: https://github.com/%{name}-player/%{name}/archive/v%{version}/%{name}-%{v...
# Fix ppc as upstream refuse to fix the issue
# https://github.com/mpv-player/mpv/issues/3776
Patch1: ppc_fix.patch
-# Patch for new libplacebo API
-Patch2: %{giturl}/commit/7c4465cefb27d4e0d07535d368febdf77b579566.patch
-
BuildRequires: pkgconfig(alsa)
BuildRequires: desktop-file-utils
BuildRequires: gcc
@@ -88,16 +81,13 @@ BuildRequires: /usr/bin/rst2man
BuildRequires: perl(Math::BigInt)
BuildRequires: perl(Math::BigRat)
BuildRequires: perl(Encode)
-
-%ifarch armv7hl armv7hnl
-%{?_with_rpi:
-BuildRequires: raspberrypi-vc-devel
-}
+%ifarch %{arm}
+%{?_with_rpi:BuildRequires: raspberrypi-vc-devel}
%endif
# Obsoletes older ci/cd
-Obsoletes: mpv-master < %{version}-100
-Provides: mpv-master = %{version}-100
+Obsoletes: %{name}-master < %{version}-100
+Provides: %{name}-master = %{version}-100
Requires: hicolor-icon-theme
Provides: mplayer-backend
@@ -117,16 +107,15 @@ This package contains the dynamic library libmpv, which provides access to Mpv.
%package libs-devel
Summary: Development package for libmpv
-Requires: mpv-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description libs-devel
Libmpv development header files and libraries.
%prep
-%autosetup -p1 -n mpv-%{?commit}%{?!commit:%{version}}
-
-sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.standard_includes.append('$(pkgconf --variable=includedir libavcodec)')|" wscript
-
+%autosetup -p1
+sed -e "s|/usr/local/etc|%{_sysconfdir}/%{name}|" -i etc/%{name}.conf
+sed -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.standard_includes.append('$(pkgconf --variable=includedir libavcodec)')|" -i wscript
%build
%set_build_flags
@@ -151,41 +140,45 @@ sed -i -e "s|c_preproc.standard_includes.append('/usr/local/include')|c_preproc.
%if 0%{?fedora} < 35
--enable-dvbin
%endif
-
-
%{_bindir}/waf -v build %{?_smp_mflags}
%install
%{_bindir}/waf install --destdir=%{buildroot}
+%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
-install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}/%{name}/
%files
%docdir %{_docdir}/%{name}/
-%{_docdir}/%{name}/
+%doc README.md etc/input.conf etc/%{name}.conf
%license LICENSE.GPL LICENSE.LGPL Copyright
+%{_docdir}/%{name}/
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/bash-completion/
%dir %{_datadir}/bash-completion/completions/
%{_datadir}/bash-completion/completions/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}*.*
-%{_datadir}/zsh/site-functions/_mpv
+%dir %{_datadir}/zsh/
+%dir %{_datadir}/zsh/site-functions/
+%{_datadir}/zsh/site-functions/_%{name}
%{_mandir}/man1/%{name}.*
%dir %{_sysconfdir}/%{name}/
%config(noreplace) %{_sysconfdir}/%{name}/encoding-profiles.conf
%files libs
%license LICENSE.GPL LICENSE.LGPL Copyright
-%{_libdir}/libmpv.so.*
+%{_libdir}/lib%{name}.so.*
%files libs-devel
%{_includedir}/%{name}/
-%{_libdir}/libmpv.so
-%{_libdir}/pkgconfig/mpv.pc
+%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Mon Nov 01 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0.34.0-1
+- Updated to version 0.34.0.
+
* Mon Sep 20 2021 Leigh Scott <leigh123linux(a)gmail.com> - 0.33.1-4
- rebuilt
diff --git a/sources b/sources
index 05d4cc6..6eb4f41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mpv-0.33.1.tar.gz) = 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
+SHA512 (mpv-0.34.0.tar.gz) = 9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
3 years, 1 month
[qarte] add fixes from upstream, rfbz #6161
by Sérgio M. Basto
commit 4a01cd8f2a592a2d651659d9668b8daccc7f1eaf
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Nov 1 15:22:22 2021 +0000
add fixes from upstream, rfbz #6161
65_64.diff | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
66_65.diff | 92 +++++++++++++++++++++++++++++++++++
qarte.spec | 10 +++-
3 files changed, 262 insertions(+), 2 deletions(-)
---
diff --git a/65_64.diff b/65_64.diff
new file mode 100644
index 0000000..2f9037d
--- /dev/null
+++ b/65_64.diff
@@ -0,0 +1,162 @@
+=== modified file 'arteconcert.py'
+--- arteconcert.py 2021-08-23 08:57:52 +0000
++++ arteconcert.py 2021-11-01 08:04:48 +0000
+@@ -295,10 +295,13 @@
+ # Quick method first
+ idx = item.order
+ #https://www.w3schools.com/tags/ref_urlencode.asp
++ #url = "".join(["https://api.arte.tv/api/",
++ #"player/v1/config/{0}/{1}?autostart=1&",
++ #"lifeCycle=1&lang={2}_{3}"])
+ url = "".join(["https://api.arte.tv/api/",
+- "player/v1/config/{0}/{1}?autostart=1&",
+- "lifeCycle=1&lang={2}_{3}"])
+- url = url.format(self.lang, idx, self.lang, self.lang.upper())
++ "player/v1/config/{0}/{1}"])
++ url = url.format(self.lang, idx)
++ #url = url.format(self.lang, idx, self.lang, self.lang.upper())
+ item.jsonurl = url
+ content = self.get_page(url)
+
+
+=== modified file 'artetv.py'
+--- artetv.py 2021-08-23 08:02:22 +0000
++++ artetv.py 2021-11-01 08:04:48 +0000
+@@ -466,6 +466,7 @@
+ lgg.info("Download item page: %s" % item.url)
+ if item.url.startswith(("/fr/", "/de/")):
+ item.url = "https://www.arte.tv" + item.url
++
+ desc, origin, anno, duration, rea, country = '', '', '', '', '', ''
+ page = self.get_page_content(item.url)
+
+@@ -484,33 +485,44 @@
+ short = video.get("shortDescription", "")
+ if short is None:
+ short = ""
++
+ desc = video.get("fullDescription", "")
+ if desc is None:
+ desc = ''
++
+ item.description = "%s<br/>%s" %(short, desc)
+ try:
+ item.label = video["kind"].get("label", "parsed")
+ except KeyError:
+ item.label = "parsed"
++
+ item.duration = self.format_duration(video.get("duration", 0))
+- credits = video["credits"]
+- for credit in credits:
+- code = credit["code"]
+- if code == "REA":
+- item.realisation = credit["values"]
+- elif code == "ACT":
+- item.actors = credit["values"]
+- elif code == "MUS":
+- item.music = credit["values"]
+- elif code == "COUNTRY":
+- item.origin = ", ".join(credit["values"])
+- elif code == "PRODUCTION_YEAR":
+- if credit["values"]:
+- item.anno = credit["values"][0]
++ try:
++ credits = video["credits"]
++ except:
++ pass
++ else:
++ for credit in credits:
++ code = credit["code"]
++ if code == "REA":
++ item.realisation = credit["values"]
++
++ elif code == "ACT":
++ item.actors = credit["values"]
++
++ elif code == "MUS":
++ item.music = credit["values"]
++
++ elif code == "COUNTRY":
++ item.origin = ", ".join(credit["values"])
++
++ elif code == "PRODUCTION_YEAR":
++ if credit["values"]:
++ item.anno = credit["values"][0]
++
+ if not item.description:
+ item.description = item.teaser
+
+-
+ def format_duration(self, value):
+ if value is not None:
+ min_, sec = divmod(value, 60)
+@@ -589,6 +601,17 @@
+ return str(content.read().decode('utf-8', 'replace'))
+ except Exception as why:
+ lgg.info('HTTP error: %s, %s' % (url, why))
++ if "#" in url:
++ url = url.replace("#", "/#")
++ req = urllib.request.Request(url, data=None,
++ headers={"User-Agent": user_agent})
++ lgg.info("Try with: %s" % url)
++ try:
++ content = urllib.request.urlopen(req)
++ return str(content.read().decode('utf-8', 'replace'))
++ except Exception as why:
++ lgg.info('HTTP error: %s, %s' % (url, why))
++
+ return False
+
+ def load_image(self, item):
+@@ -604,6 +627,7 @@
+ with open(path, 'wb') as objfile:
+ f = urllib.request.urlopen(item.pix_url, timeout=5)
+ objfile.write(f.read())
++
+ return path
+ except Exception as why:
+ lgg.info("Can't load image: %s" % item.pix_url)
+@@ -617,6 +641,7 @@
+ with open(fname, 'wb') as objfile:
+ f = urllib.request.urlopen(url, timeout=5)
+ objfile.write(f.read())
++
+ return fname
+ except Exception as why:
+ lgg.info("Can't load image: %s" % url)
+@@ -708,6 +733,7 @@
+ def remove_old_videos(self):
+ def remove():
+ self.clean_thumbnails()
++
+ Thread(target=remove).start()
+
+ def clean_thumbnails(self):
+@@ -775,9 +801,11 @@
+ def edit_category_data(self, title, subtitle, teaser):
+ if not title.endswith("\n"):
+ title += "\n"
++
+ if subtitle is not None:
+ if not subtitle.endswith("\n"):
+ subtitle += "\n"
++
+ else:
+ subtitle = ""
+ self.ui.pitch_editor.clear()
+
+=== modified file 'gui/mainui.py'
+--- gui/mainui.py 2020-10-15 09:33:01 +0000
++++ gui/mainui.py 2021-11-01 08:04:48 +0000
+@@ -471,8 +471,8 @@
+ if img.isNull():
+ img = QPixmap("medias/noPreview.png").scaled(QSize(180, 102))
+
+- w = float(QSize.width(img.size()))
+- h = float(QSize.height(img.size()))
++ w = QSize.width(img.size())
++ h = QSize.height(img.size())
+ # white frame
+ brect = QRect(0, 0, w+3, h+3)
+ bckgrnd = back.scaled(QSize(w+25, h+25))
+
diff --git a/66_65.diff b/66_65.diff
new file mode 100644
index 0000000..ec7b7c8
--- /dev/null
+++ b/66_65.diff
@@ -0,0 +1,92 @@
+=== modified file 'artetv.py'
+--- artetv.py 2021-11-01 08:04:48 +0000
++++ artetv.py 2021-11-01 09:33:11 +0000
+@@ -74,6 +74,7 @@
+ self.categories = []
+ self.categories_videos = {}
+ self.culture_at_home = {}
++ self.current_category = "arte+7"
+ self.is_in_category = False
+ self.is_loading = False
+ self.loading_aborted = False
+@@ -134,6 +135,7 @@
+ if is_videos:
+ self.ui.categories_cmb.currentTextChanged.connect(
+ self.change_category)
++ self.ui.refresh_btn.clicked.connect(self.reload_category)
+
+ self.remove_old_videos()
+
+@@ -203,6 +205,10 @@
+
+ self.is_in_category = True
+ self.ui.arte_list.display_category(selection)
++ self.current_category = name
++
++ def reload_category(self):
++ self.change_category(self.current_category)
+
+ def display_category_content(self, idx):
+ cat = self.ui.arte_list.video_items[idx]
+@@ -213,6 +219,7 @@
+
+ else:
+ self.display_sub_category(cat)
++ self.ui.refresh_btn.setEnabled(True)
+
+ def display_sub_category(self, category):
+ url = category.item.url
+
+=== modified file 'data.py'
+--- data.py 2021-08-23 08:02:22 +0000
++++ data.py 2021-11-01 09:33:11 +0000
+@@ -11,7 +11,7 @@
+ # Constants list, XXX don't forget to update VERSION if needed.
+
+
+-VERSION = (4, 14, 0)
++VERSION = (4, 15, 0)
+
+ VERSION_STR = '.'.join(str(i) for i in VERSION)
+
+
+=== modified file 'gui/mainui.py'
+--- gui/mainui.py 2021-11-01 08:04:48 +0000
++++ gui/mainui.py 2021-11-01 09:33:11 +0000
+@@ -96,6 +96,13 @@
+ self.categories_cmb = QComboBox(self)
+ self.categories_cmb.setMinimumSize(200, 24)
+ self.hl_2.addWidget(self.categories_cmb)
++ self.refresh_btn = QToolButton(self.widget1)
++ icon2 = QIcon()
++ icon2.addPixmap(QPixmap("medias/refresh.png"))
++ self.refresh_btn.setIcon(icon2)
++ self.refresh_btn.setIconSize(QSize(20, 20))
++ self.refresh_btn.setEnabled(False)
++ self.hl_2.addWidget(self.refresh_btn)
+ spacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
+ self.hl_2.addItem(spacer)
+ self.sizer_wdg = HorizontalSlider(self.widget1)
+
+=== modified file 'qarte'
+--- qarte 2021-08-23 08:57:52 +0000
++++ qarte 2021-11-01 09:33:11 +0000
+@@ -5,7 +5,7 @@
+ # This file is part of qarte-4
+ #
+ # Author: Vincent Vande Vyvre <vincent.vandevyvre(a)oqapy.eu>
+-# Copyright: 2011-2020 Vincent Vande Vyvre
++# Copyright: 2011-2021 Vincent Vande Vyvre
+ # Licence: GPL3
+ # Home page: https://launchpad.net/qarte
+ #
+@@ -31,7 +31,7 @@
+ import platform
+ import locale
+
+-VERSION_STR = "4.14.0"
++VERSION_STR = "4.15.0"
+
+ from PyQt5.QtWidgets import QApplication
+
+
diff --git a/qarte.spec b/qarte.spec
index 5a28531..b656f73 100644
--- a/qarte.spec
+++ b/qarte.spec
@@ -3,7 +3,7 @@
Name: qarte
Version: 4.14.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv3+
URL: https://launchpad.net/qarte
Source0: http://oqapy.eu/releases/%{name}-%{version}.tar.gz
@@ -15,13 +15,16 @@ BuildRequires: python3-devel
Requires: rtmpdump
Requires: python3-qt5
BuildArch: noarch
+Patch1: 65_64.diff
+Patch2: 66_65.diff
+
%description
Qarte allows browsing the archive of arte+7 & arteLiveWeb sites
and recording videos.
%prep
-%setup -q
+%autosetup -p0
%build
@@ -48,6 +51,9 @@ cp -pR locale %{buildroot}%{_datadir}
%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
%changelog
+* Mon Nov 01 2021 Sérgio Basto <sergio(a)serjux.com> - 4.14.0-2
+- add fixes from upstream, rfbz #6161
+
* Sat Sep 04 2021 Sérgio Basto <sergio(a)serjux.com> - 4.14.0-1
- Update to 4.14.0 rfbz #6060
3 years, 1 month