commit 5f2575602c5a8990ac5db5cd289e51d6201a2534 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Tue Apr 10 19:31:33 2018 +0200 Update to 1.1.0 Update source and signature URLs Drop obsolete patches Bump FFmpeg version requirement to 3.5+ due to AV_PKT_FLAG_DISPOSABLE API use .gitignore | 2 + HandBrake-add_ppc64le.patch | 16 --- HandBrake-system-OpenCL.patch | 36 ------ HandBrake.spec | 28 +++-- ffmpeg35_buildfix.patch | 260 ------------------------------------------ sources | 4 +- 6 files changed, 17 insertions(+), 329 deletions(-) --- diff --git a/.gitignore b/.gitignore index 0e1739f..2ea11bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /HandBrake-1.0.3.tar.bz2 /HandBrake-1.0.7.tar.bz2 /HandBrake-1.0.7.tar.bz2.sig +/HandBrake-1.1.0-source.tar.bz2 +/HandBrake-1.1.0-source.tar.bz2.sig diff --git a/HandBrake-system-OpenCL.patch b/HandBrake-system-OpenCL.patch index 47ff9b1..23e17b4 100644 --- a/HandBrake-system-OpenCL.patch +++ b/HandBrake-system-OpenCL.patch @@ -10,39 +10,3 @@ diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/internal.h.cl #ifdef USE_QSV #include "qsv_libav.h" #endif -diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h.cl HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h ---- HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h.cl 2017-01-19 15:01:20.000000000 +0100 -+++ HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/opencl.h 2017-01-20 11:51:28.511218948 +0100 -@@ -10,7 +10,7 @@ - #ifndef HB_OPENCL_H - #define HB_OPENCL_H - --#include "extras/cl.h" -+#include <CL/cl.h> - #include "openclwrapper.h" - - // we only support OpenCL 1.1 or later -diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c.cl HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c ---- HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c.cl 2017-01-19 15:01:20.000000000 +0100 -+++ HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.c 2017-01-20 11:51:28.511218948 +0100 -@@ -13,7 +13,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include "extras/cl.h" -+#include <CL/cl.h> - #include "opencl.h" - #include "openclwrapper.h" - #include "openclkernels.h" -diff -up HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h.cl HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h ---- HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h.cl 2017-01-19 15:01:20.000000000 +0100 -+++ HandBrake-40ec4ebaa2958b2549125dd525b6fcb2bd595d69/libhb/openclwrapper.h 2017-01-20 11:51:28.511218948 +0100 -@@ -15,7 +15,7 @@ - #define HB_OPENCL_WRAPPER_H - - #include "common.h" --#include "extras/cl.h" -+#include <CL/cl.h> - - //support AMD opencl - #define CL_QUEUE_THREAD_HANDLE_AMD 0x403E diff --git a/HandBrake.spec b/HandBrake.spec index b0d03f1..ff0a628 100644 --- a/HandBrake.spec +++ b/HandBrake.spec @@ -1,5 +1,5 @@ -%global commit0 91ed34ff38d46f389e841c46fe27b7cbfed8467c -%global date 20170409 +%global commit0 b463d33a4ed4c9da5fb6432e7fb7e08422fc1aad +%global date 20180405 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global tag %{version} @@ -16,15 +16,15 @@ %global desktop_id fr.handbrake.ghb Name: HandBrake -Version: 1.0.7 -Release: 14%{!?tag:.%{date}git%{shortcommit0}}%{?dist} +Version: 1.1.0 +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://handbrake.fr/mirror/%{name}-%{version}.tar.bz2 -Source1: https://github.com/HandBrake/HandBrake/releases/download/%{version}/%{nam... +Source0: https://download2.handbrake.fr/%{version}/%{name}-%{version}-source.tar.bz2 +Source1: https://github.com/HandBrake/HandBrake/releases/download/%{version}/%{nam... # 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 @@ -35,8 +35,6 @@ Source0: https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{ %{?_without_ffmpeg:Source10: https://libav.org/releases/libav-12.tar.gz} -# add ppc64le to configure.guess -Patch0: %{name}-add_ppc64le.patch # Build with unpatched libbluray (https://github.com/HandBrake/HandBrake/pull/458) # can be dropped with libbluray-1.0.0 Patch1: %{name}-no_clip_id.patch @@ -48,16 +46,12 @@ Patch3: %{name}-nostrip.patch Patch4: %{name}-no-libva.patch # Fix SubRip subtitle issue when built with FFmpeg Patch5: https://trac.ffmpeg.org/raw-attachment/ticket/6304/handbrake_subrip.patch -# ffmpeg35_buildfix.patch is taken from these upstream commits -# https://github.com/HandBrake/HandBrake/commit/532f067cca2113ea289282ea57e... -# https://github.com/HandBrake/HandBrake/commit/f002cf7ad405b93c5bc52e3f12c... -Patch6: ffmpeg35_buildfix.patch BuildRequires: a52dec-devel >= 0.7.4 BuildRequires: cmake BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 2.6} +%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 3.5} # Should be >= 2.6: BuildRequires: freetype-devel >= 2.4.11 # Should be >= 0.19.7: @@ -133,7 +127,6 @@ This package contains the main program with a graphical interface. gpgv2 --keyring %{S:2} %{S:1} %{S:0} %endif %setup -q %{!?tag:-n %{name}-%{commit0}} -%patch0 -p1 %if 0%{?fedora} <= 25 %patch1 -p1 %endif @@ -141,7 +134,6 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0} %patch3 -p1 %patch4 -p1 %{!?_without_ffmpeg:%patch5 -p1} -%patch6 -p1 mkdir -p download %{?_without_ffmpeg:cp -p %{SOURCE10} download} @@ -239,6 +231,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/HandBrakeCLI %changelog +* Mon Apr 09 2018 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 1.1.0-1 +- Update to 1.1.0 +- Update source and signature URLs +- Drop obsolete patches +- Bump FFmpeg version requirement to 3.5+ due to AV_PKT_FLAG_DISPOSABLE API use + * Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 1.0.7-14 - Rebuilt for new ffmpeg snapshot diff --git a/sources b/sources index 893693d..97970ec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bf39fcc56a82ccca32a9faac8fa633f5 HandBrake-1.0.7.tar.bz2 -116cb450ac21b8ff6ccf55a72160ae35 HandBrake-1.0.7.tar.bz2.sig +5d77fd9207623da1d9068f4026cd91f3 HandBrake-1.1.0-source.tar.bz2 +32f3ac2f2b433190ed595e98928e7e6f HandBrake-1.1.0-source.tar.bz2.sig