pool/subtitlecomposer
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 404336 from home:adra:branches:KDE:Extra

Browse Source 
Update to 0.6.4, Updated build/runtime requirements to KF5/Qt5, Added new build requirement mpv-devel, Removed NULL-pointer.patch and Find-platform-dependant-include-files-of-GStreamer.patch (fixed upstream)

OBS-URL: https://build.opensuse.org/request/show/404336
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/subtitlecomposer?expand=0&rev=9
This commit is contained in:
Luca Beltrame 2016-06-23 21:03:31 +00:00 committed by Git OBS Bridge
parent 9fb1cd8629
commit 602caa9377
6 changed files with 140 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Find-platform-dependant-include-files-of-GStreamer.patch
View File

@ -1,63 +0,0 @@
From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
Date: Sun, 4 Oct 2015 19:02:50 +0200
Subject: Find platform-dependant include files of GStreamer
In the current -dev packages of GStreamer 1.x in Debian, the file
"gst/gstconfig.h" is not in the same directory as the rest of the
includes, but in a subdirectory of the library directory. However,
the FindGStreamer.cmake file of Subtitlecomposer is only looking
for a single include directory per component, based on the location
of a single reference file. This patch adds the subdirectory
"gstreamer-1.0/include" of the library dir of a component to the
include dirs variable of the same component. This way, platform-
dependant files like "gst/gstconfig.h" will be found, too.
Forwarding is not needed, because upstream has moved on from using
the FindGStreamer.cmake.
Forwarded: not-needed
---
src/services/FindGStreamer.cmake | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/services/FindGStreamer.cmake b/src/services/FindGStreamer.cmake
index bf25d30..0dcc473 100644
--- a/src/services/FindGStreamer.cmake
+++ b/src/services/FindGStreamer.cmake
@@ -67,6 +67,14 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _librar
NAMES ${_library}
HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
)
+
+ # Add the "gstreamer-1.0/include" sub directory of the lib path to the list of include folders
+ # (in order to be able to resolve "gst/gstconfig.h")
+ if(${_component_prefix}_LIBRARIES)
+ list(GET ${_component_prefix}_LIBRARIES 0 FIRST_LIBRARY)
+ get_filename_component(${_component_prefix}_LIBRARY_DIR ${FIRST_LIBRARY} DIRECTORY)
+ list(APPEND ${_component_prefix}_INCLUDE_DIRS "${${_component_prefix}_LIBRARY_DIR}/gstreamer-1.0/include")
+ endif()
endmacro()
# ------------------------
@@ -79,8 +87,9 @@ FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gst/base/gstadapter.h
# 1.2. Check GStreamer version
if (GSTREAMER_INCLUDE_DIRS)
- if (EXISTS "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h")
- file(READ "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h" GSTREAMER_VERSION_CONTENTS)
+ foreach (GS_INCLUDE_DIR IN LISTS GSTREAMER_INCLUDE_DIRS)
+ if (EXISTS "${GS_INCLUDE_DIR}/gst/gstversion.h")
+ file(READ "${GS_INCLUDE_DIR}/gst/gstversion.h" GSTREAMER_VERSION_CONTENTS)
string(REGEX MATCH "#define +GST_VERSION_MAJOR +\\(([0-9]+)\\)" _dummy "${GSTREAMER_VERSION_CONTENTS}")
set(GSTREAMER_VERSION_MAJOR "${CMAKE_MATCH_1}")
@@ -92,7 +101,8 @@ if (GSTREAMER_INCLUDE_DIRS)
set(GSTREAMER_VERSION_MICRO "${CMAKE_MATCH_1}")
set(GSTREAMER_VERSION "${GSTREAMER_VERSION_MAJOR}.${GSTREAMER_VERSION_MINOR}.${GSTREAMER_VERSION_MICRO}")
- endif ()
+ endif ()
+ endforeach (GS_INCLUDE_DIR)
endif ()
if ("${GStreamer_FIND_VERSION}" VERSION_GREATER "${GSTREAMER_VERSION}")

11
NULL-pointer.patch
View File

