Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Oct 2018 09:57:10 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r483120 - in head: . multimedia multimedia/subtitlecomposer multimedia/subtitlecomposer/files
Message-ID:  <201810270957.w9R9vA4G093715@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Sat Oct 27 09:57:10 2018
New Revision: 483120
URL: https://svnweb.freebsd.org/changeset/ports/483120

Log:
  multimedia/subtitlecomposer:
  - Restore from attic and update to 0.6.6

Added:
  head/multimedia/subtitlecomposer/
     - copied from r323677, head/multimedia/subtitlecomposer/
  head/multimedia/subtitlecomposer/files/patch-src_formats_CMakeLists.txt   (contents, props changed)
Deleted:
  head/multimedia/subtitlecomposer/files/patch-src__core__subtitleline.cpp
Modified:
  head/MOVED
  head/multimedia/Makefile
  head/multimedia/subtitlecomposer/Makefile   (contents, props changed)
  head/multimedia/subtitlecomposer/distinfo   (contents, props changed)
  head/multimedia/subtitlecomposer/pkg-descr   (contents, props changed)
  head/multimedia/subtitlecomposer/pkg-plist   (contents, props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Oct 27 09:56:42 2018	(r483119)
+++ head/MOVED	Sat Oct 27 09:57:10 2018	(r483120)
@@ -4641,7 +4641,6 @@ multimedia/ksubeditor||2013-07-26|Has expired: Depends
 multimedia/mandvd||2013-07-26|Has expired: Depends on Qt 3.x
 multimedia/noatun-plugins||2013-07-26|Has expired: Depends on Qt 3.x
 multimedia/qdvdauthor||2013-07-26|Has expired: Depends on Qt 3.x
-multimedia/subtitlecomposer||2013-07-26|Has expired: Depends on Qt 3.x
 multimedia/transkode||2013-07-26|Has expired: Depends on Qt 3.x
 multimedia/xine_artsplugin||2013-07-26|Has expired: Depends on Qt 3.x
 net/cphone||2013-07-26|Has expired: Depends on Qt 3.x

Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile	Sat Oct 27 09:56:42 2018	(r483119)
+++ head/multimedia/Makefile	Sat Oct 27 09:57:10 2018	(r483120)
@@ -399,6 +399,7 @@
     SUBDIR += snappy
     SUBDIR += spigot
     SUBDIR += spook
+    SUBDIR += subtitlecomposer
     SUBDIR += subtitlecomposer-kde4
     SUBDIR += subtitleeditor
     SUBDIR += subtitleoffsetmodifier

Modified: head/multimedia/subtitlecomposer/Makefile
==============================================================================
--- head/multimedia/subtitlecomposer/Makefile	Thu Jul 25 23:23:47 2013	(r323677)
+++ head/multimedia/subtitlecomposer/Makefile	Sat Oct 27 09:57:10 2018	(r483120)
@@ -1,47 +1,61 @@
-# Created by: Max Brazhnikov <makc@issp.ac.ru>
 # $FreeBSD$
 
 PORTNAME=	subtitlecomposer
-PORTVERSION=	0.4.3
-PORTREVISION=	5
-CATEGORIES=	multimedia
-MASTER_SITES=	SF/subcomposer/subcomposer/${PORTNAME}-${PORTVERSION}
+PORTVERSION=	0.6.6
+DISTVERSIONPREFIX=	v
+CATEGORIES=	multimedia kde
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Subtitle editor for KDE
+MAINTAINER=	makc@FreeBSD.org
+COMMENT=	Subtitle editor
 
-DEPRECATED=	Depends on QT3; unmaintained
-EXPIRATION_DATE=	2013-07-01
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool
-USE_KDELIBS_VER=3
-USE_XORG=	xext
-GNU_CONFIGURE=	yes
-WANT_GSTREAMER=	yes
-INSTALLS_ICONS=	yes
+CONFLICTS_INSTALL=	subtitlecomposer-kde4-*
 
-PORTSCOUT=	limit:^0\.4\.
+LIB_DEPENDS=	libicui18n.so:devel/icu \
+		libavcodec.so:multimedia/ffmpeg
 
-OPTIONS_DEFINE=	MPLAYER XINE GSTREAMER
-OPTIONS_DEFAULT=	MPLAYER
+USES=		cmake:outsource desktop-file-utils gettext kde:5 pkgconfig \
+		qt:5 shared-mime-info
+USE_KDE=	auth codecs config configwidgets coreaddons ecm_build i18n \
+		kio kross sonnet textwidgets widgetsaddons xmlgui
+USE_QT=		buildtools_build qmake_build core gui widgets
 
-.include <bsd.port.options.mk>
+USE_GITHUB=	yes
+GH_ACCOUNT=	maxrd2
 
-.if ${PORT_OPTIONS:MMPLAYER}
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
-.endif
+OPTIONS_GROUP=	VIDEO
+VIDEO_DESC=	Video players
+OPTIONS_GROUP_VIDEO=	GSTREAMER MPLAYER MPV PHONON XINE
+OPTIONS_DEFAULT=	PHONON
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MXINE}
-LIB_DEPENDS+=	xine.2:${PORTSDIR}/multimedia/libxine
-.else
-CONFIGURE_ARGS+=--without-xine --without-xcb
-.endif
+# Requires PocketSphinx-5prealpha
+SPHINX_DESC=	Speech recognition via PocketSphinx
+SPHINX_LIB_DEPENDS=	libpocketsphinx.so:audio/pocketsphinx
+CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON
 
