diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index 9df41c52f8d8..de99a7868300 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -1,173 +1,170 @@ # 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 \ SF/opencore-amr/fdk-aac/:fdkaac \ https://ffmpeg.org/releases/:ffmpeg \ https://www.openssl.org/source/old/${OPENSSLVERSION}/:openssl DISTFILES= makemkv-oss-${PORTVERSION}.tar.gz:makemkv \ makemkv-bin-${PORTVERSION}.tar.gz:makemkv \ fdk-aac-${FDKAACVERSION}.tar.gz:fdkaac \ ffmpeg-${FFMPEGVERSION}.tar.bz2:ffmpeg \ openssl-${OPENSSLFULLVER}.tar.gz:openssl DIST_SUBDIR= ${PORTNAME} MAINTAINER= felix@palmen-it.de COMMENT= Video converter reading from DVD and Bluray # Do not sell. Do not redistribute modified binaries, but # explicit permission to distribute a patched makemkvcon given by # copyright owner LICENSE= MAKEMKV FDK LGPL21+ OpenSSL LICENSE_COMB= multi LICENSE_NAME_MAKEMKV= The MakeMKV EULA LICENSE_NAME_FDK= The FDK AAC License LICENSE_FILE_MAKEMKV= ${WRKDIR}/makemkv-bin-${PORTVERSION}/src/eula_en_linux.txt LICENSE_FILE_FDK= ${WRKDIR}/fdk-aac-${FDKAACVERSION}/NOTICE LICENSE_PERMS_MAKEMKV= dist-mirror no-dist-sell pkg-mirror no-pkg-sell \ auto-accept LICENSE_PERMS_FDK= dist-mirror no-dist-sell pkg-mirror no-pkg-sell \ auto-accept LICENSE_DISTFILES_FDK= fdk-aac-${FDKAACVERSION}.tar.gz LICENSE_DISTFILES_LGPL21+ = ffmpeg-${FFMPEGVERSION}.tar.bz2 LICENSE_DISTFILES_OpenSSL= openssl-${OPENSSLFULLVER}.tar.gz LICENSE_DISTFILES_MAKEMKV= makemkv-bin-${PORTVERSION}.tar.gz \ makemkv-oss-${PORTVERSION}.tar.gz ONLY_FOR_ARCHS= amd64 i386 USES= gmake linux pkgconfig perl5 USE_LINUX= base expat expat:build openssl openssl:build devtools:build USE_PERL5= build BUILD_DEPENDS= nasm>0:devel/nasm \ ${LOCALBASE}/include/expat.h:textproc/expat2 \ patchelf>0:sysutils/patchelf WRKSRC= ${WRKDIR}/makemkv-oss-${PORTVERSION} CONFLICTS_BUILD= v4l_compat SUB_FILES= update-makemkv-drives 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} LINUXARCH= ${ARCH:S/amd64/x86_64/} 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 \ - -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} \ --libdir=${PREFIX}/lib/makemkv 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: @${MKDIR} ${WRKDIR}/gnuroot/lib @cd ${WRKDIR}/gnuroot/lib; \ ${LN} -s ${LINUXLIBDIR}/libz.so.1; \ ${LN} -s libz.so.1 libz.so; \ ${LN} -s ${LINUXLIBDIR}/libcrypto.so.10; \ ${LN} -s libcrypto.so.10 libcrypto.so; \ ${LN} -s ${LINUXLIBDIR}/libexpat.so.1; \ ${LN} -s libexpat.so.1 libexpat.so @${MKDIR} ${WRKDIR}/gnuroot/include @cd ${WRKDIR}/gnuroot/include; \ ${LN} -s /usr/include/zlib.h; \ ${LN} -s /usr/include/zconf.h; \ ${LN} -s ${LOCALBASE}/include/expat.h; \ ${LN} -s ${LOCALBASE}/include/expat_config.h; \ ${LN} -s ${LOCALBASE}/include/expat_external.h @${MKDIR} ${WRKDIR}/gnuroot/bin @cd ${WRKDIR}/gnuroot/bin; \ for t in gcc link ld objdump ar nm strip ranlib g++; do \ ${LN} -s ${LINUXBASE}/bin/$$t ${LINUXTRIPLET}-$$t; \ done post-patch: @${REINPLACE_CMD} -e 's:INSTALL) -D:INSTALL):' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's:/bin/bash:/bin/sh:' \ -e 's:x86_64:amd64:' \ -e 's:i686:i386:' \ -e 's:-t \([^ ]*\) \([^ ]*\):\2 \1:' \ ${WRKDIR}/makemkv-bin-${PORTVERSION}/Makefile 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 \ --host=${LINUXTRIPLET} --disable-silent-rules; \ ${MAKE_CMD} ${_MAKE_JOBS} install # ffmpeg 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}; \ ./Configure --openssldir= --prefix=/usr ${OPENSSLTARGET} pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/makemkv post-install: ${INSTALL_MAN} ${FILESDIR}/makemkvcon.1 \ ${STAGEDIR}${PREFIX}/man/man1 cd ${WRKDIR}/makemkv-bin-${PORTVERSION}; \ ${MKDIR} tmp; \ ${ECHO_CMD} accepted > tmp/eula_accepted; \ ${MAKE_CMD} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} install ${PATCHELF_CMD} --set-rpath ${PREFIX}/lib/makemkv \ ${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 post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${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,12 +1,18 @@ +[ +{ type: install + message: <