[dvb-firmware] Drop compression and fix duplicates
by Nicolas Chauvet
commit 846db019bb7caefcf84b9b8880bcdca7afff3f51
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Aug 17 20:18:58 2023 +0200
Drop compression and fix duplicates
dvb-firmware.spec | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/dvb-firmware.spec b/dvb-firmware.spec
index db23c3f..c795f95 100644
--- a/dvb-firmware.spec
+++ b/dvb-firmware.spec
@@ -4,7 +4,7 @@
Name: dvb-firmware
Version: %{commitdate0}
-Release: 6.git%{shortcommit0}%{?dist}
+Release: 7.git%{shortcommit0}%{?dist}
Summary: DVB firmware nonfree
License: Redistributable, no modification permitted
@@ -32,10 +32,21 @@ Summary: DVB firmware nonfree
%install
+# Remove linux-firmware provided content
+rm -rf firmware/go7007
+
+# Remove ivtv-firmware
+for i in v4l-cx2341x-dec.fw v4l-cx2341x-enc.fw v4l-cx2341x-init.mpg v4l-pvrusb2-24xxx-01.fw v4l-pvrusb2-29xxx-01.fw ; do
+ rm -f firmware/${i}
+done
+
mkdir -p %{buildroot}/lib/firmware
# Verify that this package co-install with linux-firmware
for i in $(find firmware ! -type d) ; do
if [ -e /lib/${i}.xz ] ; then
+ rm -f ${i}.xz
+ echo "Removing ${i}.xz"
+ elif [ -e /lib/${i} ] ; then
rm -f ${i}
echo "Removing ${i}"
fi
@@ -46,23 +57,15 @@ cp -pr firmware/* %{buildroot}/lib/firmware
# Remove empty directories
find %{buildroot}/lib/firmware/* -empty -type d -delete
-# Remove linux-firmware provided content
-rm -rf %{buildroot}/lib/firmware/LICENCE.go7007
-
-# Remove ivtv-firmware
-for i in v4l-cx2341x-dec.fw v4l-cx2341x-enc.fw v4l-cx2341x-init.mpg v4l-pvrusb2-24xxx-01.fw v4l-pvrusb2-29xxx-01.fw ; do
- rm -f %{buildroot}/lib/firmware/${i}
-done
-
-# Compress to xz
-find %{buildroot}/lib/firmware -name "dvb*" -type f -exec xz {} ';'
-
%files nonfree
/lib/firmware/*
%changelog
+* Thu Aug 17 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 20230604-7.git3c1910b
+- Drop compression and fix duplicates - rfbz#6736
+
* Sat Aug 05 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 20230604-6.git3c1910b
- Update snapshot
- Fix duplication and xz compress - rfbz#6736
1 year, 3 months
[mesa-freeworld/f38] Update to 23.1.6
by Thorsten Leemhuis
commit fb251e8d76c179840e71ceac39fbe070ece48fce
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Thu Aug 17 15:37:01 2023 +0200
Update to 23.1.6
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
.gitignore | 1 +
mesa-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 709fc10..6c612bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/mesa-23.1.3.tar.xz
/mesa-23.1.4.tar.xz
/mesa-23.1.5.tar.xz
+/mesa-23.1.6.tar.xz
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index d26083f..6332b53 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -64,7 +64,7 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 23.1.5
+%global ver 23.1.6
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
License: MIT
@@ -316,6 +316,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%license docs/license.rst
%endif
%changelog
+* Thu Aug 17 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.1.6-1
+- Update to 23.1.6
+
* Thu Aug 3 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.1.5-1
- Update to 23.1.5
diff --git a/sources b/sources
index 32fe2ce..74a0745 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-23.1.5.tar.xz) = c5eac5a497561374eaf931214aebc9001820c5ab49f9b8c5634b62af081b03b2f21c169c936524b2953c8815eb27dfb5c8c12276b9b1c119722cd6fea0b22d85
+SHA512 (mesa-23.1.6.tar.xz) = 24f1c626fa05a82bcdfb24b67b8e5f96f94d5748309631b83e8d7a62142853cd3be90b92c56bac3bc4d223bf40b424d6d6a9977537b899107295b7d45d7e2575
1 year, 3 months
[obs-ndi] Update changelog
by Nicolas Chauvet
commit 3a6a696f07c93d9ec1ee36dd1da4cc30d6c53808
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Aug 16 13:38:40 2023 +0200
Update changelog
obs-ndi.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/obs-ndi.spec b/obs-ndi.spec
index 81df8af..33dda42 100644
--- a/obs-ndi.spec
+++ b/obs-ndi.spec
@@ -1,6 +1,6 @@
Name: obs-ndi
Version: 4.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Network A/V in OBS Studio with NewTek's NDI technology
License: GPLv2+
@@ -53,6 +53,9 @@ sed -i -e 's|/usr/local/lib|/usr/local/%{_lib}|' src/obs-ndi.cpp
%changelog
+* Wed Aug 16 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 4.11.1-3
+- Switch to qt6 - rfbz#6747
+
* Thu Aug 03 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 4.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 year, 3 months
[obs-ndi] Switch to qt6
by Nicolas Chauvet
commit 32a7279fc73dbe4d771d69cabdf4a9b29ae0df4f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Aug 16 13:38:18 2023 +0200
Switch to qt6
obs-ndi.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/obs-ndi.spec b/obs-ndi.spec
index b659f76..81df8af 100644
--- a/obs-ndi.spec
+++ b/obs-ndi.spec
@@ -7,13 +7,13 @@ License: GPLv2+
URL: https://github.com/Palakis/obs-ndi
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-ExclusiveArch: i686 x86_64 armv7hl
+ExclusiveArch: i686 x86_64
BuildRequires: cmake
BuildRequires: make
BuildRequires: gcc-c++
-BuildRequires: cmake(Qt5Core)
-BuildRequires: cmake(Qt5Widgets)
+BuildRequires: cmake(Qt6Core)
+BuildRequires: cmake(Qt6Widgets)
BuildRequires: obs-studio-devel
Requires: obs-studio
# A libndi.so.5 implementation is meant to be dlopen
1 year, 3 months
[vcmi/f39] New upstream release
by Leigh Scott
Summary of changes:
58e2236... New upstream release (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 3 months
[vcmi] New upstream release
by Leigh Scott
commit 58e22369ac1eff76c88c5f32d90338df905532b9
Author: Trung Lê <8(a)tle.id.au>
Date: Tue Aug 15 12:56:37 2023 +0100
New upstream release
ac81d0f.patch | 62 -----------------------------------------------------------
sources | 5 ++---
vcmi.spec | 32 +++++++++++++++---------------
3 files changed, 17 insertions(+), 82 deletions(-)
---
diff --git a/sources b/sources
index 590d947..65cfc40 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (vcmi.tar.gz) = d0b6ce3e51bd7e45bfd98bf4edfb219b64fdbdc765926a1b7ca44455c68390b18f72e5f4f44daade50bdca228bbd5c4d2ef4ace296a3a6be9eb2a82aee169f85
-SHA512 (fuzzylite-9751a75.tar.gz) = 0925487f00a0997b8ea9819a8d2f5161f797b3f3b2e69cc0859fd85d85859a013e5b6775e4a5bbf5ad5422f62139a592f03b885d567e3dcab69f7a6dab4fe9d7
-SHA512 (vcmi-1.0.0.tar.gz) = c88d307594dc73c2eb22b3c5237b9e37ea1e2f98cac2b10882a040a96fcf903ac6ec140f1cf031417c71c414e271a17d29409d4395402a669737573c6ee09ef0
+SHA512 (vcmi-1.3.0.tar.gz) = a7fbbfcc37d850ab0f9334c0c514c28db4a3d74b2f1756b2665a2adc61e2260003057349146b84f17671fc445cdaafabfd5e8a84f070f12d04ba2476759e4e03
+SHA512 (fuzzylite-7aee562.tar.gz) = f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
diff --git a/vcmi.spec b/vcmi.spec
index ca9e588..db7012f 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -2,13 +2,13 @@ Name: vcmi
Summary: Heroes of Might and Magic 3 game engine
URL: https://vcmi.eu/
-%global fuzzylite_commit 9751a751a17c0682ed5d02e583c6a0cda8bc88e5
+%global fuzzylite_commit 7aee562d6ca17f3cf42588ffb5116e03017c3c50
%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
%global fuzzylite_version 6.0
-Version: 1.0.0
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
# vcmi is GPLv2+, fyzzylight is GPLv3
License: GPLv2+ and GPLv3
@@ -16,12 +16,6 @@ License: GPLv2+ and GPLv3
Source0: https://github.com/vcmi/vcmi/archive/refs/tags/%{version}/%{name}-%{versi...
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)
-# unzip delete Maps and repack as tar.gz
-Source2: %{name}.tar.gz
-
Patch0: fix_ffmpeg_suffix.patch
# The Koji builder gets killed here, but I don't expect people to use this there
@@ -45,11 +39,12 @@ BuildRequires: boost-program-options >= 1.51
BuildRequires: boost-locale >= 1.51
BuildRequires: libappstream-glib
BuildRequires: luajit-devel
-BuildRequires: minizip-devel
+BuildRequires: minizip-ng-devel
BuildRequires: tbb-devel
BuildRequires: zlib-devel
BuildRequires: ffmpeg-devel
BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
Requires: %{name}-data = %{version}-%{release}
@@ -79,19 +74,15 @@ Data files for the VCMI project, a %{summary}.
# fuzzyight from Source1:
tar -xf %{SOURCE1} -C AI/FuzzyLite --strip-components=1
-# mods from Source2:
-tar -xf %{SOURCE2} -C Mods --strip-components=2
-
-dos2unix README.md license.txt AUTHORS ChangeLog
+dos2unix README.md license.txt AUTHORS ChangeLog.md
# Don't show GITDIR-NOTFOUND in the window title
sed -i 's/GITDIR-NOTFOUND/%{version}/' cmake_modules/*
%build
-# low effort fix of some cmake brokenness
-export CXXFLAGS="%{build_cxxflags} -I/usr/include/ffmpeg"
%cmake -Wno-dev \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DENABLE_TEST=0 \
-UCMAKE_INSTALL_LIBDIR \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
@@ -116,8 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%files
-%doc README.md AUTHORS ChangeLog
+%doc README.md AUTHORS ChangeLog.md
%license license.txt AI/FuzzyLite/LICENSE.FuzzyLite
+%{_bindir}/vcmieditor
%{_bindir}/vcmiclient
%{_bindir}/vcmiserver
%{_bindir}/vcmibuilder
@@ -127,6 +119,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
# keep this in the main package, because GNOME Software etc.
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/vcmiclient.png
+%{_datadir}/icons/hicolor/*/apps/vcmiclient.svg
+%{_datadir}/icons/hicolor/*/apps/vcmieditor.png
%{_metainfodir}/eu.vcmi.VCMI.metainfo.xml
@@ -136,6 +130,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Mon Aug 14 2023 Trung Lê <8(a)tle.id.au> - 1.3.0-1
+- New upstream release
+- Clean up defunct codes
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
1 year, 3 months