[libopenshot/f32] (4 commits) ...Fix gcc-10 -fno-common issue
by Leigh Scott
Summary of changes:
4134dea... Rebuild for ImageMagick on el7 (*)
2406e1e... Rebuild for python-3.9 (*)
8ad7d4b... add define for legacy_common_support (*)
4a61f1c... Fix gcc-10 -fno-common issue (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 5 months
[libopenshot] Fix gcc-10 -fno-common issue
by Leigh Scott
commit 4a61f1c37ecb5e08d64232b808aa7298d2eb6476
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jun 2 19:09:37 2020 +0100
Fix gcc-10 -fno-common issue
gcc10_fix.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
libopenshot.spec | 10 +++++++---
sources | 1 -
3 files changed, 58 insertions(+), 4 deletions(-)
---
diff --git a/gcc10_fix.patch b/gcc10_fix.patch
new file mode 100644
index 0000000..3adac26
--- /dev/null
+++ b/gcc10_fix.patch
@@ -0,0 +1,51 @@
+From 13290364e7bea54164ab83d973951f2898ad9e23 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils(a)gentoo.org>
+Date: Sat, 16 May 2020 02:33:37 +0300
+Subject: [PATCH] FFmpegUtilities: replace variable definition with statement
+ expression
+
+It is needed to avoid multiple definitions of AV_GET_CODEC_CONTEXT,
+which is considered as an error with '-fno-common' which is default
+since gcc-10.
+
+Fixes: #511
+---
+ include/FFmpegUtilities.h | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
+index 62d64df1..b4ec951f 100644
+--- a/include/FFmpegUtilities.h
++++ b/include/FFmpegUtilities.h
+@@ -163,11 +163,10 @@
+ #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+- AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+- avcodec_parameters_to_context(context, av_stream->codecpar); \
+- return context; \
+- };
++ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++ avcodec_parameters_to_context(context, av_stream->codecpar); \
++ context; })
+ #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
+@@ -199,11 +198,10 @@
+ #define AV_FREE_CONTEXT(av_context) avcodec_free_context(&av_context)
+ #define AV_GET_CODEC_TYPE(av_stream) av_stream->codecpar->codec_type
+ #define AV_FIND_DECODER_CODEC_ID(av_stream) av_stream->codecpar->codec_id
+- auto AV_GET_CODEC_CONTEXT = [](AVStream* av_stream, AVCodec* av_codec) { \
+- AVCodecContext *context = avcodec_alloc_context3(av_codec); \
+- avcodec_parameters_to_context(context, av_stream->codecpar); \
+- return context; \
+- };
++ #define AV_GET_CODEC_CONTEXT(av_stream, av_codec) \
++ ({ AVCodecContext *context = avcodec_alloc_context3(av_codec); \
++ avcodec_parameters_to_context(context, av_stream->codecpar); \
++ context; })
+ #define AV_GET_CODEC_PAR_CONTEXT(av_stream, av_codec) av_codec;
+ #define AV_GET_CODEC_FROM_STREAM(av_stream,codec_in)
+ #define AV_GET_CODEC_ATTRIBUTES(av_stream, av_context) av_stream->codecpar
diff --git a/libopenshot.spec b/libopenshot.spec
index 0c2f2db..34a6322 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,13 +1,14 @@
-%define _legacy_common_support 1
+%global github_url https://github.com/OpenShot/libopenshot
Name: libopenshot
Version: 0.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library for creating and editing videos
License: LGPLv3+
URL: http://www.openshot.org/
-Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version...
+Source0: %{github_url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0: %{github_url}/commit/13290364e7bea54164ab83d973951f2898ad9e23.patch#/gcc10_fix.patch
# libopenshot is completely broken on ppc64le, see rfbz #5528
ExcludeArch: ppc64le
@@ -103,6 +104,9 @@ make os_test
%{ruby_vendorarchdir}/*
%changelog
+* Tue Jun 02 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.2.5-4
+- Fix gcc-10 -fno-common issue
+
* Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.2.5-3
- Rebuild for python-3.9
diff --git a/sources b/sources
index 04fd197..2dad97d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (libopenshot-0.2.4.tar.gz) = 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
SHA512 (libopenshot-0.2.5.tar.gz) = b7cdf72897e6edaa8cc00e17dbe30f5b22a6b5d69aab64ddafb184458b41ef0332db1f3e2c6f039492bf7adb521d9758834d0bf6c24e6421a55970d8cf8caba7
4 years, 5 months
[VirtualBox] Fix build on EL8
by Sérgio M. Basto
commit 534430ee02d571456506126482919f390eb40d4f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Jun 2 15:50:05 2020 +0100
Fix build on EL8
VirtualBox.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index f2f3aaa..087ad2e 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 6.1.8
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -300,8 +300,6 @@ cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
# Remove prebuilt binary tools
find -name '*.py[co]' -delete
-# Remove pre-compiled headers
-find . -name "*.gch" -delete
rm -r src/VBox/Additions/WINNT
rm -r src/VBox/Additions/os2
rm -r kBuild/
@@ -332,7 +330,7 @@ rm -r src/libs/zlib-1.2.*/
%patch31 -p1 -b .gsoap2
%endif
%patch32 -p1 -b .vnc
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if %{with python3}
%patch40 -p1 -b .python2_path
%endif
# mageia support not ready for 6.0
@@ -403,6 +401,7 @@ kmk %{_smp_mflags} \
%{?with_docs: VBOX_WITH_DOCS=1 } \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_WITH_UPDATE_REQUEST= \
+ VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \
VBOX_BUILD_PUBLISHER=%{publisher}
# VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
@@ -872,6 +871,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue Jun 02 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-5
+- Fix build on EL8
+
* Sun May 31 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-4
- Add python-3.9 support
- Fix some conditionals of python especially for el8
4 years, 5 months
[python-ffmpeg-normalize] Initial package
by Leigh Scott
commit 1e865871e75bdc4cfa7e9713aa414769ef171202
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jun 2 15:28:06 2020 +0100
Initial package
.gitignore | 1 +
python-ffmpeg-normalize.spec | 65 ++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
3 files changed, 67 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b595548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/ffmpeg-normalize-1.19.0.tar.gz
diff --git a/python-ffmpeg-normalize.spec b/python-ffmpeg-normalize.spec
new file mode 100644
index 0000000..411d135
--- /dev/null
+++ b/python-ffmpeg-normalize.spec
@@ -0,0 +1,65 @@
+# Created by pyp2rpm-3.3.4
+%global pypi_name ffmpeg-normalize
+
+Name: python-%{pypi_name}
+Version: 1.19.0
+Release: 1%{?dist}
+Summary: Normalize audio via ffmpeg
+
+License: MIT
+URL: https://github.com/slhck/ffmpeg-normalize
+Source0: https://pypi.python.org/packages/source/f/%{pypi_name}/%{pypi_name}-%{ver...
+BuildArch: noarch
+
+BuildRequires: python3-devel
+BuildRequires: python3dist(setuptools)
+# Nedded for tests
+BuildRequires: ffmpeg >= 3.1
+BuildRequires: python3dist(tqdm) >= 4.38
+
+%description
+A utility for batch-normalizing audio using ffmpeg.
+This program normalizes media files to a certain LUFS level using the EBU R128
+loudness normalization procedure. It can also perform RMS-based normalization
+(where the mean is lifted or attenuated), or peak normalization to a certain
+target level.
+Batch processing of several input files is possible, including video files.
+
+%package -n python3-%{pypi_name}
+Summary: %{summary}
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+Requires: ffmpeg >= 3.1
+
+
+%description -n python3-%{pypi_name}
+A utility for batch-normalizing audio using ffmpeg.
+This program normalizes media files to a certain LUFS level using the EBU R128
+loudness normalization procedure. It can also perform RMS-based normalization
+(where the mean is lifted or attenuated), or peak normalization to a certain
+target level.
+Batch processing of several input files is possible, including video files.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+
+%build
+%py3_build
+
+%install
+%py3_install
+
+%check
+%{python3} test/test.py
+
+%files -n python3-%{pypi_name}
+%license LICENSE
+%doc README.md
+%{_bindir}/ffmpeg-normalize
+%{python3_sitelib}/ffmpeg_normalize
+%{python3_sitelib}/ffmpeg_normalize-%{version}-py%{python3_version}.egg-info
+
+%changelog
+* Mon Jun 01 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.19.0-1
+- Initial package.
diff --git a/sources b/sources
index e69de29..b56ff94 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (ffmpeg-normalize-1.19.0.tar.gz) = 753a79914d425b64572b6b991d266e396cf89b30d5b0a2b6f1ecf3723af1471e2b4a8ec60c1154c4715ccfd35128e5d555fe8a722f495df25c4aa0ffaf8ba85f
4 years, 5 months
[VirtualBox] Add python-3.9 support
by Sérgio M. Basto
commit 46960e3e14d856fe9a88a40c6207d3d06e8d1d71
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Jun 1 00:10:00 2020 +0100
Add python-3.9 support
Fix some conditionals of python especially for el8
37-python-3.7-support.patch | 17 --------
VirtualBox-python.patch | 101 ++++++++++++++++++++++++++++++++++++++++++++
VirtualBox.spec | 30 +++++++------
3 files changed, 119 insertions(+), 29 deletions(-)
---
diff --git a/VirtualBox-python.patch b/VirtualBox-python.patch
new file mode 100644
index 0000000..c8006d3
--- /dev/null
+++ b/VirtualBox-python.patch
@@ -0,0 +1,101 @@
+--- ./src/libs/xpcom18a4/python/gen_python_deps.py.orig 2020-06-01 05:15:00.905907651 +0100
++++ ./src/libs/xpcom18a4/python/gen_python_deps.py 2020-06-01 05:15:48.161226499 +0100
+@@ -16,7 +16,7 @@ from __future__ import print_function
+ import os,sys
+ from distutils.version import StrictVersion
+
+-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m" ]
++versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m" ]
+ prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
+ known = {}
+
+--- ./configure.orig 2020-06-01 01:15:53.880747364 +0100
++++ ./configure 2020-06-01 01:17:42.231478707 +0100
+@@ -1992,7 +1992,7 @@ extern "C" int main(void)
+ }
+ EOF
+ found=
+- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m"
++ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m"
+ for p in $PYTHONDIR; do
+ for d in $SUPPYTHONLIBS; do
+ for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
+--- ./src/libs/xpcom18a4/python/Makefile.kmk.orig 2020-06-01 05:16:07.610357728 +0100
++++ ./src/libs/xpcom18a4/python/Makefile.kmk 2020-06-01 05:22:44.735037239 +0100
+@@ -26,7 +26,7 @@ endif
+
+ #
+ # List of supported Python versions, defining a number of
+-# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|DEF]_[INC|LIB] variables
++# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables
+ # which get picked up below.
+ #
+ ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
+@@ -532,6 +532,52 @@ VBoxPython3_8m_x86_LIBS = $(VBOX_P
+ endif
+ endif
+ endif
++
++ifdef VBOX_PYTHON39_INC
++#
++# Python 3.9 version
++#
++DLLS += VBoxPython3_9
++VBoxPython3_9_EXTENDS = VBoxPythonBase
++VBoxPython3_9_EXTENDS_BY = appending
++VBoxPython3_9_TEMPLATE = XPCOM
++VBoxPython3_9_INCS = $(VBOX_PYTHON39_INC)
++VBoxPython3_9_LIBS = $(VBOX_PYTHON39_LIB)
++
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++ ifdef VBOX_PYTHON39_LIB_X86
++DLLS += VBoxPython3_9_x86
++VBoxPython3_9_x86_EXTENDS = VBoxPythonBase_x86
++VBoxPython3_9_x86_EXTENDS_BY = appending
++VBoxPython3_9_x86_TEMPLATE = XPCOM
++VBoxPython3_9_x86_INCS = $(VBOX_PYTHON39_INC)
++VBoxPython3_9_x86_LIBS = $(VBOX_PYTHON39_LIB_X86)
++ endif
++ endif
++endif
++
++ifdef VBOX_PYTHON39M_INC
++#
++# Python 3.9 version with pymalloc
++#
++DLLS += VBoxPython3_9m
++VBoxPython3_9m_EXTENDS = VBoxPythonBase_m
++VBoxPython3_9m_EXTENDS_BY = appending
++VBoxPython3_9m_TEMPLATE = XPCOM
++VBoxPython3_9m_INCS = $(VBOX_PYTHON39M_INC)
++VBoxPython3_9m_LIBS = $(VBOX_PYTHON39M_LIB)
++
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++ ifdef VBOX_PYTHON39M_LIB_X86
++DLLS += VBoxPython3_9m_x86
++VBoxPython3_9m_x86_EXTENDS = VBoxPythonBase_x86_m
++VBoxPython3_9m_x86_EXTENDS_BY = appending
++VBoxPython3_9m_x86_TEMPLATE_ = XPCOM
++VBoxPython3_9m_x86_INCS = $(VBOX_PYTHON39M_INC)
++VBoxPython3_9m_x86_LIBS = $(VBOX_PYTHON39M_LIB_X86)
++ endif
++ endif
++endif
+
+ ifdef VBOX_PYTHONDEF_INC
+ #
+--- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2020-06-01 06:01:12.923522302 +0100
++++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2020-06-01 06:02:25.704013030 +0100
+@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter
+ # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
+ # endif
+ # ifdef VBOX_PYXPCOM_VERSIONED
+-# if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
++# if PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x03100000
++# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_9")
++# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9)
++
++# elif PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000
+ # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_8")
+ # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_8)
+
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 7fc9a63..f2f3aaa 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -32,16 +32,16 @@
%bcond_without guest_additions
%endif
-%if 0%{?fedora} > 30
+%if 0%{?fedora} > 30 || 0%{?rhel} > 7
%bcond_with python2
%else
%bcond_without python2
%endif
-%if 0%{?fedora} < 16
- %bcond_with python3
-%else
+%if 0%{?fedora} > 15 || 0%{?rhel} > 7
%bcond_without python3
+%else
+ %bcond_with python3
%endif
Name: VirtualBox
@@ -73,9 +73,9 @@ Patch2: VirtualBox-6.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch27: VirtualBox-gcc.patch
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
+Patch30: VirtualBox-python.patch
# from Debian
-Patch28: 02-gsoap-build-fix.patch
-Patch30: 37-python-3.7-support.patch
+Patch31: 02-gsoap-build-fix.patch
Patch32: VBoxVNC.fix.patch
# from ArchLinux
Patch40: 007-python2-path.patch
@@ -324,15 +324,17 @@ rm -r src/libs/zlib-1.2.*/
%patch2 -p1 -b .strings
%patch18 -p1 -b .aiobug
#patch27 -p1 -b .gcc
-%if 0%{?fedora} > 20
-%patch28 -p1 -b .gsoap2
-%endif
-%if 0%{?fedora} < 28 || 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 8
%patch29 -p2 -R -b .gsoap3
%endif
-#patch30 -p1 -b .python37
+%patch30 -p1 -b .python39
+%if 0%{?fedora} > 20 || 0%{?rhel} > 7
+%patch31 -p1 -b .gsoap2
+%endif
%patch32 -p1 -b .vnc
+%if 0%{?fedora} || 0%{?rhel} > 7
%patch40 -p1 -b .python2_path
+%endif
# mageia support not ready for 6.0
#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
@@ -870,7 +872,11 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
-* Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.8-4
+* Sun May 31 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-4
+- Add python-3.9 support
+- Fix some conditionals of python especially for el8
+
+* Sat May 30 2020 Leigh Scott <leigh123linux(a)gmail.com>
- Rebuild for python-3.9
* Tue May 26 2020 Sérgio Basto <sergio(a)serjux.com> - 6.1.8-3
4 years, 5 months
[mythtv: 1/2] Fix requires in MythTV meta package.
by Richard Shaw
commit 18e9cbc63ee545289886d59fafdfd935f3e4858b
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Jun 1 11:59:40 2020 -0500
Fix requires in MythTV meta package.
mythtv.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mythtv.spec b/mythtv.spec
index ad4db60..1bffcbf 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -357,8 +357,8 @@ Requires: mythplugins%{?_isa} = %{version}-%{release}
# Reminder this one is noarch - and not a sub-package (no EVR)
Requires: mythweb = %{version}
Requires: mythffmpeg%{?_isa} = %{version}-%{release}
-Requires: mysql-compat-server >= 5
-Requires: mysql >= 5
+Requires: mariadb
+Requires: mariadb-connector-c-devel
%{?fedora:Recommends: xmltv}
# Generate the required mythtv-frontend-api version string here so we only
4 years, 5 months
