[HandBrake] New upstream version
by Leigh Scott
commit 07a1b9844e47cd5ac837b18d8ca125d4c2e2f8a4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Mar 6 21:52:41 2020 +0000
New upstream version
.gitignore | 2 ++
HandBrake.spec | 19 ++++++++++++-------
sources | 4 ++--
3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 680676f..14909f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@
/HandBrake-1.2.2-source.tar.bz2.sig
/HandBrake-1.3.0-source.tar.bz2
/HandBrake-1.3.0-source.tar.bz2.sig
+/HandBrake-1.3.1-source.tar.bz2
+/HandBrake-1.3.1-source.tar.bz2.sig
diff --git a/HandBrake.spec b/HandBrake.spec
index 2e32dfe..077adf9 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -1,5 +1,5 @@
-%global commit0 4672248655ddd687161bacdb539c208abde15c59
-%global date 20191109
+%global commit0 b6df6dfce4105d89de37530c0da0a9d6dce5de00
+%global date 20200101
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}
@@ -17,15 +17,15 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.3.0
-Release: 7%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Version: 1.3.1
+Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: http://handbrake.fr/
%if 0%{?tag:1}
-Source0: https://download2.handbrake.fr/%{version}/%{name}-%{version}-source.tar.bz2
-Source1: https://github.com/HandBrake/HandBrake/releases/download/%{version}/%{nam...
+Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%...
+Source1: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%...
# import from https://handbrake.fr/openpgp.php or https://github.com/HandBrake/HandBrake/wiki/OpenPGP
# gpg2 --export --export-options export-minimal 1629C061B3DDE7EB4AE34B81021DB8B44E4A8645 > gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
Source2: gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
@@ -214,7 +214,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{desktop_id}.deskto
%find_lang ghb
-%if 0%{?fedora} <= 24 || 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 7
%post gui
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
@@ -248,6 +248,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/HandBrakeCLI
%changelog
+* Fri Mar 06 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.3.1-1
+- New upstream version
+- Update source URL
+- Run scriptlets on el7 only
+
* Sun Feb 23 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.3.0-7
- Rebuild for x265
diff --git a/sources b/sources
index 1a0fe55..4ac4930 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (HandBrake-1.3.0-source.tar.bz2) = 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
-SHA512 (HandBrake-1.3.0-source.tar.bz2.sig) = 3c8d3d611daa46486c1fc4fb3970d52bd0e09907155c8a96d857b150069effc6595dd90bae357d7cb04f75f09cbab2c252c4917ef8664a229da1e2e087ee57a9
+SHA512 (HandBrake-1.3.1-source.tar.bz2) = b713c70155feff765fb21e201e1c1599c970bf56581584281d883e57046409731cb663c11ee8ea2c141ba75852746be81d6db813f2d481b72429e53c89d584d2
+SHA512 (HandBrake-1.3.1-source.tar.bz2.sig) = df4c363dd20e945114e10aa931d33ba0f5d9bfc670a20ae359bffa476024a9f71f21e36ed04b88013e192d637b59b74ba4b7129c24d191865a1b9b174ce931dc
4 years, 2 months
[vlc/el8] Fix f30 build with old dav1d
by Leigh Scott
Summary of changes:
7eafeaa... Fix f30 build with old dav1d (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 2 months
[vlc/f30: 2/2] Merge branch 'master' into f30
by Leigh Scott
commit d6c144ff1997f845fef1176169cb27ee466497c9
Merge: f38e469 7eafeaa
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 6 10:32:31 2020 +0000
Merge branch 'master' into f30
buildfix_for_old_dav1d.patch | 30 ++++++++++++++++++++++++++++++
vlc.spec | 6 ++++++
2 files changed, 36 insertions(+)
---
4 years, 2 months
[vlc/f31: 2/2] Merge branch 'master' into f31
by Leigh Scott
commit 88eb02aa304b34c10f17f1af6c74f2d3f4a0395b
Merge: eab2a56 7eafeaa
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 6 10:32:18 2020 +0000
Merge branch 'master' into f31
buildfix_for_old_dav1d.patch | 30 ++++++++++++++++++++++++++++++
vlc.spec | 6 ++++++
2 files changed, 36 insertions(+)
---
4 years, 2 months
[vlc/f32] Fix f30 build with old dav1d
by Leigh Scott
Summary of changes:
7eafeaa... Fix f30 build with old dav1d (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 2 months
[vlc] Fix f30 build with old dav1d
by Leigh Scott
commit 7eafeaa7b630a9c1d1fea60da473e33f3cea0b6e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 6 10:31:47 2020 +0000
Fix f30 build with old dav1d
buildfix_for_old_dav1d.patch | 30 ++++++++++++++++++++++++++++++
vlc.spec | 6 ++++++
2 files changed, 36 insertions(+)
---
diff --git a/buildfix_for_old_dav1d.patch b/buildfix_for_old_dav1d.patch
new file mode 100644
index 0000000..ab484ff
--- /dev/null
+++ b/buildfix_for_old_dav1d.patch
@@ -0,0 +1,30 @@
+--- a/modules/codec/dav1d.c
++++ b/modules/codec/dav1d.c
+@@ -223,7 +223,7 @@
+ if( p_data )
+ {
+ res = dav1d_send_data(p_sys->c, p_data);
+- if (res < 0 && res != DAV1D_ERR(EAGAIN))
++ if (res < 0 && res != -EAGAIN)
+ {
+ msg_Err(dec, "Decoder feed error %d!", res);
+ i_ret = VLC_EGENERIC;
+@@ -248,15 +248,14 @@
+ decoder_QueueVideo(dec, pic);
+ dav1d_picture_unref(&img);
+ }
+- else if (res != DAV1D_ERR(EAGAIN))
++ else if (res != -EAGAIN)
+ {
+ msg_Warn(dec, "Decoder error %d!", res);
+ break;
+ }
+
+ /* on drain, we must ignore the 1st EAGAIN */
+- if(!b_draining && (res == DAV1D_ERR(EAGAIN) || res == 0)
+- && (p_data == NULL||b_eos))
++ if(!b_draining && (res == -EAGAIN || res == 0) && (p_data == NULL||b_eos))
+ {
+ b_draining = true;
+ res = 0;
+
diff --git a/vlc.spec b/vlc.spec
index b9410ca..825572c 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -62,6 +62,9 @@ Patch0: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_16
Patch1: libplacebo_patch_1.patch
Patch2: Fix_aom_abi_break.patch
Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
+# Revert commit for f30
+# https://git.videolan.org/?p=vlc/vlc-3.0.git;a=commitdiff;h=bb98c9a1bda897...
+Patch4: buildfix_for_old_dav1d.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -304,6 +307,9 @@ VLC media player extras modules.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%if 0%{?fedora} == 30
+%patch4 -p1
+%endif
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable
4 years, 2 months
[vlc/el8] (5 commits) ...Update to current snapshot
by Leigh Scott
Summary of changes:
25ed67c... Rebuild (*)
49215ee... Rebuild for new libplacebo version (*)
dcdcafa... - Rebuild for ffmpeg-4.3 git (*)
9524022... - Rebuild for x265 (*)
ee6b5e1... Update to current snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 2 months
[vlc/f30: 5/5] Merge branch 'master' into f30
by Leigh Scott
commit f38e469e0ba221ffffd2edb1b1499ebc96d19ec8
Merge: ea3610b ee6b5e1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Mar 6 09:55:54 2020 +0000
Merge branch 'master' into f30
sources | 2 +-
vlc.spec | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 3 deletions(-)
---
4 years, 2 months