[game-data-packager/f37] first attempt at .rpmlintrc ... is not picked up :-(
by Alexandre Detiste
commit 274369378d13876b2606d7a996b259b4c3c65c73
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Wed Jan 4 09:17:36 2023 +0100
first attempt at .rpmlintrc ... is not picked up :-(
game-data-packager.rpmlintrc | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/game-data-packager.rpmlintrc b/game-data-packager.rpmlintrc
new file mode 100644
index 0000000..3bffb63
--- /dev/null
+++ b/game-data-packager.rpmlintrc
@@ -0,0 +1,2 @@
+# this is done on purpose
+addFilter(r" W: files-duplicate /usr/share/game-data-packager/game_data_packager/version.py /usr/share/game-data-packager/game_data_packager/gdp_launcher_version.py")
1 year, 11 months
[game-data-packager/f37] rpmlint: do not chmod +x the one empty __init__.py
by Alexandre Detiste
commit 511288509f9237cdb5e03760947f1d5d36520513
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Wed Jan 4 09:13:45 2023 +0100
rpmlint: do not chmod +x the one empty __init__.py
rpmlint would complain about the missing shebang
game-data-packager.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index 50ec695..9b40561 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -100,7 +100,7 @@ echo disabled
%install
%meson_install
-find %{buildroot}%{_datadir}/game-data-packager/game_data_packager -name '*.py' -exec chmod 755 {} \;
+find %{buildroot}%{_datadir}/game-data-packager/game_data_packager -name '*.py' ! -empty -exec chmod 755 {} \;
#E: python-bytecode-inconsistent-mtime
python3 -m compileall %{buildroot}%{_datadir}/game-data-packager/game_data_packager/version.py
find %{buildroot}%{_sysconfdir}/game-data-packager -empty -exec sh -c "echo '# we need more mirrors' > {}" \;
1 year, 11 months
[game-data-packager/f37] rpmlint: throw away Debian-specific scriptlet
by Alexandre Detiste
commit 4efd058261457c373125aeea47dad070c24e7fa6
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Wed Jan 4 09:08:50 2023 +0100
rpmlint: throw away Debian-specific scriptlet
it was made optional upstream right now
game-data-packager.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index a59b784..50ec695 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -105,6 +105,9 @@ find %{buildroot}%{_datadir}/game-data-packager/game_data_packager -name '*.py'
python3 -m compileall %{buildroot}%{_datadir}/game-data-packager/game_data_packager/version.py
find %{buildroot}%{_sysconfdir}/game-data-packager -empty -exec sh -c "echo '# we need more mirrors' > {}" \;
+# throw away Debian-specific scriptlet
+rm -v %{buildroot}%{_datadir}/game-data-packager/doom-common.preinst.in
+
# throw away src:quake stuff for now
rm -rvf %{buildroot}%{_sysconfdir}/apparmor.d
rm -v %{buildroot}%{_bindir}/etqw*
1 year, 11 months
[mesa-freeworld/f37: 2/2] Merge branch 'master' into f37
by Luya Tshimbalanga
commit 7e171b3bc739feb9cc8676edc48477f56208995a
Merge: b5d7854 72b2519
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue Jan 3 23:57:31 2023 -0800
Merge branch 'master' into f37
mesa-freeworld.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
1 year, 11 months
[game-data-packager/f37] rpmlint "W: macro-in-%changelog %{_datadir}"
by Alexandre Detiste
commit ed3b3542e9e8517d576661030d5f7f0d05c90bbe
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Wed Jan 4 08:49:12 2023 +0100
rpmlint "W: macro-in-%changelog %{_datadir}"
game-data-packager.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/game-data-packager.spec b/game-data-packager.spec
index 94c2ec4..a59b784 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -257,8 +257,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
* Sun Jan 24 2016 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 44-1
- First cross-distribution release
- Add Cacodemon icon to doom2-masterlevels subpackage
-- The (optional) licenses of generated .rpm goes now correctly to %{_datadir}/licenses
- instead of %{_datadir}/doc
+- The (optional) licenses of generated .rpm goes now correctly to _datadir/licenses
+ instead of _datadir/doc
- AppArmor support temporary disabled until figured out
* Thu Dec 31 2015 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 44-0.2.git2015123150f64b6
1 year, 11 months
[game-data-packager/f37] git snapshot
by Alexandre Detiste
commit a7ba0b02da14df6aaf95d5b669086580e4867b15
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Wed Jan 4 00:25:23 2023 +0100
git snapshot
.gitignore | 1 +
game-data-packager.spec | 18 +++++++++++-------
sources | 2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b84980a..8636468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/game-data-packager_66.tar.xz
/game-data-packager_68.tar.xz
/game-data-packager_69.tar.xz
+/game-data-packager-20230104.tar.gz
diff --git a/game-data-packager.spec b/game-data-packager.spec
index 9d9b485..94c2ec4 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -11,9 +11,9 @@
%global _vpath_srcdir %{name}-%{version}/
-#define gitdate 20160112
+%define gitdate 20230104
# git log --oneline -1
-%define gitversion 50f64b6
+%define gitversion a6352918
%if 0%{?gitdate}
%define gver .git%{gitdate}%{gitversion}
@@ -26,7 +26,7 @@ Summary: Installer for game data files
License: GPLv2 and GPLv2+
URL: https://wiki.debian.org/Games/GameDataPackager
%if 0%{?gitdate}
-# git archive --prefix=game-data-packager-44/ --format tar.gz master > ../rpmbuild/SOURCES/game-data-packager-`date +%Y%m%d`.tar.gz
+# git archive --prefix=game-data-packager-69/ --format tar.gz master > ../rpmbuild/SOURCES/game-data-packager-`date +%Y%m%d`.tar.gz
Source: game-data-packager-%{gitdate}.tar.gz
%else
Source: http://http.debian.net/debian/pool/contrib/g/game-data-packager/game-data...
@@ -39,13 +39,13 @@ BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
BuildRequires: inkscape
BuildRequires: python3
-BuildRequires: python3-PyYAML
+BuildRequires: python3-pyyaml
BuildRequires: python3-pyflakes
#BuildRequires: xcftools
BuildRequires: xmlstarlet
BuildRequires: zip
-Requires: python3-PyYAML
+Requires: python3-pyyaml
# download
Recommends: lgogdownloader
Suggests: steam
@@ -76,6 +76,7 @@ data which cannot be distributed (such as commercial game data).
Summary: "Master Levels for Doom II" launcher
Requires: python3-gobject-base
Requires: gobject-introspection
+Requires: gtk4
Provides: game-data-packager-runtime = %{version}
%description -n doom2-masterlevels
@@ -118,7 +119,7 @@ rm -rv %{buildroot}%{_datadir}/icons
rm -v %{buildroot}%{_mandir}/man6/etqw*.6
rm -v %{buildroot}%{_mandir}/man6/quake*.6
-desktop-file-validate %{buildroot}%{_datadir}/applications/doom2-masterlevels.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%files
%doc %{name}-%{version}/doc/adding_a_game.mdwn
@@ -136,10 +137,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/doom2-masterlevels.de
%license %{name}-%{version}/COPYING
%{_mandir}/man6/doom2-masterlevels.*
%{_bindir}/doom2-masterlevels
-%{_datadir}/applications/doom2-masterlevels.desktop
+%{_datadir}/applications/net.debian.game_data_packager.doom2_masterlevels.desktop
%{_datadir}/pixmaps/doom2-masterlevels.png
%changelog
+* Wed Jan 04 2023 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 69-2.git20230104a6352918
+- Git Snapshot
+
* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 69-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index 53eda30..636abb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (game-data-packager_69.tar.xz) = eee94d96b0395e9ac0d47195d8775c43ace2a10818b82713b91385f42fb483433aa73f67f7affe81e2af0a52dcdee7fc3d9a2e4d349d3b078a8ed8579d16fcae
+SHA512 (game-data-packager-20230104.tar.gz) = e57278a435758d208b7004687806c90efb4cc5ec66cbc92cbdb84d55dd7cd6048c6af725b0c20d3d8cbe155ce68406d0e5cde57f5fd7f5198d426bc5414ac57e
1 year, 11 months
[xpra-codecs-freeworld] Release 4.4.3| Reverse patch for bug #3693
by sagitter
commit 52dca55b5941699bad1818a818258759e7f3d001
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Tue Jan 3 16:26:54 2023 +0100
Release 4.4.3| Reverse patch for bug #3693
xpra-bug3693.patch | 272 +++++++++++++++++++++++++++++++++++++++++++++
xpra-codecs-freeworld.spec | 5 +
2 files changed, 277 insertions(+)
---
diff --git a/xpra-bug3693.patch b/xpra-bug3693.patch
new file mode 100644
index 0000000..cc2a0e3
--- /dev/null
+++ b/xpra-bug3693.patch
@@ -0,0 +1,272 @@
+From 23b2c55737ca8b368197f01cc547d5439c84b862 Mon Sep 17 00:00:00 2001
+From: totaam <antoine(a)xpra.org>
+Date: Sun, 27 Nov 2022 21:19:47 +0700
+Subject: [PATCH] make sure to include cuda libs when needed
+
+(on MS Windows)
+---
+ setup.py | 187 +++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 106 insertions(+), 81 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index fc5831cdc..22a2256b8 100755
+--- a/setup.py
++++ b/setup.py
+@@ -1503,7 +1503,7 @@ def add_service_exe(script, icon, base_name):
+ add_console_exe("xpra/codecs/nv_util.py", "nvidia.ico", "NVidia_info")
+ if nvfbc_ENABLED:
+ add_console_exe("xpra/codecs/nvfbc/capture.py", "nvidia.ico", "NvFBC_capture")
+- if nvfbc_ENABLED or nvenc_ENABLED:
++ if nvfbc_ENABLED or nvenc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED:
+ add_console_exe("xpra/codecs/cuda_common/cuda_context.py", "cuda.ico", "CUDA_info")
+
+ if ("install_exe" in sys.argv) or ("install" in sys.argv):
+@@ -2043,22 +2043,18 @@ def add_cython_ext(*_args, **_kwargs):
+ toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.cuda_common")
+ toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.nv_util")
+
+-CUDA_BIN = "%s/cuda" % share_xpra
+-if (nvenc_ENABLED and cuda_kernels_ENABLED) or nvjpeg_encoder_ENABLED:
++nvidia_ENABLED = nvenc_ENABLED or nvfbc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED
++toggle_packages(nvidia_ENABLED, "xpra.codecs.nvidia")
++if nvidia_ENABLED:
++ CUDA_BIN = f"{share_xpra}/cuda"
+ #find nvcc:
+- from xpra.util import sorted_nicely
++ from xpra.util import sorted_nicely # pylint: disable=import-outside-toplevel
+ path_options = os.environ.get("PATH", "").split(os.path.pathsep)
+ if WIN32:
+- external_includes += ["pycuda"]
++ external_includes.append("pycuda")
+ nvcc_exe = "nvcc.exe"
+ CUDA_DIR = os.environ.get("CUDA_DIR", "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA")
+- path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob("%s\\*\\bin" % CUDA_DIR))))
+- #pycuda may link against curand, find it and ship it:
+- for p in path_options:
+- if os.path.exists(p):
+- add_data_files("", glob.glob("%s\\curand64*.dll" % p))
+- add_data_files("", glob.glob("%s\\cudart64*.dll" % p))
+- break
++ path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob(f"{CUDA_DIR}\\*\\bin"))))
+ else:
+ nvcc_exe = "nvcc"
+ path_options += ["/usr/local/cuda/bin", "/opt/cuda/bin"]
+@@ -2066,12 +2062,9 @@ def add_cython_ext(*_args, **_kwargs):
+ path_options += list(reversed(sorted_nicely(glob.glob("/opt/cuda*/bin"))))
+ options = [os.path.join(x, nvcc_exe) for x in path_options]
+ #prefer the one we find on the $PATH, if any:
+- try:
+- v = shutil.which(nvcc_exe)
+- if v and (v not in options):
+- options.insert(0, v)
+- except:
+- pass
++ v = shutil.which(nvcc_exe)
++ if v and (v not in options):
++ options.insert(0, v)
+ nvcc_versions = {}
+ def get_nvcc_version(command):
+ if not os.path.exists(command):
+@@ -2082,30 +2075,94 @@ def get_nvcc_version(command):
+ vpos = out.rfind(", V")
+ if vpos>0:
+ version = out[vpos+3:].split("\n")[0]
+- version_str = " version %s" % version
++ version_str = f" version {version}"
+ else:
+ version = "0"
+ version_str = " unknown version!"
+- print("found CUDA compiler: %s%s" % (filename, version_str))
++ print(f"found CUDA compiler: {filename}{version_str}")
+ return tuple(int(x) for x in version.split("."))
+ for filename in options:
+ vnum = get_nvcc_version(filename)
+ if vnum:
+ nvcc_versions[vnum] = filename
++ nvcc_version = nvcc = None
+ if nvcc_versions:
+ #choose the most recent one:
+ nvcc_version, nvcc = list(reversed(sorted(nvcc_versions.items())))[0]
+ if len(nvcc_versions)>1:
+- print(" using version %s from %s" % (nvcc_version, nvcc))
+- else:
+- nvcc_version = nvcc = None
+- if ((nvenc_ENABLED or nvjpeg_encoder_ENABLED) and cuda_kernels_ENABLED):
+- assert nvcc_versions, "cannot find nvcc compiler!"
++ print(f" using version {nvcc_version} from {nvcc}")
++ if cuda_kernels_ENABLED and (nvenc_ENABLED or nvjpeg_encoder_ENABLED):
++ def get_gcc_version():
++ if CC_is_clang():
++ return (0, )
++ cc = os.environ.get("CC", "gcc")
++ r, _, err = get_status_output([cc, "-v"])
++ if r==0:
++ V_LINE = "gcc version "
++ tmp_version = []
++ for line in err.splitlines():
++ if not line.startswith(V_LINE):
++ continue
++ v_str = line[len(V_LINE):].strip().split(" ")[0]
++ for p in v_str.split("."):
++ try:
++ tmp_version.append(int(p))
++ except ValueError:
++ break
++ print("found gcc version: %s" % ".".join(str(x) for x in tmp_version))
++ break
++ return tuple(tmp_version)
++ return (0, )
++ assert nvcc, "cannot find nvcc compiler!"
++ def get_nvcc_args():
++ nvcc_cmd = [nvcc, "-fatbin"]
++ gcc_version = get_gcc_version()
++ if gcc_version<(7, 5):
++ print("gcc versions older than 7.5 are not supported!")
++ for _ in range(5):
++ sleep(1)
++ print(".")
++ if (8,1)<=gcc_version<(9, ):
++ #GCC 8.1 has compatibility issues with CUDA 9.2,
++ #so revert to C++03:
++ nvcc_cmd.append("-std=c++03")
++ #GCC 6 uses C++11 by default:
++ else:
++ nvcc_cmd.append("-std=c++11")
++ if gcc_version>=(12, 0) or CC_is_clang():
++ nvcc_cmd.append("--allow-unsupported-compiler")
++ if nvcc_version>=(11, 5):
++ nvcc_cmd += ["-arch=all",
++ "-Wno-deprecated-gpu-targets",
++ ]
++ if nvcc_version>=(11, 6):
++ nvcc_cmd += ["-Xnvlink", "-ignore-host-info"]
++ return nvcc_cmd
++ #older versions, add every arch we know about:
++ comp_code_options = []
++ if nvcc_version>=(7, 5):
++ comp_code_options.append((52, 52))
++ comp_code_options.append((53, 53))
++ if nvcc_version>=(8, 0):
++ comp_code_options.append((60, 60))
++ comp_code_options.append((61, 61))
++ comp_code_options.append((62, 62))
++ if nvcc_version>=(9, 0):
++ comp_code_options.append((70, 70))
++ if nvcc_version>=(10, 0):
++ comp_code_options.append((75, 75))
++ if nvcc_version>=(11, 0):
++ comp_code_options.append((80, 80))
++ if nvcc_version>=(11, 1):
++ comp_code_options.append((86, 86))
++ #if nvcc_version>=(11, 6):
++ # comp_code_options.append((87, 87))
++ for arch, code in comp_code_options:
++ nvcc_cmd.append(f"-gencode=arch=compute_{arch},code=sm_{code}")
++ return nvcc_cmd
++ nvcc_args = get_nvcc_args()
+ #first compile the cuda kernels
+ #(using the same cuda SDK for both nvenc modules for now..)
+- #TODO:
+- # * compile directly to output directory instead of using data files?
+- # * detect which arches we want to build for? (does it really matter much?)
+ kernels = []
+ if nvenc_ENABLED:
+ kernels += ["XRGB_to_NV12", "XRGB_to_YUV444", "BGRX_to_NV12", "BGRX_to_YUV444"]
+@@ -2113,67 +2170,26 @@ def get_nvcc_version(command):
+ kernels += ["BGRX_to_RGB", "RGBX_to_RGB", "RGBA_to_RGBAP", "BGRA_to_RGBAP"]
+ nvcc_commands = []
+ for kernel in kernels:
+- cuda_src = "fs/share/xpra/cuda/%s.cu" % kernel
+- cuda_bin = "fs/share/xpra/cuda/%s.fatbin" % kernel
++ cuda_src = f"fs/share/xpra/cuda/{kernel}.cu"
++ cuda_bin = f"fs/share/xpra/cuda/{kernel}.fatbin"
+ if os.path.exists(cuda_bin) and (cuda_rebuild_ENABLED is False):
+ continue
+ reason = should_rebuild(cuda_src, cuda_bin)
+ if not reason:
+ continue
+- print("rebuilding %s: %s" % (kernel, reason))
+- cmd = [nvcc,
+- '-fatbin',
+- "-c", cuda_src,
+- "-o", cuda_bin]
+- gcc_version = get_gcc_version()
+- if (8,1)<=gcc_version<(9, ):
+- #GCC 8.1 has compatibility issues with CUDA 9.2,
+- #so revert to C++03:
+- cmd.append("-std=c++03")
+- #GCC 6 uses C++11 by default:
+- else:
+- cmd.append("-std=c++11")
+- if gcc_version>=(12, 0) or CC_is_clang():
+- cmd.append("--allow-unsupported-compiler")
+- if nvcc_version>=(11, 5):
+- cmd += ["-arch=all",
+- "-Wno-deprecated-gpu-targets",
+- ]
+- if nvcc_version>=(11, 6):
+- cmd += ["-Xnvlink", "-ignore-host-info"]
+- else:
+- comp_code_options = []
+- if nvcc_version>=(7, 5):
+- comp_code_options.append((52, 52))
+- comp_code_options.append((53, 53))
+- if nvcc_version>=(8, 0):
+- comp_code_options.append((60, 60))
+- comp_code_options.append((61, 61))
+- comp_code_options.append((62, 62))
+- if nvcc_version>=(9, 0):
+- comp_code_options.append((70, 70))
+- if nvcc_version>=(10, 0):
+- comp_code_options.append((75, 75))
+- if nvcc_version>=(11, 0):
+- comp_code_options.append((80, 80))
+- if nvcc_version>=(11, 1):
+- comp_code_options.append((86, 86))
+- #if nvcc_version>=(11, 6):
+- # comp_code_options.append((87, 87))
+- for arch, code in comp_code_options:
+- cmd.append("-gencode=arch=compute_%s,code=sm_%s" % (arch, code))
+- print("CUDA compiling %s (%s)" % (kernel.ljust(16), reason))
+- print(" %s" % " ".join("'%s'" % x for x in cmd))
+- nvcc_commands.append(cmd)
+-
++ print(f"rebuilding {kernel}: {reason}")
++ kbuild_cmd = nvcc_args + ["-c", cuda_src, "-o", cuda_bin]
++ print(f"CUDA compiling %s ({reason})" % kernel.ljust(16))
++ print(" "+" ".join(f"{x!r}" for x in kbuild_cmd))
++ nvcc_commands.append(kbuild_cmd)
+ #parallel build:
+ nvcc_errors = []
+- def nvcc_compile(cmd):
+- c, stdout, stderr = get_status_output(cmd)
++ def nvcc_compile(nvcc_cmd):
++ c, stdout, stderr = get_status_output(nvcc_cmd)
+ if c!=0:
+ nvcc_errors.append(c)
+- print("Error: failed to compile CUDA kernel %s" % kernel)
+- print(" using command: %s" % (cmd,))
++ print(f"Error: failed to compile CUDA kernel {kernel}")
++ print(f" using command: {nvcc_cmd}")
+ print(stdout or "")
+ print(stderr or "")
+ nvcc_threads = []
+@@ -2186,8 +2202,17 @@ def nvcc_compile(cmd):
+ if nvcc_errors:
+ sys.exit(1)
+ t.join()
++ add_data_files(CUDA_BIN, [f"fs/share/xpra/cuda/{x}.fatbin" for x in kernels])
++ add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"])
++ if WIN32 and (nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED or nvenc_ENABLED):
++ assert nvcc_versions
++ CUDA_BIN_DIR = os.path.dirname(nvcc)
++ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/cudart64*dll"))
++ #if pycuda is built with curand, add this:
++ #add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/curand64*dll"))
++ if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED:
++ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll"))
+
+- add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/%s.fatbin" % x for x in kernels])
+ add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"])
+
+ tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc")
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 84b367e..414fc65 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -49,6 +49,8 @@ Patch0: xpra-find_py3cairo.patch
# Install into /usr/libexec always
Patch1: xpra-force_always_libexec.patch
+Patch2: xpra-bug3693.patch
+
BuildRequires: python3-devel
BuildRequires: gtk3-devel
BuildRequires: libXtst-devel
@@ -114,6 +116,8 @@ x264 and ffmpeg.
sed -i 's|@@python3_sitearch@@|%{python3_sitearch}|' setup.py
%endif
+%patch2 -p1 -R -b .backup
+
# cc1: error: unrecognized compiler option ‘-mfpmath=387’
%ifarch %{arm}
sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py
@@ -182,6 +186,7 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%changelog
* Tue Jan 03 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 4.4.3-1
- Release 4.4.3
+- Reverse patch for bug #3693
* Sun Nov 13 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 4.4.2-1
- Release 4.4.2
1 year, 11 months
[xpra-codecs-freeworld] Release 4.4.3
by sagitter
commit cda9ab93990937f9ac28c11b7875df9b51621b9f
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Tue Jan 3 16:16:47 2023 +0100
Release 4.4.3
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a13ece3..98c0f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@ xpra-0.16.3.tar.xz
/xpra-4.4.tar.gz
/xpra-4.4.1.tar.gz
/xpra-4.4.2.tar.gz
+/xpra-4.4.3.tar.gz
diff --git a/sources b/sources
index a8d33b0..c47b01d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-4.4.2.tar.gz) = efe364c170169bb1487e1eff2fb5d04dc86e209a88f95400633fb749204b377af1dc7c675de4fa4a36e84e719ec73e500e3acf4a6dea2221295351c8feb559e0
+SHA512 (xpra-4.4.3.tar.gz) = db1815ce3b2220b7494ebaac22bf94df264fd440cf9d57a9088d29afe24481895de0633f70dc0f4f7ca3566454d6febe015d68339efb0b206564acc35ec672d2
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 89d8e24..84b367e 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -36,7 +36,7 @@
%endif
Name: xpra-codecs-freeworld
-Version: 4.4.2
+Version: 4.4.3
Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -180,6 +180,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Tue Jan 03 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 4.4.3-1
+- Release 4.4.3
+
* Sun Nov 13 2022 Antonio Trande <sagitter(a)fedoraproject.org> - 4.4.2-1
- Release 4.4.2
1 year, 11 months
[mpd] Use patch for mpd.conf
by Leigh Scott
commit cbcc8c1fcafc8b5c7c09d8b9d45e8799a7f46fe2
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jan 3 15:04:22 2023 +0000
Use patch for mpd.conf
mpd-0.22-mpdconf.patch | 30 ----------------
mpd-0.23-mpdconf.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++
mpd.spec | 9 +----
3 files changed, 94 insertions(+), 38 deletions(-)
---
diff --git a/mpd-0.23-mpdconf.patch b/mpd-0.23-mpdconf.patch
new file mode 100644
index 0000000..ccf03e7
--- /dev/null
+++ b/mpd-0.23-mpdconf.patch
@@ -0,0 +1,93 @@
+--- a/doc/mpdconf.example
++++ b/doc/mpdconf.example
+@@ -10,14 +10,14 @@
+ # be disabled and audio files will only be accepted over ipc socket (using
+ # file:// protocol) or streaming files over an accepted protocol.
+ #
+-#music_directory "~/music"
++music_directory "/var/lib/mpd/music"
+ #
+ # This setting sets the MPD internal playlist directory. The purpose of this
+ # directory is storage for playlists created by MPD. The server will use
+ # playlist files not created by the server but only if they are in the MPD
+ # format. This setting defaults to playlist saving being disabled.
+ #
+-#playlist_directory "~/.mpd/playlists"
++playlist_directory "/var/lib/mpd/playlists"
+ #
+ # This setting sets the location of the MPD database. This file is used to
+ # load the database at server start up and store the database while the
+@@ -25,7 +25,7 @@
+ # MPD to accept files over ipc socket (using file:// protocol) or streaming
+ # files over an accepted protocol.
+ #
+-#db_file "~/.mpd/database"
++db_file "/var/lib/mpd/mpd.db"
+
+ # These settings are the locations for the daemon log files for the daemon.
+ #
+@@ -35,7 +35,7 @@
+ # If you use systemd, do not configure a log_file. With systemd, MPD
+ # defaults to the systemd journal, which is fine.
+ #
+-#log_file "~/.mpd/log"
++log_file "/var/log/mpd/mpd.log"
+
+ # This setting sets the location of the file which stores the process ID
+ # for use of mpd --kill and some init scripts. This setting is disabled by
+@@ -50,7 +50,7 @@
+ # it was brought down. This setting is disabled by default and the server
+ # state will be reset on server start up.
+ #
+-#state_file "~/.mpd/state"
++state_file "/var/lib/mpd/mpdstate"
+ #
+ # The location of the sticker database. This is a database which
+ # manages dynamic information attached to songs.
+@@ -67,7 +67,7 @@
+ # initialization. This setting is disabled by default and MPD is run as the
+ # current user.
+ #
+-#user "nobody"
++user "mpd"
+ #
+ # This setting specifies the group that MPD will run as. If not specified
+ # primary group of user specified with "user" setting will be used (if set).
+@@ -85,7 +85,7 @@
+ #bind_to_address "any"
+ #
+ # And for Unix Socket
+-#bind_to_address "~/.mpd/socket"
++#bind_to_address "/run/mpd/socket"
+ #
+ # This setting is the TCP port that is desired for the daemon to get assigned
+ # to.
+@@ -287,13 +287,13 @@
+ #
+ # An example of a pulseaudio output (streaming to a remote pulseaudio server)
+ #
+-#audio_output {
+-# type "pulse"
+-# name "My Pulse Output"
++audio_output {
++ type "pulse"
++ name "My Pulse Output"
+ ## server "remote_server" # optional
+ ## sink "remote_server_sink" # optional
+ ## media_role "media_role" #optional
+-#}
++}
+ #
+ # An example of a winmm output (Windows multimedia API).
+ #
+@@ -413,6 +413,6 @@
+ # If file or directory names do not display correctly for your locale then you
+ # may need to modify this setting.
+ #
+-#filesystem_charset "UTF-8"
+-#
+-###############################################################################
++filesystem_charset "UTF-8"
++#
++###############################################################################
+
diff --git a/mpd.spec b/mpd.spec
index 6b18e5a..21be16f 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -32,7 +32,7 @@ Source2: https://pgp.key-server.io/download/0x236E8A58C6DB4512#/gpgkey.as
Source3: mpd.logrotate
Source4: mpd.tmpfiles.d
Source5: mpd.xml
-Patch0: mpd-0.22-mpdconf.patch
+Patch0: mpd-0.23-mpdconf.patch
Patch1: mpd-0.20-remove_NoNewPrivileges.patch
Patch2: timidity_path.patch
@@ -193,13 +193,6 @@ touch %{buildroot}%{mpd_logfile}
touch %{buildroot}%{mpd_statefile}
install -D -p -m644 doc/mpdconf.example %{buildroot}%{mpd_configfile}
-sed -i -e "s|#music_directory.*$|music_directory \"%{mpd_musicdir}\"|g" \
- -e "s|#playlist_directory.*$|playlist_directory \"%{mpd_playlistsdir}\"|g" \
- -e "s|#db_file.*$|db_file \"%{mpd_dbfile}\"|g" \
- -e "s|#log_file.*$|log_file \"%{mpd_logfile}\"|g" \
- -e "s|#state_file.*$|state_file \"%{mpd_statefile}\"|g" \
- -e 's|#user.*$|user "mpd"|g' \
- %{buildroot}%{mpd_configfile}
rm -rf %{buildroot}%{_docdir}/mpd/
1 year, 11 months
