From nobody Sat Jan 25 07:26:40 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 4Yg5pS5Bsbz5m8l8; Sat, 25 Jan 2025 07:26:40 +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 4Yg5pS4cJDz40RF; Sat, 25 Jan 2025 07:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737790000; 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=aC112jCmwa088bvTD+29wdVWPUubrU7LaFOo9T64VaY=; b=VZ+4xrtnEXfqfn5CicawpxWpC5y9LLSdqBTOfpCJDM2wcWSLFj1qL0dTqmceX3vUHennWX o5H/Mbn+aETkbTiqBG3kT/W5YnQAyDqt2JxOe5iOvlzF7SIUXmaAQrEhfWnK5if6FIakZB TuHt7gJw26+/LdYFtAdxkCPt28TaqRdMCWutzMlV/PWW2/MICHWc4yxcOuv6JJPfyg2Ib9 8Fo4LWRBLOHWVtVub3pF+BlhTBF42csqZd7iGiGulxzFaS4DgKguADTtQihEQ54zDB4jb0 +dC6sn85kw9rUyIuvQZkM0GAORqKnnFB0EbTl83I7OCFYGoneCUBRYdCQJVKWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737790000; 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=aC112jCmwa088bvTD+29wdVWPUubrU7LaFOo9T64VaY=; b=Yer9W1JHrWubMSNeFUBygwwVBhpRo/yOoUvLfKIyELhV780cB1ZORWHfAMJllWijhB2Im8 lKkjPyy0IdbB8UwzQqbfYBNT/3H5KLW3pPtm0yX3idURHfCX9E/EOB/mguU0Ucn2BUnoTA EpQGD2CJuJJvQN/5/n2OMLe37ZIKCtRiDO5Uhb/3I1L6rfUiIyj4sts1NLRBjRwUJ1wQHe HbqmlHz04jervBTyb/Zl5q0xLG5IFJl1WNPAT6779XrAqujZCHIED7e8a8tPcsVMNKtIGX nCO5PQpCAq19BCw8RLy/sNte35elYIN/us0125VSYEPch/t6WoUpDruemwbiQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737790000; a=rsa-sha256; cv=none; b=eWLJxbcSVhBw1MC8jzCAMqGRz2cp1+y5eGP1UAh5cogemfWaIUz7Ekn187FHujNESzF3VB rlWBm+R7+KiKnj9jE5hRO1DytQJLsrdnA9HW1mfDNzWPOjriuKUiaj+y8OXohLhIdxF7Q9 5d0qGL8a5gROJOlk+8mIhLielXcmwDd9AeMMB6Sd2XyMGGwVk4wydbGOv1aXoivRJPl8Fs tmttHbD/2KTI+GkZ42vX2YD3mDb8yyCb3ZenPYn8Pd2sTUQWEeJP5E7O1cgx5uMBVbHAhm MBo2fC5+UJEOjE2Mps3spdmS9VNGkrd39v5+l46OmrkKQSg0Wyt0KgdevT/m3w== 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 4Yg5pS4Bggz12pZ; Sat, 25 Jan 2025 07:26:40 +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 50P7Qe40002934; Sat, 25 Jan 2025 07:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50P7QecP002931; Sat, 25 Jan 2025 07:26:40 GMT (envelope-from git) Date: Sat, 25 Jan 2025 07:26:40 GMT Message-Id: <202501250726.50P7QecP002931@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 939635a0284b - main - multimedia/*xine: undeprecate and improve the ports 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 939635a0284b245421ed68f940b7972fb52cdad9 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=939635a0284b245421ed68f940b7972fb52cdad9 commit 939635a0284b245421ed68f940b7972fb52cdad9 Author: Alexey Dokuchaev AuthorDate: 2025-01-25 07:25:14 +0000 Commit: Alexey Dokuchaev CommitDate: 2025-01-25 07:25:14 +0000 multimedia/*xine: undeprecate and improve the ports - Cleanup unused or duplicated dependencies - Ensure that Fontconfig and FreeType are enabled so that subtitles could be displayed [*] - Optionize Speex and VCD support (but keep on) - Do not leak Wayland into VAAPI when disabled - Chase HTTP redirection in the WWW address line PR: 268284 [*] Fixes: 2153d6346a15 --- multimedia/libxine/Makefile | 48 +++++++++++++++++++++++--------------------- multimedia/libxine/pkg-plist | 4 ++-- multimedia/xine/Makefile | 6 +----- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index e869bb61ceee..22e3c489b6e6 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -1,6 +1,6 @@ PORTNAME= xine DISTVERSION= 1.2.13 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${DISTVERSION} PKGNAMEPREFIX= lib @@ -8,26 +8,20 @@ DISTNAME= ${PORTNAME}-lib-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Libraries for xine multimedia player -WWW= https://www.xine-project.org/ +WWW= https://xine.sourceforge.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Depends on expired multimedia/libfame -EXPIRATION_DATE=2025-02-01 - LIB_DEPENDS= libFLAC.so:audio/flac \ liba52.so:audio/liba52 \ libvorbis.so:audio/libvorbis \ - libspeex.so:audio/speex \ libmng.so:graphics/libmng \ libpng.so:graphics/png \ libdvdread.so:multimedia/libdvdread \ + libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ - libfame.so:multimedia/libfame \ - libcdio_paranoia.so:sysutils/libcdio-paranoia \ libmodplug.so:audio/libmodplug \ - libvcdinfo.so:multimedia/vcdimager \ libtheora.so:multimedia/libtheora \ libmad.so:audio/libmad \ libdca.so:multimedia/libdca \ @@ -35,10 +29,8 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libfaad.so:audio/faad \ libvdpau.so:multimedia/libvdpau \ libvpx.so:multimedia/libvpx \ - libiso9660.so:sysutils/libcdio \ libogg.so:audio/libogg \ - libdvdnav.so:multimedia/libdvdnav \ - libwayland-client.so:graphics/wayland + libdvdnav.so:multimedia/libdvdnav USES= compiler cpe gl gmake gnome iconv libtool:keepla jpeg \ localbase pathfix perl5 pkgconfig tar:xz xorg @@ -46,12 +38,13 @@ LLD_UNSAFE= yes CPE_PRODUCT= xine-lib CPE_VENDOR= xine GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share USE_XORG= x11 xcb xv xinerama xext sm ice USE_GL= gl glu USE_PERL5= build USE_LDCONFIG= yes CONFIGURE_ARGS= --with-libflac \ + --with-fontconfig \ + --with-freetype \ --enable-musepack \ --enable-real-codecs \ --without-esound \ @@ -71,9 +64,10 @@ PLUGINSDIR= lib/xine/plugins/2.11 PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}" OPTIONS_DEFINE= AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB \ - IMAGEMAGICK IPV6 JACK LIBBLURAY NFS NLS PIXBUF PULSEAUDIO \ - SDL SFTP SMB SNDIO V4L VAAPI WAVPACK WAYLAND XVMC -OPTIONS_DEFAULT= DVB OPENSSL PIXBUF VAAPI + IMAGEMAGICK IPV6 JACK LIBBLURAY NFS NLS PIXBUF \ + PULSEAUDIO SDL SFTP SMB SNDIO SPEEX V4L VAAPI \ + VCD WAVPACK WAYLAND XVMC +OPTIONS_DEFAULT= DVB OPENSSL PIXBUF SPEEX VAAPI VCD WAVPACK OPTIONS_DEFINE_i386= W32DLL OPTIONS_DEFAULT_i386= W32DLL OPTIONS_GROUP= TLS @@ -88,8 +82,8 @@ NFS_DESC= Enable NFS support using libnfs SDL_DESC= Enable support for SDL 1 video output SFTP_DESC= Enable SFTP support using libssh2 TLS_DESC= Enable TLS support for https and ftps +VCD_DESC= Enable VCD (VideoCD) support W32DLL_DESC= Win32 codec support -WAYLAND_DESC= Enable Wayland support AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_ENABLE= aalib @@ -137,17 +131,21 @@ SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \ SMB_CONFIGURE_ENABLE= samba SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ENABLE= sndio +SPEEX_LIB_DEPENDS= libspeex.so:audio/speex +SPEEX_CONFIGURE_WITH= speex VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi V4L_BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_ENABLE= libv4l v4l v4l2 +VCD_LIB_DEPENDS= libvcdinfo.so:multimedia/vcdimager \ + libcdio.so:sysutils/libcdio +VCD_CONFIGURE_ENABLE= vcd W32DLL_CONFIGURE_ENABLE= w32dll W32DLL_PLIST_FILES= ${PLUGINSDIR}/xineplug_decode_w32dll.so WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack WAVPACK_CONFIGURE_WITH= wavpack -WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ - libwayland-client.so:graphics/wayland +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CONFIGURE_ENABLE= wayland .if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1) @@ -169,10 +167,6 @@ BUILD_DEPENDS+= as:devel/binutils CONFIGURE_ARGS+= --disable-tls .endif -pre-configure-GNUTLS-off: - @${REINPLACE_CMD} -e 's|have_gnutls=yes|have_gnutls=no|' \ - ${WRKSRC}/configure - post-patch: @${REINPLACE_CMD} -e '/xine_set_flags/s/XINE_PROTECTED//' \ ${WRKSRC}/include/xine.h @@ -181,6 +175,14 @@ post-patch: ${WRKSRC}/src/libw32dll/Makefile.in .endif +post-patch-GNUTLS-off: + @${REINPLACE_CMD} -e '/have_gnutls=/s|yes|no|' \ + ${WRKSRC}/configure + +post-patch-WAYLAND-off: + @${REINPLACE_CMD} -e '/have_vaapi_wayland=/s|yes|no|' \ + ${WRKSRC}/configure + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist index 7bca936938b6..5609dc573da9 100644 --- a/multimedia/libxine/pkg-plist +++ b/multimedia/libxine/pkg-plist @@ -120,8 +120,8 @@ lib/libxine.so.2.11.0 %%SFTP%%%%PLUGINSDIR%%/xineplug_inp_ssh.so %%V4L%%%%PLUGINSDIR%%/xineplug_inp_v4l.so %%V4L%%%%PLUGINSDIR%%/xineplug_inp_v4l2.so -%%PLUGINSDIR%%/xineplug_inp_vcd.so -%%PLUGINSDIR%%/xineplug_inp_vcdo.so +%%VCD%%%%PLUGINSDIR%%/xineplug_inp_vcd.so +%%VCD%%%%PLUGINSDIR%%/xineplug_inp_vcdo.so %%PLUGINSDIR%%/xineplug_nsf.so %%PLUGINSDIR%%/xineplug_sputext.so %%GNUTLS%%%%PLUGINSDIR%%/xineplug_tls_gnutls.so diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile index 18f6ae41c2a4..5341053ee75d 100644 --- a/multimedia/xine/Makefile +++ b/multimedia/xine/Makefile @@ -7,14 +7,11 @@ DISTNAME= ${PORTNAME}-ui-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= X11 multimedia player -WWW= https://www.xine-project.org +WWW= https://xine.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Depends on expired multimedia/libfame (via libxine) -EXPIRATION_DATE=2025-02-01 - LIB_DEPENDS= libpng.so:graphics/png \ libxine.so:multimedia/libxine @@ -22,7 +19,6 @@ USES= cpe desktop-file-utils gmake gnome iconv jpeg localbase pkgconfig \ readline shared-mime-info tar:xz xorg USE_XORG= x11 xext xinerama xscrnsaver xt xtst xv xxf86vm GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --enable-vdr-keys \ --disable-nvtvsimple \ --disable-rpath