-.if ${PORT_OPTIONS:MGSTREAMER}
-USE_GSTREAMER+=	yes
-.else
-CONFIGURE_ARGS+=--without-gstreamer
-.endif
+GSTREAMER_USE=	GNOME=glib20 GSTREAMER1=yes
+GSTREAMER_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON
+
+MPLAYER_DESC=	Install MPlayer
+MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
+
+MPV_DESC=	Multimedia support via MPV
+MPV_LIB_DEPENDS=	libmpv.so:multimedia/mpv
+MPV_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_MPV=ON
+
+PHONON_USE=	QT=phonon4
+PHONON_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
+
+XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
+XINE_USE=	XORG=x11,xcb
+XINE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Xine=ON
+
+post-patch:
+	${RM} ${WRKSRC}/cmake/FindICU.cmake
+	${REINPLACE_CMD} '/include <locale>/s,locale,clocale,' \
+		${WRKSRC}/src/videoplayerplugins/mpv/mpvbackend.cpp
 
 .include <bsd.port.mk>

Modified: head/multimedia/subtitlecomposer/distinfo
==============================================================================
--- head/multimedia/subtitlecomposer/distinfo	Thu Jul 25 23:23:47 2013	(r323677)
+++ head/multimedia/subtitlecomposer/distinfo	Sat Oct 27 09:57:10 2018	(r483120)
@@ -1,2 +1,3 @@
-SHA256 (subtitlecomposer-0.4.3.tar.bz2) = 9a39aac7b666eb67137c99f9f8885481f8a005cb04df14a071bf5c763d98c2b4
-SIZE (subtitlecomposer-0.4.3.tar.bz2) = 842002
+TIMESTAMP = 1540495091
+SHA256 (maxrd2-subtitlecomposer-v0.6.6_GH0.tar.gz) = 6cd1d74f7934cdaa5d492f47da4143bd096a6196f2afcb2827cada9a3cdb2ea4
+SIZE (maxrd2-subtitlecomposer-v0.6.6_GH0.tar.gz) = 1637272

Added: head/multimedia/subtitlecomposer/files/patch-src_formats_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/subtitlecomposer/files/patch-src_formats_CMakeLists.txt	Sat Oct 27 09:57:10 2018	(r483120)
@@ -0,0 +1,11 @@
+--- src/formats/CMakeLists.txt.orig	2018-10-25 20:45:54 UTC
++++ src/formats/CMakeLists.txt
+@@ -68,7 +68,7 @@ set(formats_UIS
+ 	CACHE INTERNAL EXPORTEDVARIABLE
+ )
+ 
+-find_package(ICU)
++find_package(ICU REQUIRED COMPONENTS i18n uc data)
+ if(ICU_FOUND)
+ 	message(STATUS "ICU Library will be used for charset detection.")
+ 

