Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Aug 2021 16:49:18 GMT
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a77e668d4d95 - main - multimedia/makemkv: maintainer update to 1.16.4
Message-ID:  <202108301649.17UGnIPs055817@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a77e668d4d95640a0b1d81dc197bf3fbc1c85e23

commit a77e668d4d95640a0b1d81dc197bf3fbc1c85e23
Author:     Felix Palmen <felix@palmen-it.de>
AuthorDate: 2021-08-19 16:30:43 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2021-08-30 16:48:58 +0000

    multimedia/makemkv: maintainer update to 1.16.4
    
    Release notes:
    * Much better support for discs with Java playlist obfuscation
    * Any Java runtime version is now supported, including Java 16
    * Some small improvements
    * Bug fixes:
      - Program failed to recognize some AAC streams with exotic channel
        encoding
      - Picture dimensions were displayed incorrectly for some exotic HEVC
        streams
      - Conversion of some DVDs could fail at the very end of title
    
    Updated statically linked libraries:
      - fdk-aac 2.0.2
      - ffmpeg 4.4
    
    Added convenience script to update the free beta key as an example.
    
    On i386, the compiler from linux devtools now randomly segfaults, which
    is worked around by setting MAKE_JOBS_UNSAFE=yes for i386.
    
    PR:             257946
---
 multimedia/makemkv/Makefile                    | 21 ++++++++++++++++----
 multimedia/makemkv/distinfo                    | 18 ++++++++---------
 multimedia/makemkv/files/update-makemkv-key.sh | 27 ++++++++++++++++++++++++++
 multimedia/makemkv/pkg-plist                   |  1 +
 4 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile
index 26db9a0ef3f1..4a2055a72f92 100644
--- a/multimedia/makemkv/Makefile
+++ b/multimedia/makemkv/Makefile
@@ -1,7 +1,7 @@
 # Created by: Felix Palmen <felix@palmen-it.de>
 
 PORTNAME=	makemkv
-PORTVERSION=	1.16.3
+PORTVERSION=	1.16.4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.makemkv.com/download/:makemkv \
 		http://www.makemkv.com/download/old/:makemkv \
@@ -51,8 +51,8 @@ SUB_FILES=	update-makemkv-drives
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 PLIST_SUB=	LINUXBASE=${LINUXBASE}
 
-FDKAACVERSION=	2.0.1
-FFMPEGVERSION=	4.3.2
+FDKAACVERSION=	2.0.2
+FFMPEGVERSION=	4.4
 OPENSSLVERSION=	1.0.2
 OPENSSLPATCHLEVEL=	k
 OPENSSLFULLVER=	${OPENSSLVERSION}${OPENSSLPATCHLEVEL}
@@ -62,6 +62,8 @@ LINUXTRIPLET=	${LINUXARCH}-redhat-linux
 LINUXLIBDIR=	${LINUXBASE}/${"${LINUXARCH:Mx86_64}" != "":?lib64:lib}
 OPENSSLTARGET=	${"${LINUXARCH:Mx86_64}" != "":?linux-x86_64:linux-elf}
 
+OPTIONS_DEFINE=	EXAMPLES
+
 PATCHELF_CMD?=	${LOCALBASE}/bin/patchelf
 
 CFLAGS+=	-std=c++11 -std=c11 -DFORCE_OPENSSL_NO_EC \
@@ -155,4 +157,15 @@ post-install:
 		${INSTALL_SCRIPT} ${WRKDIR}/update-makemkv-drives \
 			${STAGEDIR}${PREFIX}/sbin
 
