[intel-media-driver] Update to 20.3.0
by Nicolas Chauvet
commit ba1b5b8e30a88135e3b7d6f4d1f3ec096787fe18
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Sep 30 18:31:37 2020 +0200
Update to 20.3.0
intel-media-driver.spec | 11 +++++++----
sources | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index 16beb68..c9e072c 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -1,10 +1,10 @@
-%global pre .pre8
+#global pre .pre8
%undefine __cmake_in_source_build
Name: intel-media-driver
-Version: 20.3
-Release: 0.2%{?pre}%{?dist}
+Version: 20.3.0
+Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
URL: https://github.com/intel/media-driver
@@ -24,7 +24,7 @@ BuildRequires: libappstream-glib >= 0.6.3
BuildRequires: pkgconfig(igdgmm)
BuildRequires: pkgconfig(libcmrt)
-BuildRequires: pkgconfig(libva) >= 1.3.0
+BuildRequires: pkgconfig(libva) >= 1.6.0
BuildRequires: pkgconfig(pciaccess)
BuildRequires: pkgconfig(x11)
@@ -96,6 +96,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Wed Sep 30 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20.3.0-1
+- Update to 20.3.0
+
* Tue Sep 29 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 20.3-0.2.pre8
- Update to pre8
diff --git a/sources b/sources
index c4c3400..1791b23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (intel-media-20.3.pre8.tar.gz) = 013de524cfe5a66ecbe7ea0ac464b03bf15fbab08e91174d5bdfdec2f9529372ebc0c1806d45ecc69c61e8c12738d0dd1e53af7dbe7c45f869782e839ba4eca7
+SHA512 (intel-media-20.3.0.tar.gz) = 59fa8c5db268491f0ae41de85d6e65ad7811f89dbc787f63b7378138952ba742b480a6b3cd21758c8d3b73fec2ab8d9854d8dda1a3d7f1b07e81df0c1c745f78
4 years, 1 month
[qt5-qtwebengine-freeworld] BR: xkbcommon
by Rex Dieter
commit b73840180acdef9104c0cc34a63fef67fb054d72
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Sep 30 09:13:53 2020 -0500
BR: xkbcommon
qt5-qtwebengine-freeworld.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index df3e71e..9ad7773 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -178,6 +178,7 @@ BuildRequires: pkgconfig(libpci)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(lcms2)
+BuildRequires: pkgconfig(xkbcommon)
## https://bugreports.qt.io/browse/QTBUG-59094
#BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: perl-interpreter
4 years, 1 month
[qt5-qtwebengine-freeworld] 5.15.1
by Rex Dieter
commit 4b252746deb130b138ace0c98d41c1538b7e96db
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Sep 30 08:33:35 2020 -0500
5.15.1
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 7 +++++--
qtwebengine-everywhere-src-5.10.0-linux-pri.patch | 13 +++++++------
sources | 2 +-
4 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91c8615..21117b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/qtwebengine-everywhere-src-5.14.1.tar.xz
/qtwebengine-everywhere-src-5.14.2.tar.xz
/qtwebengine-everywhere-src-5.15.0.tar.xz
+/qtwebengine-everywhere-src-5.15.1.tar.xz
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 53babc9..df3e71e 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -46,8 +46,8 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.15.0
-Release: 2%{?dist}
+Version: 5.15.1
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -446,6 +446,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Wed Sep 30 2020 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.1-1
+- 5.15.1
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 5.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch b/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
index 995db84..a4dc334 100644
--- a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
+++ b/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
@@ -1,9 +1,10 @@
-diff -ur qtwebengine-everywhere-src-5.10.0/src/buildtools/config/linux.pri qtwebengine-everywhere-src-5.10.0-linux-pri/src/buildtools/config/linux.pri
---- qtwebengine-everywhere-src-5.10.0/src/buildtools/config/linux.pri 2017-11-29 09:42:29.000000000 +0100
-+++ qtwebengine-everywhere-src-5.10.0-linux-pri/src/buildtools/config/linux.pri 2017-12-25 12:07:40.262411459 +0100
-@@ -157,3 +157,19 @@
- #qtConfig(webengine-system-jsoncpp): gn_args += use_system_jsoncpp=true
- #qtConfig(webengine-system-libsrtp: gn_args += use_system_libsrtp=true
+diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
+index 56c18bd..cb17c7a 100644
+--- a/src/buildtools/config/linux.pri
++++ b/src/buildtools/config/linux.pri
+@@ -176,3 +176,19 @@ host_build {
+ }
+ gn_args += use_glib=false
}
+
+# yasm is only used on x86, and passing use_system_yasm makes the build fail on
diff --git a/sources b/sources
index b37cad8..f2cd8e4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
-SHA512 (qtwebengine-everywhere-src-5.15.0.tar.xz) = 11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2
+SHA512 (qtwebengine-everywhere-src-5.15.1.tar.xz) = 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4
4 years, 1 month
[vcmi] Update to a git snapshot, pick the same one as Debian
by Miro Hrončok
commit f6243dd4cb6b9fce1d7256085148cce954731617
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Sep 29 21:46:59 2020 +0200
Update to a git snapshot, pick the same one as Debian
.gitignore | 6 +-
ac81d0f.patch | 62 +++++++++++
sources | 5 +-
vcmi-boost-1.66.patch | 280 --------------------------------------------------
vcmi-boost-1.69.patch | 59 -----------
vcmi-mods.patch | 13 ---
vcmi.spec | 79 +++++++-------
7 files changed, 114 insertions(+), 390 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5350a59..6ed0011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
-/vcmi-0.99.tar.gz
+/vcmi-*.tar.gz
+/fuzzylite-*.tar.gz
/vcmi.zip
+results_vcmi/
+/vcmi-*/
+*.src.rpm
diff --git a/ac81d0f.patch b/ac81d0f.patch
new file mode 100644
index 0000000..6e024d6
--- /dev/null
+++ b/ac81d0f.patch
@@ -0,0 +1,62 @@
+From ac81d0f7b42fb535748ec311ba877a6e6216567b Mon Sep 17 00:00:00 2001
+From: krkos <krkos(a)users.noreply.github.com>
+Date: Tue, 21 Jan 2020 09:55:28 +0100
+Subject: [PATCH] Fix build with Boost versioni >= 1.70 (#615)
+
+---
+ lib/serializer/Connection.h | 7 +++++++
+ server/CVCMIServer.cpp | 8 ++++++--
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/serializer/Connection.h b/lib/serializer/Connection.h
+index e6bfcfd86..6ba68d269 100644
+--- a/lib/serializer/Connection.h
++++ b/lib/serializer/Connection.h
+@@ -14,6 +14,11 @@
+
+ struct CPack;
+
++#if BOOST_VERSION >= 107000 // Boost version >= 1.70
++#include <boost/asio.hpp>
++typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp > TSocket;
++typedef boost::asio::basic_socket_acceptor < boost::asio::ip::tcp > TAcceptor;
++#else
+ namespace boost
+ {
+ namespace asio
+@@ -43,6 +48,8 @@ namespace boost
+
+ typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::stream_socket_service<boost::asio::ip::tcp> > TSocket;
+ typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::socket_acceptor_service<boost::asio::ip::tcp> > TAcceptor;
++#endif
++
+
+ /// Main class for network communication
+ /// Allows establishing connection and bidirectional read-write
+diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
+index 730ddba96..dfcfefe4e 100644
+--- a/server/CVCMIServer.cpp
++++ b/server/CVCMIServer.cpp
+@@ -214,8 +214,8 @@ void CVCMIServer::threadAnnounceLobby()
+
+ if(acceptor)
+ {
+- acceptor->get_io_service().reset();
+- acceptor->get_io_service().poll();
++ io->reset();
++ io->poll();
+ }
+ }
+
+@@ -272,7 +272,11 @@ void CVCMIServer::startAsyncAccept()
+ assert(!upcomingConnection);
+ assert(acceptor);
+
++#if BOOST_VERSION >= 107000 // Boost version >= 1.70
++ upcomingConnection = std::make_shared<TSocket>(acceptor->get_executor());
++#else
+ upcomingConnection = std::make_shared<TSocket>(acceptor->get_io_service());
++#endif
+ acceptor->async_accept(*upcomingConnection, std::bind(&CVCMIServer::connectionAccepted, this, _1));
+ }
+
diff --git a/sources b/sources
index f176b98..736f1ec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-686c2a0283184add785d50b447db806f vcmi-0.99.tar.gz
-2464d5e6200e95c8699c0c0ce38f1d47 vcmi.zip
+SHA512 (vcmi-f06c8a8.tar.gz) = 9c646c30e4b670fc362b505bd06b90153383a9f160a43710e03776c55ad6c77de4b50d31dd80934f2176299899028e76ab50cce362c0a051bf370cec66cba287
+SHA512 (fuzzylite-9751a75.tar.gz) = 0925487f00a0997b8ea9819a8d2f5161f797b3f3b2e69cc0859fd85d85859a013e5b6775e4a5bbf5ad5422f62139a592f03b885d567e3dcab69f7a6dab4fe9d7
+SHA512 (vcmi.zip) = f64966dfc1446fafa11870875a63a8bf48c2d8d80852ecf8337914a36fbc6061e21ffdbe9f0db872b442690c74e7c68f84ecc33d9de83246bed57b69f8cc0d71
diff --git a/vcmi.spec b/vcmi.spec
index 5f9da15..aa7fb3f 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -1,26 +1,31 @@
Name: vcmi
Summary: Heroes of Might and Magic 3 game engine
-Version: 0.99
-Release: 10%{?dist}
-License: GPLv2+
URL: https://vcmi.eu/
-Source: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}....
+%global commit f06c8a872592bddfbe3fd5116979af0679f27bd3
+%global scommit %(c=%{commit}; echo ${c:0:7})
-# Absolutely disgusting and untested patch for compatibility with Boost 1.66
-# Courtesy of Robert-André Mauchin during the review
-# Sent upstream via https://github.com/vcmi/vcmi/pull/285#issuecomment-370504722
-Patch1: %{name}-boost-1.66.patch
+%global fuzzylite_commit 9751a751a17c0682ed5d02e583c6a0cda8bc88e5
+%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
+%global fuzzylite_version 6.0
+
+
+Version: 0.99^20190113git%{scommit}
+Release: 1%{?dist}
+
+# vcmi is GPLv2+, fyzzylight is GPLv3
+License: GPLv2+ and GPLv3
+
+Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{scommit}.t...
+Source1: https://github.com/fuzzylite/fuzzylite/archive/%{fuzzylite_commit}/fuzzyl...
# Enable extra resolutions
# https://forum.vcmi.eu/t/where-is-the-mod-for-resolutions-other-than-800x6...
# https://www.dropbox.com/sh/fwor43x5xrgzx6q/AABpTFqGK7Q9almbyr3hp9jma/mods... (not directly downloadable)
Source2: %{name}.zip
-Patch2: %{name}-mods.patch
-# Boost 1.69 failures
-# tribool casts + https://github.com/vcmi/vcmi/commit/edcaaf036acb76882df2274f4df2aeef3c84525e
-Patch3: %{name}-boost-1.69.patch
+# Boost 1.71+
+Patch1: https://github.com/vcmi/vcmi/commit/ac81d0f.patch
# The Koji builder gets killed here, but I don't expect people to use this there
ExcludeArch: ppc64le
@@ -41,6 +46,7 @@ BuildRequires: boost-system >= 1.51
BuildRequires: boost-thread >= 1.51
BuildRequires: boost-program-options >= 1.51
BuildRequires: boost-locale >= 1.51
+BuildRequires: minizip-devel
BuildRequires: zlib-devel
BuildRequires: ffmpeg-devel
BuildRequires: ffmpeg-libs
@@ -48,7 +54,7 @@ BuildRequires: qt5-qtbase-devel
Requires: hicolor-icon-theme
Requires: %{name}-data = %{version}-%{release}
-
+Provides: bundled(fuzzylight) = %{fuzzylite_version}
%description
The purpose of VCMI project is to rewrite entire Heroes 3.5: WoG engine from
@@ -70,32 +76,38 @@ Data files for the VCMI project, a %{summary}.
%prep
-%setup -q -a2
-
-%patch1 -p1
+%setup -q -a1 -a2 -n %{name}-%{commit}
+# fuzzyight from Source1:
+rmdir AI/FuzzyLite
+mv fuzzylite-%{fuzzylite_commit} AI/FuzzyLite
# mods from Source2:
mv vcmi/Mods/* Mods && rm -rf vcmi
-%patch2 -p1
-%patch3 -p1
+dos2unix README.md license.txt AUTHORS ChangeLog
-dos2unix README.md README.linux license.txt AUTHORS ChangeLog
+%patch1 -p1
%build
-%cmake -DENABLE_TEST=0 -UCMAKE_INSTALL_LIBDIR
+# low effort fix of some cmake brokenness
+export CXXFLAGS="%{build_cxxflags} -I/usr/include/ffmpeg"
+
+%cmake \
+ -DENABLE_TEST=0 \
+ -UCMAKE_INSTALL_LIBDIR \
+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
+ -DCMAKE_INSTALL_RPATH=%{_libdir}/%{name}
-%ifarch %{ix86} x86_64
-%make_build
-%else
+%ifnarch %{ix86} x86_64
# not enough memory in Koji for parallel build
-make
+%global _smp_mflags -j1
%endif
+%cmake_build
%install
-%make_install
+%cmake_install
%check
@@ -106,8 +118,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%files
-%doc README.md README.linux AUTHORS ChangeLog
-%license license.txt
+%doc README.md AUTHORS ChangeLog
+%license license.txt AI/FuzzyLite/LICENSE.FuzzyLite
%{_bindir}/vcmiclient
%{_bindir}/vcmiserver
%{_bindir}/vcmibuilder
@@ -118,10 +130,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/vcmiclient.png
-# don't need devel and static packages until requested
-%exclude %{_includedir}/fl
-%exclude %{_libdir}/*.a
-
%files data
%{_datadir}/%{name}/
@@ -129,11 +137,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog
-* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.99-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jun 04 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.99-9
+* Tue Sep 29 2020 Miro Hrončok <mhroncok(a)redhat.com> - 0.99^20190113gitf06c8a8-1
+- Update to a git snapshot to support new Boost
+- Use RPATH to make it launch :/
+- Declare the bundled FuzzyLite
- Rebuilt for Boost 1.73
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 0.99-8
- Rebuild for ffmpeg-4.3 git
4 years, 1 month
[qtav/f33] Rebuild for Qt_5.15.1
by sagitter
Summary of changes:
3a5b580... Rebuild for Qt_5.15.1 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 1 month
[ffmpeg] Update glslang linker patch
by Leigh Scott
commit 6063a5cd014679106ea2630e1a7ed533480fe08c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Sep 29 16:22:34 2020 +0100
Update glslang linker patch
glslang_linker_flags.patch | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/glslang_linker_flags.patch b/glslang_linker_flags.patch
index e132dd8..9826b50 100644
--- a/glslang_linker_flags.patch
+++ b/glslang_linker_flags.patch
@@ -1,12 +1,33 @@
+From 98ea1a662ee172961feaa374fe8d26078838d250 Mon Sep 17 00:00:00 2001
+From: Philip Langdale <philipl(a)overt.org>
+Date: Mon, 17 Aug 2020 16:19:39 -0700
+Subject: [PATCH] configure: Add additional glslang libraries to make linking
+ work
+
+The latest builds of glslang introduce new libraries that need to be
+linked for all symbols to be fully resolved.
+
+This change will break building against older installations of glslang
+and it's very hard to tell them apart as the library change upstream
+was not accompanied by any version bump and no official release has
+been made with this change it - just lots of people packaging up git
+snapshots. So, apologies in advance.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 9ff246b..f13d1a8 100755
--- a/configure
+++ b/configure
-@@ -6308,7 +6308,7 @@
+@@ -6308,7 +6308,7 @@ enabled fontconfig && enable libfontconfig
enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
-enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
-+enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lMachineIndependent -lGenericCodeGen -lpthread -lstdc++
++enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-
+--
+2.7.4
4 years, 1 month
