* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/
@ 2015-12-27 12:10 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2015-12-27 12:10 UTC (permalink / raw
To: gentoo-commits
commit: a7865d18b3ecb8fd9fd7da9dc2ad0aba73795d60
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 12:05:23 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 12:09:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7865d18
media-video/makemkv: Add Qt5 support, closes bug #569768
Qt5 always trumps Qt4 if it is available. There are no configure
options or variables to control this and there is no publicly
available configure.ac either so we have to selectively patch the raw
configure script directly.
Also make a couple of simplifications. src_configure checked for a
configure script even though there is always one there now. I also
couldn't see any reason for having virtual/opengl as a dependency.
Package-Manager: portage-2.2.26
media-video/makemkv/files/makemkv-qt4.patch | 34 ++++++++++++++++++++++
media-video/makemkv/files/makemkv-qt5.patch | 28 ++++++++++++++++++
...akemkv-1.9.8.ebuild => makemkv-1.9.8-r1.ebuild} | 31 +++++++++++++++-----
3 files changed, 86 insertions(+), 7 deletions(-)
diff --git a/media-video/makemkv/files/makemkv-qt4.patch b/media-video/makemkv/files/makemkv-qt4.patch
new file mode 100644
index 0000000..cbc2fa0
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-qt4.patch
@@ -0,0 +1,34 @@
+--- makemkv-oss-1.9.8/configure.orig 2015-12-20 16:22:19.000000000 +0000
++++ makemkv-oss-1.9.8/configure 2015-12-26 23:59:44.601387071 +0000
+@@ -5048,6 +5048,7 @@
+ if test "$enable_gui" != "no"; then
+
+
++: '
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt5" >&5
+ $as_echo_n "checking for qt5... " >&6; }
+@@ -5105,6 +5106,7 @@
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$qt5_PKG_ERRORS" >&5
++'
+
+
+
+@@ -5271,6 +5273,7 @@
+
+ fi
+
++: '
+ else
+ qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
+ qt5_LIBS=$pkg_cv_qt5_LIBS
+@@ -5283,6 +5286,7 @@
+ QT_MOC="$qt5_host_bins/moc";
+
+ fi
++'
+
+ QT_INC=$QT_INC
+
diff --git a/media-video/makemkv/files/makemkv-qt5.patch b/media-video/makemkv/files/makemkv-qt5.patch
new file mode 100644
index 0000000..58b5e41
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-qt5.patch
@@ -0,0 +1,28 @@
+--- makemkv-oss-1.9.8/configure.orig 2015-12-20 16:22:19.000000000 +0000
++++ makemkv-oss-1.9.8/configure 2015-12-27 00:05:18.659860655 +0000
+@@ -5108,6 +5108,7 @@
+
+
+
++: '
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt4" >&5
+ $as_echo_n "checking for qt4... " >&6; }
+@@ -5257,7 +5258,9 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+
++'
+ as_fn_error $? "Qt library (version 5 or 4) is required to build GUI" "$LINENO" 5
++: '
+
+ else
+ qt4_CFLAGS=$pkg_cv_qt4_CFLAGS
+@@ -5270,6 +5273,7 @@
+ QT_MOC=`$PKG_CONFIG --variable moc_location "QtCore" 2>/dev/null`;
+
+ fi
++'
+
+ else
+ qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
diff --git a/media-video/makemkv/makemkv-1.9.8.ebuild b/media-video/makemkv/makemkv-1.9.8-r1.ebuild
similarity index 85%
rename from media-video/makemkv/makemkv-1.9.8.ebuild
rename to media-video/makemkv/makemkv-1.9.8-r1.ebuild
index 74150ad..252dc73 100644
--- a/media-video/makemkv/makemkv-1.9.8.ebuild
+++ b/media-video/makemkv/makemkv-1.9.8-r1.ebuild
@@ -16,7 +16,8 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="libav multilib qt4"
+IUSE="libav multilib qt4 qt5"
+REQUIRED_USE="?? ( qt4 qt5 )"
QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
@@ -26,11 +27,16 @@ RDEPEND="
dev-libs/openssl:0
sys-libs/zlib
qt4? (
- virtual/opengl
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
)
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
"
@@ -40,14 +46,25 @@ S=${WORKDIR}/makemkv-oss-${PV}
src_prepare() {
epatch "${FILESDIR}"/${PN}-{makefile,path}.patch
+
+ # Qt5 always trumps Qt4 if it is available. There are no configure
+ # options or variables to control this and there is no publicly
+ # available configure.ac either.
+ if use qt4; then
+ epatch "${FILESDIR}"/${PN}-qt4.patch
+ elif use qt5; then
+ epatch "${FILESDIR}"/${PN}-qt5.patch
+ fi
}
src_configure() {
+ # See bug #439380.
replace-flags -O* -Os
- local args=""
- use qt4 || args="--disable-gui"
- if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
- econf $args
+
+ if use qt4 || use qt5; then
+ econf --enable-gui
+ else
+ econf --disable-gui
fi
}
@@ -68,7 +85,7 @@ src_install() {
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
into /opt
- if use qt4; then
+ if use qt4 || use qt5; then
dobin out/makemkv
local res
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/
@ 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: 6848ba2fb2727dd91e9ff0003e052068afc110de
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 13:15:29 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 8 16:26:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6848ba2f
media-video/makemkv: Launch executables from the PATH
Upstream launches wget as /usr/bin/wget and uses a hardcoded set of
paths to search for other executables. All the required executables
should be in the PATH anyway and this will fix prefixed systems.
Also add missing dependency on wget. It's in @system but it's one of
the less obvious entries.
Package-Manager: portage-2.2.28
media-video/makemkv/files/makemkv-path.patch | 72 +++++++++++++++++++++++-----
media-video/makemkv/makemkv-1.9.10.ebuild | 5 +-
2 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/media-video/makemkv/files/makemkv-path.patch b/media-video/makemkv/files/makemkv-path.patch
index 88f44a9..7c66849 100644
--- a/media-video/makemkv/files/makemkv-path.patch
+++ b/media-video/makemkv/files/makemkv-path.patch
@@ -1,13 +1,59 @@
---- makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp.orig 2014-04-13 14:01:36.000000000 +0100
-+++ makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp 2014-05-08 00:09:52.863784998 +0100
-@@ -36,9 +36,7 @@
- }
-
- static const char* const app_locations[]={
-- "/bin",
-- "/usr/bin",
-- "/usr/local/bin",
-+ "/opt/bin",
- NULL };
-
- const char* const* ApGetAppLocations()
+diff -Naur makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp makemkv-oss-1.9.10/libabi/src/httplinux.cpp
+--- makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp 2016-04-15 21:35:36.000000000 +0100
++++ makemkv-oss-1.9.10/libabi/src/httplinux.cpp 2016-05-08 10:52:42.481501963 +0100
+@@ -45,7 +45,7 @@
+ lurl = (char*)alloca(strlen(Url)+1);
+ strcpy(lurl,Url);
+
+- strcpy(argv0,"/usr/bin/wget"); argv[0]=argv0;
++ strcpy(argv0,"wget"); argv[0]=argv0;
+ strcpy(argv1,"-q"); argv[1]=argv1;
+ strcpy(argv2,"-O"); argv[2]=argv2;
+ strcpy(argv3,"-"); argv[3]=argv3;
+diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp
+--- makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp 2016-04-15 21:35:36.000000000 +0100
++++ makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp 2016-05-08 13:51:48.761885862 +0100
+@@ -54,8 +54,6 @@
+
+ if (AppName[0]==':')
+ {
+- bool app_found = false;
+- const char* const* app_locations = ApGetAppLocations();
+ const char* p_env = getenv("MAKEMKVCON");
+
+ AppName++;
+@@ -63,6 +61,13 @@
+ if (p_env!=NULL)
+ {
+ strcpy(app_path,p_env);
++ } else {
++ strcpy(app_path,AppName);
++ }
++ } else {
++ strcpy(app_path,AppName);
++ }
++/*
+ app_found = true;
+ } else {
+ for (size_t i=0;app_locations[i]!=NULL;i++)
+@@ -105,7 +110,7 @@
+ }
+ strcpy(p,AppName);
+ }
+-
++*/
+ strcpy(str_guiserver,"guiserver");
+ strcpy(str_apver,verstr);
+
+diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp
+--- makemkv-oss-1.9.10.orig/makemkvgui/src/spawn_posix.cpp 2016-04-15 21:35:36.000000000 +0100
++++ makemkv-oss-1.9.10/makemkvgui/src/spawn_posix.cpp 2016-05-08 10:52:37.137598384 +0100
+@@ -70,7 +70,7 @@
+ }
+ }
+
+- err = posix_spawn(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
++ err = posix_spawnp(&pid,argv[0],&spawn_actions,&spawn_attr,argv,envp);
+
+ posix_spawn_file_actions_destroy(&spawn_actions);
+ posix_spawnattr_destroy(&spawn_attr);
diff --git a/media-video/makemkv/makemkv-1.9.10.ebuild b/media-video/makemkv/makemkv-1.9.10.ebuild
index bafbae6..57fd31d 100644
--- a/media-video/makemkv/makemkv-1.9.10.ebuild
+++ b/media-video/makemkv/makemkv-1.9.10.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="?? ( qt4 qt5 )"
QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
-RDEPEND="
+DEPEND="
sys-libs/glibc[multilib?]
dev-libs/expat
dev-libs/openssl:0
@@ -41,7 +41,8 @@ RDEPEND="
!libav? ( >=media-video/ffmpeg-1.0.0:0= )
libav? ( >=media-video/libav-0.8.9:0= )
"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+ net-misc/wget"
# Upstream uses non-standard locale names so map them with this
# associative array and perform some tricks below.
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/
@ 2017-03-26 20:28 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2017-03-26 20:28 UTC (permalink / raw
To: gentoo-commits
commit: a790458c38e633d1b90926c4c6dc5a3764fc4ccf
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 20:28:03 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 20:28:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a790458c
media-video/makemkv: Version bump to 1.10.5, remove old 1.10.4
Unfortunately upstream didn't use my automake conversion but he did at
least apply all the other fixes, negating the need for most of the
patches. The new wget patch is to stop the creation of wget-log files.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-video/makemkv/Manifest | 4 +-
media-video/makemkv/files/makemkv-flags.patch | 51 ----------------------
media-video/makemkv/files/makemkv-makefile.patch | 35 ---------------
media-video/makemkv/files/makemkv-qt4.patch | 34 ---------------
media-video/makemkv/files/makemkv-qt5.patch | 28 ------------
media-video/makemkv/files/makemkv-sysmacros.patch | 10 -----
media-video/makemkv/files/makemkv-wget.patch | 29 ++++++++++++
...makemkv-1.10.4.ebuild => makemkv-1.10.5.ebuild} | 33 +++++---------
8 files changed, 43 insertions(+), 181 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 4a90670cfaf..2f966c0ca5c 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.10.4.tar.gz 8315649 SHA256 bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa SHA512 00482428a6374e37912e0537c1e876b478a5eb9e0a26476b01f74f93c0605ed7aa3547599287211f17dd2d511e5bebf60605e05d0064f501816fdfccd964b98c WHIRLPOOL 29dfa3dcc1f36511bd153ae1c43ca54b6fb2d8cfa8d62960e7605ca460a182d4d1feec05baa9d01dfba5f80734cae4c085b8b9f0ac5d0b0910c58fa766e351f8
-DIST makemkv-oss-1.10.4.tar.gz 4421220 SHA256 bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4 SHA512 6a792703ae4ab978ebe7a71e9d9f2c298e230168c2701fd2f7fab724f31a1c83388bae408c253a75504c73b9e25f9fb0ba48d5697cfa1f7ae39df133444983c4 WHIRLPOOL 099f0d5d76ec97e3bf3bfa0a0e1ffceb5c539584ca05f9d204b241960d579f9eaabb8dfc8df2a35feec253fa597d9c97ed28c7cef95928f699a6a74bed146bee
+DIST makemkv-bin-1.10.5.tar.gz 8394804 SHA256 dd50b4b4e42d5f107356ecd637015b3cbf6c7ce3cdfc450d0995a8e785a95e02 SHA512 b44bfb79ecf51419c0d234f5ff70f4571a9ee3fe323ef6f1df9a8388a24294766153c60615f318dad20097d759a3d64a66fce4643aebdf0dbda24ed20dd8aa69 WHIRLPOOL 847ddb134e8f7ef597a1b6679ba7c4d4720895326088ef22ab7f525160f6c4c9d0a69c419e421e9b0ce049f35e566e6ed7027dc9d540f5523e09d909c0e6c97b
+DIST makemkv-oss-1.10.5.tar.gz 4569597 SHA256 4aed3caa587dc206529a2cc00a25bf33e006d7f4854ac2282f5627002b90564d SHA512 b102d211a94078d1b5c6b5b37ca7993935b7e1d784437fd9a56738a7ce8cd8f24debce976a42a5d2e3cf3cbe3deb0bb4a22696f3e47c35d92e20cba30539b9b0 WHIRLPOOL 8e54c4f8a112eddd7aaf8325543debf92d20b20c7277de05e86f887f3125fd5b27bcf27d68ec24b2a4c7142016c8a998da713d164f09c45d3f970dbba7218724
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
deleted file mode 100644
index f88bde00e65..00000000000
--- a/media-video/makemkv/files/makemkv-flags.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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/files/makemkv-makefile.patch b/media-video/makemkv/files/makemkv-makefile.patch
deleted file mode 100644
index bc057caba91..00000000000
--- a/media-video/makemkv/files/makemkv-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- makemkv-oss-1.10.3/Makefile.in.orig 2016-12-11 16:14:27.000000000 +0000
-+++ makemkv-oss-1.10.3/Makefile.in 2016-12-22 23:11:24.248995344 +0000
-@@ -6,11 +6,12 @@
-
- CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
- DESTDIR=@DESTDIR@
--PREFIX=@prefix@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
- ENABLE_GUI=@ENABLE_GUI@
--LIBDIR=$(PREFIX)/lib
--BINDIR=$(PREFIX)/bin
--DATADIR=$(PREFIX)/share
-+LIBDIR=@libdir@
-+BINDIR=@bindir@
-+DATADIR=@datadir@
- FFMPEG_CFLAGS=@ffmpeg_CFLAGS@
- FFMPEG_LIBS=@ffmpeg_LIBS@
- INSTALL=@INSTALL@
-@@ -47,7 +46,7 @@
- endif
-
- out/%: out/%.full
-- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
-+ $(OBJCOPY) --discard-all $< $@
-
- out/libdriveio.so.0.full:
- mkdir -p out
-@@ -91,5 +90,5 @@
-
- tmp/image_data.o : makemkvgui/bin/image_data.bin
- mkdir -p tmp
-- $(LD) -r -b binary -o $@ $<
-+ $(LD) -r -b binary -z noexecstack -o $@ $<
-
diff --git a/media-video/makemkv/files/makemkv-qt4.patch b/media-video/makemkv/files/makemkv-qt4.patch
deleted file mode 100644
index cbc2fa08f1a..00000000000
--- a/media-video/makemkv/files/makemkv-qt4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- makemkv-oss-1.9.8/configure.orig 2015-12-20 16:22:19.000000000 +0000
-+++ makemkv-oss-1.9.8/configure 2015-12-26 23:59:44.601387071 +0000
-@@ -5048,6 +5048,7 @@
- if test "$enable_gui" != "no"; then
-
-
-+: '
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt5" >&5
- $as_echo_n "checking for qt5... " >&6; }
-@@ -5105,6 +5106,7 @@
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$qt5_PKG_ERRORS" >&5
-+'
-
-
-
-@@ -5271,6 +5273,7 @@
-
- fi
-
-+: '
- else
- qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
- qt5_LIBS=$pkg_cv_qt5_LIBS
-@@ -5283,6 +5286,7 @@
- QT_MOC="$qt5_host_bins/moc";
-
- fi
-+'
-
- QT_INC=$QT_INC
-
diff --git a/media-video/makemkv/files/makemkv-qt5.patch b/media-video/makemkv/files/makemkv-qt5.patch
deleted file mode 100644
index 58b5e4145a4..00000000000
--- a/media-video/makemkv/files/makemkv-qt5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- makemkv-oss-1.9.8/configure.orig 2015-12-20 16:22:19.000000000 +0000
-+++ makemkv-oss-1.9.8/configure 2015-12-27 00:05:18.659860655 +0000
-@@ -5108,6 +5108,7 @@
-
-
-
-+: '
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt4" >&5
- $as_echo_n "checking for qt4... " >&6; }
-@@ -5257,7 +5258,9 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-
-+'
- as_fn_error $? "Qt library (version 5 or 4) is required to build GUI" "$LINENO" 5
-+: '
-
- else
- qt4_CFLAGS=$pkg_cv_qt4_CFLAGS
-@@ -5270,6 +5273,7 @@
- QT_MOC=`$PKG_CONFIG --variable moc_location "QtCore" 2>/dev/null`;
-
- fi
-+'
-
- else
- qt5_CFLAGS=$pkg_cv_qt5_CFLAGS
diff --git a/media-video/makemkv/files/makemkv-sysmacros.patch b/media-video/makemkv/files/makemkv-sysmacros.patch
deleted file mode 100644
index 9f4edebeda1..00000000000
--- a/media-video/makemkv/files/makemkv-sysmacros.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/makemkv-wget.patch b/media-video/makemkv/files/makemkv-wget.patch
new file mode 100644
index 00000000000..01398469ae6
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-wget.patch
@@ -0,0 +1,29 @@
+https://www.makemkv.com/forum2/viewtopic.php?f=3&t=15885
+
+diff -Naur a/libabi/src/httplinux.cpp b/libabi/src/httplinux.cpp
+--- a/libabi/src/httplinux.cpp 2017-03-26 16:33:04.000000000 +0100
++++ b/libabi/src/httplinux.cpp 2017-03-26 20:31:04.630357491 +0100
+@@ -29,8 +29,8 @@
+ int HTTP_Download(const char* Url,const char* Agent,void* Buffer,uint32_t* Size)
+ {
+ int pipe_fd[2],err;
+- char* argv[10];
+- char argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4];
++ char* argv[12];
++ char argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4],argv8[4],argv9[16];
+ char *lagent,*lurl;
+ ssize_t rd;
+
+@@ -53,8 +53,10 @@
+ strcpy(argv5,"20"); argv[5]=argv5;
+ strcpy(argv6,"-U"); argv[6]=argv6;
+ argv[7]=lagent;
+- argv[8]=lurl;
+- argv[9]=NULL;
++ strcpy(argv8,"-o"); argv[8]=argv8;
++ strcpy(argv9,"/dev/null"); argv[9]=argv9;
++ argv[10]=lurl;
++ argv[11]=NULL;
+
+ err = SYS_posix_launch(argv,0,pipe_fd[1],0,SYS_posix_envp());
+
diff --git a/media-video/makemkv/makemkv-1.10.4.ebuild b/media-video/makemkv/makemkv-1.10.5.ebuild
similarity index 82%
rename from media-video/makemkv/makemkv-1.10.4.ebuild
rename to media-video/makemkv/makemkv-1.10.5.ebuild
index 77565b1ecb7..e7eeb0b8c6b 100644
--- a/media-video/makemkv/makemkv-1.10.4.ebuild
+++ b/media-video/makemkv/makemkv-1.10.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils gnome2-utils multilib flag-o-matic
+inherit gnome2-utils flag-o-matic
MY_P=makemkv-oss-${PV}
MY_PB=makemkv-bin-${PV}
@@ -23,7 +23,7 @@ QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
DEPEND="
sys-libs/glibc[multilib?]
dev-libs/expat
- dev-libs/openssl:0
+ dev-libs/openssl:0[-bindist(-)]
sys-libs/zlib
qt5? (
dev-qt/qtcore:5
@@ -43,21 +43,7 @@ RDEPEND="${DEPEND}
net-misc/wget"
S="${WORKDIR}/makemkv-oss-${PV}"
-
-src_prepare() {
- 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
- # available configure.ac either.
- if use qt5; then
- PATCHES+=( "${FILESDIR}"/${PN}-qt5.patch )
- elif use qt4; then
- PATCHES+=( "${FILESDIR}"/${PN}-qt4.patch )
- fi
-
- default
-}
+PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
src_configure() {
# See bug #439380.
@@ -66,12 +52,17 @@ src_configure() {
local econf_args=()
if use qt5 || use qt4; then
- econf_args+=( '--enable-gui' )
+ econf_args+=( --enable-gui )
else
- econf_args+=( '--disable-gui' )
+ econf_args+=( --disable-gui )
fi
- econf "${econf_args[@]}"
+ econf \
+ --enable-debug \
+ --disable-noec \
+ $(use_enable qt5) \
+ $(use_enable qt4) \
+ "${econf_args[@]}"
}
src_install() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/
@ 2018-04-30 22:30 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2018-04-30 22:30 UTC (permalink / raw
To: gentoo-commits
commit: 97fd48ee1056584a50eecf2cd9e495f6e3c46e8b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 22:29:29 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 22:29:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97fd48ee
media-video/makemkv: Bump to 1.12.2, remove old 1.12.0
The wget patch was merged upstream and the mmdtsdec binary has gone.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
media-video/makemkv/Manifest | 4 +--
media-video/makemkv/files/makemkv-wget.patch | 29 ----------------------
...makemkv-1.12.0.ebuild => makemkv-1.12.2.ebuild} | 15 ++++-------
3 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index b6bf42aa119..234d2b5ca36 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.12.0.tar.gz 9157789 BLAKE2B 5534250c6d217824de4f0eac9b17f1e61e24a82e40d01b42c3df856be24b0d5f9421e52433840b50e9dc4134fab09bfb8fd2c0e3e45fac1afd2fa8026d299ce4 SHA512 039a60308b90434c9aa39a18c03078cd67c8f5594ea20578dcc2c2eb75fbf2bc1918f976cb35b97c977c3380cbef27c5cb819593276343b6357cd0b384ac6c22
-DIST makemkv-oss-1.12.0.tar.gz 4572233 BLAKE2B 1eb14296180e4c2e13dab12414c5a7087069b43d19ef93a0ece0824d5187069fd78be750712f3fd76da2393d2717ced1fe5e26abfe3879bb6465a0bfeea275be SHA512 36c6f1e447081e2bd003fb75e6b70eaac4c6ed5ea2b39615bf81599664c66631c3ae84dcb04448ac8877724fdc4112b351af8c16aa3d1463ce8a7ac871524469
+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
diff --git a/media-video/makemkv/files/makemkv-wget.patch b/media-video/makemkv/files/makemkv-wget.patch
deleted file mode 100644
index 01398469ae6..00000000000
--- a/media-video/makemkv/files/makemkv-wget.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://www.makemkv.com/forum2/viewtopic.php?f=3&t=15885
-
-diff -Naur a/libabi/src/httplinux.cpp b/libabi/src/httplinux.cpp
---- a/libabi/src/httplinux.cpp 2017-03-26 16:33:04.000000000 +0100
-+++ b/libabi/src/httplinux.cpp 2017-03-26 20:31:04.630357491 +0100
-@@ -29,8 +29,8 @@
- int HTTP_Download(const char* Url,const char* Agent,void* Buffer,uint32_t* Size)
- {
- int pipe_fd[2],err;
-- char* argv[10];
-- char argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4];
-+ char* argv[12];
-+ char argv0[16],argv1[4],argv2[4],argv3[4],argv4[4],argv5[4],argv6[4],argv8[4],argv9[16];
- char *lagent,*lurl;
- ssize_t rd;
-
-@@ -53,8 +53,10 @@
- strcpy(argv5,"20"); argv[5]=argv5;
- strcpy(argv6,"-U"); argv[6]=argv6;
- argv[7]=lagent;
-- argv[8]=lurl;
-- argv[9]=NULL;
-+ strcpy(argv8,"-o"); argv[8]=argv8;
-+ strcpy(argv9,"/dev/null"); argv[9]=argv9;
-+ argv[10]=lurl;
-+ argv[11]=NULL;
-
- err = SYS_posix_launch(argv,0,pipe_fd[1],0,SYS_posix_envp());
-
diff --git a/media-video/makemkv/makemkv-1.12.0.ebuild b/media-video/makemkv/makemkv-1.12.2.ebuild
similarity index 90%
rename from media-video/makemkv/makemkv-1.12.0.ebuild
rename to media-video/makemkv/makemkv-1.12.2.ebuild
index 530e22a417b..bcc7cf5092e 100644
--- a/media-video/makemkv/makemkv-1.12.0.ebuild
+++ b/media-video/makemkv/makemkv-1.12.2.ebuild
@@ -16,12 +16,12 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav multilib"
+IUSE="+gui libav"
QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
DEPEND="
- sys-libs/glibc[multilib?]
+ sys-libs/glibc
dev-libs/expat
dev-libs/openssl:0[-bindist(-)]
sys-libs/zlib
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
CONFIG_CHECK="~CHR_DEV_SG"
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-{wget,path}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-path.patch )
src_configure() {
# See bug #439380.
@@ -66,13 +66,8 @@ src_install() {
cd "${WORKDIR}"/${MY_PB} || die
- # install prebuilt bins
- if use x86; then
- dobin bin/i386/{makemkvcon,mmdtsdec}
- elif use amd64; then
- dobin bin/amd64/makemkvcon
- use multilib && dobin bin/i386/mmdtsdec
- fi
+ # install prebuilt bin
+ dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
# install profiles and locales
insinto /usr/share/MakeMKV
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/
@ 2018-05-14 21:48 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2018-05-14 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 3b2c32569270c1fb2062436efae206e4be737349
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 21:48:25 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon May 14 21:48:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2c3256
media-video/makemkv: Patch for compatibility with ffmpeg 4
Closes: https://bugs.gentoo.org/655488
Package-Manager: Portage-2.3.36, Repoman-2.3.9
media-video/makemkv/files/makemkv-ffmpeg.patch | 25 +++++++++++++++++++++++++
media-video/makemkv/makemkv-1.12.2.ebuild | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/media-video/makemkv/files/makemkv-ffmpeg.patch b/media-video/makemkv/files/makemkv-ffmpeg.patch
new file mode 100644
index 00000000000..930c144d263
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-ffmpeg.patch
@@ -0,0 +1,25 @@
+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.2.ebuild
index bcc7cf5092e..e5003042929 100644
--- a/media-video/makemkv/makemkv-1.12.2.ebuild
+++ b/media-video/makemkv/makemkv-1.12.2.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
CONFIG_CHECK="~CHR_DEV_SG"
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-path.patch )
+PATCHES=( "${FILESDIR}"/${PN}-{path,ffmpeg}.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/, media-video/makemkv/files/
@ 2020-10-02 20:43 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2020-10-02 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 86c47ac90f6b9fc80930ff675b2c5f6975849f87
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 20:42:46 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 20:43:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c47ac9
media-video/makemkv: Bump to 1.15.3, drop old 1.15.2
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/makemkv/Manifest | 4 ++--
media-video/makemkv/files/makemkv-path.patch | 12 ------------
.../makemkv/{makemkv-1.15.2.ebuild => makemkv-1.15.3.ebuild} | 0
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 82330cb0009..951acfd799b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.15.2.tar.gz 8506031 BLAKE2B 515760761a0ff7753b9006b293e9d09d72b04d6778069fc706736244c47a4c7edec912b93b5ec6f516520c96b5821f300d3057b401edd257a9b0de2550cbedd4 SHA512 ee3230ba97e5087601f4277dfc57cc9cbc6188ae490b2a6be8f07beee6c24cb1b04b23ecce308be034bc21f80d9dfc7a86500b44fb51c7322ad97a1460b0e79c
-DIST makemkv-oss-1.15.2.tar.gz 6404814 BLAKE2B a7273539742e51142cf2f951b679d1667339127d592f593dfabfb7f5b279d2bd6dfea255d40fcb9f3b8a73bd1b22dd118a0a3fbaf6d6096ddc1d4d7532b14bea SHA512 d697a70b530e07629b0da170350e6c9eb74c76370634bb512817d54941d13038a89afe547f793375a1fda181b0dc23b120197d21564f745be4c6f9ab227a42cb
+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
diff --git a/media-video/makemkv/files/makemkv-path.patch b/media-video/makemkv/files/makemkv-path.patch
index 7c66849b323..6a3b3cf8dee 100644
--- a/media-video/makemkv/files/makemkv-path.patch
+++ b/media-video/makemkv/files/makemkv-path.patch
@@ -1,15 +1,3 @@
-diff -Naur makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp makemkv-oss-1.9.10/libabi/src/httplinux.cpp
---- makemkv-oss-1.9.10.orig/libabi/src/httplinux.cpp 2016-04-15 21:35:36.000000000 +0100
-+++ makemkv-oss-1.9.10/libabi/src/httplinux.cpp 2016-05-08 10:52:42.481501963 +0100
-@@ -45,7 +45,7 @@
- lurl = (char*)alloca(strlen(Url)+1);
- strcpy(lurl,Url);
-
-- strcpy(argv0,"/usr/bin/wget"); argv[0]=argv0;
-+ strcpy(argv0,"wget"); argv[0]=argv0;
- strcpy(argv1,"-q"); argv[1]=argv1;
- strcpy(argv2,"-O"); argv[2]=argv2;
- strcpy(argv3,"-"); argv[3]=argv3;
diff -Naur makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp
--- makemkv-oss-1.9.10.orig/makemkvgui/src/api_posix.cpp 2016-04-15 21:35:36.000000000 +0100
+++ makemkv-oss-1.9.10/makemkvgui/src/api_posix.cpp 2016-05-08 13:51:48.761885862 +0100
diff --git a/media-video/makemkv/makemkv-1.15.2.ebuild b/media-video/makemkv/makemkv-1.15.3.ebuild
similarity index 100%
rename from media-video/makemkv/makemkv-1.15.2.ebuild
rename to media-video/makemkv/makemkv-1.15.3.ebuild
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/
@ 2021-03-30 22:32 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2021-03-30 22:32 UTC (permalink / raw
To: gentoo-commits
commit: 6623af432998f86c34f9ed3f7587c9d0c082651d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 30 22:25:33 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 22:32:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6623af43
media-video/makemkv: Bump to 1.16.3, drop old 1.16.1
This version bundles ccextractor as mmccextr. For now, the differences
are almost entirely the disabling of unneeded functionality. This may
change though and I don't want to have to keep checking so I'm keeping
it bundled.
Closes: https://bugs.gentoo.org/777912
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/makemkv/Manifest | 4 ++--
media-video/makemkv/files/makemkv-flags.patch | 11 +++++++++++
.../{makemkv-1.16.1.ebuild => makemkv-1.16.3.ebuild} | 16 ++++++++++------
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 8dfd9fb24b0..00e323e19ee 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.16.1.tar.gz 15306460 BLAKE2B bc2c95da1e0bb6cb1280d2dbd16cfa8eaa5f9bb3c056b43f442b6d12c41ab593758f4d9eac6c472e277696707739e71b9e5746096490a926c9e97ca9d7ff36c2 SHA512 c0597aeff56da40074570bb66e6d1c16a31ec54d283d28681f2edaf89a4597fa8bea4adb45a27dfd348e99aa3c008b5447bb9dd9d0dfb11bec36d044ff3bd404
-DIST makemkv-oss-1.16.1.tar.gz 6409619 BLAKE2B d0381fc452c57695bbac66137ef5d3df97fb9c950a52c3cb97b08422d9d02ef1671443e0584c47127654502e893f6d57c197e2fa9e769727944dc2895e2a66dd SHA512 12c83ec05e31a54d75355cf396eae977319318dbe0384a08ed5a75648ffd8e4840e3c3a0bf855c14153a77e2bb831951b96c6c01a48d1d7f5285497ad772f199
+DIST makemkv-bin-1.16.3.tar.gz 15309313 BLAKE2B 34cbf3ee5400a21a4c9f3f71e95afeb2129bda69daa4743321c3aff9ad8bf2c8f703fbf63e45720612b5305efb04484fd1a5719af74398fde2a15a3f982d65b4 SHA512 0806d8f9adde605efeff5d551ba721d9f400c8643e78ec562425aec1af33bb429e2816c5b9cf2e4a1b1efe4161f5d2623a182799d75c9833f045f5420bf13543
+DIST makemkv-oss-1.16.3.tar.gz 6536679 BLAKE2B 63d119dff4098b47cafbe63112118922f77404f1d9353f8aae944be105754a6662db576d318522436ce5d4121528e5b9cc06829e30787120928e8be881d953d6 SHA512 a620141cbaeb621feb5746a753eb448b181d9c795d0f78fad0659baeea21ebf8c6ce925b24f8b7d6844f92b0438a36a32fbac7c7260858e26116d55832a233c0
diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
new file mode 100644
index 00000000000..d7a2f1be16c
--- /dev/null
+++ b/media-video/makemkv/files/makemkv-flags.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in 2021-03-19 13:06:50.000000000 +0000
++++ b/Makefile.in 2021-03-30 23:28:42.720480399 +0100
+@@ -112,7 +112,7 @@
+
+ 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
+
+ tmp/gen_buildinfo.h:
diff --git a/media-video/makemkv/makemkv-1.16.1.ebuild b/media-video/makemkv/makemkv-1.16.3.ebuild
similarity index 92%
rename from media-video/makemkv/makemkv-1.16.1.ebuild
rename to media-video/makemkv/makemkv-1.16.3.ebuild
index f28d5a01e2d..06832f14e6a 100644
--- a/media-video/makemkv/makemkv-1.16.1.ebuild
+++ b/media-video/makemkv/makemkv-1.16.3.ebuild
@@ -13,7 +13,7 @@ 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="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE="+gui libressl"
@@ -37,7 +37,6 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- media-video/ccextractor
net-misc/wget
"
BDEPEND="
@@ -50,6 +49,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-path.patch
+ "${FILESDIR}"/${PN}-flags.patch
)
src_configure() {
@@ -64,6 +64,13 @@ src_configure() {
}
src_install() {
+ local myarch
+ case "${ARCH}" in
+ arm) myarch=armel ;;
+ x86) myarch=i386 ;;
+ *) myarch=${ARCH} ;;
+ esac
+
default
# add missing symlinks for QA
@@ -77,7 +84,7 @@ src_install() {
cd "${WORKDIR}"/${MY_PB} || die
# install prebuilt bin
- dobin bin/$(usex x86 i386 ${ARCH})/makemkvcon
+ dobin bin/"${myarch}"/makemkvcon
# additional tool is actually part of makemkvcon
dosym makemkvcon /usr/bin/sdftool
@@ -85,9 +92,6 @@ src_install() {
# install profiles and locales
insinto /usr/share/MakeMKV
doins src/share/*
-
- # add symlink rather than relying on MMCCEXTRACTOR env var
- dosym ccextractor /usr/bin/mmccextr
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/
@ 2023-09-26 20:27 James Le Cuirot
0 siblings, 0 replies; 8+ messages in thread
From: James Le Cuirot @ 2023-09-26 20:27 UTC (permalink / raw
To: gentoo-commits
commit: 4b18d9619165b800b5c271ac47dba01d14f64f1e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 20:27:04 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 20:27:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b18d961
media-video/makemkv: Bump to 1.17.5, drop old 1.17.4-r1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/makemkv/Manifest | 4 ++--
media-video/makemkv/files/makemkv-ffmpeg-6.patch | 13 -------------
.../{makemkv-1.17.4-r1.ebuild => makemkv-1.17.5.ebuild} | 3 +--
3 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 526bb1f52c94..345500b6e61e 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.17.4.tar.gz 16402081 BLAKE2B 9be9fe1c2af35af7f5632857bccae45d9e6ba522fb8753eb40903a61ff73bc1ff40f2fade6d099059c5d7f716c0903ff16c3ff0849ff21728cc7eb8eafd19a95 SHA512 64251bfbbb3a5cad3a99e15a0a215ab8d3dd54fc267b1f22c9ab347fd744add78edd41d2cfd48086999f4e8912da4713974e36db96406fd18a7c930a61b2f6ec
-DIST makemkv-oss-1.17.4.tar.gz 6618658 BLAKE2B c64e209fc20e432c4befe794133fb06761f4fd2fb6eceb8ce4ce7292582768d10937850027aad0a02f31f920c647841427797b43ba6f1016ff0e5920ac466682 SHA512 6e69400ec3ce8df63e55d107a8f81ceab3f3182b5e02be2187eb2cac93c5002d3c614b96e1a3672562e32495c447fb1d7a018ac233d3a9e32f1d27957169283d
+DIST makemkv-bin-1.17.5.tar.gz 16407150 BLAKE2B b224d82113ae03c3569933ac7838f5de2d6a9af9b720d2e11a508d141de8af7d50bb32bb5f65affa8dc8e0f8d6c6205352ad00cf30d8296b1c1413da519bd400 SHA512 fab00ede2c0133b750b03df0b0adf854de72734bc9f760aae1f1ba208e0da378e005000508edef209e6b9359a969e6c7df6ff21d32a17a55e3f42aa19815400b
+DIST makemkv-oss-1.17.5.tar.gz 6618061 BLAKE2B 128c8e093cb8b39c7bf98f6cf65ab841a9e36914a6ac746d46c2bf82f6f28b8a0a61f6f15206d76be4b0b4834fa3f500ca682b841cf7a6760b20c3e187fe4c40 SHA512 2bc49e079c06ddff3442c00766e3b5635c03ec928013a331bf5aa386efaf65b1c654db340716d9a31b805b5f96a61be8f96eab3949a1cd24cc3daa9fc90b5a28
diff --git a/media-video/makemkv/files/makemkv-ffmpeg-6.patch b/media-video/makemkv/files/makemkv-ffmpeg-6.patch
deleted file mode 100644
index 684d8186bab5..000000000000
--- a/media-video/makemkv/files/makemkv-ffmpeg-6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.5.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.17.4-r1.ebuild
rename to media-video/makemkv/makemkv-1.17.5.ebuild
index 05a97bd1d4f3..8340ac2483e7 100644
--- a/media-video/makemkv/makemkv-1.17.4-r1.ebuild
+++ b/media-video/makemkv/makemkv-1.17.5.ebuild
@@ -48,7 +48,6 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-path.patch
- "${FILESDIR}"/${PN}-ffmpeg-6.patch
)
src_prepare() {
@@ -73,7 +72,7 @@ src_configure() {
src_install() {
local myarch
case "${ARCH}" in
- arm) myarch=armel ;;
+ arm) myarch=armhf ;;
x86) myarch=i386 ;;
*) myarch=${ARCH} ;;
esac
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-09-26 20:27 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-26 20:27 [gentoo-commits] repo/gentoo:master commit in: media-video/makemkv/, media-video/makemkv/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2021-03-30 22:32 James Le Cuirot
2020-10-02 20:43 James Le Cuirot
2018-05-14 21:48 James Le Cuirot
2018-04-30 22:30 James Le Cuirot
2017-03-26 20:28 James Le Cuirot
2016-05-08 16:28 James Le Cuirot
2015-12-27 12:10 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox