[aegisub] fix
by Leigh Scott
commit 45e6cd0644df4b12df98a2a4ca653cef1919072f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 21:56:10 2020 +0000
fix
Restrict-the-usage-of-undocumented-wxBitmap.patch | 35 +++++++++++++++++++++++
aegisub.spec | 6 ++--
2 files changed, 39 insertions(+), 2 deletions(-)
---
diff --git a/Restrict-the-usage-of-undocumented-wxBitmap.patch b/Restrict-the-usage-of-undocumented-wxBitmap.patch
new file mode 100644
index 0000000..2d82ad4
--- /dev/null
+++ b/Restrict-the-usage-of-undocumented-wxBitmap.patch
@@ -0,0 +1,35 @@
+From 5f235ff459e6a7ec36639894d1f45a638a9d73f3 Mon Sep 17 00:00:00 2001
+From: wangqr <wangqr(a)wangqr.tk>
+Date: Sun, 23 Feb 2020 00:42:45 -0500
+Subject: [PATCH] Restrict the usage of undocumented wxBitmap ctor to wxWidgets
+ > 3.1.0
+
+Fix build for wxWidgets 3.0
+---
+ src/libresrc/libresrc.cpp | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
+index 79dc0f16c..b308c69d5 100644
+--- a/src/libresrc/libresrc.cpp
++++ b/src/libresrc/libresrc.cpp
+@@ -22,9 +22,17 @@
+
+ wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double scale, int dir) {
+ wxMemoryInputStream mem(buff, size);
++#if wxCHECK_VERSION(3, 1, 0)
++ // Since wxWidgets 3.1.0, there is an undocumented third parameter in the ctor of wxBitmap from wxImage
++ // This "scale" parameter sets the logical scale factor of the created wxBitmap
+ if (dir != wxLayout_RightToLeft)
+- return wxBitmap(wxImage(mem), -1, scale);
+- return wxBitmap(wxImage(mem).Mirror(), -1, scale);
++ return wxBitmap(wxImage(mem), wxBITMAP_SCREEN_DEPTH, scale);
++ return wxBitmap(wxImage(mem).Mirror(), wxBITMAP_SCREEN_DEPTH, scale);
++#else
++ if (dir != wxLayout_RightToLeft)
++ return wxBitmap(wxImage(mem));
++ return wxBitmap(wxImage(mem).Mirror());
++#endif
+ }
+
+ wxIcon libresrc_geticon(const unsigned char *buff, size_t size) {
diff --git a/aegisub.spec b/aegisub.spec
index 08781a6..ec3af5d 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -24,6 +24,7 @@ Patch4: luabins.patch
Patch5: aegisub-git-version.patch
# https://github.com/wangqr/Aegisub/commit/f4cc905c69ca69c68cb95674cefce4ab...
Patch6: aegisub-fix_build_with_make4.3.patch
+Patch7: Restrict-the-usage-of-undocumented-wxBitmap.patch
# luajit isn't available on powerpc
# boost m4 detection is failing on i686 and armv7hl
@@ -54,7 +55,7 @@ BuildRequires: luajit-devel
BuildRequires: portaudio-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: uchardet-devel
-BuildRequires: wxGTK-devel
+BuildRequires: wxGTK3-devel
BuildRequires: zlib-devel
#needed for the perl script downloading the additional documentation from wiki
@@ -80,12 +81,13 @@ including a built-in real-time video preview.
%build
+export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-deprecated-copy"
./autogen.sh
%configure \
--disable-update-checker \
--with-player-audio=PulseAudio \
--without-oss \
- --with-wx-config=wx-config-3.1
+ --with-wx-config=wx-config-3.0
%make_build
3 years, 5 months
[aegisub] Update to lastest git snapshot
by Leigh Scott
commit 74fade1113f5c2b509e9f1392a1e82b1487943eb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 21:14:14 2020 +0000
Update to lastest git snapshot
.gitignore | 1 +
...lockCache-Fix-crash-in-cache-invalidation.patch | 25 -------
aegisub-boost169.patch | 82 ----------------------
aegisub-git-version.patch | 10 ++-
aegisub.spec | 37 +++++-----
sources | 2 +-
6 files changed, 26 insertions(+), 131 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 031ec09..a713c63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/aegisub-3.2.2.tar.gz
/aegisub-524c611.tar.gz
+/aegisub-6f54695.tar.gz
diff --git a/aegisub-git-version.patch b/aegisub-git-version.patch
index c6a4008..18e70e4 100644
--- a/aegisub-git-version.patch
+++ b/aegisub-git-version.patch
@@ -1,8 +1,6 @@
-Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ Aegisub-524c6114a82157b143567240884de3a6d030b091/build/git_version.h 2019-03-29 13:17:45.073329657 +0200
+--- /dev/null
++++ a/build/git_version.h
@@ -0,0 +1,3 @@
-+#define BUILD_GIT_VERSION_NUMBER 83736
-+#define BUILD_GIT_VERSION_STRING "3.2.2+git20180710"
++#define BUILD_GIT_VERSION_NUMBER 7897
++#define BUILD_GIT_VERSION_STRING "3.2.2+git20191006"
+#define TAGGED_RELEASE 0
diff --git a/aegisub.spec b/aegisub.spec
index dead7b4..08781a6 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -1,13 +1,12 @@
%global gituser Aegisub
%global gitname Aegisub
-%global commit 524c6114a82157b143567240884de3a6d030b091
+%global commit 6f546951b4f004da16ce19ba638bf3eedefb9f31
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20180710
-
+%global gitdate 20191006
Name: aegisub
Version: 3.2.2
-Release: 19.%{gitdate}.git%{shortcommit}%{?dist}
+Release: 20.%{gitdate}.git%{shortcommit}%{?dist}
Summary: Tool for creating and modifying subtitles
#src/gl/ - MIT license. See src/gl/glext.h
@@ -23,12 +22,8 @@ Patch3: aegisub-no-optimize.patch
Patch4: luabins.patch
#PATCH-FIX-OPENSUSE - davejplater(a)gmail.com - aegisub-git-version.patch - Create git_version.h which is missing in git.
Patch5: aegisub-git-version.patch
-#PATCH-FIX-UPSTREAM - 9(a)cirno.systems - aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch - Fixes undefined behavior e.g. when scrolling the audio view in spectrogram mode.
-Patch6: aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch
-#PATCH-FIX-UPSTREAM - davejplater(a)gmail.com - aegisub-boost169.patch - Fixes build with boost 1.69 where boost/gil/gil_all.hpp is moved to -boost169.patch
-Patch7: aegisub-boost169.patch
# https://github.com/wangqr/Aegisub/commit/f4cc905c69ca69c68cb95674cefce4ab...
-Patch8: aegisub-fix_build_with_make4.3.patch
+Patch6: aegisub-fix_build_with_make4.3.patch
# luajit isn't available on powerpc
# boost m4 detection is failing on i686 and armv7hl
@@ -42,10 +37,11 @@ BuildRequires: alsa-lib-devel
BuildRequires: boost-devel
# To be enabled
#BuildRequires: cajun-jsonapi-devel
-BuildRequires: ffms2-devel
+BuildRequires: ffms2-devel >= 2.40
BuildRequires: fftw-devel
BuildRequires: hunspell-devel
BuildRequires: intltool
+BuildRequires: libappstream-glib
BuildRequires: libass-devel
#Used for OpenAL tests during configure
#BuildRequires: libcxx-devel
@@ -58,12 +54,18 @@ BuildRequires: luajit-devel
BuildRequires: portaudio-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: uchardet-devel
-BuildRequires: wxGTK3-devel
+BuildRequires: wxGTK-devel
BuildRequires: zlib-devel
#needed for the perl script downloading the additional documentation from wiki
#for offline reading
-Requires: /usr/bin/perl perl(strict) perl(HTML::LinkExtor) perl(LWP) perl(File::Path) perl(utf8) perl(URI) perl(warnings)
+Requires: /usr/bin/perl
+Requires: perl(strict)
+Requires: perl(HTML::LinkExtor)
+Requires: perl(LWP)
+Requires: perl(File::Path)
+Requires: perl(utf8) perl(URI)
+Requires: perl(warnings)
Requires: hicolor-icon-theme
@@ -75,10 +77,6 @@ including a built-in real-time video preview.
%prep
%autosetup -p1 -n %{gitname}-%{commit}
-#for file in subtitles_provider_libass video_provider_dummy video_frame colour_button
-#do
-# sed -i 's|boost/gil/gil_all.hpp|boost/gil.hpp|' src/${file}.cpp
-#done
%build
@@ -87,7 +85,7 @@ including a built-in real-time video preview.
--disable-update-checker \
--with-player-audio=PulseAudio \
--without-oss \
- --with-wx-config=wx-config-3.0
+ --with-wx-config=wx-config-3.1
%make_build
@@ -95,6 +93,7 @@ including a built-in real-time video preview.
%make_install
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/aegisub.appdata.xml
%find_lang %{name}
@@ -105,9 +104,13 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_metainfodir}/aegisub.appdata.xml
%changelog
+* Sun Nov 1 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.2.2-20.20191006.git6f54695
+- Update to lastest git snapshot
+
* Sun Nov 1 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.2.2-19.20180710.git524c611
- Rebuild
diff --git a/sources b/sources
index d4e1541..7ea20b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f092f888824316e023f1e7cf4f04dd41 aegisub-524c611.tar.gz
+SHA512 (aegisub-6f54695.tar.gz) = fad96a5794d78fd268bb87323e523175f179d1dc950f76be2f823c9803eb2b6e89e99d14b1c6ed3ac28b05d0509001fad329f8f3159c34b06311054d3a04ee4a
3 years, 5 months
[shotcut/f33] Fix patch
by Leigh Scott
Summary of changes:
9a2b408... Fix patch (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 5 months
[shotcut] Fix patch
by Leigh Scott
commit 9a2b408ad5d394bbb756f1c3ee6b506ec707f8ca
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 15:50:47 2020 +0000
Fix patch
Force_X.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/Force_X.patch b/Force_X.patch
index b86d69d..bd7cae4 100644
--- a/Force_X.patch
+++ b/Force_X.patch
@@ -1,5 +1,5 @@
---- a/packaging/linux/org.shotcut.Shotcut.desktop
-+++ b/packaging/linux/org.shotcut.Shotcut.desktop
+--- packaging/linux/org.shotcut.Shotcut.desktop
++++ packaging/linux/org.shotcut.Shotcut.desktop
@@ -7,7 +7,7 @@
GenericName[ru]=Видеоредактор
Comment=Shotcut is a free, open source, cross-platform video editor.
3 years, 5 months
[shotcut/f33] (2 commits) ...Force X (rfbz#5822)
by Leigh Scott
Summary of changes:
1db59fe... Is required mlt 6.22.1 to successful build (*)
72db606... Force X (rfbz#5822) (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 5 months
[shotcut] Force X (rfbz#5822)
by Leigh Scott
commit 72db606a7e307e512124af3f8d3c27970b462996
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 15:43:50 2020 +0000
Force X (rfbz#5822)
Force_X.patch | 12 ++++++++++++
shotcut.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/Force_X.patch b/Force_X.patch
new file mode 100644
index 0000000..b86d69d
--- /dev/null
+++ b/Force_X.patch
@@ -0,0 +1,12 @@
+--- a/packaging/linux/org.shotcut.Shotcut.desktop
++++ b/packaging/linux/org.shotcut.Shotcut.desktop
+@@ -7,7 +7,7 @@
+ GenericName[ru]=Видеоредактор
+ Comment=Shotcut is a free, open source, cross-platform video editor.
+ Comment[de]=Programm zum Bearbeiten und Abspielen von Videodateien.
+-Exec=shotcut %F
++Exec=env QT_QPA_PLATFORM=xcb shotcut %F
+ Icon=org.shotcut.Shotcut
+ Terminal=false
+ Categories=AudioVideo;Video;AudioVideoEditing;
+
diff --git a/shotcut.spec b/shotcut.spec
index c271aa1..0f0cb3b 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -4,7 +4,7 @@
Name: shotcut
Version: 20.09.27
-Release: 1%{dist}
+Release: 2%{dist}
#Release: 0.1.beta1%%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
@@ -17,6 +17,8 @@ Source1: %{name}.appdata.xml
Patch0: mlt_path.patch
# shotcut-noupdatecheck.patch -- Disable automatic update check
Patch1: shotcut-noupdatecheck.patch
+# Force X
+Patch2: Force_X.patch
BuildRequires: gcc-c++
BuildRequires: desktop-file-utils
@@ -184,6 +186,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.%{name}.S
%doc doc
%changelog
+* Sun Nov 1 2020 Leigh Scott <leigh123linux(a)gmail.com> - 20.09.27-2
+- Force X (rfbz#5822)
+
* Mon Sep 28 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 20.09.27-1
- Update to 20.09.27
3 years, 5 months
[aegisub] Rebuild
by Leigh Scott
commit cc1cb5621be3eabca974f76a6f61e584158e861a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 15:31:06 2020 +0000
Rebuild
aegisub.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/aegisub.spec b/aegisub.spec
index d031251..dead7b4 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -7,7 +7,7 @@
Name: aegisub
Version: 3.2.2
-Release: 18.%{gitdate}.git%{shortcommit}%{?dist}
+Release: 19.%{gitdate}.git%{shortcommit}%{?dist}
Summary: Tool for creating and modifying subtitles
#src/gl/ - MIT license. See src/gl/glext.h
@@ -108,6 +108,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%changelog
+* Sun Nov 1 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.2.2-19.20180710.git524c611
+- Rebuild
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.2.2-18.20180710.git524c611
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
3 years, 5 months
[vlc] Drop obsolete patches
by Leigh Scott
commit 4974293c9cf88022c678d0ee506a0120c54961bf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 15:27:28 2020 +0000
Drop obsolete patches
4f899efc13a3a8f5259ce260655dfdd6f4830299.patch | 55 ------
85aa32db726559743d08d2fcafbb90fc923c43ff.patch | 27 ---
libplacebo_patch_1.patch | 101 ----------
recent_srt_fix.patch | 25 +++
replace_deprecated_luaL_checkint.patch | 261 -------------------------
vlc.spec | 4 +
6 files changed, 29 insertions(+), 444 deletions(-)
---
diff --git a/recent_srt_fix.patch b/recent_srt_fix.patch
new file mode 100644
index 0000000..b6c4fa1
--- /dev/null
+++ b/recent_srt_fix.patch
@@ -0,0 +1,25 @@
+--- a/modules/access/srt.c
++++ b/modules/access/srt.c
+@@ -165,7 +165,7 @@
+
+ /* Set latency */
+ i_latency = var_InheritInteger( p_stream, "latency" );
+- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
+ &i_latency, sizeof( int ) );
+
+ psz_passphrase = var_InheritString( p_stream, "passphrase" );
+
+--- a/modules/access_output/srt.c
++++ b/modules/access_output/srt.c
+@@ -162,7 +162,7 @@
+
+ /* Set latency */
+ i_latency = var_InheritInteger( p_access, "latency" );
+- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
+ &i_latency, sizeof( int ) );
+
+ if ( psz_passphrase != NULL && psz_passphrase[0] != '\0')
+
+
diff --git a/vlc.spec b/vlc.spec
index c773e1e..15d1a8a 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -71,6 +71,9 @@ Patch7: Switch-to-Fedora-lua-5.1.patch
# Backport for 3.0 notifyd without gtk3
Patch9: notify-don-t-depend-on-any-GTK-version.patch
+# Fix build issue with recent SRT library
+# Based on https://git.videolan.org/?p=vlc.git;a=commit;h=6e8d77431127c482196115a6ee...
+Patch10: recent_srt_fix.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -345,6 +348,7 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac
%endif
%patch9 -p1
+%patch10 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
3 years, 5 months
[ffms2] Drop obsolete patches
by Leigh Scott
commit 85077db042e5b4c4e9929e893ad8bcf094f73506
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 12:37:26 2020 +0000
Drop obsolete patches
354940823be5002556dd827f0130faa7f656c139.patch | 286 -------------------------
721ec7b98062ebce67959bae8587bd69db15e40a.patch | 71 ------
2 files changed, 357 deletions(-)
3 years, 5 months
[ffms2] Update to 2.40
by Leigh Scott
commit a77068acfe141cea004bc4b1aa21982635fa2a53
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Nov 1 12:34:22 2020 +0000
Update to 2.40
.gitignore | 1 +
ffms2.spec | 22 +++++++++++++---------
sources | 2 +-
3 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bca25ce..7a6773f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/ffms2-2.23.tar.gz
+/ffms2-2.40.tar.gz
diff --git a/ffms2.spec b/ffms2.spec
index e3cf432..b32b502 100644
--- a/ffms2.spec
+++ b/ffms2.spec
@@ -1,17 +1,15 @@
Name: ffms2
-Version: 2.23
-Release: 17%{?dist}
+Version: 2.40
+Release: 1%{?dist}
License: MIT
Summary: Wrapper library around libffmpeg
URL: https://github.com/FFMS/ffms2
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# Patches required to remove libavresample
-Patch0: %{url}/commit/721ec7b98062ebce67959bae8587bd69db15e40a.patch
-Patch1: %{url}/commit/354940823be5002556dd827f0130faa7f656c139.patch
-BuildRequires: gcc, gcc-c++
+
+BuildRequires: gcc
+BuildRequires: gcc-c++
%{?el7:BuildRequires: epel-rpm-macros}
-BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig(libavformat)
@@ -20,6 +18,8 @@ BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libavutil)
BuildRequires: zlib-devel
+Provides: bundled(vapoursynth) = 35
+
%description
FFmpegSource (usually known as FFMS or FFMS2) is a cross-platform wrapper
library around libffmpeg, plus some additional components to deal with file
@@ -37,9 +37,10 @@ formats libavformat has (or used to have) problems with.
%prep
%autosetup -p1
sed -i 's/\r$//' COPYING
+mkdir -p src/config
+autoreconf -vfi
%build
-autoreconf -vfi
%configure --disable-static --disable-silent-rules
%make_build
@@ -54,7 +55,7 @@ rm -rf %{buildroot}%{_docdir}
%license COPYING
%doc README.md
%{_bindir}/ffmsindex
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/lib%{name}.so.4*
%files devel
%doc doc/*
@@ -63,6 +64,9 @@ rm -rf %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Nov 1 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.40-1
+- Update to 2.40
+
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.23-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index bfe29f1..cb1ce99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7728ae581e278ade6bc9f204faaff9e ffms2-2.23.tar.gz
+SHA512 (ffms2-2.40.tar.gz) = 407c4b0871f5046b9d364c2946eae88c46eec381b5748530d82918742fd4a36849de590024f8235af2785bd631c0299e591499dc43ae157ff2c6a6f2dab78b67
3 years, 5 months