[HandBrake] Drop unused build dependencies
by Dominik Mierzejewski
commit ececcb7a47d2cdb874a73cd15336e09c80f0b98e
Author: Dominik Mierzejewski <dominik(a)greysector.net>
Date: Sun Jun 9 13:38:37 2024 +0200
Drop unused build dependencies
HandBrake.spec | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/HandBrake.spec b/HandBrake.spec
index 6fce0aa..dfd6534 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -47,9 +47,7 @@ Patch5: %{name}-no-contribs.patch
# https://salsa.debian.org/multimedia-team/handbrake/-/raw/master/debian/pa...
Patch6: %{name}-remove-ambient-viewing-support.patch
-BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake
-BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
%if 0%{?tag:1}
BuildRequires: gnupg2
@@ -61,47 +59,32 @@ BuildRequires: freetype-devel >= 2.4.11
# Should be >= 0.19.7:
BuildRequires: fribidi-devel >= 0.19.4
BuildRequires: gcc-c++
-BuildRequires: gstreamer1-plugins-base-devel
BuildRequires: gtk4-devel
-BuildRequires: intltool
BuildRequires: jansson-devel
BuildRequires: turbojpeg-devel
-BuildRequires: lame-devel >= 3.98
-BuildRequires: libappindicator-gtk3-devel
# Should be >= 0.13.2:
BuildRequires: libass-devel >= 0.13.1
BuildRequires: libbluray-devel >= 0.9.3
BuildRequires: libdrm-devel
BuildRequires: libdvdnav-devel >= 5.0.1
BuildRequires: libdvdread-devel >= 5.0.0
-BuildRequires: libgudev-devel
%if 0%{?_with_vpl:1}
-BuildRequires: intel-mediasdk-devel
BuildRequires: oneVPL-devel
BuildRequires: libva-devel
%endif
-BuildRequires: libmpeg2-devel >= 0.5.1
-BuildRequires: libnotify-devel
-BuildRequires: librsvg2-devel
BuildRequires: libsamplerate-devel
BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
-# Should be >= 1.5:
-BuildRequires: libvpx-devel >= 1.3
BuildRequires: make
BuildRequires: meson
%if 0%{?_with_asm:1}
BuildRequires: nasm
%endif
-BuildRequires: numactl-devel
BuildRequires: nv-codec-headers
-BuildRequires: opus-devel
BuildRequires: python3
-BuildRequires: speex-devel
BuildRequires: svt-av1-devel
BuildRequires: x264-devel >= 0.148
BuildRequires: x265-devel >= 1.9
-BuildRequires: xz-devel
Requires: hicolor-icon-theme
# needed for reading encrypted DVDs
@@ -150,7 +133,7 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%patch -P6 -p1
# Use system libraries in place of bundled ones
-for module in a52dec fdk-aac %{!?_without_ffmpeg:ffmpeg} libdvdnav libdvdread libbluray %{?_with_vpl:libmfx libvpl} nvenc libvpx svt-av1 x265; do
+for module in fdk-aac %{!?_without_ffmpeg:ffmpeg} libdvdnav libdvdread libbluray %{?_with_vpl:libvpl} nvenc svt-av1 x265; do
sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs
done
@@ -216,6 +199,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.
- Update to 1.8.0
- Drop obsolete patch
- Fix linking with system libraries
+- Drop unused build dependencies
* Sat Jun 01 2024 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.7.3-2
- Rebuild for svt-av1 2.1.0
5 months, 2 weeks
[HandBrake] Update to 1.8.0
by Dominik Mierzejewski
commit aba6e67e68cbbc91b25274ac2255986942788907
Author: Dominik Mierzejewski <dominik(a)greysector.net>
Date: Sun Jun 9 13:06:50 2024 +0200
Update to 1.8.0
Drop obsolete patch
Fix linking with system libraries
HandBrake-no-contribs.patch | 81 ++++++++++----------------
HandBrake-no-fdk_aac.patch | 33 +++++------
HandBrake-remove-ambient-viewing-support.patch | 10 ++--
HandBrake-syslibs-link.patch | 30 ++++++++++
HandBrake-x265-link.patch | 13 -----
HandBrake.spec | 18 +++---
sources | 4 +-
7 files changed, 93 insertions(+), 96 deletions(-)
---
diff --git a/HandBrake-no-contribs.patch b/HandBrake-no-contribs.patch
index 83487ef..f07952b 100644
--- a/HandBrake-no-contribs.patch
+++ b/HandBrake-no-contribs.patch
@@ -1,65 +1,46 @@
-From: Sebastian Ramacher <sramacher(a)debian.org>
-Date: Fri, 1 Dec 2023 23:22:16 +0100
-Subject: Do not use contribs
-
----
- gtk/meson.build | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/gtk/meson.build b/gtk/meson.build
-index 6f41201..c072f50 100644
---- a/gtk/meson.build
-+++ b/gtk/meson.build
-@@ -22,8 +22,8 @@ if hb_dir == ''
+diff -up HandBrake-1.8.0/gtk/meson.build.orig HandBrake-1.8.0/gtk/meson.build
+--- HandBrake-1.8.0/gtk/meson.build.orig 2024-06-08 23:25:36.847621713 +0200
++++ HandBrake-1.8.0/gtk/meson.build 2024-06-09 10:47:41.354428601 +0200
+@@ -20,7 +20,7 @@ if hb_dir == ''
hb_dir = meson.current_build_dir() / '..'
endif
--hb_libdirs = [hb_dir / 'libhb', hb_dir / 'contrib/lib'] + get_option('extra-libdirs')
-hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')
-+hb_libdirs = [hb_dir / 'libhb'] + get_option('extra-libdirs')
+hb_incdirs = include_directories(hb_dir / 'libhb')
# External dependencies (required)
ghb_deps = [
-@@ -33,7 +33,6 @@ ghb_deps = [
- cc.find_library('mp3lame', dirs: hb_libdirs),
- dependency('dvdnav'),
- dependency('dvdread'),
-- dependency('dav1d'),
- dependency('SvtAv1Enc'),
- dependency('fribidi'),
- dependency('glib-2.0', version: glib_min),
-@@ -63,7 +62,6 @@ ghb_deps = [
- dependency('vorbisenc'),
- dependency('vpx'),
- dependency('x264'),
-- dependency('zimg'),
- dependency('zlib'),
- ]
-
-diff -up HandBrake-1.7.3/libhb/module.defs.orig HandBrake-1.7.3/libhb/module.defs
---- HandBrake-1.7.3/libhb/module.defs.orig 2024-02-10 23:22:33.000000000 +0100
-+++ HandBrake-1.7.3/libhb/module.defs 2024-05-15 23:46:57.265752588 +0200
+diff -up HandBrake-1.8.0/libhb/module.defs.orig HandBrake-1.8.0/libhb/module.defs
+--- HandBrake-1.8.0/libhb/module.defs.orig 2024-05-19 16:06:45.000000000 +0200
++++ HandBrake-1.8.0/libhb/module.defs 2024-06-09 10:51:03.886266133 +0200
@@ -1,7 +1,7 @@
- __deps__ := A52DEC BZIP2 LIBVPX SVT-AV1 FFMPEG FREETYPE LAME LIBASS LIBDCA \
- LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \
- LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBVPL LIBGNURX JANSSON \
+ __deps__ := BZIP2 LIBVPX SVT-AV1 FFMPEG FREETYPE LAME LIBASS \
+ LIBDVDREAD LIBDVDNAV LIBICONV LIBTHEORA LIBVORBIS LIBOGG \
+ X264 X265 ZLIB LIBBLURAY FDKAAC LIBVPL LIBGNURX JANSSON \
- HARFBUZZ LIBOPUS LIBSPEEX LIBDAV1D LIBJPEGTURBO LIBDOVI
+ HARFBUZZ LIBOPUS LIBSPEEX LIBJPEGTURBO LIBDOVI
ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
__deps__ += FONTCONFIG
-diff -up HandBrake-1.7.3/test/module.defs.orig HandBrake-1.7.3/test/module.defs
---- HandBrake-1.7.3/test/module.defs.orig 2024-05-15 23:05:14.263979341 +0200
-+++ HandBrake-1.7.3/test/module.defs 2024-05-15 23:47:36.829590760 +0200
-@@ -16,8 +16,8 @@ TEST.libs = $(LIBHB.a)
- TEST.GCC.l = \
- ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
- dvdread fribidi swscale vpx theoraenc theoradec vorbis vorbisenc ogg \
-- x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
-- turbojpeg zimg SvtAv1Enc
-+ x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma \
-+ turbojpeg SvtAv1Enc
+@@ -118,7 +118,7 @@ LIBHB.lib = $(LIBHB.build/)hb.lib
+ LIBHB.dll.libs = $(foreach n, \
+ ass avformat avfilter avcodec avutil swresample dvdnav dvdread \
+ freetype mp3lame swscale vpx theora vorbis vorbisenc ogg x264 \
+- bluray jansson harfbuzz opus speex dav1d turbojpeg zimg SvtAv1Enc, \
++ bluray jansson harfbuzz opus speex turbojpeg SvtAv1Enc, \
+ $(CONTRIB.build/)lib/lib$(n).a )
- ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
- TEST.GCC.l += fontconfig
+ ifeq (1,$(FEATURE.fdk_aac))
+diff -up HandBrake-1.8.0/make/include/main.defs.orig HandBrake-1.8.0/make/include/main.defs
+--- HandBrake-1.8.0/make/include/main.defs.orig 2024-05-19 16:06:45.000000000 +0200
++++ HandBrake-1.8.0/make/include/main.defs 2024-06-09 10:50:34.026098608 +0200
+@@ -48,9 +48,7 @@ ifeq (1,$(FEATURE.x265))
+ MODULES += contrib/x265_12bit
+ endif
+
+-MODULES += contrib/libdav1d
+ MODULES += contrib/svt-av1
+-MODULES += contrib/zimg
+ MODULES += contrib/ffmpeg
+ MODULES += contrib/libdvdread
+ MODULES += contrib/libdvdnav
diff --git a/HandBrake-no-fdk_aac.patch b/HandBrake-no-fdk_aac.patch
index 934f236..4d28923 100644
--- a/HandBrake-no-fdk_aac.patch
+++ b/HandBrake-no-fdk_aac.patch
@@ -1,7 +1,7 @@
-diff -up HandBrake-1.7.3/gtk/meson.build.orig HandBrake-1.7.3/gtk/meson.build
---- HandBrake-1.7.3/gtk/meson.build.orig 2024-02-10 23:22:33.000000000 +0100
-+++ HandBrake-1.7.3/gtk/meson.build 2024-05-15 22:54:38.645589239 +0200
-@@ -90,10 +90,6 @@ if get_option('libdovi').enabled()
+diff -up HandBrake-1.8.0/gtk/meson.build.orig HandBrake-1.8.0/gtk/meson.build
+--- HandBrake-1.8.0/gtk/meson.build.orig 2024-05-19 16:06:45.000000000 +0200
++++ HandBrake-1.8.0/gtk/meson.build 2024-06-08 23:22:38.059852545 +0200
+@@ -57,10 +57,6 @@ if get_option('libdovi').enabled()
ghb_deps += dependency('dovi')
endif
@@ -10,15 +10,12 @@ diff -up HandBrake-1.7.3/gtk/meson.build.orig HandBrake-1.7.3/gtk/meson.build
-endif
-
if get_option('qsv').enabled()
- if host_machine.system() == 'windows'
- ghb_deps += cc.find_library('vpl', dirs: hb_libdirs)
-diff -up HandBrake-1.7.3/gtk/meson_options.txt.orig HandBrake-1.7.3/gtk/meson_options.txt
---- HandBrake-1.7.3/gtk/meson_options.txt.orig 2024-02-10 23:22:33.000000000 +0100
-+++ HandBrake-1.7.3/gtk/meson_options.txt 2024-05-15 22:54:45.430561239 +0200
-@@ -3,11 +3,6 @@ option('extra-libdirs',
- value: [],
- description: 'Extra directories to search for libraries')
-
+ ghb_deps += dependency('vpl')
+ endif
+diff -up HandBrake-1.8.0/gtk/meson_options.txt.orig HandBrake-1.8.0/gtk/meson_options.txt
+--- HandBrake-1.8.0/gtk/meson_options.txt.orig 2024-05-19 16:06:45.000000000 +0200
++++ HandBrake-1.8.0/gtk/meson_options.txt 2024-06-08 23:23:01.608085564 +0200
+@@ -1,8 +1,3 @@
-option('fdk-aac',
- type: 'feature',
- value: 'disabled',
@@ -27,11 +24,11 @@ diff -up HandBrake-1.7.3/gtk/meson_options.txt.orig HandBrake-1.7.3/gtk/meson_op
option('flatpak',
type: 'boolean',
value: false,
-diff -up HandBrake-1.7.3/gtk/module.defs.orig HandBrake-1.7.3/gtk/module.defs
---- HandBrake-1.7.3/gtk/module.defs.orig 2024-02-10 23:22:33.000000000 +0100
-+++ HandBrake-1.7.3/gtk/module.defs 2024-05-15 22:54:53.795526719 +0200
-@@ -53,12 +53,6 @@ else
- GTK.CONFIGURE.extra += -Dgstreamer=disabled
+diff -up HandBrake-1.8.0/gtk/module.defs.orig HandBrake-1.8.0/gtk/module.defs
+--- HandBrake-1.8.0/gtk/module.defs.orig 2024-05-19 16:06:45.000000000 +0200
++++ HandBrake-1.8.0/gtk/module.defs 2024-06-08 23:23:25.867325618 +0200
+@@ -48,12 +48,6 @@ else
+ GTK.CONFIGURE.extra += -Db_lto=false
endif
-ifeq (1,$(FEATURE.fdk_aac))
diff --git a/HandBrake-remove-ambient-viewing-support.patch b/HandBrake-remove-ambient-viewing-support.patch
index 0b97d23..fa4ea9f 100644
--- a/HandBrake-remove-ambient-viewing-support.patch
+++ b/HandBrake-remove-ambient-viewing-support.patch
@@ -13,15 +13,15 @@ diff --git a/libhb/encx265.c b/libhb/encx265.c
index 89f996d..b5356de 100644
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
-@@ -308,14 +308,6 @@ int encx265Init(hb_work_object_t *w, hb_job_t *job)
- param->bHighTier = 0;
+@@ -269,14 +269,6 @@ int encx265Init(hb_work_object_t *w, hb_
+ }
}
- if (job->ambient.ambient_illuminance.num && job->ambient.ambient_illuminance.den)
- {
-- param->ambientIlluminance = rescale(job->ambient.ambient_illuminance, 10000);
-- param->ambientLightX = rescale(job->ambient.ambient_light_x, 50000);
-- param->ambientLightY = rescale(job->ambient.ambient_light_y, 50000);
+- param->ambientIlluminance = hb_rescale_rational(job->ambient.ambient_illuminance, 10000);
+- param->ambientLightX = hb_rescale_rational(job->ambient.ambient_light_x, 50000);
+- param->ambientLightY = hb_rescale_rational(job->ambient.ambient_light_y, 50000);
- param->bEmitAmbientViewingEnvironment = 1;
- }
-
diff --git a/HandBrake-syslibs-link.patch b/HandBrake-syslibs-link.patch
new file mode 100644
index 0000000..cc36264
--- /dev/null
+++ b/HandBrake-syslibs-link.patch
@@ -0,0 +1,30 @@
+diff -up HandBrake-1.8.0/test/module.defs.orig HandBrake-1.8.0/test/module.defs
+--- HandBrake-1.8.0/test/module.defs.orig 2024-05-19 16:06:45.000000000 +0200
++++ HandBrake-1.8.0/test/module.defs 2024-06-09 12:44:44.012169393 +0200
+@@ -22,6 +22,14 @@ TEST.pkgconfig_libs = libass libavformat
+
+ TEST.pkgconfig_libs += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
+
++ifeq (1,$(FEATURE.qsv))
++ TEST.pkgconfig_libs += libva libva-drm vpl
++endif
++
++ifeq (1,$(FEATURE.x265))
++ TEST.pkgconfig_libs += x265
++endif
++
+ ifeq (1,$(FEATURE.flatpak))
+ TEST.pkgconfig_libs += glib-2.0
+ endif
+diff -up HandBrake-1.8.0/gtk/meson.build.orig HandBrake-1.8.0/gtk/meson.build
+--- HandBrake-1.8.0/gtk/meson.build.orig 2024-06-09 12:48:47.938685823 +0200
++++ HandBrake-1.8.0/gtk/meson.build 2024-06-09 12:52:51.685218843 +0200
+@@ -58,6 +58,8 @@ if get_option('libdovi').enabled()
+ endif
+
+ if get_option('qsv').enabled()
++ ghb_deps += dependency('libva')
++ ghb_deps += dependency('libva-drm')
+ ghb_deps += dependency('vpl')
+ endif
+
diff --git a/HandBrake.spec b/HandBrake.spec
index a835356..6fce0aa 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -15,8 +15,8 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.7.3
-Release: 2%{!?tag:.%{date}git%{shortcommit}}%{?dist}
+Version: 1.8.0
+Release: 1%{!?tag:.%{date}git%{shortcommit}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: https://handbrake.fr/
@@ -33,16 +33,14 @@ Source0: https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{
%{?_without_ffmpeg:Source10: https://libav.org/releases/libav-12.tar.gz}
-# Fix parsing of -DFOO from pkg-config --cflags libxml-2.0
-Patch0: %{name}-fix-cflags-parsing.patch
# Don't link with libva unnecessarily
Patch1: %{name}-no-libva.patch
# Don't link with fdk_aac unnecessarily
Patch2: %{name}-no-fdk_aac.patch
# Fix build on non-x86 (without nasm) and drop libtool requirement
Patch3: %{name}-no-libtool-nasm.patch
-# Patch from Gentoo
-Patch4: %{name}-x265-link.patch
+# Fix linking with system libraries
+Patch4: %{name}-syslibs-link.patch
# Patches from Debian
# https://salsa.debian.org/multimedia-team/handbrake/-/raw/master/debian/pa...
Patch5: %{name}-no-contribs.patch
@@ -64,6 +62,7 @@ BuildRequires: freetype-devel >= 2.4.11
BuildRequires: fribidi-devel >= 0.19.4
BuildRequires: gcc-c++
BuildRequires: gstreamer1-plugins-base-devel
+BuildRequires: gtk4-devel
BuildRequires: intltool
BuildRequires: jansson-devel
BuildRequires: turbojpeg-devel
@@ -141,7 +140,6 @@ This package contains the main program with a graphical interface.
gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%endif
%setup -q %{!?tag:-n %{name}-%{commit0}}
-%patch -P0 -p1
%if 0%{!?_with_vpl}
%patch -P1 -p1
%endif
@@ -164,7 +162,6 @@ echo "DATE=$(date "+%Y-%m-%d %T" -d %{date})" >> version.txt
echo "TAG=%{tag}" >> version.txt
echo "TAG_HASH=%{commit0}" >> version.txt
%endif
-sed -i -e 's/^\(GIT_TAG\)=\(.*\)/\1=%{version}/' gtk/data/version.sh
# This makes build stop if any download is attempted
export http_proxy=http://127.0.0.1
@@ -215,6 +212,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Sat Jun 08 2024 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> - 1.8.0-1
+- Update to 1.8.0
+- Drop obsolete patch
+- Fix linking with system libraries
+
* Sat Jun 01 2024 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.7.3-2
- Rebuild for svt-av1 2.1.0
diff --git a/sources b/sources
index 64c0173..044ef7e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (HandBrake-1.7.3-source.tar.bz2) = 2a934ef3fef5c9d3a23976c6138a35cc1a098dc20b482259788ea58c5c3a581d772fc73c3e00bb1c6b605a050cbeef44ec8df181f6e3e9503aef458df629a927
-SHA512 (HandBrake-1.7.3-source.tar.bz2.sig) = 2b2307ae83b43ea3fed806d19b0f4a53d650ea8b50cdd5c2fa918d29f756f6b955dc9f5388de2cde31c63241da1115168657d855a5dbac6f400b0b7e3896b14b
+SHA512 (HandBrake-1.8.0-source.tar.bz2) = 9f1d0408500ee682525359c6444476eedf280b0913c0fbe6788586b2e05647e873388fdb533d9cf6fe9dd93ffb91ab464abdaaa7fed2de95ccb6d5d04f9b616c
+SHA512 (HandBrake-1.8.0-source.tar.bz2.sig) = 3757ed18ddb46724f5295680cea211a2724d027cbe3f82569efc8000c440ad8656e7df6889d339f0f5d1729744f7b847796c62585e6e5b0e601f7757f872928b
5 months, 2 weeks
[flowblade] Update to 2.16.2
by Martin Gansser
commit 25290f9ada25229a1971cd75b930406be48e2759
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Jun 8 10:31:00 2024 +0200
Update to 2.16.2
Add %{name}-invalid-escape-sequence.patch
.gitignore | 1 +
flowblade-invalid-escape-sequence.patch | 29 +++++++++++++++++++++++++++++
flowblade.spec | 11 ++++++++---
sources | 2 +-
4 files changed, 39 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a29654..e357f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/flowblade-2.14.0.1.tar.gz
/flowblade-2.14.0.2.tar.gz
/flowblade-2.16.tar.gz
+/flowblade-2.16.2.tar.gz
diff --git a/flowblade-invalid-escape-sequence.patch b/flowblade-invalid-escape-sequence.patch
new file mode 100644
index 0000000..349175d
--- /dev/null
+++ b/flowblade-invalid-escape-sequence.patch
@@ -0,0 +1,29 @@
+--- ./flowblade-trunk/Flowblade/keyevents.py.orig 2024-06-08 09:56:17.758693101 +0200
++++ ./flowblade-trunk/Flowblade/keyevents.py 2024-06-08 09:57:55.533079094 +0200
+@@ -561,10 +561,10 @@
+ if modifier == "":
+ modifier = 'None'
+ try:
+- action = _secondary_dict[''.join(sorted(re.sub('[\s]','',modifier.lower())))]
++ action = _secondary_dict[''.join(sorted(re.sub(r'[\s+]','',modifier.lower())))]
+ except:
+ try:
+- action = _secondary_dict[''.join(sorted(re.sub('[\s]','','Any'.lower())))]
++ action = _secondary_dict[''.join(sorted(re.sub(r'[\s+]','','Any'.lower())))]
+ except:
+ action = 'None'
+ return action
+--- ./flowblade-trunk/Flowblade/shortcuts.py.orig 2024-06-08 09:59:00.103761405 +0200
++++ ./flowblade-trunk/Flowblade/shortcuts.py 2024-06-08 09:59:42.021175923 +0200
+@@ -141,9 +141,9 @@
+ # to easily compare with any entered combo of the modifiers. In fact, CTRL+ALT becomes the
+ # same as ALT+CTRL and Alt+Ctrl- it will all be +acllrtt
+ if event.get('modifiers') == None:
+- _modifier_dict[''.join(sorted(re.sub('[\s]','','None'.lower())))] = event.get('code')
++ _modifier_dict[''.join(sorted(re.sub(r'[\s+]','','None'.lower())))] = event.get('code')
+ else:
+- _modifier_dict[''.join(sorted(re.sub('[\s]','',event.get('modifiers').lower())))] = event.get('code')
++ _modifier_dict[''.join(sorted(re.sub(r'[\s+]','',event.get('modifiers').lower())))] = event.get('code')
+ _keyboard_actions[event.text] = _modifier_dict
+ _editable = root.get('editable')
+ except:
diff --git a/flowblade.spec b/flowblade.spec
index 5b0d38f..95c085c 100644
--- a/flowblade.spec
+++ b/flowblade.spec
@@ -12,8 +12,8 @@ Name: flowblade
Version: 2.14.0.2
Release: 1%{?dist}
%else
-Version: 2.16
-Release: 2%{?dist}
+Version: 2.16.2
+Release: 1%{?dist}
%endif
License: GPLv3
Summary: Multitrack non-linear video editor for Linux
@@ -23,7 +23,8 @@ Source0: %{url}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar
%else
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
%endif
-Patch0: flowblade_sys_path.patch
+Patch0: %{name}_sys_path.patch
+Patch1: %{name}-invalid-escape-sequence.patch
#Patch1: mlt7.patch
BuildRequires: desktop-file-utils
@@ -123,6 +124,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{python3_sitelib}/%{name}*
%changelog
+* Sat Jun 08 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.16.2-1
+- Update to 2.16.2
+- Add %%{name}-invalid-escape-sequence.patch
+
* Wed May 29 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.16-2
- Add RR python3-libusb1
diff --git a/sources b/sources
index 417d5f5..e9b2a61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flowblade-2.16.tar.gz) = 55e71d56d8383d13d870fc513e2601dcff3b25960ae4a62692c3efbce9baea6dfda46beab1dd51efb7e626726458e7c056005677d394222c3fd9ecae0173eb4d
+SHA512 (flowblade-2.16.2.tar.gz) = 0bfb8595bed047dd46927feb3b899d16a38b0c1684acc62704a184f6f7dfd0ac88e9da679ddc34d2f4421612882dd03130412c392347f8bd0a6b261d4f5b0c6e
5 months, 2 weeks
[flowblade/f39] Update to 2.16.2
by Martin Gansser
Summary of changes:
cfb49df... Update to 2.16.2 (*)
(*) This commit already existed in another branch; no separate mail sent
5 months, 2 weeks
[flowblade/f40] Update to 2.16.2
by Martin Gansser
commit cfb49dfec449a21a2d6ae747c24f14d374c07896
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Jun 8 10:20:47 2024 +0200
Update to 2.16.2
Add %{name}-invalid-escape-sequence.patch
.gitignore | 1 +
flowblade-invalid-escape-sequence.patch | 29 +++++++++++++++++++++++++++++
flowblade.spec | 11 ++++++++---
sources | 2 +-
4 files changed, 39 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a29654..e357f23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/flowblade-2.14.0.1.tar.gz
/flowblade-2.14.0.2.tar.gz
/flowblade-2.16.tar.gz
+/flowblade-2.16.2.tar.gz
diff --git a/flowblade-invalid-escape-sequence.patch b/flowblade-invalid-escape-sequence.patch
new file mode 100644
index 0000000..349175d
--- /dev/null
+++ b/flowblade-invalid-escape-sequence.patch
@@ -0,0 +1,29 @@
+--- ./flowblade-trunk/Flowblade/keyevents.py.orig 2024-06-08 09:56:17.758693101 +0200
++++ ./flowblade-trunk/Flowblade/keyevents.py 2024-06-08 09:57:55.533079094 +0200
+@@ -561,10 +561,10 @@
+ if modifier == "":
+ modifier = 'None'
+ try:
+- action = _secondary_dict[''.join(sorted(re.sub('[\s]','',modifier.lower())))]
++ action = _secondary_dict[''.join(sorted(re.sub(r'[\s+]','',modifier.lower())))]
+ except:
+ try:
+- action = _secondary_dict[''.join(sorted(re.sub('[\s]','','Any'.lower())))]
++ action = _secondary_dict[''.join(sorted(re.sub(r'[\s+]','','Any'.lower())))]
+ except:
+ action = 'None'
+ return action
+--- ./flowblade-trunk/Flowblade/shortcuts.py.orig 2024-06-08 09:59:00.103761405 +0200
++++ ./flowblade-trunk/Flowblade/shortcuts.py 2024-06-08 09:59:42.021175923 +0200
+@@ -141,9 +141,9 @@
+ # to easily compare with any entered combo of the modifiers. In fact, CTRL+ALT becomes the
+ # same as ALT+CTRL and Alt+Ctrl- it will all be +acllrtt
+ if event.get('modifiers') == None:
+- _modifier_dict[''.join(sorted(re.sub('[\s]','','None'.lower())))] = event.get('code')
++ _modifier_dict[''.join(sorted(re.sub(r'[\s+]','','None'.lower())))] = event.get('code')
+ else:
+- _modifier_dict[''.join(sorted(re.sub('[\s]','',event.get('modifiers').lower())))] = event.get('code')
++ _modifier_dict[''.join(sorted(re.sub(r'[\s+]','',event.get('modifiers').lower())))] = event.get('code')
+ _keyboard_actions[event.text] = _modifier_dict
+ _editable = root.get('editable')
+ except:
diff --git a/flowblade.spec b/flowblade.spec
index 5b0d38f..95c085c 100644
--- a/flowblade.spec
+++ b/flowblade.spec
@@ -12,8 +12,8 @@ Name: flowblade
Version: 2.14.0.2
Release: 1%{?dist}
%else
-Version: 2.16
-Release: 2%{?dist}
+Version: 2.16.2
+Release: 1%{?dist}
%endif
License: GPLv3
Summary: Multitrack non-linear video editor for Linux
@@ -23,7 +23,8 @@ Source0: %{url}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar
%else
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
%endif
-Patch0: flowblade_sys_path.patch
+Patch0: %{name}_sys_path.patch
+Patch1: %{name}-invalid-escape-sequence.patch
#Patch1: mlt7.patch
BuildRequires: desktop-file-utils
@@ -123,6 +124,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{python3_sitelib}/%{name}*
%changelog
+* Sat Jun 08 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.16.2-1
+- Update to 2.16.2
+- Add %%{name}-invalid-escape-sequence.patch
+
* Wed May 29 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.16-2
- Add RR python3-libusb1
diff --git a/sources b/sources
index 417d5f5..e9b2a61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flowblade-2.16.tar.gz) = 55e71d56d8383d13d870fc513e2601dcff3b25960ae4a62692c3efbce9baea6dfda46beab1dd51efb7e626726458e7c056005677d394222c3fd9ecae0173eb4d
+SHA512 (flowblade-2.16.2.tar.gz) = 0bfb8595bed047dd46927feb3b899d16a38b0c1684acc62704a184f6f7dfd0ac88e9da679ddc34d2f4421612882dd03130412c392347f8bd0a6b261d4f5b0c6e
5 months, 2 weeks
[vdr-markad/f39] Update to 3.6.6
by Martin Gansser
Summary of changes:
b58a492... Update to 3.6.6 (*)
(*) This commit already existed in another branch; no separate mail sent
5 months, 2 weeks
[vdr-markad/f40] Update to 3.6.6
by Martin Gansser
Summary of changes:
b58a492... Update to 3.6.6 (*)
(*) This commit already existed in another branch; no separate mail sent
5 months, 2 weeks
[vdr-markad] Update to 3.6.6
by Martin Gansser
commit b58a49272ede1a6aa2812b8234e69ade3ec6a9cc
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Jun 8 09:42:33 2024 +0200
Update to 3.6.6
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8eac4f0..d6e7b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.6.3.tar.gz
/vdr-markad-3.6.4.tar.gz
/vdr-markad-3.6.5.tar.gz
+/vdr-markad-3.6.6.tar.gz
diff --git a/sources b/sources
index 64a9a4e..6c9752a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.6.5.tar.gz) = 1d55374a94924eece1dbd971a7aba8bc116c006993933ed9ba355dcd39a7ddf7062a5602fc29838ea0d6b2ab02179871f2d10b2fa91710cad8ce67bf3a4bba31
+SHA512 (vdr-markad-3.6.6.tar.gz) = de60f6da4f9ace63afbd598cf0aab075d5dafc9316334f74e06de376e2cb90e475077dde519761d34689634f6a7d4025aeffb6d34d04cb43a54e9332ef85979e
diff --git a/vdr-markad.spec b/vdr-markad.spec
index ee95379..8825490 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 3.6.5
+Version: 3.6.6
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -72,6 +72,9 @@ fi
%doc html
%changelog
+* Sat Jun 08 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.6.6-1
+- Update to 3.6.6
+
* Fri May 31 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.6.5-1
- Update to 3.6.5
5 months, 2 weeks
[vcmi/f40] (4 commits) ...New upstream release
by runlevel5
Summary of changes:
b07501e... New upstream release (*)
b2e520c... Disable Innoextract build (*)
b733d4a... Move the .qm files to the expected directories (*)
108966b... New upstream release (*)
(*) This commit already existed in another branch; no separate mail sent
5 months, 2 weeks
[vcmi] New upstream release
by runlevel5
commit 108966b2bf8619e0bec870ee12c99749a7bfc307
Author: Trung Lê <8(a)tle.id.au>
Date: Sat Jun 8 00:06:47 2024 +1000
New upstream release
sources | 2 +-
vcmi.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 5f8cf32..2eeaa10 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vcmi-1.5.1.tar.gz) = 840bd3c79c2d1b25bb30e2630812cd0f99b956f15b579eb6377ba8be80d49cbb0c2566c80b462064022f63799133bdfcb2a141252bcd663f1cbee8d9d99bdb5d
+SHA512 (vcmi-1.5.2.tar.gz) = f7ce8c8849e50576a86e69f4733bc54363862c1d5081b2b43fdb747d0d8dee9d331b4cb5b776fc1de65b88f78eaddf1d5ab2347d53215ee6a6fa5c9c68a4917b
SHA512 (fuzzylite-7aee562.tar.gz) = f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
diff --git a/vcmi.spec b/vcmi.spec
index 58da9d6..104b775 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -6,8 +6,8 @@ URL: https://vcmi.eu/
%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
%global fuzzylite_version 6.0
-Version: 1.5.1
-Release: 1%{?dist}
+Version: 1.5.2
+Release: 0%{?dist}
# vcmi is GPLv2+, fyzzylight is GPLv3
License: GPLv2+ and GPLv3
@@ -136,6 +136,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Wed Jun 5 2024 Trung Lê <8(a)tle.id.au> - 1.5.2-0
+- New upstream release
+
* Mon May 27 2024 Trung Lê <8(a)tle.id.au> - 1.5.1-1
- New upstream release
5 months, 2 weeks