[mp4tools] Initial import (#4641).
by Martin Gansser
commit 85f590200815bcdd2ce98053c0f050db4f183ab5
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Oct 13 18:49:39 2017 +0200
Initial import (#4641).
.gitignore | 1 +
mp4tools-wx-config.patch | 27 +++++++++++
mp4tools.spec | 113 +++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 142 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b9986f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/MP4Tools-3.5.tar.bz2
diff --git a/mp4tools-wx-config.patch b/mp4tools-wx-config.patch
new file mode 100644
index 0000000..7b73e52
--- /dev/null
+++ b/mp4tools-wx-config.patch
@@ -0,0 +1,27 @@
+--- configure.orig 2017-03-20 21:25:19.000000000 +0100
++++ configure 2017-09-01 12:40:14.860865091 +0200
+@@ -4601,18 +4601,18 @@
+
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+ wx_config_major_version=`echo $WX_VERSION | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'`
+ wx_config_minor_version=`echo $WX_VERSION | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'`
+ wx_config_micro_version=`echo $WX_VERSION | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
+
+ wx_requested_major_version=`echo $min_wx_version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'`
+ wx_requested_minor_version=`echo $min_wx_version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'`
+ wx_requested_micro_version=`echo $min_wx_version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
+
+
+ wx_ver_ok=""
diff --git a/mp4tools.spec b/mp4tools.spec
new file mode 100644
index 0000000..e24937d
--- /dev/null
+++ b/mp4tools.spec
@@ -0,0 +1,113 @@
+%global pname MP4Tools
+
+Name: mp4tools
+Version: 3.5
+Release: 3%{?dist}
+Summary: A free cross-platform tool to manipulate MP4 files
+License: GPLv2
+URL: http://www.mp4joiner.org
+Source0: http://app.oldfoss.com:81/download/MP4Joiner/%{pname}-%{version}.tar.bz2
+# fedora specific patch
+Patch0: %{name}-wx-config.patch
+
+BuildRequires: compat-wxGTK3-gtk2-devel
+BuildRequires: desktop-file-utils
+BuildRequires: ffmpeg
+BuildRequires: ffmpeg-devel
+BuildRequires: gettext-devel
+BuildRequires: gpac
+BuildRequires: wxsvg-devel
+Requires: ffmpeg
+
+
+%description
+MP4Tools is a collection of cross-platform free tools to manipulate MP4 files.
+It contains following applications:
+⦁ MP4Joiner is a free application that allows join multiple MP4 files into one
+⦁ MP4Splitter is a free application that allows split a MP4 file in multiple
+files
+
+
+%prep
+%autosetup -n %{pname}-%{version}
+
+%build
+
+%configure \
+%if (0%{?fedora} && 0%{?fedora} < 28)
+ --with-wx-config=%{_bindir}/wx-config-3.0-gtk2
+%endif
+
+%make_build
+
+
+%install
+%make_install
+
+#menu
+mkdir -p %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/mp4joiner.desktop <<EOF
+[Desktop Entry]
+Name=MP4Joiner
+Comment=Join multiple MP4 files.
+Exec=mp4joiner
+Icon=mp4joiner
+Type=Application
+Terminal=false
+Categories=Video;
+EOF
+
+cat > %{buildroot}%{_datadir}/applications/mp4splitter.desktop <<EOF
+[Desktop Entry]
+Name=MP4Splitter
+Comment=Split MP4 files.
+Exec=mp4splitter
+Icon=mp4splitter
+Type=Application
+Terminal=false
+Categories=Video;
+EOF
+
+#icon
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -m 644 resources/mp4joiner.png \
+%{buildroot}%{_datadir}/pixmaps/mp4joiner.png
+
+install -m 644 resources/mp4splitter.png \
+%{buildroot}%{_datadir}/pixmaps/mp4splitter.png
+# remove not relevant file
+rm -f %{buildroot}%{_docdir}/%{name}/INSTALL
+
+rm -f %{buildroot}%{_pkgdocdir}/COPYING
+
+
+%find_lang %name
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/mp4joiner.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/mp4splitter.desktop
+
+%files -f %{name}.lang
+%doc README ChangeLog AUTHORS
+%license COPYING
+%{_bindir}/mp4joiner
+%{_bindir}/mp4splitter
+%{_datadir}/applications/mp4joiner.desktop
+%{_datadir}/applications/mp4splitter.desktop
+%{_datadir}/pixmaps/mp4joiner.png
+%{_datadir}/pixmaps/mp4splitter.png
+
+%changelog
+* Thu Oct 12 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 3.5-3
+- COPYING file does not report a GPLv3 license, use GPLv2
+- Do not use %%license and %%{_pkgdocdir} together
+
+* Sat Sep 02 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 3.5-2
+- remove scriptlets now longer needed
+
+* Fri Sep 01 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 3.5-1
+- Update to 3.5
+- Add %%{name}-wx-config.patch
+
+* Fri Sep 01 2017 Martin Gansser <martinkg(a)fedoraproject.org> - 3.4-1
+- initial build
diff --git a/sources b/sources
index e69de29..3d5ec4f 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+3669260ed488b56254df2dd1bc602bbe MP4Tools-3.5.tar.bz2
6 years, 7 months
[clipgrab] Update clipgrab to 3.6.6
by Sérgio M. Basto
commit 8831ecb171fed549ae66bcffa772a224fe52827a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Oct 14 01:55:06 2017 +0100
Update clipgrab to 3.6.6
.gitignore | 1 +
clipgrab.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e63545a..e19f302 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clipgrab-3.5.5.tar.gz
/clipgrab-3.6.3.tar.gz
/clipgrab-3.6.4.tar.gz
/clipgrab-3.6.5.tar.gz
+/clipgrab-3.6.6.tar.gz
diff --git a/clipgrab.spec b/clipgrab.spec
index d65e951..998c34e 100644
--- a/clipgrab.spec
+++ b/clipgrab.spec
@@ -1,6 +1,6 @@
Name: clipgrab
-Version: 3.6.5
-Release: 2%{?dist}
+Version: 3.6.6
+Release: 1%{?dist}
License: GPLv3 and Non-Commercial Use Only (Artwork and Trademark)
Group: Applications/Internet
@@ -49,6 +49,9 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1}
%changelog
+* Sat Oct 14 2017 Sérgio Basto <sergio(a)serjux.com> - 3.6.6-1
+- Update clipgrab to 3.6.6
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 3.6.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 7bb2293..dbb038e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd513633d733f4769120e5127586776c clipgrab-3.6.5.tar.gz
+141a78f0eb0a19241376987ae8c7522f clipgrab-3.6.6.tar.gz
6 years, 7 months
[get_iplayer] Update to version 3.05.
by mavit
commit 60d0f6018a0c88763c3884b50d3a6ae11a77d820
Author: Peter Oliver <git(a)mavit.org.uk>
Date: Fri Oct 13 12:07:05 2017 +0100
Update to version 3.05.
.gitignore | 1 +
get_iplayer.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ba4483..c631cc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ get_iplayer-2.94.tar.gz
/get_iplayer-3.01.tar.gz
/get_iplayer-3.02.tar.gz
/get_iplayer-3.03.tar.gz
+/get_iplayer-3.05.tar.gz
diff --git a/get_iplayer.spec b/get_iplayer.spec
index 4beb4bf..4c61085 100644
--- a/get_iplayer.spec
+++ b/get_iplayer.spec
@@ -1,5 +1,5 @@
Name: get_iplayer
-Version: 3.03
+Version: 3.05
Release: 1%{?dist}
Summary: Lists, records and streams BBC iPlayer TV and radio programmes
@@ -109,6 +109,9 @@ fi
%changelog
+* Fri Oct 13 2017 Peter Oliver <rpm(a)mavit.org.uk> - 3.05-1
+- Update to version 3.05.
+
* Mon Oct 2 2017 Peter Oliver <rpm(a)mavit.org.uk> - 3.03-1
- Update to version 3.03.
diff --git a/sources b/sources
index 96659e3..650ee35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b15227407683feeb25ccdd0b094e41c4 get_iplayer-3.03.tar.gz
+e8234cd7d89efe2a34d033458bccb39f get_iplayer-3.05.tar.gz
6 years, 7 months
[ffmpeg] add support for OpenJPEG v2.3
by Dominik Mierzejewski
commit 5e4f1ab980e5eaea3dae5af82b93426cc4938bc7
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 13 00:50:45 2017 +0200
add support for OpenJPEG v2.3
LibOpenJPEG-2.3.patch | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 8 ++++-
2 files changed, 102 insertions(+), 1 deletion(-)
---
diff --git a/LibOpenJPEG-2.3.patch b/LibOpenJPEG-2.3.patch
new file mode 100644
index 0000000..28bd4be
--- /dev/null
+++ b/LibOpenJPEG-2.3.patch
@@ -0,0 +1,95 @@
+diff -up ffmpeg-3.3.4/configure.ojp23 ffmpeg-3.3.4/configure
+--- ffmpeg-3.3.4/configure.ojp23 2017-10-13 00:22:16.314149496 +0200
++++ ffmpeg-3.3.4/configure 2017-10-13 00:27:54.069637935 +0200
+@@ -1875,6 +1875,7 @@ HEADERS_LIST="
+ machine_ioctl_meteor_h
+ malloc_h
+ opencv2_core_core_c_h
++ openjpeg_2_3_openjpeg_h
+ openjpeg_2_2_openjpeg_h
+ openjpeg_2_1_openjpeg_h
+ openjpeg_2_0_openjpeg_h
+@@ -5806,7 +5807,9 @@ enabled libopencv && { check_hea
+ require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+ require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+-enabled libopenjpeg && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++enabled libopenjpeg && { { check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
++ check_lib openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
++ { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
+ { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
+ check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+diff -up ffmpeg-3.3.4/libavcodec/libopenjpegdec.c.ojp23 ffmpeg-3.3.4/libavcodec/libopenjpegdec.c
+--- ffmpeg-3.3.4/libavcodec/libopenjpegdec.c.ojp23 2017-10-13 00:22:16.303149420 +0200
++++ ffmpeg-3.3.4/libavcodec/libopenjpegdec.c 2017-10-13 00:25:29.561527565 +0200
+@@ -34,7 +34,9 @@
+ #include "internal.h"
+ #include "thread.h"
+
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H
++# include <openjpeg-2.3/openjpeg.h>
++#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
+ # include <openjpeg-2.2/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ # include <openjpeg-2.1/openjpeg.h>
+@@ -46,7 +48,7 @@
+ # include <openjpeg.h>
+ #endif
+
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # define OPENJPEG_MAJOR_VERSION 2
+ # define OPJ(x) OPJ_##x
+ #else
+@@ -431,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCo
+ opj_stream_set_read_function(stream, stream_read);
+ opj_stream_set_skip_function(stream, stream_skip);
+ opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ opj_stream_set_user_data(stream, &reader, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ opj_stream_set_user_data(stream, &reader);
+diff -up ffmpeg-3.3.4/libavcodec/libopenjpegenc.c.ojp23 ffmpeg-3.3.4/libavcodec/libopenjpegenc.c
+--- ffmpeg-3.3.4/libavcodec/libopenjpegenc.c.ojp23 2017-10-13 00:22:16.303149420 +0200
++++ ffmpeg-3.3.4/libavcodec/libopenjpegenc.c 2017-10-13 00:25:29.561527565 +0200
+@@ -32,7 +32,9 @@
+ #include "avcodec.h"
+ #include "internal.h"
+
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H
++# include <openjpeg-2.3/openjpeg.h>
++#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
+ # include <openjpeg-2.2/openjpeg.h>
+ #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
+ # include <openjpeg-2.1/openjpeg.h>
+@@ -44,7 +46,7 @@
+ # include <openjpeg.h>
+ #endif
+
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
+ # define OPENJPEG_MAJOR_VERSION 2
+ # define OPJ(x) OPJ_##x
+ #else
+@@ -307,7 +309,7 @@ static av_cold int libopenjpeg_encode_in
+
+ opj_set_default_encoder_parameters(&ctx->enc_params);
+
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ switch (ctx->cinema_mode) {
+ case OPJ_CINEMA2K_24:
+ ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
+@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCo
+ opj_stream_set_write_function(stream, stream_write);
+ opj_stream_set_skip_function(stream, stream_skip);
+ opj_stream_set_seek_function(stream, stream_seek);
+-#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
++#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
+ opj_stream_set_user_data(stream, &writer, NULL);
+ #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
+ opj_stream_set_user_data(stream, &writer);
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 94d08c2..d5772c8 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -71,7 +71,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 3.3.4
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -81,6 +81,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/078322f33ced4b2db6ac3e5002...
Patch0: LibOpenJPEG-2.2.patch
+# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/41d6d627024393c142cf7cd93e...
+Patch1: LibOpenJPEG-2.3.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0 cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-8-0 cuda-misc-headers-8-0 cuda-npp-dev-8-0}
@@ -292,6 +294,7 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%setup -q -n ffmpeg-%{version}
%endif
%patch0 -p1
+%patch1 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -393,6 +396,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Thu Oct 12 2017 Dominik Mierzejewski <rpm(a)greysector.net> - 3.3.4-2
+- add support for OpenJPEG v2.3
+
* Tue Sep 12 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3.4-1
- Updated to 3.3.4
6 years, 7 months