[qtav] Fix bug #5350
by sagitter
commit e7c223ac2b4169f387c3085bcab3018aecf282be
Author: Antonio T <sagitter(a)fedoraproject.org>
Date: Wed Jan 20 15:06:34 2021 +0100
Fix bug #5350
qtav-avoid-avresample_dependency.patch | 22 ++++++++++++++++++++++
qtav.spec | 22 ++++++++++++++--------
2 files changed, 36 insertions(+), 8 deletions(-)
---
diff --git a/qtav-avoid-avresample_dependency.patch b/qtav-avoid-avresample_dependency.patch
new file mode 100644
index 0000000..9605ab1
--- /dev/null
+++ b/qtav-avoid-avresample_dependency.patch
@@ -0,0 +1,22 @@
+--- a/QtAV.orig.pro 2019-07-11 02:58:59.000000000 +0200
++++ b/QtAV.pro 2021-01-20 14:17:01.603852011 +0100
+@@ -36,7 +36,7 @@
+ #OTHER_FILES += config.test/mktest.sh
+ EssentialDepends = avutil avcodec avformat swscale
+ winrt: CONFIG *= no-avdevice no-openal no-portaudio no-dsound no-gdiplus
+-OptionalDepends = swresample avresample
++OptionalDepends = swresample
+ !no-avfilter: OptionalDepends *= avfilter
+ !no-avdevice: OptionalDepends *= avdevice
+ # QtOpenGL module. In Qt5 we can disable it and still have opengl support
+@@ -78,8 +78,8 @@
+ !no-videotoolbox: OptionalDepends *= videotoolbox
+ }
+ runConfigTests()
+-!config_avresample:!config_swresample {
+- error("libavresample or libswresample is required. Setup your environment correctly then delete $$BUILD_DIR/.qmake.conf and run qmake again")
++!config_swresample {
++ error("libswresample is required. Setup your environment correctly then delete $$BUILD_DIR/.qmake.conf and run qmake again")
+ }
+ PACKAGE_VERSION = $$QTAV_VERSION
+ PACKAGE_NAME= QtAV
diff --git a/qtav.spec b/qtav.spec
index 93d4108..368255c 100644
--- a/qtav.spec
+++ b/qtav.spec
@@ -3,7 +3,7 @@
Name: qtav
Version: 1.13.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A media playback framework based on Qt and FFmpeg
License: LGPLv2+ and GPLv3+ and BSD
URL: http://www.qtav.org/
@@ -11,7 +11,10 @@ Source0: https://github.com/wang-bin/QtAV/archive/v%{version}/%{project}-
Patch0: https://github.com/wang-bin/QtAV//commit/5abba7f0505e75fceabd4dd8992a7e02...
# Fix builds with Qt-5.15.1
-Patch1: qtav-fix_Qt515_builds.patch
+Patch1: %{name}-fix_Qt515_builds.patch
+
+# Exclude avresample library (bug #5350)
+Patch2: %{name}-avoid-avresample_dependency.patch
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel
@@ -55,7 +58,7 @@ Features include:
%package -n lib%{name}
Summary: QtAV library
-Requires: ffmpeg
+Requires: ffmpeg%{?_isa}
%description -n lib%{name}
QtAV is a multimedia playback library based on Qt and FFmpeg.
@@ -77,7 +80,7 @@ This package contains a set of widgets to play media.
Summary: QtAV development files
Requires: libqtav%{?_isa} = %{version}-%{release}
Requires: libqtavwidgets%{?_isa} = %{version}-%{release}
-Requires: qt5-qtbase-devel
+Requires: qt5-qtbase-devel%{?_isa}
%description devel
QtAV is a multimedia playback library based on Qt and FFmpeg.
@@ -128,12 +131,12 @@ mkdir -p _tmpdoc/examples
cp -pr examples/* _tmpdoc/examples
%build
-export CPATH="`pkg-config --variable=includedir libavformat`"
-mkdir build; pushd build
+export CPATH="`pkg-config --variable=includedir libswresample`"
+mkdir -p build; pushd build
%{_qt5_qmake} \
QMAKE_CFLAGS="${RPM_OPT_FLAGS}" \
QMAKE_CXXFLAGS="${RPM_OPT_FLAGS}" \
- QMAKE_LFLAGS="${RPM_LD_FLAGS}" \
+ QMAKE_LFLAGS="${RPM_LD_FLAGS}" \
QMAKE_STRIP="" \
CONFIG+="no_rpath recheck config_libass_link release" ..
%make_build
@@ -203,7 +206,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/QtAV.svg
%changelog
-* Fri Jan 1 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.13.0-8
+* Wed Jan 20 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.13.0-9
+- Fix bug #5350
+
+* Fri Jan 01 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.13.0-8
- Rebuilt for new ffmpeg snapshot
* Tue Sep 29 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 1.13.0-7
3 years, 10 months
[vlc] Rebuild
by Leigh Scott
commit ed32fc0ca5ccb5e7598da31f9a00239eaf0fb4e1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jan 20 08:17:18 2021 +0000
Rebuild
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index ef8a06f..eb6d93d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -51,7 +51,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%if 0%{?commit0:1}
@@ -622,6 +622,9 @@ fi || :
%changelog
+* Wed Jan 20 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.12.1-3
+- Rebuild
+
* Thu Dec 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:3.0.12.1-2
- Rebuilt for new ffmpeg snapshot
3 years, 10 months
[obs-studio/f32] Update to 26.1.2
by Martin Gansser
Summary of changes:
f22259c... Update to 26.1.2 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 10 months
[obs-studio/f33] Update to 26.1.2
by Martin Gansser
Summary of changes:
f22259c... Update to 26.1.2 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 10 months
[obs-studio] Update to 26.1.2
by Martin Gansser
commit f22259c18157e0638fb7c21cdd891397cf39143f
Author: Martin Gansser <mgansser(a)online.de>
Date: Wed Jan 20 09:04:01 2021 +0100
Update to 26.1.2
obs-studio.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index 2a742c1..d55f339 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -12,7 +12,7 @@
%endif
Name: obs-studio
-Version: 26.1.1
+Version: 26.1.2
Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
@@ -147,6 +147,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_includedir}/obs/
%changelog
+* Wed Jan 20 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 26.1.2-1
+- Update to 26.1.2
+
* Tue Jan 19 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 26.1.1-1
- Update to 26.1.1
diff --git a/sources b/sources
index db1c8cb..f810275 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (obs-studio-26.1.1.tar.gz) = 30b36ed2c4c5ee8427b82cf7e759f27f44fbccf4bec9b2264023822b63272a1b2b31b2ff78e52dda0a4c63f3e8289413e6364c6250963a926d6202c871521eaf
+SHA512 (obs-studio-26.1.2.tar.gz) = cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417
3 years, 10 months
[vdr-mpv/f32] Update to 0.3.2
by Martin Gansser
Summary of changes:
6bb75db... Update to 0.3.2 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 10 months
[vdr-mpv/f33] Update to 0.3.2
by Martin Gansser
Summary of changes:
6bb75db... Update to 0.3.2 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 10 months
[vdr-mpv] Update to 0.3.2
by Martin Gansser
commit 6bb75db0e88159e927d3db53970d0456d513ec9d
Author: Martin Gansser <mgansser(a)online.de>
Date: Wed Jan 20 08:23:58 2021 +0100
Update to 0.3.2
.gitignore | 1 +
sources | 2 +-
vdr-mpv.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f7e5bd..8f67775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/vdr-mpv-0.2.1.tar.gz
/vdr-mpv-0.2.2.tar.gz
/vdr-mpv-0.3.0.tar.gz
+/vdr-mpv-0.3.1.tar.gz
diff --git a/sources b/sources
index c445af1..72da3b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-mpv-0.3.0.tar.gz) = 32aea659d13c58278409f290deeded1ebbcaea2a1646a93a0b842cb0cb4656e3b56c422289f1228ef5c92ca7999fd386f64e6ecc2f19b44cadf334f37d352447
+SHA512 (vdr-mpv-0.3.1.tar.gz) = bf3a984038c130f094b8e2c3d35f0646d653ec72c29648e0a16d3644193ea704c01ca2f90dab2f654aea8ead3d5b5546880f124b5d5337a15de56b7e6618c30f
diff --git a/vdr-mpv.spec b/vdr-mpv.spec
index 7deb5af..29fb024 100644
--- a/vdr-mpv.spec
+++ b/vdr-mpv.spec
@@ -1,7 +1,7 @@
%global pname mpv
Name: vdr-%{pname}
-Version: 0.3.0
+Version: 0.3.1
Release: 1%{?dist}
Summary: A mpv player plugin for VDR
License: AGPLv3+
@@ -41,6 +41,9 @@ make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
%changelog
+* Wed Jan 20 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.1-1
+- Update to 0.3.2
+
* Sat Jan 16 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.3.0-1
- Update to 0.3.0
- Add BR libX11-devel
3 years, 10 months
[x264] use set_build_flags instead of configure macro
by Dominik Mierzejewski
commit 24b2e4df1ee0d1b6ed3fc93bdf24243caf075d17
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Jan 19 14:33:16 2021 +0100
use set_build_flags instead of configure macro
The configure script is not autoconf-generated.
x264.spec | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index e11fd27..afd190a 100644
--- a/x264.spec
+++ b/x264.spec
@@ -86,7 +86,13 @@ scratch.
This package contains the development files.
%global x_configure \
-%configure \\\
+./configure \\\
+ --host=%{_host} \\\
+ --prefix=%{_prefix} \\\
+ --exec-prefix=%{_exec_prefix} \\\
+ --bindir=%{_bindir} \\\
+ --includedir=%{_includedir} \\\
+ --libdir=%{_libdir} \\\
%{?_without_libavformat:--disable-lavf} \\\
%{?_without_libswscale:--disable-swscale} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
@@ -111,6 +117,7 @@ done
%build
+%set_build_flags
pushd generic
%{x_configure}\
%{?_without_asm:--disable-asm}
@@ -172,6 +179,7 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%changelog
* Tue Jan 19 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 0.161-3.20200912gitd198931
- Drop non-asm build for i686 and ppc64 (rfbz#5855)
+- Use set_build_flags instead of configure macro for non-autotools script (rfbz#5854)
* Thu Dec 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.161-2.20200912gitd198931
- Rebuilt for new ffmpeg snapshot
3 years, 10 months
[x264] drop non-asm build for i686 and ppc64 (rfbz#5855)
by Dominik Mierzejewski
commit 87e5023bed4ef5720632fc6cc316699d8f3df505
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Tue Jan 19 14:31:31 2021 +0100
drop non-asm build for i686 and ppc64 (rfbz#5855)
x264.spec | 58 +++++++---------------------------------------------------
1 file changed, 7 insertions(+), 51 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index 3bde39d..e11fd27 100644
--- a/x264.spec
+++ b/x264.spec
@@ -25,23 +25,15 @@
%endif
#Whitelist of arches with dedicated ASM code
-%global asmarch x86_64 armv7hl armv7hnl ppc64le aarch64
-# list of arches where ASM must be optional
-%global simdarch i686 ppc64
+%global asmarch aarch64 armv7hl armv7hnl i686 ppc64 ppc64le x86_64
%ifnarch %{asmarch}
%global _without_asm 1
%endif
-%ifarch i686
-%global slibdir %{_libdir}/sse2
-%endif
-%ifarch ppc64
-%global slibdir %{_libdir}/altivec
-%endif
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
@@ -62,7 +54,7 @@ BuildRequires: gcc
%ifarch armv7hl armv7hnl
BuildRequires: execstack
%endif
-%ifarch %{asmarch} %{simdarch}
+%ifarch %{asmarch}
BuildRequires: nasm
%endif
# we need to enforce the exact EVR for an ISA - not only the same ABI
@@ -112,11 +104,7 @@ pushd %{name}-0.%{api}-%{snapshot}
%patch11 -p1 -b .opencl
popd
-variants="generic generic10"
-%ifarch %{simdarch}
-variants="$variants simd simd10"
-%endif
-for variant in $variants ; do
+for variant in generic generic10 ; do
rm -rf ${variant}
cp -pr %{name}-0.%{api}-%{snapshot} ${variant}
done
@@ -140,25 +128,6 @@ pushd generic10
%make_build
popd
-%ifarch %{simdarch}
-pushd simd
-%{x_configure}\
- --libdir=%{slibdir}
-
-%make_build
-popd
-
-pushd simd10
-%{x_configure}\
- --disable-cli\
- --libdir=%{slibdir}\
- --disable-opencl \
- --bit-depth=10
-
-%make_build
-popd
-%endif
-
%install
# NOTE: the order is important here! We want the generic devel stuff
for variant in generic10 generic ; do
@@ -166,14 +135,6 @@ pushd ${variant}
%make_install
popd
done
-%ifarch %{simdarch}
-for variant in simd10 simd ; do
-pushd ${variant}
-%make_install
-rm %{buildroot}%{slibdir}/pkgconfig/x264.pc
-popd
-done
-%endif
#Fix timestamp on x264 generated headers
touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
@@ -199,10 +160,6 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%license %{_pkgdocdir}/COPYING
%{_libdir}/libx264.so.%{api}
%{_libdir}/libx26410b.so.%{api}
-%ifarch %{simdarch}
-%{slibdir}/libx264.so.%{api}
-%{slibdir}/libx26410b.so.%{api}
-%endif
%files devel
%doc generic/doc/*
@@ -211,12 +168,11 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%{_libdir}/libx264.so
%{_libdir}/libx26410b.so
%{_libdir}/pkgconfig/%{name}.pc
-%ifarch %{simdarch}
-%{slibdir}/libx264.so
-%{slibdir}/libx26410b.so
-%endif
%changelog
+* Tue Jan 19 2021 Dominik Mierzejewski <rpm(a)greysector.net> - 0.161-3.20200912gitd198931
+- Drop non-asm build for i686 and ppc64 (rfbz#5855)
+
* Thu Dec 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.161-2.20200912gitd198931
- Rebuilt for new ffmpeg snapshot
3 years, 10 months
