[aegisub] Add missing BR - sort - Rework ExcludeArch
by Nicolas Chauvet
commit 20d567a482f39a4d5bf92e904bfa94e321f773ee
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 12 09:37:23 2019 +0200
Add missing BR - sort - Rework ExcludeArch
aegisub.spec | 43 ++++++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 19 deletions(-)
---
diff --git a/aegisub.spec b/aegisub.spec
index 8cd9fc2..492c1dc 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -28,36 +28,41 @@ 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
-ExcludeArch: ppc ppc64 ppc64le i686 armv7hl
-
-Requires: hicolor-icon-theme
+# luajit isn't available on powerpc
+# boost m4 detection is failing on i686 and armv7hl
+ExcludeArch: %{power64} %{ix86} %{arm}
+BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
-BuildRequires: automake
-BuildRequires: intltool
-BuildRequires: wxWidgets-devel
-#BuildRequires: openal-devel
-BuildRequires: portaudio-devel
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: libass-devel
-BuildRequires: ffms2-devel
-BuildRequires: fftw-devel
+BuildRequires: libtool
+
BuildRequires: alsa-lib-devel
BuildRequires: boost-devel
-BuildRequires: mesa-libGL-devel
+# To be enabled
+#BuildRequires: cajun-jsonapi-devel
+BuildRequires: ffms2-devel
+BuildRequires: fftw-devel
BuildRequires: hunspell-devel
-BuildRequires: lua-devel
-BuildRequires: zlib-devel
-BuildRequires: libX11-devel
-BuildRequires: valgrind-devel
-BuildRequires: desktop-file-utils
-BuildRequires: luajit-devel
+BuildRequires: intltool
+BuildRequires: libass-devel
#Used for OpenAL tests during configure
#BuildRequires: libcxx-devel
+BuildRequires: libGL-devel
+BuildRequires: libICE-devel
+BuildRequires: libX11-devel
+BuildRequires: lua-devel
+BuildRequires: luajit-devel
+#BuildRequires: openal-devel
+BuildRequires: portaudio-devel
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: uchardet-devel
+BuildRequires: wxWidgets-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: hicolor-icon-theme
%description
5 years, 5 months
[VirtualBox-kmod/f29: 3/3] Merge branch 'master' into f29
by Sérgio M. Basto
commit 1f407f4cf278f7d25639802ce2bd699ccccdb7c6
Merge: 077b8c2 fe5e13d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jul 11 00:09:03 2019 +0100
Merge branch 'master' into f29
VirtualBox-kmod.spec | 22 +++++++++++++---
kernel-5.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++
new-kernel-5.2.patch | 63 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 153 insertions(+), 4 deletions(-)
---
5 years, 5 months
[VirtualBox-kmod] Fix build of vboxpci module under Linux 5.2, thanks to Steve Storey
by Sérgio M. Basto
commit fe5e13d308f2c1915d8177506ac31714ac7c94cd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jul 11 00:08:17 2019 +0100
Fix build of vboxpci module under Linux 5.2, thanks to Steve Storey
VirtualBox-kmod.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index abed544..0f3103e 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -45,7 +45,7 @@
Name: VirtualBox-kmod
Version: 6.0.8
-Release: 2%{?dist}
+Release: 3%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -114,9 +114,10 @@ for kernel_version in %{?kernel_versions}; do
make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules
done
- # copy vboxdrv (for host) module symbols which are used by vboxnetflt and vboxnetadp km's:
+ # copy vboxdrv (for host) module symbols which are used by vboxpci, vboxnetflt and vboxnetadp km's:
cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetadp}
cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetflt}
+ cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxpci}
%if ! %{with newvboxsf}
# copy vboxguest (for guest) module symbols which are used by vboxsf km:
cp _kmod_build_${kernel_version%%___*}/{vboxguest/Module.symvers,vboxsf}
@@ -150,6 +151,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Jul 10 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.8-3
+- Fix build of vboxpci module under Linux 5.2, thanks to Steve Storey
+
* Fri May 31 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.8-2
- Fixes for kernel 5.2
5 years, 5 months
[aegisub] Use same arches of opensuse
by Sérgio M. Basto
commit d3808b809e307502a540e115df641533e782255d
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jul 10 01:14:35 2019 +0100
Use same arches of opensuse
aegisub.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/aegisub.spec b/aegisub.spec
index 01d47cd..8cd9fc2 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -28,7 +28,7 @@ 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
-ExclusiveArch: i686 x86_64 armv7hl
+ExcludeArch: ppc ppc64 ppc64le i686 armv7hl
Requires: hicolor-icon-theme
5 years, 5 months
[aegisub] Update to git20180710 ( commit 524c6114a82157b143567240884de3a6d030b091 ) (#5275)
by Sérgio M. Basto
commit 6bbe68dc0bbc86bb725197a5d6b73edb759bfa75
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jul 10 00:58:31 2019 +0100
Update to git20180710 ( commit 524c6114a82157b143567240884de3a6d030b091 )
(#5275)
.gitignore | 1 +
Makefile.inc.in.patch | 26 +++
...lockCache-Fix-crash-in-cache-invalidation.patch | 25 +++
aegisub-boost169.patch | 82 ++++++++++
aegisub-git-version.patch | 8 +
aegisub-no-optimize.patch | 16 ++
aegisub-pthread.patch | 11 --
aegisub.spec | 57 ++++---
icu_59_buildfix.patch | 21 ---
icu_61_buildfix.patch | 58 -------
luabins.patch | 182 +++++++++++++++++++++
remove-vendor-luajit-dependency.patch | 81 +++++++++
sources | 2 +-
13 files changed, 455 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 206c2ff..031ec09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/aegisub-3.2.2.tar.gz
+/aegisub-524c611.tar.gz
diff --git a/Makefile.inc.in.patch b/Makefile.inc.in.patch
new file mode 100644
index 0000000..d731fd8
--- /dev/null
+++ b/Makefile.inc.in.patch
@@ -0,0 +1,26 @@
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in 2019-03-29 13:17:21.692386078 +0200
+@@ -29,7 +29,7 @@ CXXFLAGS = @CXXFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS_DEP = -MMD -MP
+ LIBS = @LIBS@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -pthread
+ INSTALL_FLAGS = -m 644
+ LIB_SHARED_LINK = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL)
+ LIB_SHARED_LINK_OSX = -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.8 -install_name ${CURDIR}/$(LIB_SHARED_FULL)
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac 2019-03-29 13:17:21.692386078 +0200
+@@ -136,7 +136,7 @@ AS_IF([test x$enable_compiler_flags != x
+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
+ AC_CXX_FLAG([-std=c++11])
+- AC_CXX_FLAG([-Wno-c++11-narrowing])
++ AC_CXX_FLAG([-Wno-narrowing])
+ AC_C_FLAG([-Wno-unused-local-typedefs])
+ AC_CXX_FLAG([-Wno-unused-local-typedefs])
+
diff --git a/aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch b/aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch
new file mode 100644
index 0000000..749e435
--- /dev/null
+++ b/aegisub-DataBlockCache-Fix-crash-in-cache-invalidation.patch
@@ -0,0 +1,25 @@
+From 7479ffbd6d9cc9bf9786d1f1d9f0e6307198681f Mon Sep 17 00:00:00 2001
+From: Martin Herkt <lachs0r(a)srsfckn.biz>
+Date: Thu, 14 Feb 2019 14:52:27 +0100
+Subject: [PATCH] DataBlockCache: Fix crash in cache invalidation
+
+Fixes #33
+---
+ src/block_cache.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/block_cache.h 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/block_cache.h 2019-03-29 13:17:48.209456221 +0200
+@@ -150,8 +150,8 @@ public:
+ }
+
+ // Remove old entries until we're under the max size
+- for (auto it = age.rbegin(); size > max_size && it != age.rend(); )
+- KillMacroBlock(**it++);
++ for (auto it = age.rbegin(); size > max_size && it != age.rend(); it++)
++ KillMacroBlock(**it);
+ }
+
+ /// @brief Obtain a data block from the cache
diff --git a/aegisub-boost169.patch b/aegisub-boost169.patch
new file mode 100644
index 0000000..60611ce
--- /dev/null
+++ b/aegisub-boost169.patch
@@ -0,0 +1,82 @@
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/colour_button.cpp 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/colour_button.cpp 2019-03-29 13:05:42.776195551 +0200
+@@ -18,8 +18,16 @@
+
+ #include "dialogs.h"
+
++#if BOOST_VERSION >= 106900
++
++#include <boost/gil.hpp>
++
++#else
++
+ #include <boost/gil/gil_all.hpp>
+
++#endif
++
+ AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
+
+ ColourButton::ColourButton(wxWindow *parent, wxSize const& size, bool alpha, agi::Color col, wxValidator const& validator)
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_provider_dummy.cpp 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_provider_dummy.cpp 2019-03-29 13:07:20.480135858 +0200
+@@ -45,8 +45,16 @@
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <libaegisub/format.h>
++#if BOOST_VERSION >= 106900
++
++#include <boost/gil.hpp>
++
++#else
++
+ #include <boost/gil/gil_all.hpp>
+
++#endif
++
+ DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
+ : framecount(frames)
+ , fps(fps)
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/video_frame.cpp 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/video_frame.cpp 2019-03-29 13:08:04.509911568 +0200
+@@ -16,7 +16,15 @@
+
+ #include "video_frame.h"
+
++#if BOOST_VERSION >= 106900
++
++#include <boost/gil.hpp>
++
++#else
++
+ #include <boost/gil/gil_all.hpp>
++
++#endif
+ #include <wx/image.h>
+
+ namespace {
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/subtitles_provider_libass.cpp 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/subtitles_provider_libass.cpp 2019-03-29 13:08:57.240038186 +0200
+@@ -46,7 +46,15 @@
+ #include <libaegisub/util.h>
+
+ #include <atomic>
++#if BOOST_VERSION >= 106900
++
++#include <boost/gil.hpp>
++
++#else
++
+ #include <boost/gil/gil_all.hpp>
++
++#endif
+ #include <memory>
+ #include <mutex>
+
diff --git a/aegisub-git-version.patch b/aegisub-git-version.patch
new file mode 100644
index 0000000..c6a4008
--- /dev/null
+++ b/aegisub-git-version.patch
@@ -0,0 +1,8 @@
+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
+@@ -0,0 +1,3 @@
++#define BUILD_GIT_VERSION_NUMBER 83736
++#define BUILD_GIT_VERSION_STRING "3.2.2+git20180710"
++#define TAGGED_RELEASE 0
diff --git a/aegisub-no-optimize.patch b/aegisub-no-optimize.patch
new file mode 100644
index 0000000..34aa60c
--- /dev/null
+++ b/aegisub-no-optimize.patch
@@ -0,0 +1,16 @@
+===================================================================
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/configure.ac 2019-03-29 13:17:21.692386078 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/configure.ac 2019-03-29 13:17:38.925081533 +0200
+@@ -145,8 +145,8 @@ AS_IF([test x$enable_compiler_flags != x
+ CFLAGS="$CFLAGS -O0"
+ CXXFLAGS="$CXXFLAGS -O0"
+ ], [
+- CFLAGS="$CFLAGS -O3"
+- CXXFLAGS="$CXXFLAGS -O3"
++ CFLAGS="$CFLAGS"
++ CXXFLAGS="$CXXFLAGS"
+ ])
+ ])
+
diff --git a/aegisub.spec b/aegisub.spec
index 5631a92..01d47cd 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -1,12 +1,13 @@
%global gituser Aegisub
%global gitname Aegisub
-%global commit f743d1411e09cbb2bd34ddd2d4b6738101fab710
+%global commit 524c6114a82157b143567240884de3a6d030b091
%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global gitdate 20180710
Name: aegisub
Version: 3.2.2
-Release: 12%{?dist}
+Release: 13.%{gitdate}.git%{shortcommit}%{?dist}
Summary: Tool for creating and modifying subtitles
#src/gl/ - MIT license. See src/gl/glext.h
@@ -15,26 +16,27 @@ Summary: Tool for creating and modifying subtitles
License: BSD and MIT and MPLv1.1
URL: http://www.aegisub.org
# https://github.com/Aegisub/Aegisub
-Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
-Patch0: %{name}-pthread.patch
-# Fix compilation against icu 59.1
-# https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721...
-%if 0%{?fedora} > 27
-Patch1: https://github.com/%{gituser}/%{gitname}/commit/dd67db47cb2203e7a14058e52...
-%endif
-%if 0%{?fedora} > 28
-Patch2: https://github.com/%{gituser}/%{gitname}/commit/d4461f65be5aa440506bd23e9...
-%endif
+Source0: https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{shor...
+Patch1: Makefile.inc.in.patch
+Patch2: remove-vendor-luajit-dependency.patch
+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
ExclusiveArch: i686 x86_64 armv7hl
Requires: hicolor-icon-theme
-BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: automake
+BuildRequires: intltool
BuildRequires: wxWidgets-devel
-BuildRequires: openal-devel
+#BuildRequires: openal-devel
BuildRequires: portaudio-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libass-devel
@@ -48,10 +50,10 @@ BuildRequires: lua-devel
BuildRequires: zlib-devel
BuildRequires: libX11-devel
BuildRequires: valgrind-devel
-BuildRequires: intltool
BuildRequires: desktop-file-utils
+BuildRequires: luajit-devel
#Used for OpenAL tests during configure
-BuildRequires: libcxx-devel
+#BuildRequires: libcxx-devel
#needed for the perl script downloading the additional documentation from wiki
#for offline reading
@@ -65,17 +67,20 @@ subtitles to audio, and features many powerful tools for styling them,
including a built-in real-time video preview.
%prep
-%autosetup -p1 -n %{gitname}-%{version}
-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
+%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
-#remove version postfix
-sed -i -e 's/aegisub-[0-9.]*/aegisub/g' configure
-%configure --with-wx-config=wx-config-3.0
+./autogen.sh
+%configure \
+ --disable-update-checker \
+ --with-player-audio=PulseAudio \
+ --without-oss \
+ --with-wx-config=wx-config-3.0
%make_build
@@ -96,6 +101,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Jul 09 2019 Sérgio Basto <sergio(a)serjux.com> - 3.2.2-13.20180710.git524c611
+- Update to git20180710 ( commit 524c6114a82157b143567240884de3a6d030b091 )
+ (#5275)
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3.2.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/luabins.patch b/luabins.patch
new file mode 100644
index 0000000..381b3b5
--- /dev/null
+++ b/luabins.patch
@@ -0,0 +1,182 @@
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/libaegisub/lua/modules/lpeg.c
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/libaegisub/lua/modules/lpeg.c 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/libaegisub/lua/modules/lpeg.c 2019-03-29 13:17:41.817198250 +0200
+@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
+ }
+
+
+-static struct luaL_reg pattreg[] = {
++static struct luaL_Reg pattreg[] = {
+ {"match", matchl},
+ {"print", printpat_l},
+ {"locale", locale_l},
+@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
+ };
+
+
+-static struct luaL_reg metapattreg[] = {
++static struct luaL_Reg metapattreg[] = {
+ {"__add", union_l},
+ {"__pow", star_l},
+ {"__sub", diff_l},
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/AUTHORS
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/AUTHORS 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/AUTHORS 2019-03-29 13:17:41.817198250 +0200
+@@ -2,3 +2,4 @@ Luabins authors:
+ ----------------
+
+ Alexander Gladysh <agladysh(a)gmail.com>
++hanxi <hanxi(a)gmail.com>
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/README.md
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/README.md 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/README.md 2019-03-29 13:17:41.817198250 +0200
+@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
+ Allows to save tuples of primitive Lua types into binary chunks
+ and to load saved data back.
+
++NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
++
+ On serialization
+ ----------------
+
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luabins.c
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luabins.c 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luabins.c 2019-03-29 13:17:41.817198250 +0200
+@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
+ }
+
+ /* luabins Lua module API */
+-static const struct luaL_reg R[] =
++static const struct luaL_Reg R[] =
+ {
+ { "save", l_save },
+ { "load", l_load },
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luaheaders.h
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luaheaders.h 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luaheaders.h 2019-03-29 13:17:41.817198250 +0200
+@@ -7,6 +7,16 @@ extern "C" {
+
+ #include <lua.h>
+ #include <lauxlib.h>
++
++#if !defined LUA_VERSION_NUM
++#define luaL_Reg luaL_reg
++#endif
++
++#if LUA_VERSION_NUM > 501
++#define luaL_register(L,n,R) (luaL_newlib(L,R))
++#define lua_objlen(L,i) lua_rawlen(L, (i))
++#endif
++
+ #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
+ }
+ #endif
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luainternals.h
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/src/luainternals.h 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/luainternals.h 2019-03-29 13:17:41.817198250 +0200
+@@ -7,6 +7,24 @@
+ #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
+ #define LUABINS_LUAINTERNALS_H_INCLUDED_
+
++#ifndef LUAI_BITSINT
++/*
++* LUAI_BITSINT defines the number of bits in an int.
++* CHANGE here if Lua cannot automatically detect the number of bits of
++* your machine. Probably you do not need to change this.
++*
++* avoid overflows in comparison */
++#if INT_MAX-20 < 32760
++#define LUAI_BITSINT 16
++#elif INT_MAX > 2147483640L
++/* int has at least 32 bits */
++#define LUAI_BITSINT 32
++#else
++#error "you must define LUA_BITSINT with number of bits in an integer"
++#endif
++
++#endif // ifndef LUAI_BITSINT
++
+ /*
+ * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
+ * WARNING: If your Lua config differs, fix this!
+@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
+ /*
+ ** max size of array part is 2^MAXBITS
+ */
+-#define LUAI_BITSINT 32
+ #if LUAI_BITSINT > 26
+ #define MAXBITS 26
+ #else
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/lualess.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/src/lualess.c 2019-03-29 13:17:41.817198250 +0200
+@@ -0,0 +1,32 @@
++/*
++* lualess.h
++* Lua-related definitions for lua-less builds (based on Lua manual)
++* See copyright notice in luabins.h
++*/
++
++#include <stdlib.h>
++
++/*
++* lua_Alloc-compatible allocator to use in Lua-less applications
++* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
++*/
++void * lbs_simplealloc(
++ void * ud,
++ void * ptr,
++ size_t osize,
++ size_t nsize
++ )
++{
++ (void) ud;
++ (void) osize; /* not used */
++
++ if (nsize == 0)
++ {
++ free(ptr);
++ return NULL;
++ }
++ else
++ {
++ return realloc(ptr, nsize);
++ }
++}
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/test/test.lua
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/vendor/luabins/test/test.lua 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/vendor/luabins/test/test.lua 2019-03-29 13:17:41.817198250 +0200
+@@ -6,6 +6,8 @@
+
+ package.cpath = "./?.so;"..package.cpath
+
++local pack = pack or table.pack
++local unpack = unpack or table.unpack
+ local randomseed = 1235134892
+ --local randomseed = os.time()
+
+@@ -145,6 +147,7 @@ end
+ -- Test helper functions
+ -- ----------------------------------------------------------------------------
+
++luabins = require 'luabins'
+ local luabins_local = require 'luabins'
+ assert(luabins_local == luabins)
+
+@@ -281,7 +284,7 @@ check_fail_save(
+ "can't save: unsupported type detected",
+ coroutine.create(function() end)
+ )
+-check_fail_save("can't save: unsupported type detected", newproxy())
++check_fail_save("can't save: unsupported type detected", function()end)
+
+ print("---> basic table tests")
+
diff --git a/remove-vendor-luajit-dependency.patch b/remove-vendor-luajit-dependency.patch
new file mode 100644
index 0000000..574e815
--- /dev/null
+++ b/remove-vendor-luajit-dependency.patch
@@ -0,0 +1,81 @@
+Subject: vendor/luajit is removed in the Debian package
+Author: Sebastian Reichel <sre(a)debian.org>
+Forwarded: not-needed
+Last-Update: 2014-08-06
+
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/header.mk 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/header.mk 2019-03-29 13:17:35.252933339 +0200
+@@ -13,7 +13,6 @@ subdirs := \
+ tests \
+ tools \
+ vendor/luabins \
+- vendor/luajit
+
+ subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
+
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/Makefile.inc.in 2019-03-29 13:17:21.692386078 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/Makefile.inc.in 2019-03-29 13:17:35.252933339 +0200
+@@ -79,7 +79,7 @@ CFLAGS_ICONV = @ICONV_CFLAGS@
+ CFLAGS_ICU = @ICU_I18N_CFLAGS@
+ CFLAGS_LIBASS = @LIBASS_CFLAGS@
+ CFLAGS_LIBPULSE = @LIBPULSE_CFLAGS@
+-CFLAGS_LUA = @LUAJIT_CFLAGS@
++CFLAGS_LUA = `pkg-config --cflags luajit`
+ CFLAGS_OPENAL = @OPENAL_CFLAGS@
+ CFLAGS_OSS = @OSS_CFLAGS@
+ CFLAGS_PORTAUDIO = @PORTAUDIO_CFLAGS@
+@@ -97,14 +97,14 @@ LIBS_ICONV = @ICONV_LIBS@
+ LIBS_ICU = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
+ LIBS_LIBASS = @LIBASS_LIBS@
+ LIBS_LIBPULSE = @LIBPULSE_LIBS@
+-LIBS_LUA = @LUAJIT_LIBS@
++LIBS_LUA = `pkg-config --libs luajit`
+ LIBS_OPENAL = @OPENAL_LIBS@
+ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
+ LIBS_PTHREAD = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
+ LIBS_UCHARDET = @UCHARDET_LIBS@
+
+ ifeq (yes, $(BUILD_DARWIN))
+-LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
++LIBS_LUA = `pkg-config --libs luajit`
+ endif
+
+ FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/Makefile 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/Makefile 2019-03-29 13:17:35.252933339 +0200
+@@ -12,6 +12,4 @@ repack-thes-dict_CPPFLAGS := -I$(TOP) -I
+
+ PROGRAM += $(d)repack-thes-dict
+
+-$(TOP)tools/respack.lua: $(shell command -v "$(BIN_LUA)")
+-
+ include $(TOP)Makefile.target
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/src/libresrc/Makefile 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/src/libresrc/Makefile 2019-03-29 13:17:35.252933339 +0200
+@@ -10,7 +10,7 @@ resrc_OBJ := \
+
+ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
+
+-RESPACK := cd $(TOP)src/libresrc; $(BIN_LUA) $(TOP)tools/respack.lua
++RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
+
+ $(d)bitmap.cpp: $(d)bitmap.h
+ $(d)default_config.cpp: $(d)default_config.h
+Index: Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua
+===================================================================
+--- Aegisub-524c6114a82157b143567240884de3a6d030b091.orig/tools/respack.lua 2018-07-10 00:06:51.000000000 +0200
++++ Aegisub-524c6114a82157b143567240884de3a6d030b091/tools/respack.lua 2019-03-29 13:17:35.252933339 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env luajit
++#!/usr/bin/lua
+ -- Copyright (c) 2014, Thomas Goyne <plorkyeran(a)aegisub.org>
+ --
+ -- Permission to use, copy, modify, and distribute this software for any
diff --git a/sources b/sources
index d477e87..d4e1541 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9857e606da76c3d7c2fef540da055357 aegisub-3.2.2.tar.gz
+f092f888824316e023f1e7cf4f04dd41 aegisub-524c611.tar.gz
5 years, 5 months
[rtmpdump] Add the latest 2 commits, they appear to be security commits.
by Sérgio M. Basto
commit be7eb47c316695f5ae306827b20f37e89f5a038f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jul 9 22:06:14 2019 +0100
Add the latest 2 commits, they appear to be security commits.
.gitignore | 1 +
rtmpdump.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d0bd42..8b16f99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
a107cef9b392616dff54fabfd37f985ee2190a6f.tar.gz
/rtmpdump-fa8646d.tar.gz
+/rtmpdump-c5f04a5.tar.gz
diff --git a/rtmpdump.spec b/rtmpdump.spec
index ec28cd3..5c15b9f 100644
--- a/rtmpdump.spec
+++ b/rtmpdump.spec
@@ -1,10 +1,10 @@
-%global commit fa8646daeb19dfd12c181f7d19de708d623704c0
+%global commit c5f04a58fc2aeea6296ca7c44ee4734c18401aa3
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20160224
+%global gitdate 20190330
Name: rtmpdump
Version: 2.4
-Release: 13.%{gitdate}.git%{shortcommit}%{?dist}
+Release: 14.%{gitdate}.git%{shortcommit}%{?dist}
Summary: Toolkit for RTMP streams
# The tools are GPLv2+. The library is LGPLv2+, see below.
@@ -77,6 +77,9 @@ rm -f %{buildroot}%{_libdir}/librtmp.a
%{_mandir}/man3/librtmp.3*
%changelog
+* Tue Jul 09 2019 Sérgio Basto <sergio(a)serjux.com> - 2.4-14.20190330.gitc5f04a5
+- Add the latest 2 commits, they appear to be security commits.
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4-13.20160224.gitfa8646d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
- Remove Group tag
diff --git a/sources b/sources
index d25216c..d7dad9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9572fe5e1dedabb68b7949ec84308dd rtmpdump-fa8646d.tar.gz
+64fc96a898c038d75bbaf13325b0fda2 rtmpdump-c5f04a5.tar.gz
5 years, 5 months
