diff --git a/multimedia/makemkv/Makefile b/multimedia/makemkv/Makefile index a87d022014f7..bbdde732a2da 100644 --- a/multimedia/makemkv/Makefile +++ b/multimedia/makemkv/Makefile @@ -2,29 +2,15 @@ # $FreeBSD$ PORTNAME= makemkv -PORTVERSION= 1.15.4 +PORTVERSION= 1.16.1 CATEGORIES= multimedia MASTER_SITES= http://www.makemkv.com/download/:makemkv \ http://www.makemkv.com/download/old/:makemkv \ - KERNEL_ORG/linux/kernel/v2.6:linux \ - GNU/binutils:binutils \ - GNU/glibc:glibc \ - GNU/gmp:gmp \ - GNU/mpfr:mpfr \ - GNU/mpc:mpc \ - GCC/releases/gcc-${GCCVERSION}:gcc \ 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 \ - linux-${LINUXVERSION}.tar.xz:linux \ - binutils-${BINUTILSVERSION}.tar.bz2:binutils \ - glibc-${GLIBCVERSION}.tar.xz:glibc \ - gmp-${GMPVERSION}.tar.xz:gmp \ - mpfr-${MPFRVERSION}.tar.xz:mpfr \ - mpc-${MPCVERSION}.tar.gz:mpc \ - gcc-${GCCVERSION}.tar.gz:gcc \ fdk-aac-${FDKAACVERSION}.tar.gz:fdkaac \ ffmpeg-${FFMPEGVERSION}.tar.bz2:ffmpeg \ openssl-${OPENSSLFULLVER}.tar.gz:openssl @@ -33,7 +19,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= felix@palmen-it.de COMMENT= Video converter reading from DVD and Bluray -LICENSE= MAKEMKV FDK GPLv2 GPLv3 LGPL21+ LGPL3 OpenSSL +LICENSE= MAKEMKV FDK LGPL21+ OpenSSL LICENSE_COMB= multi LICENSE_NAME_MAKEMKV= The MakeMKV EULA LICENSE_NAME_FDK= The FDK AAC License @@ -44,29 +30,18 @@ LICENSE_PERMS_MAKEMKV= dist-mirror no-dist-sell pkg-mirror no-pkg-sell \ 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_GPLv2= binutils-${BINUTILSVERSION}.tar.bz2 \ - glibc-${GLIBCVERSION}.tar.xz \ - linux-${LINUXVERSION}.tar.xz \ - gcc-${GCCVERSION}.tar.gz LICENSE_DISTFILES_LGPL21+ = ffmpeg-${FFMPEGVERSION}.tar.bz2 -LICENSE_DISTFILES_GPLv3= gmp-${GMPVERSION}.tar.xz \ - mpfr-${MPFRVERSION}.tar.xz -LICENSE_DISTFILES_LGPL3= mpc-${MPCVERSION}.tar.gz 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 +USE_LINUX= base expat expat:build openssl openssl:build devtools:build USE_PERL5= build -USE_GCC= yes -USE_LDCONFIG= yes BUILD_DEPENDS= nasm>0:devel/nasm \ ${LOCALBASE}/include/expat.h:textproc/expat2 \ - patchelf>0:sysutils/patchelf \ - gawk>0:lang/gawk \ - gsed>0:textproc/gsed + patchelf>0:sysutils/patchelf NO_CDROM= Do not sell RESTRICTED_FILES= makemkv-bin-${PORTVERSION}.tar.gz @@ -80,44 +55,33 @@ SUB_FILES= update-makemkv-drives SUB_LIST= LINUXBASE=${LINUXBASE} PLIST_SUB= LINUXBASE=${LINUXBASE} -LINUXVERSION= 2.6.32.27 -BINUTILSVERSION= 2.27 -GLIBCVERSION= 2.17 -GMPVERSION= 5.1.3 -MPFRVERSION= 3.1.2 -MPCVERSION= 1.0.3 -GCCVERSION= 5.5.0 FDKAACVERSION= 2.0.1 -FFMPEGVERSION= 4.3.1 +FFMPEGVERSION= 4.3.2 OPENSSLVERSION= 1.0.2 OPENSSLPATCHLEVEL= k OPENSSLFULLVER= ${OPENSSLVERSION}${OPENSSLPATCHLEVEL} LINUXARCH= ${ARCH:S/amd64/x86_64/} -LINUX32CPUTYPE= ${${OSVERSION} >= 1300000:?i686:i486} -LINUXTRIPLET= ${LINUXARCH:S/i386/${LINUX32CPUTYPE}/}-unknown-linux-gnu +LINUXTRIPLET= ${LINUXARCH}-redhat-linux LINUXLIBDIR= ${LINUXBASE}/${"${LINUXARCH:Mx86_64}" != "":?lib64:lib} -GNUCROSSDIR= ${WRKDIR}/gnuroot/${LINUXTRIPLET} -GNUCROSSLIBDIR= ${GNUCROSSDIR}/${"${LINUXARCH:Mx86_64}" != "":?lib64:lib} OPENSSLTARGET= ${"${LINUXARCH:Mx86_64}" != "":?linux-x86_64:linux-elf} PATCHELF_CMD?= ${LOCALBASE}/bin/patchelf -CFLAGS+= -DFORCE_OPENSSL_NO_EC -I${WRKDIR}/gnuroot/include \ +CFLAGS+= -std=c++11 -DFORCE_OPENSSL_NO_EC -I${WRKDIR}/gnuroot/include \ -I${WRKDIR}/openssl-${OPENSSLFULLVER}/include SSP_CFLAGS= -LDFLAGS+= -L${WRKDIR}/gnuroot/lib -Wl,-rpath-link=${WRKDIR}/gnuroot/lib +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} STRIP_CMD= ${WRKDIR}/gnuroot/bin/${LINUXTRIPLET}-strip post-extract: - @${MV} -f ${WRKDIR}/gmp-${GMPVERSION} \ - ${WRKDIR}/gcc-${GCCVERSION}/gmp - @${MV} -f ${WRKDIR}/mpfr-${MPFRVERSION} \ - ${WRKDIR}/gcc-${GCCVERSION}/mpfr - @${MV} -f ${WRKDIR}/mpc-${MPCVERSION} \ - ${WRKDIR}/gcc-${GCCVERSION}/mpc @${MKDIR} ${WRKDIR}/gnuroot/lib @cd ${WRKDIR}/gnuroot/lib; \ ${LN} -s ${LINUXLIBDIR}/libz.so.1; \ @@ -133,9 +97,11 @@ post-extract: ${LN} -s ${LOCALBASE}/include/expat.h; \ ${LN} -s ${LOCALBASE}/include/expat_config.h; \ ${LN} -s ${LOCALBASE}/include/expat_external.h - @${MKDIR} ${WRKDIR}/binutils-build - @${MKDIR} ${WRKDIR}/gcc-build - @${MKDIR} ${WRKDIR}/glibc-build + @${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):' \ @@ -145,75 +111,8 @@ post-patch: -e 's:i686:i386:' \ -e 's:-t \([^ ]*\) \([^ ]*\):\2 \1:' \ ${WRKDIR}/makemkv-bin-${PORTVERSION}/Makefile - @${REINPLACE_CMD} -e 's:3\.79:4.*:' \ - ${WRKDIR}/glibc-${GLIBCVERSION}/configure - @${REINPLACE_CMD} -e 's:#ifndef __u_char_defined:#if 0:' \ - -e 's:#ifndef __daddr_t_defined:#if 0:' \ - ${WRKDIR}/glibc-${GLIBCVERSION}/sunrpc/rpc/types.h - @${REINPLACE_CMD} -e 's:^\([[:space:]]*\)sed :\1gsed :' \ - ${WRKDIR}/glibc-${GLIBCVERSION}/Makerules pre-configure: - # Linux headers - cd ${WRKDIR}/linux-${LINUXVERSION}; \ - ${MAKE_CMD} V=1 HOSTCC=${CC} ARCH=${LINUXARCH} \ - INSTALL_HDR_PATH=${GNUCROSSDIR} headers_install; \ - # Binutils - cd ${WRKDIR}/binutils-build; \ - CC=${CC} CXX=${CXX} ../binutils-${BINUTILSVERSION}/configure \ - --target=${LINUXTRIPLET} \ - --prefix=${WRKDIR}/gnuroot \ - --disable-multilib --disable-nls --without-isl; \ - ${MAKE_CMD} ${_MAKE_JOBS} && \ - ${MAKE_CMD} install - # GCC compiler - cd ${WRKDIR}/gcc-build; \ - export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ - CC=${CC} CXX=${CXX} ../gcc-${GCCVERSION}/configure \ - --target=${LINUXTRIPLET} \ - --prefix=${WRKDIR}/gnuroot \ - --enable-languages=c,c++ --disable-multilib \ - --without-isl; \ - ${MAKE_CMD} ${_MAKE_JOBS} all-gcc && \ - ${MAKE_CMD} install-gcc - # Glibc headers / startup code - cd ${WRKDIR}/glibc-build; \ - export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ - export nargs=0; \ - BUILD_CC=${CC} CC=${LINUXTRIPLET}-gcc \ - ../glibc-${GLIBCVERSION}/configure \ - --host=${LINUXTRIPLET} \ - --prefix=${GNUCROSSDIR} \ - --with-binutils=${WRKDIR}/gnuroot/bin \ - --with-headers=${GNUCROSSDIR}/include \ - --disable-profile --disable-multilib \ - --enable-kernel=2.6.32 libc_cv_forced_unwind=yes \ - libc_cv_ssp=no; \ - ${MAKE_CMD} install-bootstrap-headers=yes install-headers; \ - ${MAKE_CMD} ${_MAKE_JOBS} csu/subdir_lib; \ - ${INSTALL_DATA} csu/crt1.o csu/crti.o csu/crtn.o \ - ${GNUCROSSDIR}/lib; \ - ${LINUXTRIPLET}-gcc -nostdlib -nostartfiles -shared \ - -x c /dev/null -o ${GNUCROSSDIR}/lib/libc.so; \ - ${TOUCH} ${GNUCROSSDIR}/include/gnu/stubs.h - # GCC support libs - cd ${WRKDIR}/gcc-build; \ - export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ - ${MAKE_CMD} ${_MAKE_JOBS} all-target-libgcc; \ - ${MAKE_CMD} install-target-libgcc - # Glibc library - cd ${WRKDIR}/glibc-build; \ - export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ - ${MAKE_CMD} ${_MAKE_JOBS}; \ - ${MAKE_CMD} install - # GCC libstdc++ - ${ECHO_CMD} '#!/bin/sh\ntrue' \ - >${WRKDIR}/gnuroot/bin/ldconfig - ${CHMOD} +x ${WRKDIR}/gnuroot/bin/ldconfig - cd ${WRKDIR}/gcc-build; \ - export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ - ${MAKE_CMD} ${_MAKE_JOBS}; \ - ${MAKE_CMD} install # FDK AAC cd ${WRKDIR}/fdk-aac-${FDKAACVERSION}; \ export PATH=${WRKDIR}/gnuroot/bin:$$PATH; \ @@ -241,25 +140,12 @@ pre-configure: cd ${WRKDIR}/openssl-${OPENSSLFULLVER}; \ ./Configure --openssldir= --prefix=/usr ${OPENSSLTARGET} -do-configure: - cd ${WRKSRC}; \ - CC=${LINUXTRIPLET}-gcc CXX=${LINUXTRIPLET}-g++ \ - 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 \ - ./configure --prefix=${PREFIX} --host=${LINUXTRIPLET} \ - --libdir=${PREFIX}/lib/makemkv --disable-gui - pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/makemkv post-install: ${INSTALL_MAN} ${FILESDIR}/makemkvcon.1 \ ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_LIB} ${GNUCROSSLIBDIR}/libstdc++.so.6 \ - ${STAGEDIR}${PREFIX}/lib/makemkv cd ${WRKDIR}/makemkv-bin-${PORTVERSION}; \ ${MKDIR} tmp; \ ${ECHO_CMD} accepted > tmp/eula_accepted; \ diff --git a/multimedia/makemkv/distinfo b/multimedia/makemkv/distinfo index 53141c09a24c..cbec50df093b 100644 --- a/multimedia/makemkv/distinfo +++ b/multimedia/makemkv/distinfo @@ -1,25 +1,11 @@ -TIMESTAMP = 1608288974 -SHA256 (makemkv/makemkv-oss-1.15.4.tar.gz) = 82d062d4844d17901293f65dce40e63ae1084fd81accd6913427eda9b2c43fe3 -SIZE (makemkv/makemkv-oss-1.15.4.tar.gz) = 6405606 -SHA256 (makemkv/makemkv-bin-1.15.4.tar.gz) = 45eba7e61a7b467b1fe8de722fa890d556e19f3fc02a7b7f8d846ac8e2badb9a -SIZE (makemkv/makemkv-bin-1.15.4.tar.gz) = 8976023 -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 -SIZE (makemkv/binutils-2.27.tar.bz2) = 26099568 -SHA256 (makemkv/glibc-2.17.tar.xz) = 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e -SIZE (makemkv/glibc-2.17.tar.xz) = 10981956 -SHA256 (makemkv/gmp-5.1.3.tar.xz) = dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071 -SIZE (makemkv/gmp-5.1.3.tar.xz) = 1818812 -SHA256 (makemkv/mpfr-3.1.2.tar.xz) = 399d0f47ef6608cc01d29ed1b99c7faff36d9994c45f36f41ba250147100453b -SIZE (makemkv/mpfr-3.1.2.tar.xz) = 1074388 -SHA256 (makemkv/mpc-1.0.3.tar.gz) = 617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3 -SIZE (makemkv/mpc-1.0.3.tar.gz) = 669925 -SHA256 (makemkv/gcc-5.5.0.tar.gz) = 3aabce75d6dd206876eced17504b28d47a724c2e430dbd2de176beb948708983 -SIZE (makemkv/gcc-5.5.0.tar.gz) = 123816630 +TIMESTAMP = 1615585240 +SHA256 (makemkv/makemkv-oss-1.16.1.tar.gz) = 32e0ee2708527ce22a961c7249c607d11d88f5ffdb41809a7b7ed8003af48845 +SIZE (makemkv/makemkv-oss-1.16.1.tar.gz) = 6409619 +SHA256 (makemkv/makemkv-bin-1.16.1.tar.gz) = 941f88acfb3790ecc008b2675e8ad3d0353f0163778cc1cb9507aa87c3427db6 +SIZE (makemkv/makemkv-bin-1.16.1.tar.gz) = 15306460 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.1.tar.bz2) = f4a4ac63946b6eee3bbdde523e298fca6019d048d6e1db0d1439a62cea65f0d9 -SIZE (makemkv/ffmpeg-4.3.1.tar.bz2) = 11301038 +SHA256 (makemkv/ffmpeg-4.3.2.tar.bz2) = ab3a6d6a70358ba0a5f67f37f91f6656b7302b02e98e5b8c846c16763c99913a +SIZE (makemkv/ffmpeg-4.3.2.tar.bz2) = 11307134 SHA256 (makemkv/openssl-1.0.2k.tar.gz) = 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 SIZE (makemkv/openssl-1.0.2k.tar.gz) = 5309236 diff --git a/multimedia/makemkv/pkg-plist b/multimedia/makemkv/pkg-plist index 35918067a5fa..d67a14812af7 100644 --- a/multimedia/makemkv/pkg-plist +++ b/multimedia/makemkv/pkg-plist @@ -3,7 +3,6 @@ bin/sdftool lib/makemkv/libdriveio.so.0 lib/makemkv/libmakemkv.so.1 lib/makemkv/libmmbd.so.0 -lib/makemkv/libstdc++.so.6 man/man1/makemkvcon.1.gz sbin/update-makemkv-drives share/MakeMKV/appdata.tar