[mlt-freeworld] Update mlt-6.14.0 Sync with Fedora Modernize spec
by Sérgio M. Basto
commit fb23a68a50742675ca03050903360a99bc34c2bc
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Apr 29 03:17:30 2019 +0100
Update mlt-6.14.0
Sync with Fedora
Modernize spec
.gitignore | 1 +
mlt-freeworld.spec | 22 ++++++++++++++++------
sources | 2 +-
3 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca6dc15..813ddff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/mlt-6.8.0.tar.gz
/mlt-6.10.0.tar.gz
/mlt-6.12.0.tar.gz
+/mlt-6.14.0.tar.gz
diff --git a/mlt-freeworld.spec b/mlt-freeworld.spec
index a75f897..d9c2485 100644
--- a/mlt-freeworld.spec
+++ b/mlt-freeworld.spec
@@ -7,22 +7,24 @@
%global realname mlt
Name: mlt-freeworld
-Version: 6.12.0
-Release: 2%{?dist}
+Version: 6.14.0
+Release: 1%{?dist}
Summary: Toolkit for broadcasters, video editors, media players, transcoders
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
# but is not used in Linux
License: GPLv3 and LGPLv2+
URL: http://www.mltframework.org/
-Group: System Environment/Libraries
Source0: https://github.com/mltframework/mlt/archive/v%{version}/%{realname}-%{ver...
#Patch0: https://github.com/mltframework/mlt/compare/v6.4.1...%%{commit}.diff
BuildRequires: frei0r-devel
BuildRequires: opencv-devel
+BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qt3d-devel
+BuildRequires: SDL-devel
+BuildRequires: SDL_image-devel
BuildRequires: SDL2-devel
BuildRequires: SDL2_image-devel
BuildRequires: gtk2-devel
@@ -41,8 +43,10 @@ BuildRequires: libexif-devel
BuildRequires: fftw-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: alsa-lib-devel
-BuildRequires: movit-devel
BuildRequires: vid.stab-devel
+BuildRequires: movit-devel
+BuildRequires: eigen3-devel
+BuildRequires: libebur128-devel
BuildRequires: ffmpeg-devel
BuildRequires: xine-lib-devel
@@ -72,6 +76,8 @@ chmod -x demo/demo
sed -i -e '/fomit-frame-pointer/d' configure
sed -i -e '/ffast-math/d' configure
+sed -i -e 's|qmake|qmake-qt5|' src/modules/qt/configure
+
# mlt/src/win32/fnmatch.{c,h} are BSD-licensed.
# be sure that aren't used
rm -r src/win32/
@@ -102,14 +108,18 @@ find %{buildroot} -type f -print0 | grep -vPz "mlt/avformat|libmltavformat.so" |
find %{buildroot} -type l -delete
find %{buildroot} -type d -empty -delete
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
%{_libdir}/mlt/
%{_datadir}/mlt/
%changelog
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 6.14.0-1
+- Update mlt-6.14.0
+- Sync with Fedora
+- Modernize spec
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index a8a69a9..e8641e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eebf40c27f6c1717c6e99fd18319fbc3 mlt-6.12.0.tar.gz
+6360e0d3b795f3d4324413e6db021511 mlt-6.14.0.tar.gz
5 years, 7 months
[x264/f29] Fix opencl dlopen (rfbz#5185)
by Leigh Scott
commit 4a04df0a5804801eb22f8ebe60f5d13c077c0b01
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Apr 28 23:19:22 2019 +0100
Fix opencl dlopen (rfbz#5185)
x264-opencl.patch | 11 +++++++++++
x264.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/x264-opencl.patch b/x264-opencl.patch
new file mode 100644
index 0000000..6a6363e
--- /dev/null
+++ b/x264-opencl.patch
@@ -0,0 +1,11 @@
+--- a/common/opencl.c 2019-03-12 00:41:42.000000000 +0000
++++ b/common/opencl.c 2019-04-28 22:39:02.672147762 +0100
+@@ -36,7 +36,7 @@
+ #if SYS_MACOSX
+ #define ocl_open dlopen( "/System/Library/Frameworks/OpenCL.framework/OpenCL", RTLD_NOW )
+ #else
+-#define ocl_open dlopen( "libOpenCL.so", RTLD_NOW )
++#define ocl_open dlopen( "libOpenCL.so.1", RTLD_NOW )
+ #endif
+ #define ocl_close dlclose
+ #define ocl_address dlsym
diff --git a/x264.spec b/x264.spec
index f808b7c..d599a44 100644
--- a/x264.spec
+++ b/x264.spec
@@ -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
@@ -42,6 +42,7 @@ Patch0: x264-nover.patch
# add 10b suffix to high bit depth build
Patch1: x264-10b.patch
Patch10: x264-gpac.patch
+Patch11: x264-opencl.patch
Patch20: x264-sandbox.git-b63c73dc5c37e5405bf032c9113c1daced3e45a4.patch
BuildRequires: gcc
@@ -66,6 +67,7 @@ This package contains the frontend.
%package libs
Summary: Library for encoding H264/AVC video streams
+Recommends: %{_libdir}/libOpenCL.so.1
%description libs
x264 is a free library for encoding H264/AVC video streams, written from
@@ -99,6 +101,7 @@ pushd %{name}-0.%{api}-%{snapshot}
%patch0 -p1 -b .nover
%patch1 -p1 -b .10b
%patch10 -p1 -b .gpac
+%patch11 -p1 -b .opencl
%patch20 -p1 -b .stack_align
popd
@@ -205,6 +208,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Sun Apr 28 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.155-3.20180806git0a84d98
+- Fix opencl dlopen (rfbz#5185)
+
* Wed Nov 07 2018 Stefan Becker <chemobejk(a)gmail.com> - 0.155-2.20180806git0a84d98
- reverse order of generic/generic10 install to fix -devel contents (rfbz #5071)
5 years, 7 months
[x264/f30] (2 commits) ...Update changelog
by Leigh Scott
Summary of changes:
61df541... Fix opencl dlopen (rfbz#5185) (*)
0136d44... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 7 months
[x264] Update changelog
by Leigh Scott
commit 0136d44350c1942105ca21cc50a1a0c0d351165a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Apr 28 23:10:13 2019 +0100
Update changelog
x264.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index 50eaf2f..7b00b29 100644
--- a/x264.spec
+++ b/x264.spec
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 3%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 4%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -206,6 +206,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Sun Apr 28 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.157-4.20190303git72db437
+- Fix opencl dlopen (rfbz#5185)
+
* Tue Mar 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 0.157-3.20190303git72db437
- Disable bootstrap build
5 years, 7 months
[x264] Fix opencl dlopen (rfbz#5185)
by Leigh Scott
commit 61df5414f6b404e888a970bd1eecbf7dd00c53f1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Apr 28 23:00:10 2019 +0100
Fix opencl dlopen (rfbz#5185)
x264-opencl.patch | 11 +++++++++++
x264.spec | 3 +++
2 files changed, 14 insertions(+)
---
diff --git a/x264-opencl.patch b/x264-opencl.patch
new file mode 100644
index 0000000..6a6363e
--- /dev/null
+++ b/x264-opencl.patch
@@ -0,0 +1,11 @@
+--- a/common/opencl.c 2019-03-12 00:41:42.000000000 +0000
++++ b/common/opencl.c 2019-04-28 22:39:02.672147762 +0100
+@@ -36,7 +36,7 @@
+ #if SYS_MACOSX
+ #define ocl_open dlopen( "/System/Library/Frameworks/OpenCL.framework/OpenCL", RTLD_NOW )
+ #else
+-#define ocl_open dlopen( "libOpenCL.so", RTLD_NOW )
++#define ocl_open dlopen( "libOpenCL.so.1", RTLD_NOW )
+ #endif
+ #define ocl_close dlclose
+ #define ocl_address dlsym
diff --git a/x264.spec b/x264.spec
index 057aef5..50eaf2f 100644
--- a/x264.spec
+++ b/x264.spec
@@ -42,6 +42,7 @@ Patch0: x264-nover.patch
# add 10b suffix to high bit depth build
Patch1: x264-10b.patch
Patch10: x264-gpac.patch
+Patch11: x264-opencl.patch
BuildRequires: gcc
%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
@@ -65,6 +66,7 @@ This package contains the frontend.
%package libs
Summary: Library for encoding H264/AVC video streams
+Recommends: %{_libdir}/libOpenCL.so.1
%description libs
x264 is a free library for encoding H264/AVC video streams, written from
@@ -98,6 +100,7 @@ pushd %{name}-0.%{api}-%{snapshot}
%patch0 -p1 -b .nover
%patch1 -p1 -b .10b
%patch10 -p1 -b .gpac
+%patch11 -p1 -b .opencl
popd
variants="generic generic10"
5 years, 7 months
[chromium-vaapi/f29] Remove string created due to merge conflict
by hellbanger
commit 465a3d2df67c7ea913bf6ff96d178074f4c813a6
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Sun Apr 28 17:38:21 2019 +0000
Remove string created due to merge conflict
chromium-vaapi.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index dd8acd8..89846b6 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -234,7 +234,6 @@ chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
sed -i 's|const std::vector<Delta> deltas_;|std::vector<Delta> deltas_;|' chrome/browser/ui/tabs/tab_strip_model_observer.h
%endif
->>>>>>> master
#Let's change the default shebang of python files.
find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
5 years, 7 months
[chromium-vaapi/f29: 20/20] Merge branch 'master' into f29
by hellbanger
commit fee4be033b68b26de055b2e2a3e8da08f4050abc
Merge: 32e2c66 b94d551
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Sun Apr 28 17:33:32 2019 +0000
Merge branch 'master' into f29
.gitignore | 13 +---
chromium-color_utils-use-std-sqrt.patch | 48 -------------
chromium-glibc-2.29.patch | 98 +++++++++++++++++++++++++++
chromium-media-fix-build-with-libstdc++.patch | 48 -------------
chromium-vaapi.sh | 1 +
chromium-vaapi.spec | 55 +++++++++++----
nounrar.patch | 14 ++--
sources | 2 +-
stopVsyncspam.patch | 32 ---------
9 files changed, 150 insertions(+), 161 deletions(-)
---
diff --cc chromium-vaapi.spec
index cfd599e,a3b4435..dd8acd8
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@@ -204,11 -206,9 +206,8 @@@ Patch54: brand.patc
#Stolen from Fedora to fix building with pipewire
# https://src.fedoraproject.org/rpms/chromium/blob/master/f/chromium-73.0.3...
Patch65: chromium-73.0.3683.75-pipewire-cstring-fix.patch
- # Stop Vsync error spam when chromium runs on Wayland (Reviewed upstream)
- Patch66: stopVsyncspam.patch
- #Fix chromium color
- Patch67: chromium-color_utils-use-std-sqrt.patch
- Patch68: chromium-media-fix-build-with-libstdc++.patch
+ # Update Linux Seccomp syscall restrictions to EPERM posix_spawn/vfork
+ Patch66: chromium-glibc-2.29.patch
-
%description
chromium-vaapi is an open-source web browser, powered by WebKit (Blink)
############################################PREP###########################################################
@@@ -228,10 -228,13 +227,14 @@@
%if 0%{?fedora} >= 29
%patch65 -p1 -b .pipewire
%endif
- %patch66 -p1 -b .vsync
- %patch67 -p1 -b .color
- %patch68 -p1 -b .media
+ %patch66 -p1 -b .glibc
+
+ %if 0%{?fedora} >= 30
+ # Add a workaround for a race condition in clang-llvm8+ compiler
+ sed -i 's|const std::vector<Delta> deltas_;|std::vector<Delta> deltas_;|' chrome/browser/ui/tabs/tab_strip_model_observer.h
+ %endif
+
++>>>>>>> master
#Let's change the default shebang of python files.
find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' {} +
./build/linux/unbundle/remove_bundled_libraries.py --do-remove \
@@@ -464,15 -469,13 +469,19 @@@
sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' device/usb/BUILD.gn
- # Don't use static libstdc++
- sed -i '/-static-libstdc++/d' tools/gn/build/gen.py
+
+ # Remove compiler flags not supported by our system clang
+ # sed -i \
+ # -e '/"-Wno-ignored-pragma-optimize"/d' \
+ # build/config/compiler/BUILD.gn
+
+# Remove compiler flags not supported by our system clang
+ sed -i \
+ -e '/"-Wno-ignored-pragma-optimize"/d' \
+ build/config/compiler/BUILD.gn
+
+
rmdir third_party/markupsafe
ln -s %{python2_sitearch}/markupsafe third_party/markupsafe
diff --cc nounrar.patch
index 7395711,b3be4fa..a9a28b5
--- a/nounrar.patch
+++ b/nounrar.patch
@@@ -186,3 -186,4 +186,5 @@@ index 94d6ec0e16f8..2eda4f378bcc 10064
const std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
+
++
5 years, 7 months
[chromium-vaapi/f29] (20 commits) ...Merge branch 'master' into f29
by hellbanger
Summary of changes:
e57526b... Add fix-the-VA_CHECK_VERSION patch from upstream (*)
2ce345d... Updated to 72.0.3626.121 spec cleanup (*)
147974b... Update to 73.0.3683.75 Update BuildRequires for ozone, libv (*)
eba61dc... Enable pipewire support Added a patch from fedora to fix bu (*)
d76fb61... Add a patch from upstream to stop vsync error spam when run (*)
8b7b9e0... Switched to clang compiler which is supported by upstream (*)
f149ea0... Update to 73.0.3683.86. Disable debug logs. (*)
4d4d9b4... Update source file. (*)
27d8141... Switched to GNU ar and nm to work around a bug in the curre (*)
e953730... Fix date in changelog. (*)
45601a9... Revert switching to GNU ar and nm. (*)
8bf777f... Update to 73.0.3683.103. (*)
16c42b6... Add wildcard for gitignore (*)
528cdf6... Removed outdated workarounds for linker and compiler (*)
566b951... Merge branch 'master' of ssh://pkgs.rpmfusion.org/free/chro (*)
8a83ddf... Fixed build with llvm 8. (*)
84f0bc7... Add MEIPreload in install package (*)
f0dfab7... Update to 74.0.3729.108 Install missing MEIPreload componen (*)
b94d551... Upload new sources (*)
fee4be0... Merge branch 'master' into f29
(*) This commit already existed in another branch; no separate mail sent
5 years, 7 months
[chromium-vaapi/f30: 4/4] Merge branch 'master' into f30
by hellbanger
commit 5a043ebd02376d31cb4b8655b631b223e9f5e740
Merge: 846be0c b94d551
Author: Akarshan Biswas <akarshan.biswas(a)gmail.com>
Date: Sun Apr 28 17:10:41 2019 +0000
Merge branch 'master' into f30
chromium-color_utils-use-std-sqrt.patch | 48 -------------
chromium-glibc-2.29.patch | 98 +++++++++++++++++++++++++++
chromium-media-fix-build-with-libstdc++.patch | 48 -------------
chromium-vaapi.spec | 35 ++++++----
nounrar.patch | 13 ++--
sources | 2 +-
stopVsyncspam.patch | 32 ---------
7 files changed, 129 insertions(+), 147 deletions(-)
---
5 years, 7 months