From nobody Thu May 08 02:42:31 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZtGd36dZHz5vhJt; Thu, 08 May 2025 02:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtGd363XFz3K8j; Thu, 08 May 2025 02:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746672151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGIaBwaf1bKF9+zqO+RYMUNlykJ5u5beFiFNPQPw9VE=; b=F2G3xQZwoNS0+rptdc10Er3NBtdh0jEll4N2blvW95luKrwrpSafWhIld6auo4tsklDMMp EuWE0Y2DDKp177mt4Kd5xiswWpOKAIzUafAZm+0xyng8aoccKZ34Xjbm01qGs3Hoboctiu M/0lzJsNM+CCodwH1cgLkiK/bFyaPKPApg/Z94hdog9pBcbERpiYK/Wa/tYI7cc1HkFKtY DG1H+h/Jn0rW1LEjAR+oTRa+kL7J7zuMoPD+mF9obPODYiMLDzcajYPIOTm5ySCpSRu7uX QmoQQOv/BNU/6iWAtM3FyDWz7EBV1tubZDdq7wAwFo37ptOzpJXwEkDBxqj34w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746672151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGIaBwaf1bKF9+zqO+RYMUNlykJ5u5beFiFNPQPw9VE=; b=w0+bEwENDxIVWu7/rJCzt8qlwok8ha9yhmSrTHVlXjEFurx7d0vh0gTCguNfaI+UpwfShS w5rXoAgheSpwp/VmDEU7L/9ztncqqqIkxP9UpvwCMotw7qNRu1eykfK4PYE02VAKSaUycI ZEd+ZpfqAANsSUpGIuqcNKyxqfINF4adpIKkurbmWu0bzITdOMZtL0lu7sGnJSzgM6qFx+ jZ6ahN7A5BQ6+ZaiApQiE6vAF4/87HnXzu8BKJyqxhjwZbVswGEPo0kCoNHZ0JwX5seCAi gqfPw3OiIBO+SKfUEiwD8A3IBicCbf95LZZiT0bKfHd9qn0ztrDZ78hR67M9cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746672151; a=rsa-sha256; cv=none; b=w6d8HFiKjcMS7b0gsUV15u9BUIPSLzFbiDCOyXEDau3EYr7KgcL5k5+vvkEZdO0u5tkxBW BoDeoiE40bhCm1u2AmBwg0Jtw5Gqb+fVXZmYeK035Oz3/mLaUtK6gRGqmODwMSJzFUNtGs wNNENKW+p+y+zG0jVzKK1l50iKGyrrAKdv7OQkxkYPCQCS/w4L3mJVKihU/pPc2c9HdpKa fd8MF8f+JV+2eMb1aeebkqH+L2oMCL/gx6wzIWdMqgwf95DvOn7XLJjke70mskMOgL1/FY RTTG+yRnOM0hf4idAxU1hczkzoPazodkiwRCaa2uQKuYLFni9E8pWTsntPzOwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZtGd35dFCzwmf; Thu, 08 May 2025 02:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5482gVeW071931; Thu, 8 May 2025 02:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5482gV92071928; Thu, 8 May 2025 02:42:31 GMT (envelope-from git) Date: Thu, 8 May 2025 02:42:31 GMT Message-Id: <202505080242.5482gV92071928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 61634b3d14c7 - main - net/liveMedia: Update to 2025.04.24 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61634b3d14c767486356d6124f15569e889233e3 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=61634b3d14c767486356d6124f15569e889233e3 commit 61634b3d14c767486356d6124f15569e889233e3 Author: Jason E. Hale AuthorDate: 2025-05-08 02:25:12 +0000 Commit: Jason E. Hale CommitDate: 2025-05-08 02:42:27 +0000 net/liveMedia: Update to 2025.04.24 Use the stock config.linux-with-shared-libraries profile with minimal patching instead of shipping our own config.freebsd-fixed profile. The two profiles are almost identical, but we haven't exactly been keeping up with the shared library number changes over the years. http://www.live555.com/liveMedia/public/changelog.txt --- net/liveMedia/Makefile | 5 +-- net/liveMedia/distinfo | 6 +-- net/liveMedia/files/config.fixed-freebsd | 46 ---------------------- .../files/patch-config.linux-with-shared-libraries | 22 +++++++++++ net/liveMedia/pkg-plist | 16 ++++---- 5 files changed, 35 insertions(+), 60 deletions(-) diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile index 12f13212fc87..372cd379d30c 100644 --- a/net/liveMedia/Makefile +++ b/net/liveMedia/Makefile @@ -1,5 +1,5 @@ PORTNAME= liveMedia -DISTVERSION= 2025.01.17 +DISTVERSION= 2025.04.24 PORTEPOCH= 2 CATEGORIES= net devel MASTER_SITES= https://download.videolan.org/contrib/live555/ @@ -18,12 +18,11 @@ USE_LDCONFIG= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= genMakefiles -CONFIGURE_ARGS= fixed-freebsd +CONFIGURE_ARGS= linux-with-shared-libraries WRKSRC= ${WRKDIR}/live post-patch: - ${CP} ${FILESDIR}/config.fixed-freebsd ${WRKSRC} @${REINPLACE_CMD} \ -e '/^PREFIX/s|=|?=|' \ ${WRKSRC}/*/Makefile.head diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo index f87e51ff1a07..af1157295a8e 100644 --- a/net/liveMedia/distinfo +++ b/net/liveMedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738821860 -SHA256 (live.2025.01.17.tar.gz) = 273d9cf77468015c2377e50e384e3eea67cf255c75fe60a175e9e0917afe847b -SIZE (live.2025.01.17.tar.gz) = 696558 +TIMESTAMP = 1746664554 +SHA256 (live.2025.04.24.tar.gz) = a34a17e8c0922097bcd1fae6d5b42a6d75d493266a4f4a6f11dc0b4c3351a6f6 +SIZE (live.2025.04.24.tar.gz) = 696521 diff --git a/net/liveMedia/files/config.fixed-freebsd b/net/liveMedia/files/config.fixed-freebsd deleted file mode 100644 index 9374167a8060..000000000000 --- a/net/liveMedia/files/config.fixed-freebsd +++ /dev/null @@ -1,46 +0,0 @@ -# 'CURRENT':'REVISION':'AGE' are updated - whenever a library changes - as follows: -# The library code changes, but without any changes to the API (i.e., interfaces) => increment REVISION -# At least one interface changes, or is removed => CURRENT += 1; REVISION = 0; AGE = 0 -# One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1 - -libliveMedia_VERSION_CURRENT= 16 -libliveMedia_VERSION_REVISION= 1 -libliveMedia_VERSION_AGE= 0 -libliveMedia_LIB_SUFFIX= so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION) - -libBasicUsageEnvironment_VERSION_CURRENT= 0 -libBasicUsageEnvironment_VERSION_REVISION= 1 -libBasicUsageEnvironment_VERSION_AGE= 0 -libBasicUsageEnvironment_LIB_SUFFIX= so.$(shell expr $(libBasicUsageEnvironment_VERSION_CURRENT) - $(libBasicUsageEnvironment_VERSION_AGE)).$(libBasicUsageEnvironment_VERSION_AGE).$(libBasicUsageEnvironment_VERSION_REVISION) - -libUsageEnvironment_VERSION_CURRENT= 1 -libUsageEnvironment_VERSION_REVISION= 0 -libUsageEnvironment_VERSION_AGE= 0 -libUsageEnvironment_LIB_SUFFIX= so.$(shell expr $(libUsageEnvironment_VERSION_CURRENT) - $(libUsageEnvironment_VERSION_AGE)).$(libUsageEnvironment_VERSION_AGE).$(libUsageEnvironment_VERSION_REVISION) - -libgroupsock_VERSION_CURRENT= 1 -libgroupsock_VERSION_REVISION= 1 -libgroupsock_VERSION_AGE= 0 -libgroupsock_LIB_SUFFIX= so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION) -##### - -COMPILE_OPTS = $(INCLUDES) -I. -DBSD=1 -DNEWLOCALE_NOT_USED=1 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_SOCKADDR_LEN=1 -fpic -C = c -C_COMPILER = $(CC) -C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS) -CPP = cpp -CPLUSPLUS_COMPILER = $(CXX) -CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -Wno-deprecated $(CPPFLAGS) $(CXXFLAGS) -OBJ = o -LINK = $(CXX) -o -LINK_OPTS = -L. $(LDFLAGS) -CONSOLE_LINK_OPTS = $(LINK_OPTS) -LIBRARY_LINK = $(CC) -o -SHORT_LIB_SUFFIX= so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE)) -LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION) -LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS) -LIBS_FOR_CONSOLE_APPLICATION = -L$(OPENSSLLIB) -lssl -lcrypto -LIBS_FOR_GUI_APPLICATION = -LIBS_FOR_LIVEMEDIA_LIB = -L$(OPENSSLLIB) -lssl -lcrypto -EXE = -INSTALL2 = install_shared_libraries diff --git a/net/liveMedia/files/patch-config.linux-with-shared-libraries b/net/liveMedia/files/patch-config.linux-with-shared-libraries new file mode 100644 index 000000000000..ef68b02f40d4 --- /dev/null +++ b/net/liveMedia/files/patch-config.linux-with-shared-libraries @@ -0,0 +1,22 @@ +--- config.linux-with-shared-libraries.orig 2025-04-24 20:16:36 UTC ++++ config.linux-with-shared-libraries +@@ -24,7 +24,7 @@ libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock + libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION) + ##### + +-COMPILE_OPTS = $(INCLUDES) -I/usr/local/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC ++COMPILE_OPTS = $(INCLUDES) -I. -DSOCKLEN_T=socklen_t -DHAVE_SOCKADDR_LEN=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC + C = c + C_COMPILER = $(CC) + C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS) +@@ -39,8 +39,8 @@ LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHOR + SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE)) + LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION) + LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS) +-LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto ++LIBS_FOR_CONSOLE_APPLICATION = -L$(OPENSSLLIB) -lssl -lcrypto + LIBS_FOR_GUI_APPLICATION = +-LIBS_FOR_LIVEMEDIA_LIB = -lssl -lcrypto ++LIBS_FOR_LIVEMEDIA_LIB = -L$(OPENSSLLIB) -lssl -lcrypto + EXE = + INSTALL2 = install_shared_libraries diff --git a/net/liveMedia/pkg-plist b/net/liveMedia/pkg-plist index 2d63153419a8..a6916eaa1fd2 100644 --- a/net/liveMedia/pkg-plist +++ b/net/liveMedia/pkg-plist @@ -218,14 +218,14 @@ include/liveMedia/liveMedia_version.hh include/liveMedia/ourMD5.hh include/liveMedia/uLawAudioFilter.hh lib/libBasicUsageEnvironment.so -lib/libBasicUsageEnvironment.so.0 -lib/libBasicUsageEnvironment.so.0.0.1 +lib/libBasicUsageEnvironment.so.2 +lib/libBasicUsageEnvironment.so.2.1.0 lib/libUsageEnvironment.so -lib/libUsageEnvironment.so.1 -lib/libUsageEnvironment.so.1.0.0 +lib/libUsageEnvironment.so.3 +lib/libUsageEnvironment.so.3.2.0 lib/libgroupsock.so -lib/libgroupsock.so.1 -lib/libgroupsock.so.1.0.1 +lib/libgroupsock.so.30 +lib/libgroupsock.so.30.2.0 lib/libliveMedia.so -lib/libliveMedia.so.16 -lib/libliveMedia.so.16.0.1 +lib/libliveMedia.so.116 +lib/libliveMedia.so.116.0.2