git: 1d3db2fc407a - main - multimedia/openh264: link library as originally intended

The branch main has been updated by cmt:

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

commit 1d3db2fc407a31b254a0723228d051b99fd78740
Author:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
AuthorDate: 2026-10-17 19:23:07 +0000
Commit:     Christoph Moench-Tegeder <cmt@FreeBSD.org>
CommitDate: 2026-10-17 19:27:58 +0000

    multimedia/openh264: link library as originally intended
    
    We carried this patch since importing openh264 into the ports tree,
    but at this time it results in weird linkage.
    The original reasoning behind this patch can't be reconstructed beyond
    the short comment in the patch file.
    Without the patch, the library looks much more sane.
    
    PR:             299071
    Reported by:    jsm@
---
 multimedia/openh264/Makefile             |  2 +-
 multimedia/openh264/files/patch-Makefile | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile
index 19c292bcdbad..f22a869fa14a 100644
--- a/multimedia/openh264/Makefile
+++ b/multimedia/openh264/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openh264
 DISTVERSIONPREFIX=v
 DISTVERSION=	2.6.0
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 
diff --git a/multimedia/openh264/files/patch-Makefile b/multimedia/openh264/files/patch-Makefile
deleted file mode 100644
index 40cc9e5c1a34..000000000000
--- a/multimedia/openh264/files/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Force gmp plugin to link dynamically against libopenh264
-
---- Makefile.orig	2017-06-16 04:20:14 UTC
-+++ Makefile
-@@ -263,7 +263,7 @@ endif
- echo-plugin-name:
- 	@echo $(MODULE)
- 
--$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXFULLVER): $(MODULE_OBJS) $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS)
-+$(LIBPREFIX)$(MODULE_NAME).$(SHAREDLIBSUFFIXFULLVER): $(MODULE_OBJS) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
- 	$(QUIET)rm -f $@
- 	$(QUIET_CXX)$(CXX) $(SHARED) $(CXX_LINK_O) $+ $(LDFLAGS) $(SHLDFLAGS) $(MODULE_LDFLAGS)
- ifeq (True, $(PROCESS_FILES))