From nobody Thu Apr 27 12:04:01 2023 X-Original-To: dev-commits-ports-all@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 4Q6ZCP5JhSz474g5; Thu, 27 Apr 2023 12:04:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q6ZCP3QV2z3lM4; Thu, 27 Apr 2023 12:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597041; 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=q64QTM64wuSneS+rLiBmBL0bbxfWbGW0zS9w2NKsH6I=; b=U7sMwEDcCJxYxCSgbaxyPpwXYN/tkbjLk+mX/cmdeIPFxbSkFkCJU5L0fbte0J/NhgERyp MZlhpEdvhnVxyQtIVhW3rrauyicvXFfzE9AmErF5CcEUQQnovzwavybUID+KHd9Oxr8V58 cEjybnoi6MEJIEfo4xSvJJT8zgV/v6CRaMo5O314yUH3VOY2W8DCiUASDKy/ps3+N5m/Qe 7PaHd2J7ZzRw2IeMHEVQ1JUK1Oj23hcA7oHlrs0Y1jRTzbRK4pEN+ZUDRqC+uyuP/gp1c0 JLbDZ65s5cmNMHY2wxWAF0SrpiOvgCUtYf8AVun53aWeag7yOQEwhXmPa/OjSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597041; 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=q64QTM64wuSneS+rLiBmBL0bbxfWbGW0zS9w2NKsH6I=; b=PhGt+1D9GNGaP2nKtTxkeaKBrd7dji8l2DTiaYBPf9rlcZbTbePqJk8nrnqEFWgDz0M0VU YW6681MlXTiHS83vHml1agHciopiEIvrfhhzG2RBc+9B/SybPzMwAlu8uoiBjzNt8BjPea mEf4UqpbKZAXtTrYefbyybVxnUG5OcORE+M5xzQhqA6zjKYEFwc7Lf5GYPDsb1qc2mVt3B CSfRYrh1GcseLNtOLK7a8z4772BbwnDhE+kUe3V+kJme+qrsbV7fxH54M6kPvAVeuzBGqs dcj5BihHKbd5VZfvrDX/e5ouxoKyDxMxRQdJDaB5X61tCjEsk3Fq0wayAqYHbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597041; a=rsa-sha256; cv=none; b=Bb/0sGpLSmTTLMmKzZVLTIMziLAofoJlT8c/YOFfmAbSPooM/dmRMH3VoB4r3hQpAZa56D BZ76sPUY6M1wUpwt7ilueb6kgB9T5nFcw0AZB8XCGNOm56JZISxYx26Gig8GVJaYb58KR8 cc3Dxh7/hPXWXYLguMKB3usD/jrFEjNQx+HwiLpqF0omN8/vZ9QVQVJDdPAypaCuth0AJs KWc7QIAlWGhT19P1CIjOGlEczwFvRR9TbhYgjV5kPp/SKXuwzge5ywSuR5xeuk4rrr9NO7 yEmB7bQyvODycOftezf5R0WD+Nwednir8MiiOQVzsUIelj+pTzevF6FXSYlmxw== 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 4Q6ZCP2WQdzGrX; Thu, 27 Apr 2023 12:04:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RC41DO046200; Thu, 27 Apr 2023 12:04:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC41Po046199; Thu, 27 Apr 2023 12:04:01 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:01 GMT Message-Id: <202304271204.33RC41Po046199@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 1c4a5a439be1 - main - java/openjfx14: Move to FFmpeg 4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c4a5a439be18241f9c356261f3275bc0e68cc1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c4a5a439be18241f9c356261f3275bc0e68cc1e commit 1c4a5a439be18241f9c356261f3275bc0e68cc1e Author: Daniel Engberg AuthorDate: 2023-04-27 09:50:28 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:42 +0000 java/openjfx14: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 261302 Reported by: antoine (via exp-run) Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- java/openjfx14/Makefile | 5 ++- ...tive_gstreamer_projects_linux_avplugin_Makefile | 37 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile index 2a7d0e8984d1..05aea99965e4 100644 --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -58,7 +58,7 @@ OPTIONS_SUB= yes MEDIA_DESC= Media module SWT_DESC= SWT support -MEDIA_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +MEDIA_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libsndio.so:audio/sndio MEDIA_USES= gmake MEDIA_VARS= COMPILE_MEDIA=true @@ -133,6 +133,9 @@ post-patch: @${RM} -r ${WRKSRC}/modules/javafx.web/src/main/native/Source/WTF/icu @cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/3rd_party && \ ${RM} -r glib libffi +# Environment variables gets lost so hardcode where we can find FFmpeg 4.x + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile do-configure: @${MKDIR} ${WRKDIR}/gradle-home diff --git a/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_linux_avplugin_Makefile b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_linux_avplugin_Makefile new file mode 100644 index 000000000000..1d019e231f7a --- /dev/null +++ b/java/openjfx14/files/patch-modules_javafx.media_src_main_native_gstreamer_projects_linux_avplugin_Makefile @@ -0,0 +1,37 @@ +--- modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile.orig 2020-07-17 10:21:33 UTC ++++ modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +@@ -41,25 +41,16 @@ endif + PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) + PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0) + +-INCLUDES= -I../../../plugins \ +- -I../../../plugins/av \ +- -I../../../gstreamer-lite/gstreamer \ +- -I../../../gstreamer-lite/gstreamer/libs \ +- $(PACKAGES_INCLUDES) ++INCLUDES = -I../../../plugins -I../../../plugins/av -I../../../gstreamer-lite/gstreamer -I../../../gstreamer-lite/gstreamer/libs -I%%LOCALBASE%%/ffmpeg4/include $(PACKAGES_INCLUDES) ++LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -L%%LOCALBASE%%/ffmpeg4/lib -lavcodec -lavformat $(PACKAGES_LIBS) -z relro -static-libgcc -static-libstdc++ -Wl,--gc-sections + +-LDFLAGS = -L$(BUILD_DIR) \ +- -lgstreamer-lite \ +- $(PACKAGES_LIBS) \ +- -z relro \ +- -static-libgcc -static-libstdc++ -Wl,--gc-sections +- +-ifneq ($(strip $(LIBAV_DIR)),) +-INCLUDES += -I$(LIBAV_DIR)/include +-LDFLAGS += -L$(LIBAV_DIR)/lib/ -lavcodec -lavformat +-else +-INCLUDES += $(shell pkg-config --cflags libavcodec libavformat) +-LDFLAGS += $(shell pkg-config --libs libavcodec libavformat) +-endif ++# ifneq ($(strip $(LIBAV_DIR)),) ++# INCLUDES += -I$(LIBAV_DIR)/include ++# LDFLAGS += -L$(LIBAV_DIR)/lib/ -lavcodec -lavformat ++# else ++# INCLUDES += $(shell pkg-config --cflags libavcodec libavformat) ++# LDFLAGS += $(shell pkg-config --libs libavcodec libavformat) ++# endif + + ifeq ($(ARCH), x32) + CFLAGS += -m32