commit 5869edc5d7dbae44b7cd1f3530acf3851b64f997 Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Tue Jan 22 12:32:39 2019 +0100 Update to 1.2.0 Drop upstreamed subtitle handling patch Make libbluray patch EL-only, all current Fedoras have >1.0.0 new dependencies: speex, xz enable asm parts on x86 .gitignore | 2 ++ HandBrake-no-libva.patch | 10 +++++----- HandBrake-nostrip.patch | 21 ++++++++++----------- HandBrake.spec | 32 +++++++++++++++++++++----------- handbrake_subrip.patch | 36 ------------------------------------ sources | 4 ++-- 6 files changed, 40 insertions(+), 65 deletions(-) --- diff --git a/.gitignore b/.gitignore index 2ea11bc..bbcc4b3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /HandBrake-1.0.7.tar.bz2.sig /HandBrake-1.1.0-source.tar.bz2 /HandBrake-1.1.0-source.tar.bz2.sig +/HandBrake-1.2.0-source.tar.bz2 +/HandBrake-1.2.0-source.tar.bz2.sig diff --git a/HandBrake-no-libva.patch b/HandBrake-no-libva.patch index 8508123..d9b32f3 100644 --- a/HandBrake-no-libva.patch +++ b/HandBrake-no-libva.patch @@ -1,7 +1,7 @@ -diff -up HandBrake-1.0.2/test/module.defs.va HandBrake-1.0.2/test/module.defs ---- HandBrake-1.0.2/test/module.defs.va 2017-01-22 17:49:13.000000000 +0100 -+++ HandBrake-1.0.2/test/module.defs 2017-01-28 23:54:19.637153799 +0100 -@@ -21,9 +21,6 @@ TEST.GCC.l = \ +diff -up HandBrake-1.2.0/test/module.defs.va HandBrake-1.2.0/test/module.defs +--- HandBrake-1.2.0/test/module.defs.va 2018-12-16 18:16:51.000000000 +0100 ++++ HandBrake-1.2.0/test/module.defs 2019-01-21 00:40:28.279840862 +0100 +@@ -25,9 +25,6 @@ endif ifeq (1,$(FEATURE.qsv)) TEST.GCC.D += USE_QSV HAVE_THREADS=1 @@ -10,4 +10,4 @@ diff -up HandBrake-1.0.2/test/module.defs.va HandBrake-1.0.2/test/module.defs -endif endif - ifeq (1,$(FEATURE.x265)) + ifeq (1,$(FEATURE.vce)) diff --git a/HandBrake-nostrip.patch b/HandBrake-nostrip.patch index fceb843..077e544 100644 --- a/HandBrake-nostrip.patch +++ b/HandBrake-nostrip.patch @@ -1,11 +1,10 @@ -diff -up HandBrake-6b5d91aef5ba0fde44ab5960f643e6e5da509642/gtk/module.rules.nostrip HandBrake-6b5d91aef5ba0fde44ab5960f643e6e5da509642/gtk/module.rules ---- HandBrake-6b5d91aef5ba0fde44ab5960f643e6e5da509642/gtk/module.rules.nostrip 2016-08-03 22:46:47.000000000 +0200 -+++ HandBrake-6b5d91aef5ba0fde44ab5960f643e6e5da509642/gtk/module.rules 2016-08-22 09:47:47.465186383 +0200 -@@ -18,6 +18,7 @@ $(GTK.CONFIGURE.stamp): $(GTK.src/)confi - PKG_CONFIG_PATH=$(BUILD/)contrib/lib/pkgconfig \ - CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \ - LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \ -+ STRIP="$(STRIP.exe)" \ - --prefix=$(PREFIX) \ - --with-hb=$(call fn.ABSOLUTE,$(BUILD/)) - $(TOUCH.exe) $@ +--- a/gtk/module.rules ++++ b/gtk/module.rules +@@ -21,6 +21,7 @@ $(GTK.CONFIGURE.stamp): $(GTK.src/)confi + CXX="$(GCC.gxx)" \ + CFLAGS="$(call fn.ARGS,GTK.GCC,.g .O *D ?extra)" \ + LDFLAGS="$(call fn.ARGS,GTK.GCC,?strip .g .O ?extra.exe)" \ ++ STRIP="$(STRIP.exe)" \ + PYTHON="$(PYTHON.exe)" \ + --prefix=$(PREFIX) \ + --with-hb=$(call fn.ABSOLUTE,$(BUILD/)) diff --git a/HandBrake.spec b/HandBrake.spec index ff0a628..d76c5c0 100644 --- a/HandBrake.spec +++ b/HandBrake.spec @@ -10,13 +10,14 @@ #global _without_ffmpeg 1 %ifarch i686 x86_64 +%global _with_asm 1 %global _with_mfx 1 %endif %global desktop_id fr.handbrake.ghb Name: HandBrake -Version: 1.1.0 +Version: 1.2.0 Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist} Summary: An open-source multiplatform video transcoder License: GPLv2+ @@ -44,8 +45,6 @@ Patch2: %{name}-system-OpenCL.patch Patch3: %{name}-nostrip.patch # Don't link with libva unnecessarily 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 BuildRequires: a52dec-devel >= 0.7.4 BuildRequires: cmake @@ -56,7 +55,7 @@ BuildRequires: desktop-file-utils BuildRequires: freetype-devel >= 2.4.11 # Should be >= 0.19.7: BuildRequires: fribidi-devel >= 0.19.4 -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gstreamer1-plugins-base-devel BuildRequires: intltool BuildRequires: jansson-devel @@ -83,12 +82,18 @@ BuildRequires: libvorbis-devel # Should be >= 1.5: BuildRequires: libvpx-devel >= 1.3 BuildRequires: make +%if 0%{?_with_asm:1} +BuildRequires: nasm +%endif +BuildRequires: nv-codec-headers BuildRequires: opencl-headers BuildRequires: opus-devel BuildRequires: python +BuildRequires: speex-devel BuildRequires: x264-devel >= 0.148 BuildRequires: x265-devel >= 1.9 BuildRequires: yasm +BuildRequires: xz-devel Requires: hicolor-icon-theme # needed for reading encrypted DVDs @@ -127,18 +132,17 @@ 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}} -%if 0%{?fedora} <= 25 +%if 0%{?rhel} %patch1 -p1 %endif %patch2 -p1 %patch3 -p1 %patch4 -p1 -%{!?_without_ffmpeg:%patch5 -p1} mkdir -p download %{?_without_ffmpeg:cp -p %{SOURCE10} download} # Use system libraries in place of bundled ones -for module in a52dec %{?_with_fdk:fdk-aac} %{!?_without_ffmpeg:ffmpeg} libdvdnav libdvdread libbluray %{?_with_mfx:libmfx} libvpx x265; do +for module in a52dec %{?_with_fdk:fdk-aac} %{!?_without_ffmpeg:ffmpeg} libdvdnav libdvdread libbluray %{?_with_mfx:libmfx} nvenc libvpx x265; do sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs done rm libhb/extras/cl{,_platform}.h @@ -173,6 +177,7 @@ echo "GCC.args.g.none = " >> custom.defs --verbose \ --disable-df-fetch \ --disable-gtk-update-checks \ + %{?_with_asm:--enable-asm} \ --enable-x265 \ %{?_with_fdk:--enable-fdk-aac} \ %{?_with_mfx:--enable-qsv} @@ -190,8 +195,6 @@ install -D -p -m 644 gtk/src/%{desktop_id}.desktop \ %{buildroot}/%{_datadir}/applications/%{desktop_id}.desktop install -D -p -m 644 gtk/src/%{desktop_id}.svg \ %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/%{desktop_id}.svg -install -D -p -m 644 gtk/src/%{desktop_id}.appdata.xml \ - %{buildroot}/%{_datadir}/appdata/%{desktop_id}.appdata.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/%{desktop_id}.desktop @@ -218,9 +221,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %doc AUTHORS.markdown NEWS.markdown README.markdown THANKS.markdown %{_bindir}/ghb %if 0%{?fedora} || 0%{?rhel} >= 7 -%{_datadir}/appdata/%{desktop_id}.appdata.xml +%{_metainfodir}/%{desktop_id}.appdata.xml %else -%exclude %{_datadir}/appdata/%{desktop_id}.appdata.xml +%exclude %{_metainfodir}/%{desktop_id}.appdata.xml %endif %{_datadir}/applications/%{desktop_id}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{desktop_id}.svg @@ -231,6 +234,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_bindir}/HandBrakeCLI %changelog +* Sun Jan 20 2019 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 1.2.0-1 +- Update to 1.2.0 +- Drop upstreamed subtitle handling patch +- Make libbluray patch EL-only, all current Fedoras have >1.0.0 +- new dependencies: speex, xz +- enable asm parts on x86 + * 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 diff --git a/sources b/sources index 97970ec..695f982 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5d77fd9207623da1d9068f4026cd91f3 HandBrake-1.1.0-source.tar.bz2 -32f3ac2f2b433190ed595e98928e7e6f HandBrake-1.1.0-source.tar.bz2.sig +efc3839160fa3224ce1b234aae12deca HandBrake-1.2.0-source.tar.bz2 +9969cdc5601b891bca25da592f52daac HandBrake-1.2.0-source.tar.bz2.sig