git: c094198561b3 - main - multimedia/x264: update to 0.161.3049

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c094198561b3e5dc74d6dd3d557e33cfe287a8ec

commit c094198561b3e5dc74d6dd3d557e33cfe287a8ec
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-04-12 06:54:56 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-04-27 15:52:46 +0000

    multimedia/x264: update to 0.161.3049
    
    Changes:        https://code.videolan.org/videolan/x264/compare/544c61f...55d517b
    Reported by:    OpenBSD
---
 multimedia/x264/Makefile             |  4 ++--
 multimedia/x264/distinfo             |  6 +++---
 multimedia/x264/files/patch-Makefile | 13 -------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 68754bdf6fac..8cb3626e5a50 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -33,7 +33,7 @@ BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS?=	libx264.so:multimedia/libx264
 
 X264_BUILD=	161
-X264_REV=	3039
+X264_REV=	3049
 X264_GITVER=	${GL_COMMIT:C/^(.{7}).*/\1/}
 
 USES?=		pkgconfig
@@ -42,7 +42,7 @@ USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://code.videolan.org
 GL_ACCOUNT=	videolan
-GL_COMMIT=	544c61f082194728d0391fb280a6e138ba320a96
+GL_COMMIT=	55d517bc4569272a2c9a367a4106c234aba2ffbc
 HAS_CONFIGURE=	yes
 SHEBANG_FILES=	configure
 PLIST_FILES?=	bin/x264
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index efb5bb8098ab..60acc7895a40 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1617891586
+TIMESTAMP = 1618210496
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
-SHA256 (x264/videolan-x264-544c61f082194728d0391fb280a6e138ba320a96_GL0.tar.gz) = 40e26ebf46868fc3facd954a9282ed518d056dabe0ae6f80327d6156afd2d0a0
-SIZE (x264/videolan-x264-544c61f082194728d0391fb280a6e138ba320a96_GL0.tar.gz) = 936949
+SHA256 (x264/videolan-x264-55d517bc4569272a2c9a367a4106c234aba2ffbc_GL0.tar.gz) = 463946031aa3dc507940e988c78ef02d2eb1769043877c17923ad9411b13af5b
+SIZE (x264/videolan-x264-55d517bc4569272a2c9a367a4106c234aba2ffbc_GL0.tar.gz) = 937106
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
deleted file mode 100644
index 4ddae76c6834..000000000000
--- a/multimedia/x264/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
--T (treat DEST as a normal file) is not supported by BSD install(1)
-
---- Makefile.orig	2020-09-12 17:23:57 UTC
-+++ Makefile
-@@ -413,7 +413,7 @@ endif
- install-bashcompletion:
- ifneq ($(BASHCOMPLETIONSDIR),)
- 	$(INSTALL) -d $(DESTDIR)$(BASHCOMPLETIONSDIR)
--	$(INSTALL) -m 644 -T $(SRCPATH)/tools/bash-autocomplete.sh $(DESTDIR)$(BASHCOMPLETIONSDIR)/x264
-+	$(INSTALL) -m 644 $(SRCPATH)/tools/bash-autocomplete.sh $(DESTDIR)$(BASHCOMPLETIONSDIR)/x264
- endif
- 
- uninstall: