Date: Thu, 20 Jul 2023 09:48:28 GMT From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: db63cc4d3899 - main - net/mptsd: update to 1.1-27 and fix for FreeBSD 14 Message-ID: <202307200948.36K9mSDH040993@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=db63cc4d389920c499e8bf413a0e12227cd482f7 commit db63cc4d389920c499e8bf413a0e12227cd482f7 Author: Alex Mironov <win2000rus@hotmail.com> AuthorDate: 2023-07-20 06:20:26 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2023-07-20 09:48:17 +0000 net/mptsd: update to 1.1-27 and fix for FreeBSD 14 PR: 272603 Reported by: win2000rus@hotmail.com (maintainer) --- net/mptsd/Makefile | 10 ++++++++-- net/mptsd/distinfo | 10 +++++++--- net/mptsd/files/patch-Makefile | 21 --------------------- net/mptsd/files/patch-libfuncs_Makefile | 12 ++++-------- net/mptsd/files/patch-libtsfuncs_Makefile | 12 ++++-------- net/mptsd/files/patch-mptsd.c | 13 ++++++++----- 6 files changed, 31 insertions(+), 47 deletions(-) diff --git a/net/mptsd/Makefile b/net/mptsd/Makefile index 8d0e8b63bdb5..798d9f62ba85 100644 --- a/net/mptsd/Makefile +++ b/net/mptsd/Makefile @@ -1,16 +1,22 @@ PORTNAME= mptsd -PORTVERSION= 1.1 +DISTVERSIONPREFIX=v +DISTVERSION= 1.1-27 +DISTVERSIONSUFFIX=-g21bf4ea CATEGORIES= net multimedia MASTER_SITES= https://georgi.unixsol.org/programs/mptsd/ MAINTAINER= win2000rus@hotmail.com COMMENT= MPEG TS stream muxer -WWW= https://github.com/gfto/mptsd LICENSE= GPLv2 MIT LICENSE_COMB= multi USES= gmake tar:bzip2 +USE_GITHUB= yes +GH_ACCOUNT= gfto +GH_PROJECT= mptsd +GH_TUPLE= gfto:libfuncs:0dc8d87080badd7a276316ad7ae6e6f1aed2331b:libfuncs/libfuncs \ + gfto:libtsfuncs:45e7e999a17c1954915295bd13b242bbd937cf28:libtsfuncs/libtsfuncs do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/net/mptsd/distinfo b/net/mptsd/distinfo index f24ec2de6e68..f293a53b6221 100644 --- a/net/mptsd/distinfo +++ b/net/mptsd/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1523373210 -SHA256 (mptsd-1.1.tar.bz2) = 3609e13df7ee561f59f667d7700f13d515714c9b13c2220e88adb3c144b995f0 -SIZE (mptsd-1.1.tar.bz2) = 95989 +TIMESTAMP = 1689782801 +SHA256 (gfto-mptsd-v1.1-27-g21bf4ea_GH0.tar.gz) = 3f7744a8991301ec22442d34c8a496774443ca0c2e9199508368abc21385c7c0 +SIZE (gfto-mptsd-v1.1-27-g21bf4ea_GH0.tar.gz) = 46689 +SHA256 (gfto-libfuncs-0dc8d87080badd7a276316ad7ae6e6f1aed2331b_GH0.tar.gz) = c8446c30742815527676f1b26f94fb463b46ffc7a01e7a0b94ae8cba5952ff4e +SIZE (gfto-libfuncs-0dc8d87080badd7a276316ad7ae6e6f1aed2331b_GH0.tar.gz) = 12863 +SHA256 (gfto-libtsfuncs-45e7e999a17c1954915295bd13b242bbd937cf28_GH0.tar.gz) = a548f45cfbe4aa98ec7621198f4cbcec1731b86c6278b329d4b94506d9b34be1 +SIZE (gfto-libtsfuncs-45e7e999a17c1954915295bd13b242bbd937cf28_GH0.tar.gz) = 49660 diff --git a/net/mptsd/files/patch-Makefile b/net/mptsd/files/patch-Makefile deleted file mode 100644 index 32420b53455e..000000000000 --- a/net/mptsd/files/patch-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.orig 2012-01-26 12:00:02 UTC -+++ Makefile -@@ -1,17 +1,8 @@ --CC = $(CROSS)$(TARGET)gcc - STRIP = $(CROSS)$(TARGET)strip --BUILD_ID = $(shell date +%F_%R) - VERSION="v1.1" --GIT_VER = $(shell git describe --tags --dirty --always 2>/dev/null) --CFLAGS = -ggdb -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -O2 -D_GNU_SOURCE -DBUILD_ID=\"$(BUILD_ID)\" --ifneq "$(GIT_VER)" "" --CFLAGS += -DGIT_VER=\"$(GIT_VER)\" --else --CFLAGS += -DGIT_VER=\"$(VERSION)\" --endif -+CFLAGS += -Wall -Wextra -Wshadow -Wformat-security -Wno-strict-aliasing -D_GNU_SOURCE -DBUILD_ID=\"FreeBSD_port\" -DGIT_VER=\"$(VERSION)\" - - RM = /bin/rm -f --Q = @ - - LIBS = -lpthread -lm -lrt - diff --git a/net/mptsd/files/patch-libfuncs_Makefile b/net/mptsd/files/patch-libfuncs_Makefile index 69e1d6feeec9..19cca457bd25 100644 --- a/net/mptsd/files/patch-libfuncs_Makefile +++ b/net/mptsd/files/patch-libfuncs_Makefile @@ -1,16 +1,12 @@ ---- libfuncs/Makefile.orig 2012-01-05 12:40:53 UTC +--- libfuncs/Makefile.orig 2023-07-11 19:14:41 UTC +++ libfuncs/Makefile -@@ -1,12 +1,9 @@ --CC = $(CROSS)$(TARGET)gcc - LINK = $(CROSS)$(TARGET)ld -o - MKDEP = $(CC) -M -o $*.d $< +@@ -4,8 +4,7 @@ + MKDEP = $(CROSS)$(CC) -M -o $*.d $< LIBRARY_LINK_OPTS = -L. -r -CFLAGS = -O2 -ggdb -std=c99 -D_GNU_SOURCE -CFLAGS += -Wall -Wextra -Wshadow -Wformat-security -Wstrict-prototypes +CFLAGS += -std=c99 -D_GNU_SOURCE -Wall -Wextra -Wshadow -Wformat-security -Wstrict-prototypes RM = /bin/rm -f --Q=@ + Q=@ - OBJS = queue.o list.o cbuf.o io.o log.o http_response.o asyncdns.o \ - server.o misc.o diff --git a/net/mptsd/files/patch-libtsfuncs_Makefile b/net/mptsd/files/patch-libtsfuncs_Makefile index af6c11733184..231be4d0cea6 100644 --- a/net/mptsd/files/patch-libtsfuncs_Makefile +++ b/net/mptsd/files/patch-libtsfuncs_Makefile @@ -1,16 +1,12 @@ ---- libtsfuncs/Makefile.orig 2012-01-05 12:41:01 UTC +--- libtsfuncs/Makefile.orig 2023-07-11 19:18:33 UTC +++ libtsfuncs/Makefile -@@ -1,12 +1,9 @@ --CC = $(CROSS)$(TARGET)gcc - LINK = $(CROSS)$(TARGET)ld -o - MKDEP = $(CC) -M -o $*.d $< +@@ -4,8 +4,7 @@ + MKDEP = $(CROSS)$(CC) -M -o $*.d $< LIBRARY_LINK_OPTS = -L. -r -CFLAGS = -O2 -ggdb -std=c99 -D_GNU_SOURCE -CFLAGS += -Wall -Wextra -Wshadow -Wformat-security -Wstrict-prototypes +CFLAGS += -std=c99 -D_GNU_SOURCE -Wall -Wextra -Wshadow -Wformat-security -Wstrict-prototypes RM = /bin/rm -f --Q=@ + Q=@ - OBJS = log.o tsfuncs.o crc.o misc.o time.o \ - sections.o secdata.o \ diff --git a/net/mptsd/files/patch-mptsd.c b/net/mptsd/files/patch-mptsd.c index 731e7881245e..a14e34708e28 100644 --- a/net/mptsd/files/patch-mptsd.c +++ b/net/mptsd/files/patch-mptsd.c @@ -1,11 +1,14 @@ ---- mptsd.c.orig 2011-09-16 12:37:04 UTC +--- mptsd.c.orig 2018-05-07 06:42:40 UTC +++ mptsd.c -@@ -34,7 +34,7 @@ - +@@ -35,9 +35,9 @@ #define PROGRAM_NAME "ux-mptsd" + #ifdef BUILD_ID -const char *program_id = PROGRAM_NAME " " GIT_VER " build " BUILD_ID; -+const char *program_id = PROGRAM_NAME " FreeBSD port"; ++const char *program_id = PROGRAM_NAME " " GIT_VER " build " BUILD_ID " FreeBSD port"; + #else +-const char *program_id = PROGRAM_NAME " " GIT_VER; ++const char *program_id = PROGRAM_NAME " " GIT_VER " FreeBSD port"; + #endif char *server_sig = PROGRAM_NAME; - char *server_ver = GIT_VER;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307200948.36K9mSDH040993>