Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jul 2020 13:04:59 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r543596 - head/multimedia/makemkv
Message-ID:  <202007281304.06SD4xVB015850@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Tue Jul 28 13:04:59 2020
New Revision: 543596
URL: https://svnweb.freebsd.org/changeset/ports/543596

Log:
  multimedia/makemkv: update to 1.15.2
  
  While here, a few fixes/improvements
  
  PR:		248273
  Submitted by:	Felix Palmen <felix@palmen-it.de> (maintainer)

Modified:
  head/multimedia/makemkv/Makefile   (contents, props changed)
  head/multimedia/makemkv/distinfo   (contents, props changed)
  head/multimedia/makemkv/pkg-plist   (contents, props changed)

Modified: head/multimedia/makemkv/Makefile
==============================================================================
--- head/multimedia/makemkv/Makefile	Tue Jul 28 13:03:39 2020	(r543595)
+++ head/multimedia/makemkv/Makefile	Tue Jul 28 13:04:59 2020	(r543596)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	makemkv
-PORTVERSION=	1.15.1
+PORTVERSION=	1.15.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.makemkv.com/download/:makemkv \
 		http://www.makemkv.com/download/old/:makemkv \
@@ -88,13 +88,12 @@ MPFRVERSION=	3.1.2
 MPCVERSION=	1.0.3
 GCCVERSION=	5.5.0
 FDKAACVERSION=	2.0.1
-FFMPEGVERSION=	4.2.2
+FFMPEGVERSION=	4.3.1
 OPENSSLVERSION=	1.0.2
 OPENSSLPATCHLEVEL=	k
 OPENSSLFULLVER=	${OPENSSLVERSION}${OPENSSLPATCHLEVEL}
 
 LINUXARCH=	${ARCH:S/amd64/x86_64/}
-LINUXTRIPLET=	${LINUXARCH}-unknown-linux-gnu
 LINUX32CPUTYPE=	${${OSVERSION} >= 1300000:?i686:i486}
 LINUXTRIPLET=	${LINUXARCH:S/i386/${LINUX32CPUTYPE}/}-unknown-linux-gnu
 LINUXLIBDIR=	${LINUXBASE}/${"${LINUXARCH:Mx86_64}" != "":?lib64:lib}
@@ -164,7 +163,7 @@ pre-configure:
 		CC=${CC} CXX=${CXX} ../binutils-${BINUTILSVERSION}/configure \
 			--target=${LINUXTRIPLET} \
 			--prefix=${WRKDIR}/gnuroot \
-			--disable-multilib --disable-nls; \
+			--disable-multilib --disable-nls --without-isl; \
 		${MAKE_CMD} ${_MAKE_JOBS} && \
 		${MAKE_CMD} install
 		# GCC compiler
@@ -173,7 +172,8 @@ pre-configure:
 		CC=${CC} CXX=${CXX} ../gcc-${GCCVERSION}/configure \
 			--target=${LINUXTRIPLET} \
 			--prefix=${WRKDIR}/gnuroot \
-			--enable-languages=c,c++ --disable-multilib; \
+			--enable-languages=c,c++ --disable-multilib \
+			--without-isl; \
 		${MAKE_CMD} ${_MAKE_JOBS} all-gcc && \
 		${MAKE_CMD} install-gcc
 		# Glibc headers / startup code
@@ -207,7 +207,7 @@ pre-configure:
 		${MAKE_CMD} ${_MAKE_JOBS}; \
 		${MAKE_CMD} install
 		# GCC libstdc++
-		${ECHO_CMD} '#/bin/sh\ntrue' \
+		${ECHO_CMD} '#!/bin/sh\ntrue' \
 			>${WRKDIR}/gnuroot/bin/ldconfig
 		${CHMOD} +x ${WRKDIR}/gnuroot/bin/ldconfig
 		cd ${WRKDIR}/gcc-build; \
@@ -244,8 +244,8 @@ pre-configure:
 do-configure:
 		cd ${WRKSRC}; \
 		CC=${LINUXTRIPLET}-gcc CXX=${LINUXTRIPLET}-g++ \
-		CFLAGS="${CFLAGS:N-Wl,-rpath=*}" \
-		CXXFLAGS="${CXXFLAGS:N-Wl,-rpath=*}" \
+		CFLAGS="-std=c++11 ${CFLAGS:N-Wl,-rpath=*}" \
+		CXXFLAGS="-std=c++11 ${CXXFLAGS:N-Wl,-rpath=*}" \
 		LDFLAGS="${LDFLAGS:N-Wl,-rpath=*}" \
 		PATH=${WRKDIR}/gnuroot/bin:${PATH} \
 		PKG_CONFIG_PATH=${WRKDIR}/gnuroot/lib/pkgconfig \
