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() {