@ -1,11 +0,0 @@
--- subtitlecomposer-0.5.7.orig/src/services/gstreamer/gstreamerdecoderbackend.cpp 2014-09-26 12:33:30.000000000 +0200
+++ subtitlecomposer-0.5.7/src/services/gstreamer/gstreamerdecoderbackend.cpp 2014-11-15 18:26:01.075684697 +0100
@@ -294,7 +294,7 @@ GStreamerDecoderBackend::decodebinNoMore
{
GStreamerDecoderBackend *backend = (GStreamerDecoderBackend *)userData;
- GstStructure *structure = gst_structure_new("app_message", "type", G_TYPE_INT, MESSAGE_INFO_INIT_DISPOSE, 0);
+ GstStructure *structure = gst_structure_new("app_message", "type", G_TYPE_INT, MESSAGE_INFO_INIT_DISPOSE, NULL);
GstMessage *msg = gst_message_new_application(GST_OBJECT(backend->m_infoPipeline), structure);
gst_element_post_message(GST_ELEMENT(backend->m_infoPipeline), msg);

3
subtitlecomposer-0.6.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:030f3a33dccdc95b890c06de6f2566c4e6ec85264c8bc47430c72c137ce74f91
size 1638176

90
subtitlecomposer.changes
View File

@ -1,3 +1,93 @@
-------------------------------------------------------------------
Thu Jun 23 20:03:40 UTC 2016 - asterios.dramis@gmail.com
- Update to 0.6.4:
* ADD: WaveformWidget: context menu
* MOD: Updated German translations - thanks @Martchus
* MOD: Updated Croatian translations - thanks @muzena
* FIX: Inserting subtitle line would corrupt subtitle indexes
* FIX: Display audio of WebM/FLV files in waveform - thanks
@Martchus
From 0.6.3:
* ADD: WaveformWidget: customization settings page
* ADD: Speech recognition with PocketSphinx
* MOD: Waveform and Player widgets can be docked to any side of
the main window
* MOD: WaveformWidget: can be manually scrolled even if
autoscroll is enabled
* MOD: WaveformWidget: ability to drag whole subtitle line
* MOD: Updated croatian translation - thanks @muzena
* FIX: Video player fullscreen and icon display under was not
right under some desktop environments - thanks @Martchus
* FIX: WaveformWidget: when dragging subtitle borders (or
clicking near them), show/hide time was jumping to mouse
position
* FIX: po/Messages.sh will generate .po files compatible with Qt
Linguist, and will run from any path
* FIX: Build cleanups - thanks @pinotree
From 0.6.2:
* ADD: Ability to demux text streams from loaded video
* MOD: WaveformWidget: added scrollbar and manual scrolling mode,
improved zoom, widget state is loaded/saved
* MOD: WaveformWidget: double click will seek in video player
* MOD: WaveformWidget: subtitle show/hide time can be dragged
* MOD: Added default shortcut for play/pause video.
* MOD: Support for building with cmake older version than 3.3
* FIX: Changing player backend setting will reopen loaded video
in new player backend.
* FIX: Timeline after last anchored subtitle was scaled
incorrectly.
* FIX: WaveformWidget: optimizations and speed improvements
* FIX: Recent files list was not saved properly in some cases
(subtitle list full).
* FIX: WaveformWidget: fixed crash after closing subtitle
* FIX: WaveformWidget: editing of non-anchored lines is not
allowed
* FIX: StreamProcessor was not freeing it's resources.
* FIX: Updated configure and install scripts
* FIX: Removed "Decoder backend" entry from video player settings
page.
From 0.6.1:
* FIX: Anchor points syncing wasn't working right in some cases
From 0.6.0:
* ADD: Anchor points syncing
* ADD: Waveform widget.
* MOD: Improved precision of the Time class.
* MOD: GStreamerPlayerBackend will pause when reaching
end-of-stream instead of stopping/resetting player.
* MOD: Converted playerbackends to plugins
* MOD: updated German translation
* FIX: Video player widget will repaint background correctly.
* FIX: Code refactoring, cleanups and optimizations.
* FIX: fixed/enabled Drag & Drop
From 0.5.9:
* FIX: Improved error reporting during video open.
* MOD: Added italian translation.
From 0.5.8:
* ADD: MPV player support
* MOD: Replaced remaining KDE4 deprecated code, removed
KDELibs4Support dependency. Finalized KF5 porting.
* MOD: Update croatian translation and README.md
* MOD: Added option not to resume playback after subtitle
doubleclick if player is paused
* FIX: Gettext translations were not created during build
process.
* FIX: FindGStreamer.cmake was not searching for and including
arch-specific include dir
* FIX: Errors/Spelling in "Error Check" settings
* FIX: Build process fixes
* FIX: improved player/decoder backends, solved crashes when
switching backends
* FIX: Added option to antialias subtitles
* FIX: Phonon player backend was displaying embeded subtitles
* FIX: OBS (OpenSuse) package creation was failing
- Updated build/runtime requirements to KF5/Qt5.
- Added new build requirement mpv-devel.
- Removed fdupes macro (not needed anymore).
- Removed NULL-pointer.patch and
Find-platform-dependant-include-files-of-GStreamer.patch (fixed
upstream).
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 3 17:57:44 UTC 2016 - asterios.dramis@gmail.com Sun Jan 3 17:57:44 UTC 2016 - asterios.dramis@gmail.com

84
subtitlecomposer.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package subtitlecomposer # spec file for package subtitlecomposer
# #
# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,31 +17,43 @@
Name: subtitlecomposer Name: subtitlecomposer
Version: 0.5.7 Version: 0.6.4
Release: 0 Release: 0
Summary: A text-based subtitle editor Summary: A text-based subtitle editor
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Multimedia/Video/Editors and Convertors Group: Productivity/Multimedia/Video/Editors and Convertors
Url: https://github.com/maxrd2/subtitlecomposer/ Url: https://github.com/maxrd2/subtitlecomposer/
Source: https://github.com/maxrd2/%{name}/archive/v%{version}.tar.gz Source0: https://github.com/maxrd2/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM NULL-pointer.patch BuildRequires: extra-cmake-modules
Patch0: NULL-pointer.patch
# PATCH-FIX-OPENSUSE Find-platform-dependant-include-files-of-GStreamer.patch asterios.dramis@gmail.com -- Find platform-dependant include files of GStreamer (taken from Debian)
Patch1: Find-platform-dependant-include-files-of-GStreamer.patch
BuildRequires: fdupes
BuildRequires: gstreamer-plugins-base-devel BuildRequires: gstreamer-plugins-base-devel
BuildRequires: kauth-devel
BuildRequires: kcodecs-devel
BuildRequires: kconfig-devel
BuildRequires: kconfigwidgets-devel
BuildRequires: kcoreaddons-devel
BuildRequires: ki18n-devel
BuildRequires: kio-devel
BuildRequires: kross-devel
BuildRequires: ktextwidgets-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: kxmlgui-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libkde4-devel
BuildRequires: libxine-devel BuildRequires: libxine-devel
BuildRequires: mpv-devel
BuildRequires: phonon4qt5-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: sonnet-devel
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
%endif %endif
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Requires(post): shared-mime-info Requires(post): shared-mime-info
Requires(postun): shared-mime-info Requires(postun): shared-mime-info
%kde4_runtime_requires
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -52,41 +64,35 @@ every platform supported by KDE.
%lang_package %lang_package
%prep %prep
%setup -q -n %{name}-%{version} %setup -q
%patch0 -p1
%if 0%{?suse_version} > 1320
%patch1 -p1
%endif
# Fix permissions # Fix permissions
chmod 644 ChangeLog chmod 644 ChangeLog
%build %build
%cmake_kde4 -d build %cmake_kf5 -d build
%make_jobs %make_jobs
%install %install
%kde4_makeinstall -C build %kf5_makeinstall -C build
# Fix persissions
chmod 755 %{buildroot}%{_kf5_appsdir}/%{name}/scripts/*.py
chmod 755 %{buildroot}%{_kf5_appsdir}/%{name}/scripts/*.rb
# Fix rpmlint error (devel-file-in-non-devel-package) and install header files as doc (since they are installed just for help)
mkdir files_for_doc
cp -a %{buildroot}%{_kf5_appsdir}/%{name}/scripts/api/ files_for_doc/
rm -rf %{buildroot}%{_kf5_appsdir}/%{name}/scripts/api/
# Point to the correct path of the header files directory (doc)
perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroot}%{_kf5_appsdir}/%{name}/scripts/README
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file -r %{name} Qt KDE AudioVideo AudioVideoEditing %suse_update_desktop_file -r %{name} Qt KDE AudioVideo AudioVideoEditing
%endif %endif
%fdupes -s %{buildroot}%{_datadir}
%find_lang %{name} %find_lang %{name}
%kde_post_install %kf5_post_install
# Fix persissions
chmod 755 %{buildroot}%{_kde4_appsdir}/%{name}/scripts/*.py
chmod 755 %{buildroot}%{_kde4_appsdir}/%{name}/scripts/*.rb
# Fix rpmlint warning (devel-file-in-non-devel-package) and install header files as doc (since they are installed just for help)
mkdir files_for_doc
cp -a %{buildroot}%{_kde4_appsdir}/%{name}/scripts/api/ files_for_doc/
rm -rf %{buildroot}%{_kde4_appsdir}/%{name}/scripts/api/
# Point to the correct path of the header files directory (doc)
perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroot}%{_kde4_appsdir}/%{name}/scripts/README
%post %post
%mime_database_post %mime_database_post
@ -97,13 +103,17 @@ perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroo
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README.md TODO files_for_doc/api %doc AUTHORS COPYING ChangeLog README.md TODO files_for_doc/api
%{_kde4_bindir}/%{name} %{_kf5_applicationsdir}/%{name}.desktop
%{_kde4_applicationsdir}/%{name}.desktop %{_kf5_appsdir}/%{name}/
%{_kde4_appsdir}/%{name}/ %{_kf5_bindir}/%{name}
%{_kde4_configdir}/%{name}rc %config(noreplace) %{_kf5_configdir}/%{name}rc
%dir %{_kde4_iconsdir}/hicolor/* %if 0%{?suse_version} < 1320
%dir %{_kde4_iconsdir}/hicolor/*/apps %dir %{_kf5_iconsdir}/hicolor/*
%{_kde4_iconsdir}/hicolor/*/*/* %dir %{_kf5_iconsdir}/hicolor/*/apps
%endif
%{_kf5_iconsdir}/hicolor/*/*/*
%{_kf5_kxmlguidir}/%{name}/
%{_kf5_libdir}/%{name}/
%{_datadir}/mime/packages/%{name}.xml %{_datadir}/mime/packages/%{name}.xml
%files lang -f %{name}.lang %files lang -f %{name}.lang

3
v0.5.7.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6a901bccf535c306ec7c72e46ceaeb4c33a64f11c190ebc1502835bc38f0564
size 1594102