Modified: head/multimedia/subtitlecomposer/pkg-descr
==============================================================================
--- head/multimedia/subtitlecomposer/pkg-descr	Thu Jul 25 23:23:47 2013	(r323677)
+++ head/multimedia/subtitlecomposer/pkg-descr	Sat Oct 27 09:57:10 2018	(r483120)
@@ -1,6 +1,4 @@
-Subtitle Composer supports the basic operations (text, time, and
-style edition) as well as real time preview, spell checking and
-more; aiming to become an improved version of Subtitle Workshop for
-UNIX-like OSes.
+Subtitle editor that supports basic operations (text, time, and
+style edition, live preview, spell checking and more.
 
-WWW: http://www.kde-apps.org/content/show.php?content=69822
+WWW: https://github.com/maxrd2/subtitlecomposer

Modified: head/multimedia/subtitlecomposer/pkg-plist
==============================================================================
--- head/multimedia/subtitlecomposer/pkg-plist	Thu Jul 25 23:23:47 2013	(r323677)
+++ head/multimedia/subtitlecomposer/pkg-plist	Sat Oct 27 09:57:10 2018	(r483120)
@@ -1,36 +1,69 @@
 bin/subtitlecomposer
-share/applications/kde/subtitlecomposer.desktop
-share/apps/subtitlecomposer/input.conf
-share/apps/subtitlecomposer/pics/audio-volume-high.png
-share/apps/subtitlecomposer/pics/audio-volume-low.png
-share/apps/subtitlecomposer/pics/audio-volume-muted.png
-share/apps/subtitlecomposer/pics/current-line-follows-video.png
-share/apps/subtitlecomposer/pics/flags.png
-share/apps/subtitlecomposer/pics/logo-gstreamer.png
-share/apps/subtitlecomposer/pics/logo-mplayer.png
-share/apps/subtitlecomposer/pics/logo-xine.png
-share/apps/subtitlecomposer/pics/player.png
-share/apps/subtitlecomposer/pics/set-hide-time.png
-share/apps/subtitlecomposer/pics/set-show-time.png
-share/apps/subtitlecomposer/pics/time-from-video.png
-share/apps/subtitlecomposer/subtitlecomposerui.rc
-share/config/subtitlecomposerrc
+etc/xdg/subtitlecomposerrc
+%%GSTREAMER%%lib/subtitlecomposer/gstplayer.so
+lib/subtitlecomposer/mplayer.so
+%%MPV%%lib/subtitlecomposer/mpvplayer.so
+%%PHONON%%lib/subtitlecomposer/phononplayer.so
+%%XINE%%lib/subtitlecomposer/xineplayer.so
+share/applications/subtitlecomposer.desktop
 share/icons/hicolor/128x128/apps/subtitlecomposer.png
 share/icons/hicolor/16x16/apps/subtitlecomposer.png
+share/icons/hicolor/256x256/apps/subtitlecomposer.png
 share/icons/hicolor/32x32/apps/subtitlecomposer.png
-share/icons/hicolor/64x64/apps/subtitlecomposer.png
+share/kxmlgui5/subtitlecomposer/subtitlecomposerui.rc
+share/locale/bg/LC_MESSAGES/subtitlecomposer.mo
+share/locale/cs/LC_MESSAGES/subtitlecomposer.mo
+share/locale/de/LC_MESSAGES/subtitlecomposer.mo
 share/locale/el/LC_MESSAGES/subtitlecomposer.mo
 share/locale/es/LC_MESSAGES/subtitlecomposer.mo
+share/locale/fr/LC_MESSAGES/subtitlecomposer.mo
+share/locale/hr/LC_MESSAGES/subtitlecomposer.mo
+share/locale/hu/LC_MESSAGES/subtitlecomposer.mo
+share/locale/it/LC_MESSAGES/subtitlecomposer.mo
+share/locale/pl/LC_MESSAGES/subtitlecomposer.mo
+share/locale/pt_BR/LC_MESSAGES/subtitlecomposer.mo
+share/locale/ru/LC_MESSAGES/subtitlecomposer.mo
 share/locale/sr/LC_MESSAGES/subtitlecomposer.mo
-share/locale/sr@Latn/LC_MESSAGES/subtitlecomposer.mo
-share/mimelnk/subtitle/x-advsubstationalpha.desktop
-share/mimelnk/subtitle/x-microdvd.desktop
-share/mimelnk/subtitle/x-mplayer.desktop
-share/mimelnk/subtitle/x-subrip.desktop
-share/mimelnk/subtitle/x-substationalpha.desktop
-share/mimelnk/subtitle/x-subviewer.desktop
-@dirrmtry share/mimelnk/subtitle
-@dirrmtry share/config
-@dirrm share/apps/subtitlecomposer/pics
-@dirrm share/apps/subtitlecomposer
-@dirrmtry share/applications/kde
+share/locale/sr@latin/LC_MESSAGES/subtitlecomposer.mo
+share/locale/uk/LC_MESSAGES/subtitlecomposer.mo
+share/mime/packages/subtitlecomposer.xml
+%%DATADIR%%/icons/hicolor/128x128/categories/waveform.png
+%%DATADIR%%/icons/hicolor/16x16/actions/select_stream.png
+%%DATADIR%%/icons/hicolor/16x16/actions/time_from_video.png
+%%DATADIR%%/icons/hicolor/48x48/actions/audio_extract.png
+%%DATADIR%%/icons/hicolor/48x48/apps/gstreamer.png
+%%DATADIR%%/icons/hicolor/48x48/apps/mediaplayer.png
+%%DATADIR%%/icons/hicolor/48x48/apps/mplayer.png
+%%DATADIR%%/icons/hicolor/48x48/apps/xine.png
+%%DATADIR%%/icons/hicolor/64x64/apps/mpv.png
+%%DATADIR%%/icons/hicolor/scalable/actions/anchor.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/current_line_follows_video.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/playrate_minus.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/playrate_plus.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/set_hide_time.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/set_show_time.svg
+%%DATADIR%%/scripts/README
+%%DATADIR%%/scripts/api/scripting_list.h
+%%DATADIR%%/scripts/api/scripting_range.h
+%%DATADIR%%/scripts/api/scripting_rangelist.h
+%%DATADIR%%/scripts/api/scripting_rangesmodule.h
+%%DATADIR%%/scripts/api/scripting_sstring.h
+%%DATADIR%%/scripts/api/scripting_stringsmodule.h
+%%DATADIR%%/scripts/api/scripting_subtitle.h
+%%DATADIR%%/scripts/api/scripting_subtitleline.h
+%%DATADIR%%/scripts/api/scripting_subtitlelinemodule.h
+%%DATADIR%%/scripts/api/scripting_subtitlemodule.h
+%%DATADIR%%/scripts/example_capitalize_all_lines.js
+%%DATADIR%%/scripts/example_capitalize_all_lines.py
+%%DATADIR%%/scripts/example_capitalize_all_lines.rb
+%%DATADIR%%/scripts/example_iterate_selection.js
+%%DATADIR%%/scripts/example_iterate_selection.py
+%%DATADIR%%/scripts/example_iterate_selection.rb
+%%DATADIR%%/scripts/example_remove_impair_lines.js
+%%DATADIR%%/scripts/example_remove_impair_lines.py
+%%DATADIR%%/scripts/example_remove_impair_lines.rb
+%%DATADIR%%/scripts/example_trim_to_selection.js
+%%DATADIR%%/scripts/example_trim_to_selection.py
+%%DATADIR%%/scripts/example_trim_to_selection.rb
+%%DATADIR%%/scripts/fix_dialog_cues.py
+%%DATADIR%%/scripts/remove_hearing_impaired_text.js



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810270957.w9R9vA4G093715>