[openshot] Add appdata file moving, for EL7 (like old F27)
by Frank R Dana
commit e13c7c33fb2ef698c2a21a5775b5012a35a8522d
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sun Apr 28 23:08:03 2019 -0400
Add appdata file moving, for EL7 (like old F27)
openshot.spec | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/openshot.spec b/openshot.spec
index 426221a..ae58ac3 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -98,6 +98,12 @@ done
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop
+%if 0%{?rhel}
+# Move appdata file to default location
+mkdir -p %{buildroot}%{_metainfodir}
+mv %{buildroot}%{_datadir}/metainfo/*.appdata.xml %{buildroot}%{_metainfodir}/
+%endif #rhel
+
# Validate appdata file
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
5 years, 6 months
[x264] Build /usr/bin/x264 with gpac shared lib instead static lib.
by Sérgio M. Basto
commit 67dda12f04b5c7f6a66ef024eb4915b2f1180844
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Apr 29 04:02:29 2019 +0100
Build /usr/bin/x264 with gpac shared lib instead static lib.
x264-gpac.patch | 14 ++++++--------
x264.spec | 1 +
2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/x264-gpac.patch b/x264-gpac.patch
index 3979342..af7c8bd 100644
--- a/x264-gpac.patch
+++ b/x264-gpac.patch
@@ -1,13 +1,11 @@
--- ./configure.orig 2019-03-12 00:41:42.000000000 +0000
-+++ ./configure 2019-03-12 01:10:12.603640526 +0000
-@@ -1207,7 +1207,9 @@ fi
++++ ./configure 2019-04-29 03:48:04.806285957 +0100
+@@ -1206,7 +1206,7 @@ fi
+
if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no"
- GPAC_LIBS="-lgpac_static"
-- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
-+ for lib in -lz -lssl -lcrypto -lpng -ljpeg; do
-+ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
-+ done
+- GPAC_LIBS="-lgpac_static"
++ GPAC_LIBS="-lgpac"
+ cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
if [ "$SYS" = "WINDOWS" ] ; then
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
- cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"
diff --git a/x264.spec b/x264.spec
index 3e16faf..b56c858 100644
--- a/x264.spec
+++ b/x264.spec
@@ -210,6 +210,7 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-5.20190303git72db437
- Enable opencl (which is default) only exist --disable-opencl option
- Disable opencl on 10bit seems that is just prepared for 8bit.
+- Build /usr/bin/x264 with gpac shared lib instead static lib.
* Sun Apr 28 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.157-4.20190303git72db437
- Fix opencl dlopen (rfbz#5185)
5 years, 6 months
[x264] Enable opencl (which is default) only exist --disable-opencl option Disable opencl on 10bit seems th
by Sérgio M. Basto
commit cbc69593c42f9150120b08f44c16508f1e22d714
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Apr 29 03:44:08 2019 +0100
Enable opencl (which is default) only exist --disable-opencl option
Disable opencl on 10bit seems that is just prepared for 8bit.
x264.spec | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index 7b00b29..3e16faf 100644
--- a/x264.spec
+++ b/x264.spec
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 4%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 5%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -88,7 +88,6 @@ This package contains the development files.
%{?_without_libavformat:--disable-lavf} \\\
%{?_without_libswscale:--disable-swscale} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
- --disable-opencl \\\
--enable-debug \\\
--enable-shared \\\
--system-libx264 \\\
@@ -125,6 +124,7 @@ pushd generic10
%{x_configure}\
%{?_without_asm:--disable-asm}\
--disable-cli\
+ --disable-opencl \
--bit-depth=10
%{__make} %{?_smp_mflags}
@@ -142,6 +142,7 @@ pushd simd10
%{x_configure}\
--disable-cli\
--libdir=%{slibdir}\
+ --disable-opencl \
--bit-depth=10
%{__make} %{?_smp_mflags}
@@ -206,6 +207,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Mon Apr 29 2019 Sérgio Basto <sergio(a)serjux.com> - 0.157-5.20190303git72db437
+- Enable opencl (which is default) only exist --disable-opencl option
+- Disable opencl on 10bit seems that is just prepared for 8bit.
+
* Sun Apr 28 2019 Leigh Scott <leigh123linux(a)gmail.com> - 0.157-4.20190303git72db437
- Fix opencl dlopen (rfbz#5185)
5 years, 6 months
[openshot/f28: 2/2] Merge branch 'master' into f28
by Frank R Dana
commit b5292269b82b5fd72802a91234dfbe7b9c2c8ddc
Merge: 7c7a7b5 28da396
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sun Apr 28 22:30:47 2019 -0400
Merge branch 'master' into f28
openshot.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
5 years, 6 months
[openshot] Requires: python-requests & python-simplejson
by Frank R Dana
commit 28da396c516043f77bde44d7e881e048e8ff64b7
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sun Apr 28 22:10:34 2019 -0400
Requires: python-requests & python-simplejson
openshot.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/openshot.spec b/openshot.spec
index bc0bd28..426221a 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -3,7 +3,7 @@
Name: openshot
Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Create and edit videos and movies
Group: Applications/Multimedia
@@ -33,6 +33,8 @@ BuildRequires: desktop-file-utils
Requires: python%{python3_pkgversion}-qt5
Requires: python%{python3_pkgversion}-qt5-webkit
Requires: python%{python3_pkgversion}-httplib2
+Requires: python%{python3_pkgversion}-requests
+Requires: python%{python3_pkgversion}-simplejson
Requires: python%{python3_pkgversion}-libopenshot >= 0.2.3
Requires: python%{python3_pkgversion}-zmq
Requires: ffmpeg-libs
@@ -138,6 +140,9 @@ fi
%changelog
+* Sun Apr 28 2019 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 2.4.4-2
+- Declare dependency on requests, simplejson Python modules
+
* Fri Mar 22 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.4-1
- New upstream release
5 years, 6 months