From 55486672deac5a32877b0a151df793e54e22b246 Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Mon, 6 Jan 2020 02:00:16 +0000
Subject: multimedia/handbrake: update to 1.3.1

1. remove `patch-gtk_src_Makefile.am`
    This patch has already been merged by upstream.

2. update ffmpeg to 4.2.2 in CONTRIB_FILES.
    Upstream has updated to this version.

3. update 'version.txt'
    Picked from released source archive.

PR:		243114
Submitted by:	naito.yuichiro@gmail.com (maintainer)
MFH:		2020Q1
---
 multimedia/handbrake/Makefile                        |  5 ++---
 multimedia/handbrake/distinfo                        | 10 +++++-----
 multimedia/handbrake/files/patch-gtk_src_Makefile.am | 11 -----------
 multimedia/handbrake/files/version.txt               | 10 +++++-----
 4 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 multimedia/handbrake/files/patch-gtk_src_Makefile.am

(limited to 'multimedia/handbrake')

diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 3faa1ea82302..c02a921037ff 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	handbrake
-DISTVERSION=	1.3.0
-PORTREVISION=	2
+DISTVERSION=	1.3.1
 CATEGORIES=	multimedia
 DIST_SUBDIR=	${PORTNAME}
 
@@ -42,7 +41,7 @@ USES=		autoreconf:build compiler:c11 gmake iconv \
 		libtool:build localbase:ldflags pkgconfig python:3.6+,build
 
 CONTRIB_FILES=	fdk-aac-2.0.1.tar.gz \
-		ffmpeg-4.2.1.tar.bz2 \
+		ffmpeg-4.2.2.tar.bz2 \
 		libbluray-1.1.2.tar.bz2 \
 		libdvdnav-6.0.1.tar.bz2 \
 		libdvdread-6.0.2.tar.bz2 \
diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo
index 71607dd9e338..30c7eda5388c 100644
--- a/multimedia/handbrake/distinfo
+++ b/multimedia/handbrake/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1573434561
+TIMESTAMP = 1578176293
 SHA256 (handbrake/fdk-aac-2.0.1.tar.gz) = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
 SIZE (handbrake/fdk-aac-2.0.1.tar.gz) = 2488373
-SHA256 (handbrake/ffmpeg-4.2.1.tar.bz2) = 682a9fa3f6864d7f0dbf224f86b129e337bc60286e0d00dffcd710998d521624
-SIZE (handbrake/ffmpeg-4.2.1.tar.bz2) = 10953293
+SHA256 (handbrake/ffmpeg-4.2.2.tar.bz2) = b620d187c26f76ca19e74210a0336c3b8380b97730df5cdf45f3e69e89000e5c
+SIZE (handbrake/ffmpeg-4.2.2.tar.bz2) = 10953320
 SHA256 (handbrake/libbluray-1.1.2.tar.bz2) = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
 SIZE (handbrake/libbluray-1.1.2.tar.bz2) = 745779
 SHA256 (handbrake/libdvdnav-6.0.1.tar.bz2) = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
@@ -13,5 +13,5 @@ SHA256 (handbrake/dav1d-0.5.1.tar.bz2) = 0214d201a338e8418f805b68f9ad277e33d79c1
 SIZE (handbrake/dav1d-0.5.1.tar.bz2) = 548584
 SHA256 (handbrake/x265_3.2.1.tar.gz) = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
 SIZE (handbrake/x265_3.2.1.tar.gz) = 1426255
-SHA256 (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = d31c6f669da5f49b60ff2d04f5c5906e15fc5e81563331333e3f862e4e48668b
-SIZE (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = 17908235
+SHA256 (handbrake/HandBrake-HandBrake-1.3.1_GH0.tar.gz) = 43283029fa40d35fb480813bfc40f2015d0828c2e2b2233d77c92602f995911f
+SIZE (handbrake/HandBrake-HandBrake-1.3.1_GH0.tar.gz) = 17912540
diff --git a/multimedia/handbrake/files/patch-gtk_src_Makefile.am b/multimedia/handbrake/files/patch-gtk_src_Makefile.am
deleted file mode 100644
index 7e4520ebfdde..000000000000
--- a/multimedia/handbrake/files/patch-gtk_src_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/src/Makefile.am.orig	2019-11-09 20:44:32 UTC
-+++ gtk/src/Makefile.am
-@@ -51,7 +51,7 @@ DISTCLEANFILES = \
- 	$(appdata_files)
- 
- AM_CPPFLAGS = \
--	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-+	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
- 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	$(GHB_CFLAGS)
diff --git a/multimedia/handbrake/files/version.txt b/multimedia/handbrake/files/version.txt
index 48d6a870aa37..787ed3bebf77 100644
--- a/multimedia/handbrake/files/version.txt
+++ b/multimedia/handbrake/files/version.txt
@@ -1,9 +1,9 @@
 URL=https://github.com/HandBrake/HandBrake.git
-HASH=4672248655ddd687161bacdb539c208abde15c59
-SHORTHASH=467224865
-TAG=1.3.0
-TAG_HASH=4672248655ddd687161bacdb539c208abde15c59
+HASH=b6df6dfce4105d89de37530c0da0a9d6dce5de00
+SHORTHASH=b6df6dfce
+TAG=1.3.1
+TAG_HASH=b6df6dfce4105d89de37530c0da0a9d6dce5de00
 REV=0
 BRANCH=
 REMOTE=https://github.com/HandBrake/HandBrake.git
-DATE=2019-11-09 15:44:32 -0500
+DATE=2020-01-04 16:28:06 +0000
-- 
cgit v1.2.3