* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2016-05-08 16:28 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2016-05-08 16:28 UTC (permalink / raw
To: gentoo-commits
commit: be1b18ebfa5b0355faa799cc8ce7eeb7a90d2da3
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 12:59:37 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 8 16:26:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be1b18eb
media-video/makemkv: Patch implicit inclusion of sysmacros.h, #580342
Package-Manager: portage-2.2.28
media-video/makemkv/files/makemkv-sysmacros.patch | 10 ++++++++++
media-video/makemkv/makemkv-1.9.10.ebuild | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/media-video/makemkv/files/makemkv-sysmacros.patch b/media-video/makemkv/files/makemkv-sysmacros.patch
new file mode 100644
index 0000000..9f4edeb
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-sysmacros.patch
@@ -0,0 +1,10 @@
+--- makemkv-oss-1.9.10/libabi/src/sys_linux.c.orig 2016-04-15 21:35:36.000000000 +0100
++++ makemkv-oss-1.9.10/libabi/src/sys_linux.c 2016-05-08 10:34:07.988650837 +0100
+@@ -20,6 +20,7 @@
+ */
+ #include <lgpl/sysabi.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <string.h>
diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild b/media-video/makemkv/makemkv-1.9.10.ebuild
index d1daf39..bafbae6 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -68,7 +68,7 @@ inherit l10n
S="${WORKDIR}/makemkv-oss-${PV}"
src_prepare() {
- PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path}.patch )
+ PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path,sysmacros}.patch )
# Qt5 always trumps Qt4 if it is available. There are no configure
# options or variables to control this and there is no publicly
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2016-12-17 23:43 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2016-12-17 23:43 UTC (permalink / raw
To: gentoo-commits
commit: 2d2e27068addf11b3a4f60265a031686383fd741
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 23:42:32 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 23:43:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2e2706
media-video/makemkv: Fix building against Qt 5.7, closes bug #599228
The -std=c++11 flag is needed for building against Qt 5.7. Trouble is
that upstream builds with CC rather than CXX. This only exhibits a
warning but if you try to force CXX, it fails to build the C parts,
which probably explains why upstream did this in the first place. I
thought -x none might work but it breaks unless you put it before
every C file. Possibly a GCC bug? Ideally upstream would just use
automake and avoid this whole mess. The easiest way out is to only
apply CXX and -std=c++11 to the makemkv binary, which doesn't have any
C sources.
The new patch also respects LDFLAGS. CFLAGS (not CXXFLAGS) is already
respected by upstream now so src_compile is no longer needed.
Some of the src_install stuff has also been dropped in favour of
default as we now want upstream behaviour.
Package-Manager: portage-2.3.3
media-video/makemkv/files/makemkv-flags.patch | 51 +++++++++++++++++++++++++++
media-video/makemkv/makemkv-1.10.3.ebuild | 24 +++----------
2 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
new file mode 100644
index 00000000..f88bde0
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-flags.patch
@@ -0,0 +1,51 @@
+diff -Naur a/Makefile.in b/Makefile.in
+--- a/Makefile.in 2016-12-11 16:14:27.000000000 +0000
++++ b/Makefile.in 2016-12-17 23:13:03.227251463 +0000
+@@ -2,9 +2,11 @@
+ include makefile.common
+
+ GCC=@CC@
++GXX=@CXX@
+ MOC=@QT_MOC@
+
+ CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
++LDFLAGS=@LDFLAGS@
+ DESTDIR=@DESTDIR@
+ PREFIX=@prefix@
+ ENABLE_GUI=@ENABLE_GUI@
+@@ -51,13 +53,13 @@
+
+ out/libdriveio.so.0.full:
+ mkdir -p out
+- $(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
++ $(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
+ -fPIC -Xlinker -dy -Xlinker --version-script=libdriveio/src/libdriveio.vers \
+ -Xlinker -soname=libdriveio.so.0 -lc -lstdc++
+
+ out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
+ mkdir -p out
+- $(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
++ $(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
+ $(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFABI_INC) $(LIBDCADEC_DEF) \
+ $(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
+ $(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFABI_SRC) $(LIBDCADEC_SRC) \
+@@ -67,16 +69,16 @@
+
+ out/libmmbd.so.0.full:
+ mkdir -p out
+- $(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
++ $(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
+ $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBABI_INC) $(LIBMMBD_SRC) $(LIBMMBD_SRC_LINUX) $(SSTRING_SRC) \
+ -fPIC -Xlinker -dy -Xlinker --version-script=libmmbd/src/libmmbd.vers \
+ -Xlinker -soname=libmmbd.so.0 -lc -lstdc++ -lrt -lpthread -lcrypto
+
+ out/makemkv.full: $(MAKEMKVGUI_GEN) $(MAKEMKVGUI_SRC_LINUX) tmp/gen_buildinfo.h
+ mkdir -p out
+- $(GCC) $(CFLAGS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
++ $(GXX) $(CFLAGS) $(LDFLAGS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
+ $(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) $(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \
+- -DHAVE_BUILDINFO_H -Itmp \
++ -std=c++11 -DHAVE_BUILDINFO_H -Itmp \
+ @QT_INC@ -lc -lstdc++ \
+ @QT_LIB@ -lpthread -lz -lrt
+
diff --git a/media-video/makemkv/makemkv-1.10.3.ebuild b/media-video/makemkv/makemkv-1.10.3.ebuild
index d2a5e6e..fd12203 100644
--- a/media-video/makemkv/makemkv-1.10.3.ebuild
+++ b/media-video/makemkv/makemkv-1.10.3.ebuild
@@ -46,7 +46,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/makemkv-oss-${PV}"
src_prepare() {
- PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path,sysmacros}.patch )
+ PATCHES+=( "${FILESDIR}"/${PN}-{makefile,path,sysmacros,flags}.patch )
# Qt5 always trumps Qt4 if it is available. There are no configure
# options or variables to control this and there is no publicly
@@ -75,15 +75,10 @@ src_configure() {
econf "${econf_args[@]}"
}
-src_compile() {
- emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
-}
-
src_install() {
- # install oss package
- dolib.so out/libdriveio.so.0
- dolib.so out/libmakemkv.so.1
- dolib.so out/libmmbd.so.0
+ default
+
+ # add missing symlinks for QA
dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
@@ -91,17 +86,6 @@ src_install() {
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
- if use qt5 || use qt4; then
- dobin out/makemkv
-
- local res
- for res in 16 22 32 64 128; do
- newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
- done
-
- make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
- fi
-
cd "${WORKDIR}"/${MY_PB} || die
# install prebuilt bins
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2018-07-25 21:25 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2018-07-25 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 5966e5e410ac11b1483f7d781a061ddf21f66cc1
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 25 21:25:10 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 25 21:25:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5966e5e4
media-video/makemkv: Bump to 1.12.3, remove old 1.12.2
The ffmpeg patch is no longer needed.
Package-Manager: Portage-2.3.43, Repoman-2.3.10
media-video/makemkv/Manifest | 4 ++--
media-video/makemkv/files/makemkv-ffmpeg.patch | 25 ----------------------
...makemkv-1.12.2.ebuild => makemkv-1.12.3.ebuild} | 2 +-
3 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 234d2b5ca36..c71ed4d6bf8 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.12.2.tar.gz 9137254 BLAKE2B 9dbb6ff446f76bd119fdad65a97b983badeee17f78b59d79a4cb55f22d1bff443493ddbc1be77686906e324c6dbd3c93b851b0944238e97fc29bc4503c85ef07 SHA512 25b6be8dcea8aa521f2cf4b4ebac1a7a29ed1de603c5c14ee50f94fbf6a2968bf94116ba2dc39129334fb62497966d01032da4b276563c2e819a5f62f93d4d94
-DIST makemkv-oss-1.12.2.tar.gz 4379033 BLAKE2B 24da56b6b3c356dd41d7a6f0449258c0b45cfb8f4882f130fb934911c5c42c080294f4e6445e949f840c372079f143a9b4c920e7f79ed71e553b8486bcc778b4 SHA512 d418dbb14b55bc69937d2265220b3df9dd4baf7d083ba94ff51ed5d9eb2e65c0c4dd2527076dfdcc539ccde7da24dcba94e471bef47998921f0d154330dc2980
+DIST makemkv-bin-1.12.3.tar.gz 9252749 BLAKE2B b81503e6bb98dbf0f61cf7918ab614972032106fc44c79d698df8fc3ebf73b4c07f74e6208cacc1756dc6a5b06a6ada663d0529f9f35bf7f0c658e18b07cb6ac SHA512 79d73c8a3dcc4028a79b8aef8c228e6519ef8df7178cdbacd85ae24b8c6078a43651e34bb32c0ff83027ea2def998fefc938676ca6d83645d2b52fc36d65df9b
+DIST makemkv-oss-1.12.3.tar.gz 4379072 BLAKE2B 3fded704fbb8f5c4fac944cac028fe8b7d7c9e86402475d84638db0052480d7694c170c5babb0422f756920f0f5b191031e555fce0dfdde8b9ee63be1d57c195 SHA512 cfb4f61333751038120b94e3854afa471e9007af36b47cb0a681c3615a7f66e0462ee601c711cd9ea7cb51cc6e0ff38662a62b78e0e47735b8c19b2da272f892
diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch
deleted file mode 100644
index 930c144d263..00000000000
--- a/media-video/makemkv/files/makemkv-ffmpeg.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Taken from https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm
-See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615
-and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca
-diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
-index 20db4e9..f08d53c 100644
---- a/libffabi/src/ffabi.c
-+++ b/libffabi/src/ffabi.c
-@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n
- info->profile : FF_PROFILE_UNKNOWN;
-
- if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0)
-- ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- if (argp) {
- for (i=0;argp[i];i+=2) {
-@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod
- info->delay = (int32_t)ctx->avctx->delay;
- info->flags = 0;
-
-- if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0)
-+ if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0)
- info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER;
-
- return 0;
diff --git a/media-video/makemkv/makemkv-1.12.2.ebuild b/media-video/makemkv/makemkv-1.12.3.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.12.2.ebuild
rename to media-video/makemkv/makemkv-1.12.3.ebuild
index e5003042929..bcc7cf5092e 100644
--- a/media-video/makemkv/makemkv-1.12.2.ebuild
+++ b/media-video/makemkv/makemkv-1.12.3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
CONFIG_CHECK="~CHR_DEV_SG"
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
src_configure() {
# See bug #439380.
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2020-10-12 21:08 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-10-12 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 43a573c4850f15bd97b15db5b481eebf9c4d9f28
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 21:08:24 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 21:08:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a573c4
media-video/makemkv: Patch around missing quotes in configure
I have reported this upstream and I believe they will use a proper
autoconf macro to set the -std flag in future.
Closes: https://bugs.gentoo.org/746368
Suggested-By: Matt Whitlock
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch | 12 ++++++++++++
media-video/makemkv/makemkv-1.15.3.ebuild | 6 +++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
new file mode 100644
index 00000000000..3dfe508a24a
--- /dev/null
+++ b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
@@ -0,0 +1,12 @@
+diff -Naur makemkv-oss-1.15.3~/configure makemkv-oss-1.15.3/configure
+--- makemkv-oss-1.15.3~/configure 2020-10-01 13:59:27.000000000 +0000
++++ makemkv-oss-1.15.3/configure 2020-10-03 20:49:45.588257151 +0000
+@@ -11726,7 +11726,7 @@
+ ENABLE_DEBUG=$enable_debug
+
+
+-if test -z $CXXFLAGS; then
++if test -z "$CXXFLAGS"; then
+ CXXFLAGS='-std=c++11'
+ fi
+
diff --git a/media-video/makemkv/makemkv-1.15.3.ebuild b/media-video/makemkv/makemkv-1.15.3.ebuild
index 4d94806d84d..3c81c3d3988 100644
--- a/media-video/makemkv/makemkv-1.15.3.ebuild
+++ b/media-video/makemkv/makemkv-1.15.3.ebuild
@@ -47,7 +47,11 @@ BDEPEND="
CONFIG_CHECK="~CHR_DEV_SG"
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-path.patch
+ "${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch
+)
src_configure() {
# See bug #439380.
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2020-12-14 17:14 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-12-14 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 447ac34f261e49cfe7f3d3ebb3f3002a7f26bfee
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 17:12:26 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 17:12:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=447ac34f
media-video/makemkv: Bump to 1.15.4, drop old 1.15.3
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/makemkv/Manifest | 4 ++--
.../makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch | 12 ------------
.../makemkv/{makemkv-1.15.3.ebuild => makemkv-1.15.4.ebuild} | 1 -
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 951acfd799b..3c8a15189f8 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.15.3.tar.gz 8664187 BLAKE2B 37f026306a0601709659cfc2478e59251dd7fc1567f8b43326ddbefa55c9bfee77dc8f0f81d3e8e111e78ad9da0f4b32613d5ffbcae542a8978c49467be80db6 SHA512 4555c1fbb609b3b6d842fced374a8a6fab0bc69952f4349a1c6636964d7384001d1e6e7a91fae3715c4cf468cbfbd713f89d17e53eef6c5d69edfa158e47d8bd
-DIST makemkv-oss-1.15.3.tar.gz 6403409 BLAKE2B c02881c13236d65eba5bbc66d9191ba4b2da53e1d776c502427a02ee8b18091db90643d7e8c3f94be5b5c80c40dfc5df282daee6f69c42d32383937aba33e700 SHA512 11248f4d35a16793a13a94c92f8eef060206e95d2383da06ce7adeadcd445dc12d09bad79142169cc32e514594b2c6cacf9ab216d446eece531c849a8803f13a
+DIST makemkv-bin-1.15.4.tar.gz 8976023 BLAKE2B 945d5efc61d4302690201a63caa959580476635729d78f8b9fcb0f252af9874b10b9f6a771c724eb76ffe00fa4217773890045b1657335d9910f753c8de5a5bd SHA512 f08377a77807bffc66e34f38975018ebf14a7bba91e0bb7ffce1d8376e52660b9c8f5da154ea5bf55b3d42b57ad301ac43a8c74ec97aad7d40f926029fa09c09
+DIST makemkv-oss-1.15.4.tar.gz 6405606 BLAKE2B 84e958b6004fa66a52186118be1ca696a181e300d21a2be583917181b3f1f87ee47b760e3cbcfc26b4fcdae4711fd18962c42763ce8ec6b176aaf865ab4e45b0 SHA512 f812d63363ddac68d50a0a4b3d2c3dd46000b8775d7885d61d5bf9dde013e3e9ff9cef558bcf54b2d59f5c4725dbfc014d48be3f3996d1055df761072fa4d62f
diff --git a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch b/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
deleted file mode 100644
index 3dfe508a24a..00000000000
--- a/media-video/makemkv/files/1.15.3-configure-CXXFLAGS-quoting.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur makemkv-oss-1.15.3~/configure makemkv-oss-1.15.3/configure
---- makemkv-oss-1.15.3~/configure 2020-10-01 13:59:27.000000000 +0000
-+++ makemkv-oss-1.15.3/configure 2020-10-03 20:49:45.588257151 +0000
-@@ -11726,7 +11726,7 @@
- ENABLE_DEBUG=$enable_debug
-
-
--if test -z $CXXFLAGS; then
-+if test -z "$CXXFLAGS"; then
- CXXFLAGS='-std=c++11'
- fi
-
diff --git a/media-video/makemkv/makemkv-1.15.3.ebuild b/media-video/makemkv/makemkv-1.15.4.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.15.3.ebuild
rename to media-video/makemkv/makemkv-1.15.4.ebuild
index 3c81c3d3988..643dfc37ef2 100644
--- a/media-video/makemkv/makemkv-1.15.3.ebuild
+++ b/media-video/makemkv/makemkv-1.15.4.ebuild
@@ -50,7 +50,6 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-path.patch
- "${FILESDIR}"/${PV}-configure-CXXFLAGS-quoting.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2022-07-06 22:14 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2022-07-06 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 7cf73ac1cbe0d710bfdb32c587d0ac943bfaf856
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 22:14:16 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 22:14:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf73ac1
media-video/makemkv: Bump to 1.17.0, add unofficial man page
Thanks to Steve Dibb for the man page.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/makemkv/Manifest | 4 +-
media-video/makemkv/files/makemkvcon.1 | 242 +++++++++++++++++++++
...makemkv-1.16.7.ebuild => makemkv-1.17.0.ebuild} | 5 +-
3 files changed, 248 insertions(+), 3 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index e74db0a7a5a3..864814751179 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.16.7.tar.gz 16130689 BLAKE2B 6535cbeb65d0166c5093920f2064065f4d7a3ea0232878dfeda76f5ea53dad68e2da10894dcbeaab706c93b733f32e9c316a07a9365f43943a1f0710a48af83f SHA512 8233affac002a4ec9b0d37746371d2f582f5ebbb18621bb4801442bab2f8b79616b7f641893b896c350a8a7e8f09368b8b4acae58a6ab32a591926d98b808be1
-DIST makemkv-oss-1.16.7.tar.gz 6541953 BLAKE2B 28273db7300532b1ce2ab63629aa5ceb90059e4e02ea22e6f2764e727946fe6e6dbc45e16c743bf239e3bdfe015e447e662d0c5e838ada8564d0e251721a6bcc SHA512 6e8159b344caa70103369585f5a2f12dcfb6e5d6f65fb19466dab97dbf690cecaa1f08f6501342007966c23a08aa13f625eca078e270c8bb651d9b896a5977ff
+DIST makemkv-bin-1.17.0.tar.gz 16332197 BLAKE2B 9a51f7802c54ad7cfba5678ea1caf45d5099f9479fe1c6bdb4be05fe29d738b69d780c747e69147ef0eed85d9bc1174e0a959642039276ede9fe0a693d377b85 SHA512 f60ad2279e738e91dbe9d716a64102212b00bc32819907ebf4da8ea2127d74bb577dee25f3efb16da6393b1e29d3a2a09498dec93fc70940175471f0a4744939
+DIST makemkv-oss-1.17.0.tar.gz 6631571 BLAKE2B fd4c383deb26a948079005671e59d3bc3230612b7b405ee8587684922175a94beee4f4ba2ab7e4d0052ca09f6fdabaca4ef008a5a711d77c7e861dc879df3120 SHA512 895c0edd429e934d72f851a6cbbfe6df183e246e65a2899945e77917c612e7ee04251c4a22f94f2d7df547ce58ddded4fd451497791c56fe473b1d201aaa52e6
diff --git a/media-video/makemkv/files/makemkvcon.1 b/media-video/makemkv/files/makemkvcon.1
new file mode 100644
index 000000000000..0abeaa5387e0
--- /dev/null
+++ b/media-video/makemkv/files/makemkvcon.1
@@ -0,0 +1,242 @@
+'\" t
+.\" Title: makemkvcon
+.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 05/20/2020
+.\" Manual: \ \&
+.\" Source: \ \&
+.\" Language: English
+.\"
+.TH "MAKEMKVCON" "1" "05/20/2020" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+makemkvcon \- MakeMKV console application
+.SH "SYNOPSIS"
+.sp
+\fBmakemkvcon\fR [\fIOPTIONS\fR] <backup|info|mkv> [\fIPARAMETERS\fR]
+.SH "DESCRIPTION"
+.sp
+Command\-line options for MakeMKV\&.
+.sp
+Configuration options and setup keys are located in ~/\&.MakeMKV/
+.SH "OPTIONS"
+.sp
+General options:
+.PP
+\fB\-\-messages=\fR\fIFILE\fR
+.RS 4
+Output all messgaes to a file\&. Special file names: stdout, stderr, null\&. Default is to stdout\&.
+.RE
+.PP
+\fB\-\-progress=\fR\fIFILE\fR
+.RS 4
+Output all progress messages to a file\&. Special file names: stdout, stderr, null\&. Use
+\fB\-same\fR
+to use
+\fB\-\-messages\fR
+argument\&. Default is no output\&.
+.RE
+.PP
+\fB\-\-debug\fR[=\fIFILE\fR]
+.RS 4
+Enables debug messages\&. Optionally saves to output file\&.
+.RE
+.PP
+\fB\-\-directio=[true|false]\fR
+.RS 4
+Enables or disables direct disc access\&.
+.RE
+.PP
+\fB\-\-noscan\fR
+.RS 4
+Don\(cqt access any media during disc scan and do not check for media insertion and removal\&. Helpful when other applications are already accessing discs in other drives\&.
+.RE
+.PP
+\fB\-\-cache=\fR\fISIZE\fR
+.RS 4
+Specifies size of read cache in megabytes\&. By default program uses a huge amount of memory\&. About 128 MB is recommended for streaming and backup, 512MB for DVD conversion and 1024MB for Blu\-ray conversion\&.
+.RE
+.PP
+\fB\-r, \-\-robot\fR
+.RS 4
+Enables automation mode\&. Program will output more information in a format that is easier to parse\&. All output is line\-based and output is flushed on line end\&. All strings are quoted, all control characters and quotes are backlash\-escaped\&. If you automate this program it is highly recommended to use this option\&. Some options make reference to apdefs\&.h file that can be found in MakeMKV open\-source package, included with version for Linux\&. These values will not change in future versions\&.
+.RE
+.sp
+Backup options:
+.PP
+\fB\-\-decrypt\fR
+.RS 4
+Decrypt stream files during backup\&. Default: no decryption\&.
+.RE
+.PP
+\fB\-\-minlength\fR=\fISECONDS\fR
+.RS 4
+Specify minimum title length\&. Default: program preferences\&.
+.RE
+.SH "COMMANDS"
+.sp
+\fBbackup\fR Backup disc\&.
+.sp
+\fBinfo\fR Display information about a disc\&.
+.sp
+\fBmkv\fR Copy titles from disc\&.
+.sp
+\fBf\fR Run universal firmware tool\&.
+.SH "PARAMETERS"
+.PP
+\fBsource iso:\fR\fIFILENAME\fR
+.RS 4
+Open ISO image\&.
+.RE
+.PP
+\fBsource file:\fR\fIDIRECTORY\fR
+.RS 4
+Open files in directory\&.
+.RE
+.PP
+\fBsource disc:\fR\fIDISC ID\fR
+.RS 4
+Open disc with ID\&.
+.RE
+.PP
+\fBsource dev:\fR\fIDEVICE\fR
+.RS 4
+Open disc with device name\&.
+.RE
+.SH "EXAMPLES"
+.sp
+Copy all titles from first disc and save as MKV files into current directory:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+makemkvcon mkv disc:0 all \&.
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+List all available drives:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+makemkvcon \-r \-\-cache=1 info disc:9999
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+Backup first disc decrypting all video files in automation mode with progress output:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+makemkvcon backup \-\-decrypt \-\-cache=16 \-\-noscan \-r \-\-progress=\-same disc:0 \&.
+.fi
+.if n \{\
+.RE
+.\}
+.SH "MESSAGE FORMATS"
+.sp
+\fBMessage output\fR
+.sp
+MSG:code,flags,count,message,format,param0,param1,\&...
+.sp
+code \- unique message code, should be used to identify particular string in language\-neutral way\&.
+.sp
+flags \- message flags, see AP_UIMSG_xxx flags in apdefs\&.h
+.sp
+count \- number of parameters
+.sp
+message \- raw message string suitable for output
+.sp
+format \- format string used for message\&. This string is localized and subject to change, unlike message code\&.
+.sp
+paramX \- parameter for message
+.sp
+\fBCurrent and total progress title\fR
+.sp
+PRGC:code,id,name
+.sp
+PRGT:code,id,name
+.sp
+code \- unique message code
+.sp
+id \- operation sub\-id
+.sp
+name \- name string
+.sp
+\fBProgress bar values for current and total progress\fR
+.sp
+PRGV:current,total,max
+.sp
+current \- current progress value
+.sp
+total \- total progress value
+.sp
+max \- maximum possible value for a progress bar, constant
+.sp
+\fBDrive scan messages\fR
+.sp
+DRV:index,visible,enabled,flags,drive name,disc name
+.sp
+index \- drive index
+.sp
+visible \- set to 1 if drive is present
+.sp
+enabled \- set to 1 if drive is accessible
+.sp
+flags \- media flags, see AP_DskFsFlagXXX in apdefs\&.h
+.sp
+drive name \- drive name string
+.sp
+disc name \- disc name string
+.sp
+\fBDisc information output messages\fR
+.sp
+TCOUT:count
+.sp
+count \- titles count
+.sp
+\fBDisc, title and stream information\fR
+.sp
+CINFO:id,code,value
+.sp
+TINFO:id,code,value
+.sp
+SINFO:id,code,value
+.sp
+id \- attribute id, see AP_ItemAttributeId in apdefs\&.h
+.sp
+code \- message code if attribute value is a constant string
+.sp
+value \- attribute value
+.SH "RESOURCES"
+.sp
+Console usage: https://www\&.makemkv\&.com/developers/usage\&.txt
+.sp
+MakeMKV for Linux forum: https://www\&.makemkv\&.com/forum/viewforum\&.php?f=3
+.sp
+Main web site: https://www\&.makemkv\&.com/
diff --git a/media-video/makemkv/makemkv-1.16.7.ebuild b/media-video/makemkv/makemkv-1.17.0.ebuild
similarity index 96%
rename from media-video/makemkv/makemkv-1.16.7.ebuild
rename to media-video/makemkv/makemkv-1.17.0.ebuild
index 23a32955e746..7bb22f94b4f1 100644
--- a/media-video/makemkv/makemkv-1.16.7.ebuild
+++ b/media-video/makemkv/makemkv-1.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -100,6 +100,9 @@ src_install() {
# install profiles and locales
insinto /usr/share/MakeMKV
doins src/share/*
+
+ # install unofficial man page
+ doman "${FILESDIR}"/makemkvcon.1
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2022-07-13 20:19 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2022-07-13 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 88b0e87ce97a7215a4d8426e5989c64a35ab686c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 20:18:57 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 20:19:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b0e87c
media-video/makemkv: Bump to 1.17.1, drop old 1.17.0
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/makemkv/Manifest | 4 ++--
media-video/makemkv/files/makemkv-flags.patch | 17 -----------------
.../{makemkv-1.17.0.ebuild => makemkv-1.17.1.ebuild} | 1 -
3 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 864814751179..0600d44ca045 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.0.tar.gz 16332197 BLAKE2B 9a51f7802c54ad7cfba5678ea1caf45d5099f9479fe1c6bdb4be05fe29d738b69d780c747e69147ef0eed85d9bc1174e0a959642039276ede9fe0a693d377b85 SHA512 f60ad2279e738e91dbe9d716a64102212b00bc32819907ebf4da8ea2127d74bb577dee25f3efb16da6393b1e29d3a2a09498dec93fc70940175471f0a4744939
-DIST makemkv-oss-1.17.0.tar.gz 6631571 BLAKE2B fd4c383deb26a948079005671e59d3bc3230612b7b405ee8587684922175a94beee4f4ba2ab7e4d0052ca09f6fdabaca4ef008a5a711d77c7e861dc879df3120 SHA512 895c0edd429e934d72f851a6cbbfe6df183e246e65a2899945e77917c612e7ee04251c4a22f94f2d7df547ce58ddded4fd451497791c56fe473b1d201aaa52e6
+DIST makemkv-bin-1.17.1.tar.gz 16162724 BLAKE2B f6d6f7e7effb6c71dd9c6f6c6d8e8604dfe9b8f29ada1765a52b8e5e3ae0342393455cea6902f3f564904629e9bca4fff20b09bfd8ef9accbdb9c202bf3e136a SHA512 cb875580a69b7a23a84aced235dbfb80e44bbc92f87945d0745cdb00089862bf03818e0d0d2bfee978f310d97778f253028a595d273ff397f76afb442425407d
+DIST makemkv-oss-1.17.1.tar.gz 6631683 BLAKE2B f70bc3d663703c0a0915064e5e8df4eea807c573ef1a1666d907b97448894e59f3b4be77752ae31150e2069d766151d330c3dc04d9c5f4a4c8cc5c44cf90f1e7 SHA512 83cf5c3abeb19602891b11494ff002f7901467b491841781f4c698abfb2cbcb67a7be2d01214562506fe2642254027cbc74114d1d84601af901f1358e299e696
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
deleted file mode 100644
index 0f05aa7a751b..000000000000
--- a/media-video/makemkv/files/makemkv-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur a/Makefile.in b/Makefile.in
---- a/Makefile.in 2022-06-26 20:14:12.000000000 +0100
-+++ b/Makefile.in 2022-07-07 13:28:27.481730073 +0100
-@@ -113,12 +113,12 @@
-
- out/mmccextr.full: $(MMCCX_SRC) tmp/gen_buildinfo.h
- mkdir -p out
-- $(GCC) $(CFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
-+ $(GCC) $(CFLAGS) $(LDFLAGS) $(MMCCEXTR_DEF) -DHAVE_BUILDINFO_H -Itmp -D_GNU_SOURCE -o$@ $(MMCCX_SRC) -lc \
- -ffunction-sections -Wl,--gc-sections -Wl,-z,defs
-
- out/mmgplsrv.full: $(MMGPL_SRC)
- mkdir -p out
-- $(GCC) $(CFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \
-+ $(GCC) $(CFLAGS) $(LDFLAGS) $(INCF)$(MMGPL_INC) $(INCF)$(DVDNAV_INC) $(INCF)$(DVDREAD_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) \
- $(INCF)$(LIBDRIVEIO_INC) $(INCF)$(LIBABI_INC) $(MMGPL_DEF) -D_GNU_SOURCE -Dstl=std -o$@ $(MMGPL_SRC) $(MMGPL_SRC_LINUX) -lc -lstdc++ \
- -ffunction-sections -Wl,--gc-sections -Wl,-z,defs
diff --git a/media-video/makemkv/makemkv-1.17.0.ebuild b/media-video/makemkv/makemkv-1.17.1.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.17.0.ebuild
rename to media-video/makemkv/makemkv-1.17.1.ebuild
index 7bb22f94b4f1..f458e1ceb1d6 100644
--- a/media-video/makemkv/makemkv-1.17.0.ebuild
+++ b/media-video/makemkv/makemkv-1.17.1.ebuild
@@ -49,7 +49,6 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-path.patch
- "${FILESDIR}"/${PN}-flags.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/
@ 2023-07-10 18:57 Piotr Karbowski
0 siblings, 0 replies; 8+ messages in thread
From: Piotr Karbowski @ 2023-07-10 18:57 UTC (permalink / raw
To: gentoo-commits
commit: a09ba8ba17ff0c374918d4a7dc6b63ff20a10abe
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 18:56:22 2023 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 18:57:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09ba8ba
media-video/makemkv: 1.17.4-r1 revbump with ffmpeg-6 support.
Closes: https://bugs.gentoo.org/909307
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
media-video/makemkv/files/makemkv-ffmpeg-6.patch | 13 +++
media-video/makemkv/makemkv-1.17.4-r1.ebuild | 128 +++++++++++++++++++++++
2 files changed, 141 insertions(+)
diff --git a/media-video/makemkv/files/makemkv-ffmpeg-6.patch b/media-video/makemkv/files/makemkv-ffmpeg-6.patch
new file mode 100644
index 000000000000..684d8186bab5
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-ffmpeg-6.patch
@@ -0,0 +1,13 @@
+diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c
+index 5dda9e1..2b29b87 100644
+--- a/libffabi/src/ffabi.c
++++ b/libffabi/src/ffabi.c
+@@ -478,7 +478,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n
+ #else
+ ctx->frame = av_frame_alloc();
+ if (av_sample_fmt_is_planar(ctx->avctx->sample_fmt)) {
+- ctx->frame_extended_data = av_mallocz_array(ctx->avctx->channels,
++ ctx->frame_extended_data = av_calloc(ctx->avctx->channels,
+ sizeof(*ctx->frame_extended_data));
+ if (!ctx->frame_extended_data) {
+ ffm_audio_encode_close(ctx);
diff --git a/media-video/makemkv/makemkv-1.17.4-r1.ebuild b/media-video/makemkv/makemkv-1.17.4-r1.ebuild
new file mode 100644
index 000000000000..05a97bd1d4f3
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.17.4-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info xdg
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/"
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+ http://www.makemkv.com/download/${MY_PB}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui +java"
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+ dev-libs/expat
+ dev-libs/openssl:0=[-bindist(-)]
+ >=media-video/ffmpeg-1.0.0:0=
+ sys-libs/glibc
+ sys-libs/zlib
+ gui? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ java? ( >=virtual/jre-1.8 )
+"
+BDEPEND="
+ virtual/pkgconfig
+ gui? ( dev-qt/qtcore:5 )
+"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-path.patch
+ "${FILESDIR}"/${PN}-ffmpeg-6.patch
+)
+
+src_prepare() {
+ default
+
+ if ! use java; then
+ rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
+ fi
+}
+
+src_configure() {
+ # See bug #439380.
+ replace-flags -O* -Os
+
+ econf \
+ --enable-debug \
+ --disable-noec \
+ $(use_enable gui) \
+ $(use_enable gui qt5)
+}
+
+src_install() {
+ local myarch
+ case "${ARCH}" in
+ arm) myarch=armel ;;
+ x86) myarch=i386 ;;
+ *) myarch=${ARCH} ;;
+ esac
+
+ default
+
+ # add missing symlinks for QA
+ dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+ dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+ dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+ dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+ dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so
+ dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+ cd "${WORKDIR}"/${MY_PB} || die
+
+ # install prebuilt bin
+ dobin bin/"${myarch}"/makemkvcon
+
+ # additional tool is actually part of makemkvcon
+ dosym makemkvcon /usr/bin/sdftool
+
+ # install profiles and locales
+ insinto /usr/share/MakeMKV
+ doins src/share/*
+
+ # install unofficial man page
+ doman "${FILESDIR}"/makemkvcon.1
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "While MakeMKV is in beta mode, upstream has provided a license"
+ elog "to use if you do not want to purchase one."
+ elog ""
+ elog "See this forum thread for more information, including the key:"
+ elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053"
+ elog ""
+ elog "Note that beta license may have an expiration date and you will"
+ elog "need to check for newer licenses/releases. "
+ elog ""
+ elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+ elog "is no longer necessary and you should delete it from there to"
+ elog "avoid warning messages."
+ elog ""
+ elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+ elog "libbdplus, allowing transparent decryption of a wider range of"
+ elog "titles under players like VLC and mplayer. To enable this, set"
+ elog "the following variables when launching the player:"
+ elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-07-10 18:57 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-08 16:28 [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/files/, media-video/makemkv/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2016-12-17 23:43 James Le Cuirot
2018-07-25 21:25 James Le Cuirot
2020-10-12 21:08 James Le Cuirot
2020-12-14 17:14 James Le Cuirot
2022-07-06 22:14 James Le Cuirot
2022-07-13 20:19 James Le Cuirot
2023-07-10 18:57 Piotr Karbowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox