[xpra-codecs-freeworld/f39: 7/8] Update xpra-codecs-freeworld to 5.0.10
by Sérgio M. Basto
commit 7b9054fffa8500e008bfe80140792b04c2a186d9
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Oct 13 01:18:29 2024 +0100
Update xpra-codecs-freeworld to 5.0.10
.gitignore | 1 +
ignore_assert_pandoc.patch | 8 ++++----
sources | 2 +-
xpra-codecs-freeworld.spec | 14 ++++++++++++--
4 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fb9bac..d15cfba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ xpra-0.16.3.tar.xz
/xpra-5.0.2.tar.gz
/xpra-5.0.3.tar.gz
/xpra-5.0.6.tar.gz
+/xpra-5.0.10.tar.gz
diff --git a/ignore_assert_pandoc.patch b/ignore_assert_pandoc.patch
index ceacee9..81f654e 100644
--- a/ignore_assert_pandoc.patch
+++ b/ignore_assert_pandoc.patch
@@ -28,12 +28,12 @@ Traceback (most recent call last):
assert r==0, "'%s' returned %s" % (" ".join(cmd), r)
^^^^
AssertionError: 'pandoc --from markdown --to html -o /builddir/build/BUILDROOT/xpra-4.4.4-1.fc38.ppc64le/usr/share/doc/xpra/Build/Debian.html ./docs/Build/Debian.md --lua-filter ./fs/bin/links-to-html.lua' returned -11
---- ./setup.py.orig 2023-03-13 17:59:39.193977373 +0000
-+++ ./setup.py 2023-03-13 17:59:48.477944801 +0000
-@@ -410,7 +410,7 @@ def convert_doc(fsrc, fdst, fmt="html",
+--- ./setup.py.orig 2024-10-11 13:20:23.798168651 +0100
++++ ./setup.py 2024-10-11 13:23:23.220858810 +0100
+@@ -514,7 +514,7 @@ def convert_doc(fsrc, fdst, fmt="html",
else:
cmd += ["--lua-filter", "./fs/bin/links-to-html.lua"]
- r = subprocess.Popen(cmd).wait(30)
+ r = subprocess.Popen(cmd).wait(TIMEOUT)
- assert r==0, "'%s' returned %s" % (" ".join(cmd), r)
+ #assert r==0, "'%s' returned %s" % (" ".join(cmd), r)
diff --git a/sources b/sources
index 0fb0044..ede007b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-5.0.6.tar.gz) = c25a763f4925c2ee987d7994cb040538635ba32bdfec830f386cae48e6acf4644b68198f79f42ddfef8174a16d6b40cdcedd75756fec1b23baa2319947a573be
+SHA512 (xpra-5.0.10.tar.gz) = e1b01eb1d36351db460d7631dd33efd24e68d374784d803fcd8ad6774b25509dcd42c2d62fd00999ec513265745a3be17dde611a61c07fa70136f319a9a4eaca
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 7a395be..d290aac 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -39,10 +39,10 @@
%endif
Name: xpra-codecs-freeworld
-Version: 5.0.6
+Version: 5.0.10
Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://www.xpra.org/
Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/xpra-%{ver...
Patch1: ignore_assert_pandoc.patch
@@ -91,6 +91,7 @@ BuildRequires: setxkbmap
%if %{with debug}
BuildRequires: libasan
%endif
+
%if %{with enc_x264}
BuildRequires: x264-devel
%endif
@@ -190,6 +191,15 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Sat Oct 12 2024 Sérgio Basto <sergio(a)serjux.com> - 5.0.10-1
+- Update xpra-codecs-freeworld to 5.0.10
+
+* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 5.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jun 13 2024 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.6-2
+- Rebuilt for Python 3.13
+
* Sat Feb 24 2024 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.6-1
- Release 5.0.6
1 month, 1 week
[lxdream] Fix for -Werror=incompatible-pointer-types
by Mamoru Tasaka
commit 15770d85fc1a663629243ae9d275d5b476948e3b
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Sun Oct 13 08:46:56 2024 +0900
Fix for -Werror=incompatible-pointer-types
Fix for -Werror=implicit-function-declaration
lxdream-0.9.1-header-include.patch | 10 ++++++++++
lxdream-0.9.1-pointer-type-cast.patch | 11 +++++++++++
lxdream.spec | 12 +++++++++++-
3 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/lxdream-0.9.1-header-include.patch b/lxdream-0.9.1-header-include.patch
new file mode 100644
index 0000000..0d70ad2
--- /dev/null
+++ b/lxdream-0.9.1-header-include.patch
@@ -0,0 +1,10 @@
+--- lxdream-0.9.1/src/gdrom/gdrom.c.include 2024-10-12 22:44:53.722357545 +0900
++++ lxdream-0.9.1/src/gdrom/gdrom.c 2024-10-12 22:58:30.514235708 +0900
+@@ -20,6 +20,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <arpa/inet.h>
+ #include "gdrom/ide.h"
+ #include "gdrom/gdrom.h"
+ #include "gdrom/gddriver.h"
diff --git a/lxdream-0.9.1-pointer-type-cast.patch b/lxdream-0.9.1-pointer-type-cast.patch
new file mode 100644
index 0000000..7e7925e
--- /dev/null
+++ b/lxdream-0.9.1-pointer-type-cast.patch
@@ -0,0 +1,11 @@
+--- lxdream-0.9.1/src/gtkui/gtk_ctrl.c.cast 2009-06-29 08:04:40.000000000 +0900
++++ lxdream-0.9.1/src/gtkui/gtk_ctrl.c 2024-10-12 22:56:06.019903467 +0900
+@@ -310,7 +310,7 @@ static gboolean maple_device_changed( Gt
+ MAPLE_VMU_HAS_NAME(maple_data[i].new_device, vmu_filename) ) {
+ maple_data[i].new_device->destroy(maple_data[i].new_device);
+ maple_data[i].new_device = NULL;
+- gtk_combo_box_set_active(maple_data[i].combo,0);
++ gtk_combo_box_set_active(GTK_COMBO_BOX(maple_data[i].combo),0);
+ }
+ }
+ MAPLE_SET_VMU_NAME(data->new_device,vmu_filename);
diff --git a/lxdream.spec b/lxdream.spec
index 53a5a8a..d7075fe 100644
--- a/lxdream.spec
+++ b/lxdream.spec
@@ -1,6 +1,6 @@
Name: lxdream
Version: 0.9.1
-Release: 25%{?dist}
+Release: 26%{?dist}
Summary: Sega Dreamcast emulator
License: GPLv2+
URL: http://www.lxdream.org
@@ -9,6 +9,10 @@ Source0: %{name}-%{version}.tar.gz
Source1: README.fedora
Patch0: %{name}-%{version}-glib.patch
Patch1: %{name}-%{version}-implicit.patch
+# Fix -Werror=incompatible-pointer-types
+Patch2: %{name}-%{version}-pointer-type-cast.patch
+# Fix -Werror=implicit-function-declaration
+Patch3: %{name}-%{version}-header-include.patch
BuildRequires: gcc
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -33,6 +37,8 @@ is already capable of running many demos and some games.
%setup -q
%patch -P0 -p1 -b .glib
%patch -P1 -p1 -b .implicit
+%patch -P2 -p1 -b .cast
+%patch -P3 -p1 -b .include
#Fix the desktop file
sed -i "s/Categories=Game;Emulator/Categories=Game;Emulator;/" lxdream.desktop
@@ -67,6 +73,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/lxdream.desktop
%changelog
+* Sat Oct 12 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.9.1-26
+- Fix for -Werror=incompatible-pointer-types
+- Fix for -Werror=implicit-function-declaration
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.9.1-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 month, 1 week
[xpra-codecs-freeworld] Update xpra-codecs-freeworld to 5.0.10
by Sérgio M. Basto
commit bdc6e1da1d838096ec2a18a87266e6d0cbde0307
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Oct 13 00:39:33 2024 +0100
Update xpra-codecs-freeworld to 5.0.10
.gitignore | 1 +
ignore_assert_pandoc.patch | 8 ++++----
sources | 2 +-
xpra-codecs-freeworld.spec | 10 +++++++---
4 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fb9bac..d15cfba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ xpra-0.16.3.tar.xz
/xpra-5.0.2.tar.gz
/xpra-5.0.3.tar.gz
/xpra-5.0.6.tar.gz
+/xpra-5.0.10.tar.gz
diff --git a/ignore_assert_pandoc.patch b/ignore_assert_pandoc.patch
index ceacee9..81f654e 100644
--- a/ignore_assert_pandoc.patch
+++ b/ignore_assert_pandoc.patch
@@ -28,12 +28,12 @@ Traceback (most recent call last):
assert r==0, "'%s' returned %s" % (" ".join(cmd), r)
^^^^
AssertionError: 'pandoc --from markdown --to html -o /builddir/build/BUILDROOT/xpra-4.4.4-1.fc38.ppc64le/usr/share/doc/xpra/Build/Debian.html ./docs/Build/Debian.md --lua-filter ./fs/bin/links-to-html.lua' returned -11
---- ./setup.py.orig 2023-03-13 17:59:39.193977373 +0000
-+++ ./setup.py 2023-03-13 17:59:48.477944801 +0000
-@@ -410,7 +410,7 @@ def convert_doc(fsrc, fdst, fmt="html",
+--- ./setup.py.orig 2024-10-11 13:20:23.798168651 +0100
++++ ./setup.py 2024-10-11 13:23:23.220858810 +0100
+@@ -514,7 +514,7 @@ def convert_doc(fsrc, fdst, fmt="html",
else:
cmd += ["--lua-filter", "./fs/bin/links-to-html.lua"]
- r = subprocess.Popen(cmd).wait(30)
+ r = subprocess.Popen(cmd).wait(TIMEOUT)
- assert r==0, "'%s' returned %s" % (" ".join(cmd), r)
+ #assert r==0, "'%s' returned %s" % (" ".join(cmd), r)
diff --git a/sources b/sources
index 0fb0044..ede007b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-5.0.6.tar.gz) = c25a763f4925c2ee987d7994cb040538635ba32bdfec830f386cae48e6acf4644b68198f79f42ddfef8174a16d6b40cdcedd75756fec1b23baa2319947a573be
+SHA512 (xpra-5.0.10.tar.gz) = e1b01eb1d36351db460d7631dd33efd24e68d374784d803fcd8ad6774b25509dcd42c2d62fd00999ec513265745a3be17dde611a61c07fa70136f319a9a4eaca
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index b9d0159..d290aac 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -39,10 +39,10 @@
%endif
Name: xpra-codecs-freeworld
-Version: 5.0.6
-Release: 3%{?dist}
+Version: 5.0.10
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
-License: GPLv2+
+License: GPL-2.0-or-later
URL: https://www.xpra.org/
Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/xpra-%{ver...
Patch1: ignore_assert_pandoc.patch
@@ -91,6 +91,7 @@ BuildRequires: setxkbmap
%if %{with debug}
BuildRequires: libasan
%endif
+
%if %{with enc_x264}
BuildRequires: x264-devel
%endif
@@ -190,6 +191,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Sat Oct 12 2024 Sérgio Basto <sergio(a)serjux.com> - 5.0.10-1
+- Update xpra-codecs-freeworld to 5.0.10
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 5.0.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 month, 1 week