From nobody Thu Jun 13 10:36:02 2024 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 4W0JjG6dmjz5NPrN; Thu, 13 Jun 2024 10:36:02 +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 4W0JjG66s1z4nNb; Thu, 13 Jun 2024 10:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718274962; 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=RHnUtDg58Dhf/N3QR4HYGFZWp0+SnvwT19zOsJfM9Gs=; b=YX7xJlHjxTdGCfAVENRunZILzkEthDCg8iGXwVKPRHqCU0dqff9k+U12ll+LkNLkm+23L6 L5a9AsSzSVvtFqgyzQYsHnaYlWhIK7YHFkF83X8w1iYBXlEsgMpVBYO7B+kdlMzaP0ohLr jW/JPWbZky+Gv/2vUldbzpnQZxjXOTKMN68p0oNdLvsdknfVqVnjnW6w1KAxOJ6L3yt8DH +5jwsdq9DZZzqqKwvo5+Cu+0InbAbJjCCfR8AG//lodIpWiLio2xcNnylq2SdkeTjd6pQf eAGI5uczu3dhc7Z7YcXwZiXa5Qh9uYjzF0ORms/jpIKZoC5ntKBxiXfyRwHe8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718274962; a=rsa-sha256; cv=none; b=F/Ck/EuK6HFg5D8ckz54Mc3p5ZyIG5qtaL1UVLebIbgpCogk9qhgh6s4bk+YIX6ue2AOTk 8XocnkOOg5qWTYP7//gRTKTUkrPNsbjw/drrOsRFoVemY7TvV8272Hs+B6aFzLjeEzFOU2 NWuXzBSGMmOOQaQLixbAM20ZQmSp5y6M/5Nb7jOU6cBLMdgTGt7PPB9UrbrDbRd/VFahhC deIj5FiAvi3/peWqKeLsMktPKug/9z8XLnXytvbr+0u76ff4VWNq7AlNoq4xa+g4jo5GvU AGQwjXhu/PxzPloyv77rIzSKSaOh+4sOJCvHObXnKCXn/Xd8M5WQ8D+JW0WiXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718274962; 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=RHnUtDg58Dhf/N3QR4HYGFZWp0+SnvwT19zOsJfM9Gs=; b=VaRpECSEuUdKsHqFpknKidM6+aSPNz+OrvHmFhTo/SGkbycS3EZ1KHtTRRYJnKmfKGiKtC DonFvkD/5LlO+PX1ku3dWDemkztPpD1onzJFpVRxpciq91/htjnn6QrSf1UbuVQfpuD56a hRRaAbFgzIG+mVbZaSuf88h+HkXlsgpQJxMb4vyFRv5TF/iXd/LlbRz7SvdEU9nWbESkxj u2A6QBNXdl+Fvd+Rx8r8nNZ47DLX/razlr9p/so++HftEPjTNfruvbQgdIi7RDJp6rwfmF nwhVoFiGh8uokRme1CW9HLW5WtXoAVsxw6H20a7EaAozD0Cvqr941vD+bGjmJA== 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 4W0JjG5kQ0zZ7C; Thu, 13 Jun 2024 10:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45DAa2RX061459; Thu, 13 Jun 2024 10:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45DAa2QM061456; Thu, 13 Jun 2024 10:36:02 GMT (envelope-from git) Date: Thu, 13 Jun 2024 10:36:02 GMT Message-Id: <202406131036.45DAa2QM061456@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: 8238768a7990 - main - multimedia/vlc: Link to libOpenGL instead of libGL 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: 8238768a799033f2bbca7b3a80b6f9fe8e5daeb7 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=8238768a799033f2bbca7b3a80b6f9fe8e5daeb7 commit 8238768a799033f2bbca7b3a80b6f9fe8e5daeb7 Author: Jason E. Hale AuthorDate: 2024-06-13 09:39:51 +0000 Commit: Jason E. Hale CommitDate: 2024-06-13 10:30:56 +0000 multimedia/vlc: Link to libOpenGL instead of libGL This fixes a dependency problem if the X11 option is off in graphics/libglvnd for whatever reason. Reported by: olgeni (via private mail) --- multimedia/vlc/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 67f44e0135fd..75a9df8eca32 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,5 +1,6 @@ PORTNAME= vlc DISTVERSION= 3.0.21 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= multimedia audio net www MASTER_SITES= https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -30,7 +31,7 @@ RUN_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg USES= compiler:c++17-lang cpe desktop-file-utils elfctl gettext-tools \ gl gmake gnome iconv:wchar_t libtool localbase pathfix pkgconfig \ tar:xz -USE_GL= gl +USE_GL= opengl CPE_VENDOR= videolan @@ -364,8 +365,8 @@ WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CONFIGURE_ENABLE= wayland X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms -X11_USES= gl xorg -X11_USE= GL=gl XORG=xcb,xorgproto,sm,ice,x11 +X11_USES= xorg +X11_USE= XORG=xcb,xorgproto,sm,ice,x11 X11_CONFIGURE_ENABLE= xcb xvideo X11_CONFIGURE_WITH= x @@ -393,6 +394,7 @@ post-patch: @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ -e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \ + -e '/PKG_CONFIG/s|\"gl\"|"opengl"|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \