Hello community,
here is the log from the commit of package aegisub for openSUSE:Factory checked in at 2017-06-08 15:02:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aegisub (Old)
and /work/SRC/openSUSE:Factory/.aegisub.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aegisub"
Thu Jun 8 15:02:15 2017 rev:23 rq:501091 version:3.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/aegisub/aegisub.changes 2017-03-24 02:22:06.472216196 +0100
+++ /work/SRC/openSUSE:Factory/.aegisub.new/aegisub.changes 2017-06-08 15:02:20.888569569 +0200
@@ -1,0 +2,11 @@
+Mon Jun 5 07:47:20 UTC 2017 - tchvatal@suse.com
+
+- Add constraints file to allow paralel build
+- Add changelog to files list to ensure plain rpmbuild to work
+- Do not bundle luajit remove-vendor-luajit-dependency.patch
+- Disable the version checking, calling home in desktop apps is
+ really bad idea, esp since upstream is semi-dead
+- Add patch to fix build with icu59 icu59.patch
+- Add patch to not put O3 to the cflags aegisub-no-optimize.patch
+
+-------------------------------------------------------------------
New:
----
_constraints
aegisub-no-optimize.patch
icu59.patch
remove-vendor-luajit-dependency.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aegisub.spec ++++++
--- /var/tmp/diff_new_pack.mRR8kj/_old 2017-06-08 15:02:22.176387820 +0200
+++ /var/tmp/diff_new_pack.mRR8kj/_new 2017-06-08 15:02:22.184386691 +0200
@@ -17,7 +17,6 @@
%bcond_with ffms2
-
Name: aegisub
Version: 3.2.2
Release: 0
@@ -26,21 +25,18 @@
Group: Productivity/Multimedia/Video/Editors and Convertors
Url: http://www.aegisub.net/
Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.xz
+Source99: aegisub.changes
Patch0: aegisub.build-compare.patch
Patch1: Makefile.inc.in.patch
+Patch2: remove-vendor-luajit-dependency.patch
+Patch3: icu59.patch
+Patch4: aegisub-no-optimize.patch
BuildRequires: autoconf
BuildRequires: automake
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_filesystem-devel
-BuildRequires: libboost_locale-devel
-BuildRequires: libboost_regex-devel
-BuildRequires: libboost_thread-devel
-%else
-BuildRequires: boost-devel >= 1.50.0
-%endif
BuildRequires: gcc-c++
BuildRequires: intltool
-BuildRequires: pkg-config >= 0.20
+BuildRequires: lua51
+BuildRequires: pkgconfig >= 0.20
BuildRequires: wxWidgets-devel >= 3
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(fftw3) >= 3.3
@@ -49,12 +45,20 @@
BuildRequires: pkgconfig(hunspell) >= 1.2.0
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libpulse) >= 0.5
-BuildRequires: pkgconfig(lua) >= 5.1
+BuildRequires: pkgconfig(luajit)
BuildRequires: pkgconfig(zlib)
+ExcludeArch: ppc ppc64 ppc64le
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_filesystem-devel
+BuildRequires: libboost_locale-devel
+BuildRequires: libboost_regex-devel
+BuildRequires: libboost_thread-devel
+%else
+BuildRequires: boost-devel >= 1.50.0
+%endif
%if %{with ffms2}
BuildRequires: pkgconfig(ffms2)
%endif
-ExcludeArch: ppc ppc64 ppc64le
%description
Aegisub is an advanced subtitle editor for Windows, and UNIX-like systems, such
@@ -69,18 +73,21 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/version.cpp
%build
-autoreconf -fi
-# Don't use --disable-update-checker because of http://blog.aegisub.org/2012/02/bit-of-statistics.html
-%configure --with-player-audio=PulseAudio \
+autoreconf -fvi
+%configure \
+ --disable-update-checker \
+ --with-player-audio=PulseAudio \
--without-oss
-# parallel make takes too much memory
-make -j1
+make %{?_smp_mflags}
%install
%make_install
++++++ _constraints ++++++
<constraints>
<hardware>
<physicalmemory>
<size unit="M">4000</size>
</physicalmemory>
</hardware>
</constraints>
++++++ aegisub-no-optimize.patch ++++++
Index: aegisub-3.2.2/configure
===================================================================
--- aegisub-3.2.2.orig/configure
+++ aegisub-3.2.2/configure
@@ -5949,8 +5949,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
else
- CFLAGS="$CFLAGS -O3"
- CXXFLAGS="$CXXFLAGS -O3"
+ CFLAGS="$CFLAGS"
+ CXXFLAGS="$CXXFLAGS"
fi
Index: aegisub-3.2.2/configure.ac
===================================================================
--- aegisub-3.2.2.orig/configure.ac
+++ aegisub-3.2.2/configure.ac
@@ -151,8 +151,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"
])
])
++++++ icu59.patch ++++++
diff -upr aegisub-3.2.2.orig/src/utils.cpp aegisub-3.2.2/src/utils.cpp
--- aegisub-3.2.2.orig/src/utils.cpp 2014-12-08 02:07:09.000000000 +0200
+++ aegisub-3.2.2/src/utils.cpp 2017-04-26 11:11:15.438239182 +0300
@@ -44,6 +44,7 @@
#include