[mythtv] Update to 31.0.130.20210108git016630a35c from branch fixes/31
by Sérgio M. Basto
commit b8235ddb02970088c1f5fa6b42b4aa8a4298edc4
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 17 16:16:19 2021 +0000
Update to 31.0.130.20210108git016630a35c from branch fixes/31
.gitignore | 1 +
mythtv.spec | 11 +-
sources | 1 +
update_fixes.sh | 10 +-
v31.0..eb3c84de5f.patch | 13779 ----------------------------------------------
5 files changed, 14 insertions(+), 13788 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 493296a..86a474d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ mythtv-0.27.5.tar.gz
/mythtv-30.0.tar.gz
/v30.0..b774c4140b.patch
/mythtv-31.0.tar.gz
+/v31.0..016630a35c.patch
diff --git a/mythtv.spec b/mythtv.spec
index 0b1e53b..dfeb8a0 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -57,13 +57,13 @@
%global desktop_applications mythfrontend mythtv-setup
# git has used to fetch fixes diff
-%global githash eb3c84de5fe12831d386d15452aeb7658841e072
+%global githash 016630a35cd24d3d1e4eca11e62758161d5af92f
%global shorthash %(c=%{githash}; echo ${c:0:10})
# MythTV Version string -- preferably the output from git describe
-%global vers_string v31.0-118-geb3c84de5f
+%global vers_string v31.0-130-g016630a35c
%global rel_date 20201031
-%global rel_string .%{rel_date}git%{shorthash}
+%global rel_string .130.20210108git016630a35c
%global branch fixes/31
@@ -72,7 +72,7 @@
#
Name: mythtv
Version: 31.0
-Release: 11%{rel_string}%{?dist}
+Release: 12%{rel_string}%{?dist}
Summary: A digital video recorder (DVR) application
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -1382,6 +1382,9 @@ exit 0
%changelog
+* Sun Jan 17 2021 Sérgio Basto <sergio(a)serjux.com> - 31.0-12.130.20210108git016630a35c
+- Update to 31.0.130.20210108git016630a35c from branch fixes/31
+
* Mon Dec 07 2020 Sérgio Basto <sergio(a)serjux.com>
- Fix for rfbz #5843
diff --git a/sources b/sources
index 90e27b3..1f40d10 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (mythtv-31.0.tar.gz) = 8df6bf6105a073a0a019f93e22228ff8500945f57a2205ffcd7ef20a69e7d74467068b7b3b2ee0896808e54b11007273dd6a520d75a716fac146c566c4f8ae3e
+SHA512 (v31.0..016630a35c.patch) = 7dce063331e6d55c182e7ab507ff67cb1174800e9c60f47789e9607087dcc0b168273cf2fcb67b74d0c98a4ee559dd48a81c50e42b8092bf2d8d404c8718af8f
diff --git a/update_fixes.sh b/update_fixes.sh
index d56acac..abb7525 100755
--- a/update_fixes.sh
+++ b/update_fixes.sh
@@ -1,8 +1,8 @@
if ! [ -d "mythtv" ]; then
git clone git://github.com/MythTV/mythtv.git
fi
-version=29.1
-branch=fixes/29
+version=31.0
+branch=fixes/31
pushd mythtv
git checkout $branch
git pull
@@ -16,9 +16,9 @@ popd
# Clean previous modifications on mythtv.spec
echo Press enter to run: Clean previous modifications on mythtv.spec; read dummy;
git checkout mythtv.spec
-sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" mythtv.spec
-sed -i "s|^%define rel_string .*|%define rel_string $relversion|" mythtv.spec
-sed -i "s|^%define githash .*|%define githash $githash|" mythtv.spec
+sed -i "s|global vers_string .*|global vers_string $newdescrib|" mythtv.spec
+sed -i "s|global rel_string .*|global rel_string $relversion|" mythtv.spec
+sed -i "s|global githash .*|global githash $githash|" mythtv.spec
rpmdev-bumpspec -c "Update to $version$relversion from branch $branch " mythtv.spec
spectool -g mythtv.spec
echo Press enter to run: rfpkg new-sources mythtv-${version}.tar.gz v${version}..${shorthash}.patch; read dummy;
3 years, 10 months
[mythtv] Restore helper scritp update_fixes.sh
by Sérgio M. Basto
commit 3776f408e9545c26b86cbd23bc9b093d2bc418f1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jan 17 16:09:33 2021 +0000
Restore helper scritp update_fixes.sh
update_fixes.sh | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
---
diff --git a/update_fixes.sh b/update_fixes.sh
new file mode 100755
index 0000000..d56acac
--- /dev/null
+++ b/update_fixes.sh
@@ -0,0 +1,37 @@
+if ! [ -d "mythtv" ]; then
+ git clone git://github.com/MythTV/mythtv.git
+fi
+version=29.1
+branch=fixes/29
+pushd mythtv
+git checkout $branch
+git pull
+#git log v$version..HEAD > ../ChangeLog
+newdescrib=$(git describe)
+date=$(git log -1 --format=%cd --date=short | tr -d \-)
+relversion=$(echo $newdescrib | sed "s/^[^-]*//; s/-/./g; s/\.g/.${date}git/")
+githash=$(git rev-parse HEAD)
+shorthash=$(echo $githash | cut -b -10)
+popd
+# Clean previous modifications on mythtv.spec
+echo Press enter to run: Clean previous modifications on mythtv.spec; read dummy;
+git checkout mythtv.spec
+sed -i "s|^%define vers_string .*|%define vers_string $newdescrib|" mythtv.spec
+sed -i "s|^%define rel_string .*|%define rel_string $relversion|" mythtv.spec
+sed -i "s|^%define githash .*|%define githash $githash|" mythtv.spec
+rpmdev-bumpspec -c "Update to $version$relversion from branch $branch " mythtv.spec
+spectool -g mythtv.spec
+echo Press enter to run: rfpkg new-sources mythtv-${version}.tar.gz v${version}..${shorthash}.patch; read dummy;
+rfpkg new-sources mythtv-${version}.tar.gz v${version}..${shorthash}.patch
+echo Press enter to continue; read dummy;
+rfpkg ci -c && git show
+echo Press enter to build current branch.; read dummy;
+rfpkg push && rfpkg build --nowait
+echo Press enter to build f29; read dummy;
+git checkout f28 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to build f28; read dummy;
+git checkout f28 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to build f27; read dummy;
+git checkout f27 && git merge master && git push && rfpkg build --nowait; git checkout master
+echo Press enter to build elf; read dummy;
+git checkout el7 && git merge master && git push && rfpkg build --nowait; git checkout master
3 years, 10 months
[fceux] Updated to new upstream release Obsoleted fceux-net-server because it is no longer supported upsteam
by Andrea Musuruane
commit 6dfc9f611e63456de01c422a157025a5c0f4ffad
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sun Jan 17 16:14:42 2021 +0100
Updated to new upstream release
Obsoleted fceux-net-server because it is no longer supported upsteam
.gitignore | 1 +
fceux-2.2.3-scons-python3.patch | 108 ------------------------------------
fceux.spec | 119 +++++++++++++++-------------------------
sources | 2 +-
4 files changed, 46 insertions(+), 184 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ab2beb..a687129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
fceux-2.2.2.src.tar.gz
/fceux-2.2.3.src.tar.gz
+/fceux-2.3.0.tar.gz
diff --git a/fceux.spec b/fceux.spec
index 9af58dc..fab120a 100644
--- a/fceux.spec
+++ b/fceux.spec
@@ -1,25 +1,26 @@
+%undefine __cmake_in_source_build
+
+%global giturl https://github.com/TASVideos/fceux.git
+%global commit 65c5b0d2a1c08db75bb41340bfa5534578926944
+
Name: fceux
-Version: 2.2.3
-Release: 10%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
License: GPLv2+
URL: http://fceux.com/
-Source: http://downloads.sourceforge.net/fceultra/%{name}-%{version}.src.tar.gz
-# Fix building with python3 scons
-# Patch from ArchLinux
-Patch0: %{name}-2.2.3-scons-python3.patch
+Source: http://downloads.sourceforge.net/fceultra/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
-BuildRequires: scons
-BuildRequires: SDL-devel >= 1.2.14
-BuildRequires: gtk2-devel >= 2.18
-BuildRequires: gd-devel
+BuildRequires: cmake
+BuildRequires: SDL2-devel
+BuildRequires: qt5-qtbase-devel
BuildRequires: compat-lua-devel
-%if 0%{?fedora} >= 30
-BuildRequires: minizip-compat-devel
-%else
+%if 0%{?rhel}
BuildRequires: minizip-devel
+%else
+BuildRequires: minizip-compat-devel
%endif
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -28,6 +29,7 @@ Provides: fceultra = %{version}-%{release}
Obsoletes: fceultra < 2.0.0
Provides: gfceu = %{version}-%{release}
Obsoletes: gfceu <= 0.6.2
+Obsoletes: fceux-net-server <= 2.2.3
%description
@@ -42,22 +44,11 @@ of all worlds for the casual player, the ROM-hacking community, Lua
Scripters, and the Tool-Assisted Speedrun Community.
-%package net-server
-Summary: Server for the FCEUX emulator
-
-%description net-server
-FCEUX clients can connect to this server and play multiplayer NES games over
-the network.
-
-
%prep
-%autosetup -p1
-
-# Remove windows binary
-rm fceux-server/fceux-net-server.exe
+%autosetup
-# Remove ~attic directories
-find . -name '~attic' -type d -prune -exec rm -rf {} \;
+# Remove attic directories
+find . -name 'attic' -type d -prune -exec rm -rf {} \;
# Remove Visual Studio directory
rm -rf vc
@@ -65,66 +56,45 @@ rm -rf vc
# Remove bundled LUA library
rm -rf src/lua
-# Fix for LUA 5.1
-sed -i 's/lua5.1/lua-5.1/' SConstruct
-
# Remove bundled minizip library
rm -rf src/utils/unzip.*
# Fix end-of-line-encoding
sed -i 's/\r//' changelog.txt NewPPUtests.txt \
- documentation/Videolog.txt \
- fceux-server/{AUTHORS,ChangeLog,README}
+ documentation/Videolog.txt
# Fix desktop file
-sed -i 's/\/usr\/share\/pixmaps\/fceux.png/fceux/' fceux.desktop
+sed -i 's/\/usr\/share\/pixmaps\/fceux1.png/fceux/' fceux.desktop
sed -i '/MimeType=*/s/$/;/' fceux.desktop
sed -i '/OnlyShowIn=*/s/$/;/' fceux.desktop
+# Public release
+sed -i 's!//#define PUBLIC_RELEASE!#define PUBLIC_RELEASE!' src/version.h
+
+# Set git data
+sed -i -r 's!(GIT_URL=).+!\1"%{giturl}"!' scripts/genGitHdr.sh
+sed -i -r 's!(GIT_REV=).+!\1"%{commit}"!' scripts/genGitHdr.sh
+
%build
-%set_build_flags macro
-# Enable system LUA
-# Enable system minizip
-# Enable AVI creation
-scons %{?_smp_mflags} \
- SYSTEM_LUA=1 \
- SYSTEM_MINIZIP=1 \
- CREATE_AVI=1
+%cmake
+%cmake_build
%install
-# Install binary files
-install -d %{buildroot}%{_bindir}
-install -p -m 755 bin/fceux %{buildroot}%{_bindir}
-install -p -m 755 bin/fceux-net-server %{buildroot}%{_bindir}
+%cmake_install
-# Install data
-install -d %{buildroot}%{_datadir}/%{name}
-cp -pR output/{palettes,luaScripts} %{buildroot}%{_datadir}/%{name}
-install -p -m 644 bin/auxlib.lua %{buildroot}%{_datadir}/%{name}/luaScripts/
-
-# Install icon
+# Install icons
install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -d %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+install -p -m 644 %{name}1.png \
+ %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-# Install desktop file
-desktop-file-install \
- --dir %{buildroot}%{_datadir}/applications \
- %{name}.desktop
-
-# Install man pages
-install -d %{buildroot}%{_mandir}/man6
-install -p -m 644 documentation/fceux.6 \
- %{buildroot}%{_mandir}/man6/
-install -p -m 644 documentation/fceux-net-server.6 \
- %{buildroot}%{_mandir}/man6/
-
-# Install config file
-install -d %{buildroot}%{_sysconfdir}
-install -p -m 644 fceux-server/fceux-server.conf \
- %{buildroot}%{_sysconfdir}
+# Validate desktop file
+desktop-file-validate \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
%files
@@ -132,20 +102,19 @@ install -p -m 644 fceux-server/fceux-server.conf \
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%exclude %{_datadir}/pixmaps/%{name}1.png
%{_mandir}/man6/%{name}.6*
-%doc Authors changelog.txt NewPPUtests.txt README-SDL TODO-SDL
+%exclude %{_mandir}/man6/%{name}-net-server.6*
+%doc changelog.txt NewPPUtests.txt README TODO-SDL
%doc documentation/{cheat.html,faq,todo,TODO-PROJECT,Videolog.txt}
%license COPYING
-%files net-server
-%{_bindir}/fceux-net-server
-%config(noreplace) %{_sysconfdir}/fceux-server.conf
-%{_mandir}/man6/fceux-net-server.6*
-%doc fceux-server/{AUTHORS,ChangeLog,README}
-%license COPYING
-
%changelog
+* Mon Jan 4 11:08:08 CET 2021 Andrea Musuruane <musuruan(a)gmail.com> - 2.3.0-1
+- Updated to new upstream release
+- Obsoleted fceux-net-server because it is no longer supported upsteam
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.2.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index ec0a2db..38f9f2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8002b161ea3342decce1abcca76db84a fceux-2.2.3.src.tar.gz
+SHA512 (fceux-2.3.0.tar.gz) = 46b53f0c4c790ae4f7d5e800adf81cce3c7ccf4b06f972d46e29c0170485e291516709a8c28b26c762d535453e280a6c6de935869c7674bb135c3dca2e266407
3 years, 10 months
[smplayer] Update appdata.xml and relax the validation
by Sérgio M. Basto
commit d38af5b3ff9db89b3f849686f21cce1cde3db60c
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Jan 16 18:56:38 2021 +0000
Update appdata.xml and relax the validation
smplayer.appdata.xml | 2 +-
smplayer.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/smplayer.appdata.xml b/smplayer.appdata.xml
index 432e27d..966c92f 100644
--- a/smplayer.appdata.xml
+++ b/smplayer.appdata.xml
@@ -57,6 +57,6 @@
</screenshots>
<content_rating type="oars-1.1"/>
<releases>
- <release version="20.6.0" date="2020-06-17"/>
+ <release version="21.1.0" date="2021-01-06"/>
</releases>
</component>
diff --git a/smplayer.spec b/smplayer.spec
index 8898c00..e45d3a7 100644
--- a/smplayer.spec
+++ b/smplayer.spec
@@ -2,7 +2,7 @@ Name: smplayer
Version: 21.1.0
%global smplayer_themes_ver 20.11.0
%global smplayer_skins_ver 20.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer and mpv
License: GPLv2+
@@ -136,7 +136,7 @@ install -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-appstream-util validate --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%if (0%{?rhel} && 0%{?rhel} <= 7)
%post
@@ -176,6 +176,9 @@ fi
%{_datadir}/smplayer/themes/
%changelog
+* Sat Jan 16 2021 Sérgio Basto <sergio(a)serjux.com> - 21.1.0-2
+- Update appdata.xml and relax the validation
+
* Thu Jan 07 2021 Sérgio Basto <sergio(a)serjux.com> - 21.1.0-1
- Update smplayer to 21.1.0
3 years, 10 months
[vdr-mpv] Update to 0.3.0 Add BR libX11-devel
by Martin Gansser
commit 2f5b773c9d052ffa3c74c98a9464fda2d6c6a254
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Jan 16 13:44:55 2021 +0100
Update to 0.3.0
Add BR libX11-devel
vdr-mpv.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/vdr-mpv.spec b/vdr-mpv.spec
index 09ef21a..7deb5af 100644
--- a/vdr-mpv.spec
+++ b/vdr-mpv.spec
@@ -12,6 +12,7 @@ BuildRequires: gcc-c++
BuildRequires: vdr-devel >= 2.0.0
BuildRequires: mpv-libs-devel
BuildRequires: libxcb-devel
+BuildRequires: libX11-devel
BuildRequires: xcb-util-image-devel
BuildRequires: xcb-util-keysyms-devel
BuildRequires: xcb-util-wm-devel
@@ -42,6 +43,7 @@ make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%changelog
* Sat Jan 16 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.0-1
- Update to 0.3.0
+- Add BR libX11-devel
* Wed Jan 06 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.2.2-1
- Update to 0.2.2
3 years, 10 months