@@ -268,6 +268,7 @@ post-install:
 			${STAGEDIR}${PREFIX}/bin/makemkvcon
 		${REINPLACE_CMD} -e 's:/sys/bus/scsi:/etc/makemkv/:' \
 			${STAGEDIR}${PREFIX}/bin/makemkvcon
+		${BRANDELF} -t Linux ${STAGEDIR}${PREFIX}/bin/makemkvcon
 		${INSTALL_SCRIPT} ${WRKDIR}/update-makemkv-drives \
 			${STAGEDIR}${PREFIX}/sbin
 

Modified: head/multimedia/makemkv/distinfo
==============================================================================
--- head/multimedia/makemkv/distinfo	Tue Jul 28 13:03:39 2020	(r543595)
+++ head/multimedia/makemkv/distinfo	Tue Jul 28 13:04:59 2020	(r543596)
@@ -1,8 +1,8 @@
-TIMESTAMP = 1587020270
-SHA256 (makemkv/makemkv-oss-1.15.1.tar.gz) = 5e6b3da05a3298a0ac85c674dbde45d5eb36956159deb3207ac23f85a7ffa166
-SIZE (makemkv/makemkv-oss-1.15.1.tar.gz) = 6403114
-SHA256 (makemkv/makemkv-bin-1.15.1.tar.gz) = 80bbd4438c3ce6e95c085a63b9129c919dff865d14cd2b5e58a851da74302631
-SIZE (makemkv/makemkv-bin-1.15.1.tar.gz) = 8338636
+TIMESTAMP = 1595663605
+SHA256 (makemkv/makemkv-oss-1.15.2.tar.gz) = 1ede2f3c6d3f650c257b667d5254526375605e8d97492810e4d870573efdd0f2
+SIZE (makemkv/makemkv-oss-1.15.2.tar.gz) = 6404814
+SHA256 (makemkv/makemkv-bin-1.15.2.tar.gz) = 141b67c526bb0dfa0b556c9c6322ea73586439b5a03042a6827c518a81be71b5
+SIZE (makemkv/makemkv-bin-1.15.2.tar.gz) = 8506031
 SHA256 (makemkv/linux-2.6.32.27.tar.xz) = 96c20c370ed440db61624d93f34721a09a69b12bb81b1b03bb735041983fb1bd
 SIZE (makemkv/linux-2.6.32.27.tar.xz) = 52652044
 SHA256 (makemkv/binutils-2.27.tar.bz2) = 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
@@ -19,7 +19,7 @@ SHA256 (makemkv/gcc-5.5.0.tar.gz) = 3aabce75d6dd206876
 SIZE (makemkv/gcc-5.5.0.tar.gz) = 123816630
 SHA256 (makemkv/fdk-aac-2.0.1.tar.gz) = 840133aa9412153894af03b27b03dde1188772442c316a4ce2a24ed70093f271
 SIZE (makemkv/fdk-aac-2.0.1.tar.gz) = 2865456
-SHA256 (makemkv/ffmpeg-4.2.2.tar.bz2) = b620d187c26f76ca19e74210a0336c3b8380b97730df5cdf45f3e69e89000e5c
-SIZE (makemkv/ffmpeg-4.2.2.tar.bz2) = 10953320
+SHA256 (makemkv/ffmpeg-4.3.1.tar.bz2) = f4a4ac63946b6eee3bbdde523e298fca6019d048d6e1db0d1439a62cea65f0d9
+SIZE (makemkv/ffmpeg-4.3.1.tar.bz2) = 11301038
 SHA256 (makemkv/openssl-1.0.2k.tar.gz) = 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 SIZE (makemkv/openssl-1.0.2k.tar.gz) = 5309236

Modified: head/multimedia/makemkv/pkg-plist
==============================================================================
--- head/multimedia/makemkv/pkg-plist	Tue Jul 28 13:03:39 2020	(r543595)
+++ head/multimedia/makemkv/pkg-plist	Tue Jul 28 13:04:59 2020	(r543596)
@@ -1,4 +1,5 @@
 bin/makemkvcon
+bin/sdftool
 lib/makemkv/libdriveio.so.0
 lib/makemkv/libmakemkv.so.1
 lib/makemkv/libmmbd.so.0



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