[qt5-qtwebengine-freeworld] 5.12.1, sync changes from fedora packaging (deps, patches, etc...)
by Rex Dieter
commit b76f5c55c3643e50f745666a62299492d78cf8e1
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Mar 12 14:49:53 2019 -0500
5.12.1, sync changes from fedora packaging (deps, patches, etc...)
qt5-qtwebengine-freeworld.spec | 94 +-
...verywhere-src-5.10.0-gn-bootstrap-verbose.patch | 12 -
qtwebengine-everywhere-src-5.10.0-icu59.patch | 545 -
qtwebengine-everywhere-src-5.10.0-linux-pri.patch | 4 +-
...ywhere-src-5.10.0-no-aspirational-scripts.patch | 86 -
qtwebengine-everywhere-src-5.10.0-skia-neon.patch | 390 -
...gine-everywhere-src-5.10.0-system-icu-utf.patch | 463 -
...-everywhere-src-5.10.0-system-nspr-prtime.patch | 80 -
...ngine-everywhere-src-5.10.1-CVE-2018-6033.patch | 64 -
...engine-everywhere-src-5.10.1-gcc8-alignof.patch | 18 -
qtwebengine-everywhere-src-5.10.1-no-sse2.patch | 30292 -------------------
...gine-everywhere-src-5.10.1-security-5.9.5.patch | 1245 -
...verywhere-src-5.12.0-gn-bootstrap-verbose.patch | 12 +
qtwebengine-gcc9-drop-rsp-clobber.patch | 12 +
...ne-opensource-src-5.12.1-fix-extractcflag.patch | 12 +
...ine-opensource-src-5.9.0-fix-extractcflag.patch | 12 -
...e-opensource-src-5.9.0-webrtc-neon-detect.patch | 14 -
qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch | 11 -
sources | 1 -
19 files changed, 76 insertions(+), 33291 deletions(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index f0eda5a..ec6c162 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -43,8 +43,8 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.11.3
-Release: 2%{?dist}.1
+Version: 5.12.1
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -64,50 +64,18 @@ Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch
Patch1: qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
# fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the
# ARM flags with our %%qmake_qt5 macro, including for the next patch
-Patch2: qtwebengine-opensource-src-5.9.0-fix-extractcflag.patch
+Patch2: qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
# disable NEON vector instructions on ARM where the NEON code FTBFS due to
# GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch
-# use the system NSPR prtime (based on Debian patch)
-# We already depend on NSPR, so it is useless to copy these functions here.
-# Debian uses this just fine, and I don't see relevant modifications either.
-Patch4: qtwebengine-everywhere-src-5.10.0-system-nspr-prtime.patch
-# use the system ICU UTF functions
-# We already depend on ICU, so it is useless to copy these functions here.
-# I checked the history of that directory, and other than the renames I am
-# undoing, there were no modifications at all. Must be applied after Patch4.
-Patch5: qtwebengine-everywhere-src-5.10.0-system-icu-utf.patch
-# do not require SSE2 on i686
-# cumulative revert of Chromium reviews 187423002, 308003004, 511773002 (parts
-# relevant to QtWebEngine only), 516543004, 1152053004 and 1161853008, Chromium
-# Gerrit review 570351 and V8 Gerrit review 575756, along with some custom fixes
-# and improvements
-# also build V8 shared and twice on i686 (once for x87, once for SSE2)
-Patch6: qtwebengine-everywhere-src-5.10.1-no-sse2.patch
-# fix missing ARM -mfpu setting
-Patch9: qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch
# remove Android dependencies from openmax_dl ARM NEON detection (detect.c)
Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
-# restore NEON runtime detection in Skia: revert upstream review 1952953004,
-# restore the non-Android Linux NEON runtime detection code lost in upstream
-# review 1890483002, also add VFPv4 runtime detection
-Patch11: qtwebengine-everywhere-src-5.10.0-skia-neon.patch
-# webrtc: enable the CPU feature detection for ARM Linux also for Chromium
-Patch12: qtwebengine-opensource-src-5.9.0-webrtc-neon-detect.patch
# Force verbose output from the GN bootstrap process
-Patch21: qtwebengine-everywhere-src-5.10.0-gn-bootstrap-verbose.patch
-# Forward-port missing parts of build fix with system ICU >= 59 from 5.9:
-# https://codereview.qt-project.org/#/c/196922/
-# see QTBUG-60886 and QTBUG-65090
-Patch22: qtwebengine-everywhere-src-5.10.0-icu59.patch
-# Fix FTBFS with GCC 8 on i686: GCC8 has changed the alignof operator to return
-# the minimal alignment required by the target ABI instead of the preferred
-# alignment. This means int64_t is now 4 on i686 (instead of 8). Use __alignof__
-# to get the value we expect (and chromium checks for). Patch by spot.
-Patch23: qtwebengine-everywhere-src-5.10.1-gcc8-alignof.patch
+Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
# Fix/workaround FTBFS on aarch64 with newer glibc
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
-## Upstream patches:
+# borrow fix from chromium packaging
+Patch26: qtwebengine-gcc9-drop-rsp-clobber.patch
%if 0%{?bootstrap}
ExclusiveArch: %{ix86} x86_64
@@ -132,8 +100,12 @@ BuildRequires: ninja-build
BuildRequires: cmake
BuildRequires: bison
BuildRequires: flex
+BuildRequires: gcc-c++
+# gn links statically (for now)
+BuildRequires: libstdc++-static
BuildRequires: git-core
BuildRequires: gperf
+BuildRequires: krb5-devel
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: re2-devel
@@ -148,6 +120,7 @@ BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(egl)
+BuildRequires: pkgconfig(jsoncpp)
%if 0%{?use_system_ffmpeg}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
@@ -162,6 +135,7 @@ BuildRequires: pkgconfig(libwebp) >= 0.6.0
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(opus)
+BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(zlib)
%if 0%{?fedora} && 0%{?fedora} < 30
@@ -188,7 +162,7 @@ BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(lcms2)
BuildRequires: perl-interpreter
-BuildRequires: python
+BuildRequires: python2-devel
%if 0%{?use_system_libvpx}
BuildRequires: pkgconfig(vpx) >= 1.7.0
%endif
@@ -333,23 +307,24 @@ This version is compiled with support for patent-encumbered codecs enabled.
%if !0%{?arm_neon}
%patch3 -p1 -b .no-neon
%endif
-#patch4 -p1 -b .system-nspr-prtime
-#patch5 -p1 -b .system-icu-utf
-#patch6 -p1 -b .no-sse2
-%ifarch %{ix86}
-#global sse2 1
-%endif
-%patch9 -p1 -b .arm-fpu-fix
+
+## upstream patches
+
%patch10 -p1 -b .openmax-dl-neon
-#patch11 -p1 -b .skia-neon
-%patch12 -p1 -b .webrtc-neon-detect
-%patch21 -p1 -b .gn-bootstrap-verbose
-#patch22 -p1 -b .icu59
-%patch23 -p1 -b .gcc8
+## NEEDSWORK
+#patch21 -p1 -b .gn-bootstrap-verbose
%patch24 -p1 -b .aarch64-new-stat
+%patch26 -p1 -b .gcc9-drop-rsp-clobber
+
+# the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references
+# when building on older Qt releases
+%if "%{_qt5_version}" < "5.12.0"
+sed -i -e 's|QT_CONFIG(xkbcommon)|QT_CONFIG(xkbcommon_evdev)|g' src/core/web_event_factory.cpp
+%endif
+
# fix // in #include in content/renderer/gpu to avoid debugedit failure
-sed -i -e 's!gpu//!gpu/!g' \
- src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
+#sed -i -e 's!gpu//!gpu/!g' \
+# src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
# and another one in 2 files in WebRTC
sed -i -e 's!audio_processing//!audio_processing/!g' \
src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft.cc \
@@ -382,7 +357,7 @@ sed -i -e 's/use_jumbo_build=true/use_jumbo_build=false/g' src/core/config/commo
# generate qtwebengine-3rdparty.qdoc, it is missing from the tarball
pushd src/3rdparty
-python chromium/tools/licenses.py \
+%{__python2} chromium/tools/licenses.py \
--file-template ../../tools/about_credits.tmpl \
--entry-template ../../tools/about_credits_entry.tmpl \
credits >../webengine/doc/src/qtwebengine-3rdparty.qdoc
@@ -396,9 +371,13 @@ export STRIP=strip
export NINJAFLAGS="%{__ninja_common_opts}"
export NINJA_PATH=%{__ninja}
-%{qmake_qt5} CONFIG+="%{debug_config}" \
- QMAKE_EXTRA_ARGS+="-system-webengine-icu %{?system_ffmpeg_flag} -proprietary-codecs" .
+%{qmake_qt5} \
+ CONFIG+="%{debug_config}" \
+ QMAKE_EXTRA_ARGS+="-system-webengine-icu" \
+ QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
+ .
+# avoid %%make_build for now, the -O flag buffers output from intermediate build steps done via ninja
make %{?_smp_mflags}
%install
@@ -425,6 +404,9 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Tue Mar 12 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 5.12.1-1
+- 5.12.1, sync changes from fedora packaging (deps, patches, etc...)
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 5.11.3-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch b/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
index 162f63e..4bcd376 100644
--- a/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
+++ b/qtwebengine-everywhere-src-5.10.0-linux-pri.patch
@@ -19,5 +19,5 @@ diff -ur qtwebengine-everywhere-src-5.10.0/src/core/config/linux.pri qtwebengine
+CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()"
+R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py"
+R_G_F_PY_ARGS = "--system-libraries yasm"
-+log("Running python $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
-+!system("python $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
++log("Running python2 $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
++!system("python2 $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
diff --git a/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch b/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
new file mode 100644
index 0000000..9d4cadb
--- /dev/null
+++ b/qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
@@ -0,0 +1,12 @@
+diff -up qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro
+--- qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro.gn-bootstrap-verbose 2018-12-07 09:53:18.262171677 -0600
++++ qtwebengine-everywhere-src-5.12.0/src/buildtools/gn.pro 2018-12-07 09:57:53.246646133 -0600
+@@ -18,7 +18,7 @@ build_pass|!debug_and_release {
+ src_3rd_party_dir = $$absolute_path("$${getChromiumSrcDir()}/../", "$$QTWEBENGINE_ROOT")
+ gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
+
+- gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path
++ gn_configure = $$system_quote($$gn_bootstrap) --verbose --no-last-commit-position --out-path $$out_path
+ !system("$$pythonPathForSystem() $$gn_configure") {
+ error("GN generation error!")
+ }
diff --git a/qtwebengine-gcc9-drop-rsp-clobber.patch b/qtwebengine-gcc9-drop-rsp-clobber.patch
new file mode 100644
index 0000000..ecfda33
--- /dev/null
+++ b/qtwebengine-gcc9-drop-rsp-clobber.patch
@@ -0,0 +1,12 @@
+diff -up qtwebengine-everywhere-src-5.12.1/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.gcc9 qtwebengine-everywhere-src-5.12.1/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
+--- qtwebengine-everywhere-src-5.12.1/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.gcc9 2019-03-03 08:43:11.558507679 -0600
++++ qtwebengine-everywhere-src-5.12.1/src/3rdparty/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2019-03-03 08:43:44.941779231 -0600
+@@ -1485,7 +1485,7 @@ struct kernel_stat {
+ "d"(LSS_SYSCALL_ARG(parent_tidptr)),
+ "r"(LSS_SYSCALL_ARG(newtls)),
+ "r"(LSS_SYSCALL_ARG(child_tidptr))
+- : "rsp", "memory", "r8", "r10", "r11", "rcx");
++ : "memory", "r8", "r10", "r11", "rcx");
+ }
+ LSS_RETURN(int, __res);
+ }
diff --git a/qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch b/qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
new file mode 100644
index 0000000..3f047c2
--- /dev/null
+++ b/qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
@@ -0,0 +1,12 @@
+diff -up qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf.fix-extractcflag qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf
+--- qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf.fix-extractcflag 2019-02-01 09:25:44.950965875 -0600
++++ qtwebengine-everywhere-src-5.12.1/mkspecs/features/functions.prf 2019-02-01 09:28:39.290041131 -0600
+@@ -11,7 +11,7 @@ defineReplace(getChromiumSrcDir) {
+ }
+
+ defineReplace(extractCFlag) {
+- CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
++ CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS $$QMAKE_CFLAGS_RELEASE
+ OPTION = $$find(CFLAGS, $$1)
+ OPTION = $$split(OPTION, =)
+ PARAM = $$member(OPTION, 1)
diff --git a/sources b/sources
index 96b135f..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-c3c086fd2bc0b25fce9737b3a1fe63fb qtwebengine-everywhere-src-5.11.3.tar.xz
5 years, 8 months
[kplayer] Been ~10 years since last release, and recently FTBFS
by Rex Dieter
commit 98a09255f1d52e17bb2f0e3355d0fc3b551ec4b4
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Mar 12 14:32:05 2019 -0500
Been ~10 years since last release, and recently FTBFS
.gitignore | 0
dead.package | 1 +
2 files changed, 1 insertion(+)
---
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a3d123b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Been ~10 years since last release, and recently FTBFS
5 years, 8 months
[kplayer] Been ~10 years since last release, and recently FTBFS
by Rex Dieter
commit 68fcf4450e9882c21d2ecf71a63a29c67559e50a
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Mar 12 14:30:02 2019 -0500
Been ~10 years since last release, and recently FTBFS
.gitignore | 4 -
dead.package | 1 +
kplayer-desktop-fix.patch | 40 ---------
kplayer.spec | 210 ----------------------------------------------
sources | 1 -
5 files changed, 1 insertion(+), 255 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bbb18fc..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +0,0 @@
-kplayer-0.7.0-20081211cvs.tar.bz2
-kplayer-snapshot.sh
-/kplayer-0.7.2.tar.gz
-/kplayer-0.7.2.tar.xz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a3d123b
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Been ~10 years since last release, and recently FTBFS
5 years, 8 months
[x264] Disable bootstrap build
by Leigh Scott
commit 6c49d5d14bb11e71b799239e0ba7fa1c60333523
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 12 18:41:32 2019 +0000
Disable bootstrap build
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index 0e32f7d..057aef5 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-%global _with_bootstrap 1
+#global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 2%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 3%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -203,6 +203,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Tue Mar 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.157-3.20190303git72db437
+- Disable bootstrap build
+
* Tue Mar 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.157-2.20190303git72db437_bootstrap
- Do the forgotten bootstrap build
5 years, 8 months
[gpac] Mass rebuild for x264
by Leigh Scott
commit 96707e30ee75387bc12cf87a6db7e1480875b035
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 12 15:47:37 2019 +0000
Mass rebuild for x264
gpac.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gpac.spec b/gpac.spec
index f8d84cc..e3044c2 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -9,7 +9,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.7.1
-Release: 9%{?git:.%{git}git}%{?dist}
+Release: 10%{?git:.%{git}git}%{?dist}
License: LGPLv2+
URL: http://gpac.sourceforge.net/
Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.tar.gz
@@ -186,6 +186,9 @@ rm %{buildroot}%{_includedir}/gpac/config.h
%changelog
+* Tue Mar 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.7.1-10
+- Mass rebuild for x264
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.7.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 8 months
[x264] Do the forgotten bootstrap build
by Leigh Scott
commit 3206971f94bd3dddc579c4eb97892a0bfd166e58
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Mar 12 15:21:32 2019 +0000
Do the forgotten bootstrap build
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index cecdb12..0e32f7d 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 2%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -203,6 +203,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Tue Mar 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.157-2.20190303git72db437_bootstrap
+- Do the forgotten bootstrap build
+
* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-1.20190303git72db437
- Update to 0.157 (stable branch)
- Rebase patches
5 years, 8 months
[tvheadend] Fix build with GCC 9
by Mohamed ElMorabity
commit d759873574661359ec34769ef6461c30aa6554dd
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Mar 12 16:16:05 2019 +0100
Fix build with GCC 9
tvheadend-4.2.8-gcc9.patch | 36 ++++++++++++++++++++++++++++++++++++
tvheadend.spec | 9 ++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
---
diff --git a/tvheadend-4.2.8-gcc9.patch b/tvheadend-4.2.8-gcc9.patch
new file mode 100644
index 0000000..9ccadb4
--- /dev/null
+++ b/tvheadend-4.2.8-gcc9.patch
@@ -0,0 +1,36 @@
+diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c
+--- ./src/plumbing/transcoding.c.orig 2019-01-12 09:58:47.000000000 +0100
++++ ./src/plumbing/transcoding.c 2019-03-12 15:49:24.922314869 +0100
+@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s
+ char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)];
+ int codec_match=0;
+
+- strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
++ memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
+
+ tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n",
+ tp->tp_src_vcodec,
+@@ -2130,10 +2130,10 @@ transcoder_set_properties(streaming_targ
+ transcoder_t *t = (transcoder_t *)st;
+ transcoder_props_t *tp = &t->t_props;
+
+- strncpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
+- strncpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
+- strncpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
+- strncpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
++ memcpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1);
++ memcpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1);
++ memcpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1);
++ memcpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1);
+ tp->tp_channels = props->tp_channels;
+ tp->tp_vbitrate = props->tp_vbitrate;
+ tp->tp_abitrate = props->tp_abitrate;
+@@ -2141,7 +2141,7 @@ transcoder_set_properties(streaming_targ
+
+ memcpy(tp->tp_language, props->tp_language, 4);
+
+- strncpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
++ memcpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1);
+ }
+
+
diff --git a/tvheadend.spec b/tvheadend.spec
index 5d461b7..8f4ee4d 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -20,7 +20,7 @@
Name: tvheadend
Version: 4.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: TV streaming server and digital video recorder
License: GPLv3+
@@ -41,6 +41,8 @@ Patch3: %{name}-4.2.2-dtv_scan_tables.patch
Patch4: %{name}-4.2.1-crypto_policies.patch
# Python 3 fixes for Python bindings
Patch5: %{name}-4.2.7-python3.patch
+# Fix build with GCC 9
+Patch6: %{name}-4.2.8-gcc9.patch
BuildRequires: bzip2
BuildRequires: gcc
@@ -133,6 +135,8 @@ done
%build
+# https://github.com/FFmpeg/FFmpeg/commit/4361293
+export CFLAGS="$RPM_OPT_FLAGS -Wno-attributes"
echo "%{version}-%{release}" >rpm/version
# Note: --disable-lib* correspond to options to build bundled FFmpeg
%configure \
@@ -228,6 +232,9 @@ exit 0
%changelog
+* Tue Mar 12 2019 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.8-3
+- Fix build with GCC 9
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 8 months
[libquicktime] Mass rebuild for x264
by Sérgio M. Basto
commit cc61de5af79efd39f230c79f8aef434c06a781d7
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Mar 12 03:34:58 2019 +0000
Mass rebuild for x264
libquicktime.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libquicktime.spec b/libquicktime.spec
index 750563f..e91b11b 100644
--- a/libquicktime.spec
+++ b/libquicktime.spec
@@ -7,7 +7,7 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.4
-Release: 36%{?rel_string}%{?dist}
+Release: 37%{?rel_string}%{?dist}
License: LGPLv2+
URL: http://libquicktime.sourceforge.net/
Source0: https://sourceforge.net/code-snapshots/git/l/li/libquicktime/git.git/libq...
@@ -137,6 +137,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -a -name \*.la -exec rm {} \;
# --------------------------------------------------------------------
%changelog
+* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com> - 1.2.4-37.112.20180804gitfff99cd
+- Mass rebuild for x264
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.4-36.112.20180804gitfff99cd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 8 months
[gstreamer-plugins-ugly] Mass rebuild for x264
by Sérgio M. Basto
commit 3fda022ac40ff0e81de58b01fd8cf885f16973de
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Mar 12 03:34:41 2019 +0000
Mass rebuild for x264
gstreamer-plugins-ugly.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer-plugins-ugly.spec b/gstreamer-plugins-ugly.spec
index fbc6e8e..92ea2c5 100644
--- a/gstreamer-plugins-ugly.spec
+++ b/gstreamer-plugins-ugly.spec
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.19
-Release: 31%{?dist}
+Release: 32%{?dist}
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{...
@@ -125,6 +125,9 @@ gstreamer-plugins-good because:
%changelog
+* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com> - 0.10.19-32
+- Mass rebuild for x264
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.10.19-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 8 months