From nobody Sun Aug 7 07:09:28 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M0r6w43H3z4Y1NP; Sun, 7 Aug 2022 07:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M0r6w3Wl3z3tMx; Sun, 7 Aug 2022 07:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659856168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kb+spC5+neCyDkPhwuX5arcXb5igLk3Xqw457rK09bs=; b=MXNDCOSbEAFpFIVwF54vRmofzMKNCeN48pGGSXLHVJrqskQy/HsbGWyb3ZDtGuBfB1C/Uf 5WEiTYOdB4p+qIPKY1N1O30BEcpwGIQPxD8sKfR9D8nDjsD3+0/gdg0M/sE1nhrWhMx4T8 6rt3vV5OpiYlTIYX2L60dttxOfee1JV/55Sxuswy/yqjZ8H1O2UrGRn7tt+J6iIugpln67 sDs/VYps1rFLxrB6Qxwjhs12m1Z2JsC1j0CDWhDtFH0nVLAA/N2pL5PrFgjJwH3d2Z/6+U PgD+IGvJQX9+q3GZwgM/O5oNneWlVGxYU9w8Rfvxm/+tNr+gYVJ+LsuuPtSUXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M0r6w2Xjmz13jj; Sun, 7 Aug 2022 07:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27779SYx064246; Sun, 7 Aug 2022 07:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27779So1064245; Sun, 7 Aug 2022 07:09:28 GMT (envelope-from git) Date: Sun, 7 Aug 2022 07:09:28 GMT Message-Id: <202208070709.27779So1064245@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Felix Palmen Subject: git: 370d7900f0c9 - 2022Q3 - multimedia/makemkv: Update to 1.17.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 370d7900f0c9fe3e222be6f8b0e4aacd7ff52716 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659856168; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kb+spC5+neCyDkPhwuX5arcXb5igLk3Xqw457rK09bs=; b=hcZPVd97u431zdIu2LvfxpULvP0ClW/S/p9Jm00hR2V8Ia2ejQkpxtbsJbZaxDDPzoha+K 1hpoFwbcyI4hv4QexZ4FU1+NgRfjDzb9pONNOSjQMkXR5fXtk/lpi5C59t4Eg2FEnuzHoV 2grToPq+7utyClu9mpXNVNkMce3TEsVxRcpC62g/ChfinF+92r5pcKZe5cilgeUGCc1nu+ 6tGkelGkruuD30d7YTqcnO1PhZ5FAopK3+32nrGkocZoXi//ag1AXSKmirikGP1Beq03Uv nnbTr3bK2O7S+OINHFU9mIyWZlFfCkCpaa9WKjAq0U3m5/Dc7HE1xTkGuHVeLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659856168; a=rsa-sha256; cv=none; b=DM/XUjqY6AppfMxzCXS7r/ynzAfNzdz3c7bnSzw6vCWBFt5gNcd0kPujXAvNCcF0xA0aX1 9P8Oc6qGLmg9kcOVCwLb5T60/rfbNEO8Mph59dzsh/+R5drQlw0t27+rOwDL4QftLFmTKE 8YP2SxPiZnRd8uIE1OSPr8zxxtcn2RIZ5hBPATDpVyGizX257edmtlRtp9IfM5X9WPkG1m qVzo9iWXbq6DjONYRb5cCq1xT6KEHBF9ImqGBcOOCc1DTukzMJOL5f5Jw4Bg4YAhXpCrVT QqgALSU9grj73VrYqCdyfOOFqarRPO3bh5FFmjW0gPaArOcU35VJvuZrx87e0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=370d7900f0c9fe3e222be6f8b0e4aacd7ff52716 commit 370d7900f0c9fe3e222be6f8b0e4aacd7ff52716 Author: Felix Palmen AuthorDate: 2022-07-07 16:24:40 +0000 Commit: Felix Palmen CommitDate: 2022-08-07 07:07:05 +0000 multimedia/makemkv: Update to 1.17.0 Release notes (aggregated): * LibMMBD stability improvements * Improved handling for discs with mastering errors * A new, rewritten DVD engine - much better handling for discs with structure protection * Many small bug-fixes Updated statically linked libraries: - ffmpeg 5.0.1 While here, convert pkg-message to UCL format. PR: 265078 Reported by: portscout (cherry picked from commit 43c5c839a15b395c4db862da77541accb725cede) --- multimedia/makemkv/Makefile | 29 +++++++++++++---------------- multimedia/makemkv/distinfo | 14 +++++++------- multimedia/makemkv/pkg-message | 6 ++++++ multimedia/makemkv/pkg-plist | 1 + 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index 9df41c52f8d8..de99a7868300 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -1,7 +1,7 @@ # Created by: Felix Palmen PORTNAME= makemkv -PORTVERSION= 1.16.4 +PORTVERSION= 1.17.0 CATEGORIES= multimedia MASTER_SITES= http://www.makemkv.com/download/:makemkv \ http://www.makemkv.com/download/old/:makemkv \ @@ -54,7 +54,7 @@ SUB_LIST= LINUXBASE=${LINUXBASE} PLIST_SUB= LINUXBASE=${LINUXBASE} FDKAACVERSION= 2.0.2 -FFMPEGVERSION= 4.4 +FFMPEGVERSION= 5.0.1 OPENSSLVERSION= 1.0.2 OPENSSLPATCHLEVEL= k OPENSSLFULLVER= ${OPENSSLVERSION}${OPENSSLPATCHLEVEL} @@ -68,10 +68,12 @@ OPTIONS_DEFINE= EXAMPLES PATCHELF_CMD?= ${LOCALBASE}/bin/patchelf -CFLAGS+= -std=c++11 -std=c11 -DFORCE_OPENSSL_NO_EC \ - -I${WRKDIR}/gnuroot/include \ - -I${WRKDIR}/openssl-${OPENSSLFULLVER}/include -SSP_CFLAGS= +CPPFLAGS+= -I${WRKDIR}/gnuroot/include \ + -I${WRKDIR}/openssl-${OPENSSLFULLVER}/include \ + -D_linux_ -DFORCE_OPENSSL_NO_EC \ + ${${OSVERSION}<1300000:?-Dcaddr_t=void\* -D__daddr_t_defined:} +CFLAGS+= -std=c11 +CXXFLAGS+= -std=c++11 LDFLAGS+= -L${WRKDIR}/gnuroot/lib HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --disable-gui --host=${LINUXTRIPLET} \ @@ -80,6 +82,7 @@ CONFIGURE_ENV= CC=${LINUXTRIPLET}-gcc CXX=${LINUXTRIPLET}-g++ \ PATH=${WRKDIR}/gnuroot/bin:${PATH} \ PKG_CONFIG_PATH=${WRKDIR}/gnuroot/lib/pkgconfig MAKE_ENV= PATH=${WRKDIR}/gnuroot/bin:${PATH} +MAKE_ARGS= CFLAGS="${CXXFLAGS} ${CPPFLAGS} -std=c11" STRIP_CMD= ${WRKDIR}/gnuroot/bin/${LINUXTRIPLET}-strip post-extract: @@ -117,7 +120,7 @@ pre-configure: # FDK AAC cd ${WRKDIR}/fdk-aac-${FDKAACVERSION}; \ export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ - export CXXFLAGS="${CFLAGS}"; \ + export CXXFLAGS="${CXXFLAGS}"; \ LDFLAGS=-L${WRKDIR}/gnuroot/lib \ ./configure --prefix=${WRKDIR}/gnuroot \ --disable-shared --enable-static --with-pic \ @@ -127,15 +130,15 @@ pre-configure: cd ${WRKDIR}/ffmpeg-${FFMPEGVERSION}; \ export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ export CFLAGS="${CFLAGS}"; \ + export CPPFLAGS="${CPPFLAGS}"; \ PKG_CONFIG_PATH=${WRKDIR}/gnuroot/lib/pkgconfig \ - CPPFLAGS="-Dcaddr_t=void\* -D__daddr_t_defined" \ LDFLAGS=-L${WRKDIR}/gnuroot/lib \ ./configure --prefix=${WRKDIR}/gnuroot \ --disable-shared --enable-static --enable-pic \ --enable-libfdk-aac --pkg-config=pkg-config \ --cross-prefix=${LINUXTRIPLET}- --arch=${LINUXARCH} \ --target-os=linux --host-cc=${CC}; \ - CFLAGS="${CFLAGS}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ ${MAKE_CMD} ${_MAKE_JOBS} V=1 ARCH=x86 all install # OpenSSL headers cd ${WRKDIR}/openssl-${OPENSSLFULLVER}; \ @@ -164,10 +167,4 @@ post-install-EXAMPLES-on: ${INSTALL_DATA} ${FILESDIR}/update-makemkv-key.sh \ ${STAGEDIR}${EXAMPLESDIR} -.include - -.if ${ARCH} == "i386" -MAKE_JOBS_UNSAFE= yes -.endif - -.include +.include diff --git a/multimedia/makemkv/distinfo b/multimedia/makemkv/distinfo index 249dc9e071fa..59e1de163c43 100644 --- a/multimedia/makemkv/distinfo +++ b/multimedia/makemkv/distinfo @@ -1,11 +1,11 @@ -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 +TIMESTAMP = 1657210297 +SHA256 (makemkv/makemkv-oss-1.17.0.tar.gz) = ede75c7cc05dbef9d2e5c55d340dc090f58b25b0c809e2345c2554f0b20cf75f +SIZE (makemkv/makemkv-oss-1.17.0.tar.gz) = 6631571 +SHA256 (makemkv/makemkv-bin-1.17.0.tar.gz) = e277d75722aede64ac1b564969c7d64608e00591b17068dc7a88358e7a03e2c0 +SIZE (makemkv/makemkv-bin-1.17.0.tar.gz) = 16332197 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/ffmpeg-5.0.1.tar.bz2) = 28df33d400a1c1c1b20d07a99197809a3b88ef765f5f07dc1ff067fac64c59d6 +SIZE (makemkv/ffmpeg-5.0.1.tar.bz2) = 11824483 SHA256 (makemkv/openssl-1.0.2k.tar.gz) = 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 SIZE (makemkv/openssl-1.0.2k.tar.gz) = 5309236 diff --git a/multimedia/makemkv/pkg-message b/multimedia/makemkv/pkg-message index f0cfb71e17e9..ca6c39cd1982 100644 --- a/multimedia/makemkv/pkg-message +++ b/multimedia/makemkv/pkg-message @@ -1,3 +1,6 @@ +[ +{ type: install + message: <