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

6 files changed, 29 insertions, 158 deletions

diff --git a/media-video/makemkv/files/makemkv-flags.patch b/media-video/makemkv/files/makemkv-flags.patch
deleted file mode 100644
index f88bde00e651..000000000000
--- 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 bc057caba91f..000000000000
--- 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 cbc2fa08f1ad..000000000000
--- 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 58b5e4145a4b..000000000000
--- 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 9f4edebeda11..000000000000
--- 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 000000000000..01398469ae6d
--- /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());
+