[lightspark] Fix build for EL7 (gcc 4.8)
by Xavier Bachelot
commit 15c93c61651bf290977c7eb48d8b03785df8fb14
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Sep 27 11:38:18 2021 +0200
Fix build for EL7 (gcc 4.8)
lightspark-0.8.5-gcc48.patch | 108 +++++++++++++++++++++++++++++++++++++++++++
lightspark.spec | 14 ++++--
2 files changed, 119 insertions(+), 3 deletions(-)
---
diff --git a/lightspark-0.8.5-gcc48.patch b/lightspark-0.8.5-gcc48.patch
new file mode 100644
index 0000000..9aed952
--- /dev/null
+++ b/lightspark-0.8.5-gcc48.patch
@@ -0,0 +1,108 @@
+From 4d81b0977433f52d944d89a3c527162eb4a15c2f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludger=20Kr=C3=A4mer?= <dbluelle(a)onlinehome.de>
+Date: Fri, 24 Sep 2021 17:56:50 +0200
+Subject: [PATCH] fix copmpilation on CentOS 7 fixes #808
+
+---
+ src/scripting/abc_opcodes.cpp | 4 ++--
+ src/scripting/flash/globalization/collator.cpp | 2 +-
+ src/scripting/flash/globalization/currencyformatter.cpp | 2 +-
+ src/scripting/flash/globalization/datetimeformatter.cpp | 2 +-
+ src/scripting/flash/globalization/localeid.cpp | 2 +-
+ src/scripting/flash/globalization/numberformatter.cpp | 2 +-
+ src/scripting/flash/globalization/stringtools.cpp | 2 +-
+ 7 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/scripting/abc_opcodes.cpp b/src/scripting/abc_opcodes.cpp
+index 5efa29bbb..a0f35ecfc 100644
+--- a/src/scripting/abc_opcodes.cpp
++++ b/src/scripting/abc_opcodes.cpp
+@@ -2842,8 +2842,8 @@ void ABCVm::newClass(call_context* th, int n)
+ ret->getGlobalScope()->setVariableByQName(mname->name_s_id,mname->ns[0], ret,DECLARED_TRAIT);
+ th->mi->context->root->bindClass(className,ret);
+
+- auto j = th->mi->context->root->applicationDomain->classesSuperNotFilled.cbegin();
+- while (j != th->mi->context->root->applicationDomain->classesSuperNotFilled.cend())
++ auto j = th->mi->context->root->applicationDomain->classesSuperNotFilled.begin();
++ while (j != th->mi->context->root->applicationDomain->classesSuperNotFilled.end())
+ {
+ if((*j)->super == ret)
+ {
+diff --git a/src/scripting/flash/globalization/collator.cpp b/src/scripting/flash/globalization/collator.cpp
+index 9c4e8deb9..2cda2dde9 100644
+--- a/src/scripting/flash/globalization/collator.cpp
++++ b/src/scripting/flash/globalization/collator.cpp
+@@ -51,7 +51,7 @@ ASFUNCTIONBODY_ATOM(Collator,_constructor)
+ if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName))
+ {
+ std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName);
+- th->currlocale = std::locale(localeName);
++ th->currlocale = std::locale(localeName.c_str());
+ th->actualLocaleIDName = th->requestedLocaleIDName;
+ th->lastOperationStatus="noError";
+ }
+diff --git a/src/scripting/flash/globalization/currencyformatter.cpp b/src/scripting/flash/globalization/currencyformatter.cpp
+index bb717d163..dc0b18d86 100644
+--- a/src/scripting/flash/globalization/currencyformatter.cpp
++++ b/src/scripting/flash/globalization/currencyformatter.cpp
+@@ -84,7 +84,7 @@ ASFUNCTIONBODY_ATOM(CurrencyFormatter,_constructor)
+ }
+
+ std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName);
+- th->currlocale = std::locale(localeName);
++ th->currlocale = std::locale(localeName.c_str());
+ th->actualLocaleIDName = th->requestedLocaleIDName;
+ th->lastOperationStatus="noError";
+
+diff --git a/src/scripting/flash/globalization/datetimeformatter.cpp b/src/scripting/flash/globalization/datetimeformatter.cpp
+index b2a518db2..547473c10 100644
+--- a/src/scripting/flash/globalization/datetimeformatter.cpp
++++ b/src/scripting/flash/globalization/datetimeformatter.cpp
+@@ -78,7 +78,7 @@ ASFUNCTIONBODY_ATOM(DateTimeFormatter,_constructor)
+ if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName))
+ {
+ std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName);
+- th->currlocale = std::locale(localeName);
++ th->currlocale = std::locale(localeName.c_str());
+ th->actualLocaleIDName = th->requestedLocaleIDName;
+ th->lastOperationStatus="noError";
+ }
+diff --git a/src/scripting/flash/globalization/localeid.cpp b/src/scripting/flash/globalization/localeid.cpp
+index 822fe3790..4d11de444 100644
+--- a/src/scripting/flash/globalization/localeid.cpp
++++ b/src/scripting/flash/globalization/localeid.cpp
+@@ -58,7 +58,7 @@ ASFUNCTIONBODY_ATOM(LocaleID,_constructor)
+ if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName))
+ {
+ std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName);
+- th->currlocale = std::locale(localeName);
++ th->currlocale = std::locale(localeName.c_str());
+ th->actualLocaleIDName = th->requestedLocaleIDName;
+ th->lastOperationStatus="noError";
+ }
+diff --git a/src/scripting/flash/globalization/numberformatter.cpp b/src/scripting/flash/globalization/numberformatter.cpp
+index 54b190629..619a54198 100644
+--- a/src/scripting/flash/globalization/numberformatter.cpp
++++ b/src/scripting/flash/globalization/numberformatter.cpp
+@@ -76,7 +76,7 @@ ASFUNCTIONBODY_ATOM(NumberFormatter,_constructor)
+ if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName))
+ {
+ std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName);
+- th->currlocale = std::locale(localeName);
++ th->currlocale = std::locale(localeName.c_str());
+ th->actualLocaleIDName = th->requestedLocaleIDName;
+ th->lastOperationStatus="noError";
+ }
+diff --git a/src/scripting/flash/globalization/stringtools.cpp b/src/scripting/flash/globalization/stringtools.cpp
+index 9f4f9115e..ce63769c6 100644
+--- a/src/scripting/flash/globalization/stringtools.cpp
++++ b/src/scripting/flash/globalization/stringtools.cpp
+@@ -52,7 +52,7 @@ ASFUNCTIONBODY_ATOM(StringTools,_constructor)
+ if (sys->localeManager->isLocaleAvailableOnSystem(th->requestedLocaleIDName))
+ {
+ std::string localeName = sys->localeManager->getSystemLocaleName(th->requestedLocaleIDName);
+- th->currlocale = std::locale(localeName);
++ th->currlocale = std::locale(localeName.c_str());
+ th->actualLocaleIDName = th->requestedLocaleIDName;
+ th->lastOperationStatus="noError";
+ }
diff --git a/lightspark.spec b/lightspark.spec
index 59399a2..9b69586 100644
--- a/lightspark.spec
+++ b/lightspark.spec
@@ -7,7 +7,7 @@
Name: lightspark
Version: 0.8.5
-Release: 2%{?git_snapshot:.%{date}git%{commit_short}}%{?dist}
+Release: 3%{?git_snapshot:.%{date}git%{commit_short}}%{?dist}
Summary: An alternative Flash Player implementation
License: LGPLv3+
URL: http://lightspark.github.io/
@@ -17,6 +17,10 @@ Source0: https://github.com/lightspark/lightspark/archive/%{commit}.tar.g
Source0: https://github.com/lightspark/lightspark/archive/%{version}/%{name}-%{ver...
%endif
+# Fix build on EL7 (gcc4.8)
+# https://github.com/lightspark/lightspark/commit/4d81b0977433f52d944d89a3c...
+Patch0: lightspark-0.8.5-gcc48.patch
+
BuildRequires: cmake3
BuildRequires: desktop-file-utils
BuildRequires: ffmpeg-devel
@@ -72,6 +76,7 @@ This is the Chromium compatible plugin for %{name}.
%setup -q -n %{name}-%{commit}
%else
%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .gcc48
%endif
@@ -83,11 +88,11 @@ This is the Chromium compatible plugin for %{name}.
%{?with_tightspark: -DCOMPILE_TIGHTSPARK=1} \
.
-%cmake_build
+%cmake3_build
%install
-%cmake_install
+%cmake3_install
%find_lang %{name}
%if %{with tightspark}
@@ -125,6 +130,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Fri Nov 26 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.8.5-3
+- Fix build for EL7 (gcc 4.8)
+
* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 0.8.5-2
- Rebuilt for new ffmpeg snapshot
2 years, 5 months
[vdr-xineliboutput] Update to 2.2.0-11.20210820gitf4df324
by Martin Gansser
commit 72be61dfcbd4e216ea75c6163d8b38e4cc5e123a
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Nov 26 14:46:59 2021 +0100
Update to 2.2.0-11.20210820gitf4df324
.gitignore | 1 +
sources | 2 +-
vdr-xineliboutput.spec | 9 ++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68fc4dc..b95c004 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ vdr-xineliboutput-1.1.0-20150422.tgz
/vdr-xineliboutput-2.1.0-32a5ffc.tar.gz
/vdr-xineliboutput-2.2.0-43e9fa7.tar.gz
/vdr-xineliboutput-2.2.0-0b9a01d.tar.gz
+/vdr-xineliboutput-2.2.0-f4df324.tar.gz
diff --git a/sources b/sources
index 5f0ce7a..ecce00d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-xineliboutput-2.2.0-0b9a01d.tar.gz) = 198784852fc582f673fe74ce6d9281f9471e40e50d300301f9029c8b347c01a9857d86a78c2522c31b2a6fdcae35d6964b7e40e7208aa52670d10350ec984750
+SHA512 (vdr-xineliboutput-2.2.0-f4df324.tar.gz) = 19b5d8f48fab447360504b25b6e5d29678eb4e2341e1f61285be5bd8ec8c4f9ebad4bd157ba040906f92e1eb06ac543680319f275af490c5c8f851895881d9c2
diff --git a/vdr-xineliboutput.spec b/vdr-xineliboutput.spec
index 4b7e6b2..ab1745f 100644
--- a/vdr-xineliboutput.spec
+++ b/vdr-xineliboutput.spec
@@ -3,15 +3,15 @@
%global xinepluginver 2.2.0
%global pname xineliboutput
%global vdrver %(pkg-config --modversion vdr 2>/dev/null || echo ERROR)
-%global gitrev 0b9a01d
-%global gitdate 20200830
+%global gitrev f4df324
+%global gitdate 20210820
# build bluray support (disabled for now)
%global have_bluray 1
%global have_wayland 1
Name: vdr-%{pname}
Version: 2.2.0
-Release: 10.%{gitdate}git%{gitrev}%{?dist}
+Release: 11.%{gitdate}git%{gitrev}%{?dist}
Summary: Plugins for watching VDR over Xine
License: GPLv2+
URL: http://sourceforge.net/projects/xineliboutput
@@ -161,6 +161,9 @@ find %{buildroot}%{xineplugindir} -name '*.so' -exec chmod +x '{}' ';'
%endif
%changelog
+* Wed Nov 24 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 2.2.0-11.20210820gitf4df324
+- Update to 2.2.0-11.20210820gitf4df324
+
* Fri Nov 12 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.2.0-10.20200830git0b9a01d
- Rebuilt for new ffmpeg snapshot
2 years, 5 months
[xorg-x11-drv-nvidia-470xx] fix rfbz#6149
by Leigh Scott
commit 779f387a665f9e8bdc0c56048ed03d8c179d2902
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Nov 26 09:17:07 2021 +0000
fix rfbz#6149
xorg-x11-drv-nvidia-470xx.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia-470xx.spec b/xorg-x11-drv-nvidia-470xx.spec
index 7ecf9e3..4f85c56 100644
--- a/xorg-x11-drv-nvidia-470xx.spec
+++ b/xorg-x11-drv-nvidia-470xx.spec
@@ -25,7 +25,7 @@
Name: xorg-x11-drv-%{_nvidia_serie}
Epoch: 3
Version: 470.86
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 470xx series proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -554,6 +554,9 @@ fi ||:
%endif
%changelog
+* Fri Nov 26 2021 Leigh Scott <leigh123linux(a)gmail.com> - 3:470.86-2
+- fix rfbz#6149
+
* Mon Nov 15 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3:470.86-1
- Updated to version 470.86.
2 years, 5 months
[rpmfusion-nonfree-release/rf-next: 4/4] Add Next testing repos
by Xavier Bachelot
commit 8869001e2bb8e33eca8756e32940a5cc1e68b2ca
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Nov 25 22:41:39 2021 +0100
Add Next testing repos
rpmfusion-nonfree-next-testing.repo | 33 +++++++++++++++++++++++++++++++++
rpmfusion-nonfree-release.spec | 4 +++-
2 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-nonfree-next-testing.repo b/rpmfusion-nonfree-next-testing.repo
new file mode 100644
index 0000000..e13390a
--- /dev/null
+++ b/rpmfusion-nonfree-next-testing.repo
@@ -0,0 +1,33 @@
+[rpmfusion-nonfree-next]
+name=RPM Fusion for EL 8 - Nonfree - Next Test
+#baseurl=http://download1.rpmfusion.org/nonfree/el/testing/next/8/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-test-8&arch=$basearch
+enabled=0
+metadata_expire=6h
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8
+
+[rpmfusion-nonfree-next-debuginfo]
+name=RPM Fusion for EL 8 - Nonfree - Next Test Debug
+#baseurl=http://download1.rpmfusion.org/nonfree/el/testing/next/8/$basearch/debug/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-test-debug-8&arch=$basearch
+enabled=0
+metadata_expire=6h
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8
+
+[rpmfusion-nonfree-next-source]
+name=RPM Fusion for EL 8 - Nonfree - Next Test Source
+#baseurl=http://download1.rpmfusion.org/nonfree/el/testing/next/8/SRPMS/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-test-source-8&arch=$basearch
+enabled=0
+metadata_expire=6h
+type=rpm-md
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8
+
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 7ecc4cf..e6e62dd 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -13,6 +13,7 @@ Source2: rpmfusion-%{_repo}-updates.repo
Source3: rpmfusion-%{_repo}-updates-testing.repo
Source5: rpmfusion-%{_repo}-tainted.repo
Source6: rpmfusion-%{_repo}-next.repo
+Source6: rpmfusion-%{_repo}-next-testing.repo
BuildArch: noarch
Requires: redhat-release >= %{version}
@@ -82,6 +83,7 @@ install -d -m755 \
%{SOURCE3} \
%{SOURCE5} \
%{SOURCE6} \
+ %{SOURCE7} \
%{buildroot}%{_sysconfdir}/yum.repos.d
%files
@@ -92,7 +94,7 @@ install -d -m755 \
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%files next
-%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-next.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-next*.repo
%changelog
* Fri Jul 23 2021 Xavier Bachelot <xavier(a)bachelot.org> - 8-0.2
2 years, 5 months
[rpmfusion-nonfree-release/rf-next: 3/4] Fixup
by Xavier Bachelot
commit bf046c2d82d091878d400812b5cf9d61ec119f5a
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Nov 25 22:40:55 2021 +0100
Fixup
rpmfusion-nonfree-next.repo | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-nonfree-next.repo b/rpmfusion-nonfree-next.repo
index 84bf83f..20f1466 100644
--- a/rpmfusion-nonfree-next.repo
+++ b/rpmfusion-nonfree-next.repo
@@ -1,5 +1,5 @@
[rpmfusion-nonfree-next]
-name=RPM Fusion for EL 8 - Nonfree next
+name=RPM Fusion for EL 8 - Nonfree - Next
#baseurl=http://download1.rpmfusion.org/nonfree/el/next/8/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-8&ar...
enabled=1
@@ -10,7 +10,7 @@ repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8
[rpmfusion-nonfree-next-debuginfo]
-name=RPM Fusion for EL 8 - Nonfree next - Debug
+name=RPM Fusion for EL 8 - Nonfree - Next Debug
#baseurl=http://download1.rpmfusion.org/nonfree/el/next/8/$basearch/debug/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-debu...
enabled=0
@@ -21,7 +21,7 @@ repo_gpgcheck=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8
[rpmfusion-nonfree-next-source]
-name=RPM Fusion for EL 8 - Nonfree next - Source
+name=RPM Fusion for EL 8 - Nonfree - Next Source
#baseurl=http://download1.rpmfusion.org/nonfree/el/next/8/SRPMS/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-next-sour...
enabled=0
2 years, 5 months
