Djam/handbrake
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/handbrake.git synced 2025-02-23 16:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update version

Browse source
This commit is contained in:
Aleksandr Proklov 2021-07-30 15:10:08 +09:00
parent 92b3b6cca9
commit 73d0d7f046
5 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.abf.yml
View file

@ -1,4 +1,3 @@
sources:
HandBrake-1.3.3-source.tar.bz2: efde8bb8cbb455e92f8bafd0f092db81c4b5827b
download.tar.gz: fd9681c93e997bfb16cc2965398c8b6d17350008
HandBrake-1.4.0-source.tar.bz2: 847c330a6699d69d209659ca781e6f79f52f0735
handbrake-1.2.0_ru.tar.gz: 6bd50d9c34ae4cd978b9dd5f151420310eb703e3

12
handbrake-1.3.3-fix-x265-linking-failure.patch
View file

@ -1,12 +0,0 @@
diff -rupN HandBrake-1.3.3.old/test/module.defs HandBrake-1.3.3/test/module.defs
--- HandBrake-1.3.3.old/test/module.defs 2020-06-13 16:05:35.000000000 +0200
+++ HandBrake-1.3.3/test/module.defs 2020-08-15 14:22:44.208133677 +0200
@@ -16,7 +16,7 @@ TEST.libs = $(LIBHB.a)
TEST.GCC.l = \
ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
dvdread fribidi \
- swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
+ swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
ifeq (,$(filter $(HOST.system),darwin cygwin mingw))

17
handbrake-1.3.3-ROSA-force-system-libs-use.patch → handbrake-1.4.0-ROSA-force-system-libs-use.patch
View file

@ -1,10 +1,14 @@
diff -rupN HandBrake-1.3.3.old/make/include/main.defs HandBrake-1.3.3/make/include/main.defs
--- HandBrake-1.3.3.old/make/include/main.defs 2020-06-13 16:05:35.000000000 +0200
+++ HandBrake-1.3.3/make/include/main.defs 2020-08-15 14:43:06.594993369 +0200
@@ -39,19 +39,6 @@ ifeq (1,$(FEATURE.fdk_aac))
MODULES += contrib/fdk-aac
diff -ruN a/make/include/main.defs b/make/include/main.defs
--- a/make/include/main.defs 2021-07-18 16:27:44.000000000 +0900
+++ b/make/include/main.defs 2021-07-30 15:04:10.247178934 +0900
@@ -36,24 +36,6 @@
MODULES += contrib/x264
endif
-ifeq (1,$(FEATURE.fdk_aac))
- MODULES += contrib/fdk-aac
-endif
-
-ifeq (1,$(FEATURE.x265))
- MODULES += contrib/x265
- MODULES += contrib/x265_8bit
@ -13,11 +17,12 @@ diff -rupN HandBrake-1.3.3.old/make/include/main.defs HandBrake-1.3.3/make/inclu
-endif
-
-MODULES += contrib/libdav1d
-MODULES += contrib/zimg
-MODULES += contrib/ffmpeg
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-
ifeq (1,$(FEATURE.qsv))
ifeq (,$(filter $(HOST.system),freebsd))
MODULES += contrib/libmfx
endif

12
handbrake-1.4.0-fix-x265-linking-failure.patch Normal file
View file

@ -0,0 +1,12 @@
diff -ruN a/test/module.defs b/test/module.defs
--- a/test/module.defs 2021-07-18 16:27:44.000000000 +0900
+++ b/test/module.defs 2021-07-30 14:43:56.659255207 +0900
@@ -16,7 +16,7 @@
TEST.GCC.l = \
ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
dvdread fribidi swscale vpx theoraenc theoradec vorbis vorbisenc ogg \
- x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
+ x264 x265 fdk-aac bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
turbojpeg zimg
ifeq (,$(filter $(HOST.system),darwin cygwin mingw))

22
handbrake.spec
View file

@ -1,5 +1,3 @@
%define distsuffix plf
%define _enable_debug_packages %{nil}
%define debug_package %{nil}
@ -8,19 +6,19 @@
Summary: Open-source video transcoder
Name: handbrake
Version: 1.3.3
Release: 2
Version: 1.4.0
Release: 1
License: GPLv2+
Group: Video
Url: http://handbrake.fr/
Source0: https://github.com/HandBrake/HandBrake/releases/download/%{version}/%{oname}-%{version}-source.tar.bz2
# TODO: Update to new 1.3.3 sources
Source1: handbrake-1.2.0_ru.tar.gz
Patch0: handbrake-1.3.3-fix-x265-linking-failure.patch
Patch0: handbrake-1.4.0-fix-x265-linking-failure.patch
# Force using system libraries, some from Source2 will not bee needed
Patch1: handbrake-1.3.3-ROSA-force-system-libs-use.patch
Source2: download.tar.gz
Patch1: handbrake-1.4.0-ROSA-force-system-libs-use.patch
BuildRequires: cmake
BuildRequires: meson
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: iso-codes
@ -52,7 +50,7 @@ BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(jansson)
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libbluray) >= 1.0
BuildRequires: pkgconfig(libgtkhtml-3.14)
BuildRequires: pkgconfig(libgtkhtml-4.0)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libva)
@ -68,6 +66,7 @@ BuildRequires: pkgconfig(webkitgtk-3.0)
BuildRequires: pkgconfig(x264)
BuildRequires: pkgconfig(x265)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(zimg)
Recommends: typelib(AppIndicator3)
Recommends: gstreamer%{gstapi}-libav
Recommends: gstreamer%{gstapi}-plugins-base
@ -94,12 +93,7 @@ supports modern video formats.
#----------------------------------------------------------------------------
%prep
%setup -qn %{oname}-%{version}
%patch0 -p1
%patch1 -p1
# Install optional libraries
tar -xvzf %{SOURCE2}
%autosetup -p1 -n %{oname}-%{version}
# Install Russian translation files
pushd gtk/po