-.include <bsd.port.mk>
+post-install-EXAMPLES-on:
+		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+		${INSTALL_DATA} ${FILESDIR}/update-makemkv-key.sh \
+			${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+MAKE_JOBS_UNSAFE=	yes
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/makemkv/distinfo b/multimedia/makemkv/distinfo
index b247d8f07c4b..249dc9e071fa 100644
--- a/multimedia/makemkv/distinfo
+++ b/multimedia/makemkv/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1616401969
-SHA256 (makemkv/makemkv-oss-1.16.3.tar.gz) = 6141a8ccff41eaf9964385b172d49b7b3ceefb4c8b25734a424f53c27405f05d
-SIZE (makemkv/makemkv-oss-1.16.3.tar.gz) = 6536679
-SHA256 (makemkv/makemkv-bin-1.16.3.tar.gz) = 1b65dc78cc2216ee1f593e0bdc72730c1feb0f77925fa928e91755c3bd902f38
-SIZE (makemkv/makemkv-bin-1.16.3.tar.gz) = 15309313
-SHA256 (makemkv/fdk-aac-2.0.1.tar.gz) = 840133aa9412153894af03b27b03dde1188772442c316a4ce2a24ed70093f271
-SIZE (makemkv/fdk-aac-2.0.1.tar.gz) = 2865456
-SHA256 (makemkv/ffmpeg-4.3.2.tar.bz2) = ab3a6d6a70358ba0a5f67f37f91f6656b7302b02e98e5b8c846c16763c99913a
-SIZE (makemkv/ffmpeg-4.3.2.tar.bz2) = 11307134
+TIMESTAMP = 1629369603
+SHA256 (makemkv/makemkv-oss-1.16.4.tar.gz) = e6b0d391159e60c48c115cdf6938eb02f5aeef3c3fecf94813c500f4031e4f6b
+SIZE (makemkv/makemkv-oss-1.16.4.tar.gz) = 6536730
+SHA256 (makemkv/makemkv-bin-1.16.4.tar.gz) = 22fbd3f57e93f3c79a76c878202fb27e85f2d66de26b3be87b69198228a66aa2
+SIZE (makemkv/makemkv-bin-1.16.4.tar.gz) = 15455839
+SHA256 (makemkv/fdk-aac-2.0.2.tar.gz) = c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f
+SIZE (makemkv/fdk-aac-2.0.2.tar.gz) = 2886434
+SHA256 (makemkv/ffmpeg-4.4.tar.bz2) = 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e
+SIZE (makemkv/ffmpeg-4.4.tar.bz2) = 11489948
 SHA256 (makemkv/openssl-1.0.2k.tar.gz) = 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 SIZE (makemkv/openssl-1.0.2k.tar.gz) = 5309236
diff --git a/multimedia/makemkv/files/update-makemkv-key.sh b/multimedia/makemkv/files/update-makemkv-key.sh
new file mode 100755
index 000000000000..e08a47aa4e81
--- /dev/null
+++ b/multimedia/makemkv/files/update-makemkv-key.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# Convenience script to update the free beta key for makemkv in your user's
+# configuration.
+#
+# originally found on https://pastebin.com/vafpYkfa, 2013-08-11
+# adapted to FreeBSD by Manfred Heins <manfred.heins@selma.de>, 2021-08-18
+# minor improvements by Felix Palmen <felix@palmen-it.de>, 2021-08-19
+
+MAKEMKV_DIR="${HOME}/.MakeMKV"
+MAKEMKV_CFG="${MAKEMKV_DIR}/settings.conf"
+KEY_URL="http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
+
+BETA_KEY=$(fetch -o- "${KEY_URL}" 2>/dev/null \
+	| grep -oe '<code>.*</code>' \
+	| sed -E 's:</?code>::g')
+
+if [ "x$BETA_KEY" != x ]; then
+	echo "found key: ${BETA_KEY}"
+	mkdir -p "${MAKEMKV_DIR}"
+	sed -i.bak -e '/app_Key/d' -e '/^$/d' "${MAKEMKV_CFG}" 2>/dev/null
+	echo "app_Key = \"${BETA_KEY}\"" >> ${MAKEMKV_CFG}
+else
+	echo "key could not be found." >&2
+	exit 1
+fi
+
diff --git a/multimedia/makemkv/pkg-plist b/multimedia/makemkv/pkg-plist
index c2f5a00b9a62..2c06ff60adda 100644
--- a/multimedia/makemkv/pkg-plist
+++ b/multimedia/makemkv/pkg-plist
@@ -9,5 +9,6 @@ sbin/update-makemkv-drives
 share/MakeMKV/appdata.tar
 share/MakeMKV/blues.jar
 share/MakeMKV/blues.policy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/update-makemkv-key.sh
 @postexec update-makemkv-drives
 @preunexec rm -fr %%LINUXBASE%%/etc/makemkv



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108301649.17UGnIPs055817>