[libdvdcss/el6: 3/3] Downgrade to 1.2.13
by Xavier Bachelot
commit 95c3215b076f49e69ded30f11afc322370731de1
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Thu Aug 2 14:33:20 2018 +0200
Downgrade to 1.2.13
.gitignore | 1 +
libdvdcss.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d01af2..42565b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/libdvdcss-1.4.1.tar.bz2
/libdvdcss-1.4.2.tar.bz2
+/libdvdcss-1.2.13.tar.bz2
diff --git a/libdvdcss.spec b/libdvdcss.spec
index b439fc9..d97a080 100644
--- a/libdvdcss.spec
+++ b/libdvdcss.spec
@@ -1,7 +1,7 @@
Summary: A portable abstraction library for DVD decryption
Name: libdvdcss
-Version: 1.4.2
-Release: 3%{?dist}
+Version: 1.2.13
+Release: 1%{?dist}
License: GPLv2+
Source: http://www.videolan.org/pub/videolan/libdvdcss/%{version}/libdvdcss-%{ver...
URL: http://www.videolan.org/libdvdcss/
@@ -62,6 +62,10 @@ find %{buildroot} -regex ".*\.la$" -delete
%changelog
+* Thu Aug 02 2018 Xavier Bachelot <xavier(a)bachelot.org> - 1.2.13-1
+- Downgrade to 1.2.13 to match EL6 libdvdread.
+ No Epoch: bump, this is expected.
+
* Fri Jul 27 2018 Xavier Bachelot <xavier(a)bachelot.org> - 1.4.2-3
- Add BR: gcc.
- Modernize specfile.
diff --git a/sources b/sources
index 8ddf72a..11ffb69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b74f2e142b13c9de6dc8d807ab912d4 libdvdcss-1.4.2.tar.bz2
+53cfc52a60a156763c425572e5179273 libdvdcss-1.2.13.tar.bz2
5 years, 8 months
[lightspark] Enable ppc64le build again
by Xavier Bachelot
commit 1cabc71ef6ad2cf03782fa6dfc067301e7f67318
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Tue Jul 31 19:35:50 2018 +0200
Enable ppc64le build again
lightspark.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/lightspark.spec b/lightspark.spec
index edaaa3b..97406ca 100644
--- a/lightspark.spec
+++ b/lightspark.spec
@@ -19,7 +19,7 @@
Name: lightspark
Version: 0.8.1
-Release: %{?pre:0.}1%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
+Release: %{?pre:0.}2%{?git_snapshot:.%{date}git}%{?pre:.%{pre}}%{?dist}
Summary: An alternative Flash Player implementation
License: LGPLv3+
URL: http://lightspark.github.io/
@@ -31,9 +31,9 @@ Source0: https://github.com/lightspark/lightspark/archive/%{name}-%{versi
Patch0: lightspark-0.7.2-fix_ffmpeg_include_dir.patch
-# Build fails on ppc64 and ppc64le, temporarily disable them
+# Build fails on ppc64, temporarily disable it
# https://github.com/lightspark/lightspark/issues/283
-ExcludeArch: ppc64 ppc64le
+ExcludeArch: ppc64
BuildRequires: boost-devel
BuildRequires: cmake3
@@ -147,6 +147,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%changelog
+* Tue Jul 31 2018 Xavier Bachelot <xavier(a)bachelot.org> - 0.8.1-2
+- Remove ppc64le from ExcludeArch:.
+
* Sat Jul 21 2018 Xavier Bachelot <xavier(a)bachelot.org> - 0.8.1-1
- Update to 0.8.1.
- Add BR: gcc-c++.
5 years, 8 months
[openhantek] Update to latest git.
by Vasiliy Glazov
commit 6990937632c6dde3a88cc7021e9ce2babbf054f0
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Aug 1 10:47:36 2018 +0300
Update to latest git.
.gitignore | 1 +
openhantek.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c04a42..1d02b1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/9935f0a6defa78a77824d389472d9b3a7172a1aa
/57e0bebcc1d4cf99d70071eae48604149332abd3
+/78623870f4e18910448b9beed86b32911f1db3a2
diff --git a/openhantek.spec b/openhantek.spec
index 341198d..16e9e91 100644
--- a/openhantek.spec
+++ b/openhantek.spec
@@ -1,6 +1,6 @@
-%global gitcommit_full 57e0bebcc1d4cf99d70071eae48604149332abd3
+%global gitcommit_full 78623870f4e18910448b9beed86b32911f1db3a2
%global gitcommit %(c=%{gitcommit_full}; echo ${c:0:7})
-%global date 20180715
+%global date 20180722
Name: openhantek
Version: 0
@@ -67,6 +67,9 @@ install -p -D -m 644 %{name}/res/images/%{name}.svg %{buildroot}%{_datadir}/icon
%changelog
+* Wed Aug 01 2018 Vasiliy N. Glazov <vascom2(a)gmail.com> - 0-2.20180722git7862387
+- Update to latest git
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <sergio(a)serjux.com> - 0-2.20180715git57e0beb
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 86a6b4c..fb1b178 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03c359518ff408c027aa49fd285eb09d 57e0bebcc1d4cf99d70071eae48604149332abd3
+1aaf11825f648a5dc538a41d0bfe982a 78623870f4e18910448b9beed86b32911f1db3a2
5 years, 9 months
[openshot] Uploaded source
by Sérgio M. Basto
commit 291afab1867560d8aa31224d78d3130871d03660
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Aug 1 02:44:00 2018 +0100
Uploaded source
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index f16839e..ecbb19a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ openshot-1.4.3.tar.gz
/openshot-qt-2.3.4.tar.gz
/openshot-qt-2.4.0.tar.gz
/openshot-qt-2.4.1.tar.gz
+/openshot-qt-2.4.2.tar.gz
diff --git a/sources b/sources
index 3cf6c76..ed3f5da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d30874074aa5a37c6f9def34d8bc90d openshot-qt-2.4.1.tar.gz
+d5cdf9a71a4b02d54df18a83596c49f4 openshot-qt-2.4.2.tar.gz
5 years, 9 months
[openshot] New upstream release
by Sérgio M. Basto
commit 687d6e8bb36e9b0c015bb0f113a3b5e9255b880f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Aug 1 02:34:12 2018 +0100
New upstream release
openshot.spec | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/openshot.spec b/openshot.spec
index 34add97..b3cb6d7 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -2,8 +2,8 @@
%global find_lang %{_sourcedir}/openshot-find-lang.sh %{buildroot}
Name: openshot
-Version: 2.4.1
-Release: 7%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
Summary: Create and edit videos and movies
Group: Applications/Multimedia
@@ -20,8 +20,8 @@ BuildArch: noarch
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-qt5-devel
BuildRequires: python%{python3_pkgversion}-setuptools
-BuildRequires: libopenshot >= 0.1.9
-BuildRequires: libopenshot-audio >= 0.1.5
+BuildRequires: libopenshot >= 0.2.0
+BuildRequires: libopenshot-audio >= 0.1.6
BuildRequires: desktop-file-utils
# To fix icon
BuildRequires: ImageMagick
@@ -29,7 +29,7 @@ BuildRequires: ImageMagick
Requires: python%{python3_pkgversion}-qt5
Requires: python%{python3_pkgversion}-qt5-webkit
Requires: python%{python3_pkgversion}-httplib2
-Requires: python%{python3_pkgversion}-libopenshot >= 0.1.9
+Requires: python%{python3_pkgversion}-libopenshot >= 0.2.0
Requires: python%{python3_pkgversion}-zmq
Requires: ffmpeg-libs
@@ -121,7 +121,7 @@ fi
%files
%license COPYING
-%doc AUTHORS README
+%doc AUTHORS README.md
%{_bindir}/*
%{_datadir}/applications/%{name}-qt.desktop
%{_datadir}/icons/hicolor/*/apps/*
@@ -136,6 +136,9 @@ fi
%changelog
+* Tue Jul 31 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.2-1
+- New upstream release
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
5 years, 9 months
[libopenshot] New upstream release
by Sérgio M. Basto
commit e232301a4d1630a523f0e26b0428924368458cf7
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Aug 1 01:22:35 2018 +0100
New upstream release
.gitignore | 1 +
ffmpeg35_buildfix.patch => ffmpeg40_buildfix.patch | 80 +++++++++++-----------
libopenshot.spec | 32 +++++++--
sources | 2 +-
4 files changed, 68 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9253366..7d2ecaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ libopenshot-0.0.6.tar.gz
/libopenshot-0.1.7.tar.gz
/libopenshot-0.1.8.tar.gz
/libopenshot-0.1.9.tar.gz
+/libopenshot-0.2.0.tar.gz
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg40_buildfix.patch
similarity index 69%
rename from ffmpeg35_buildfix.patch
rename to ffmpeg40_buildfix.patch
index 2ce1171..8336296 100644
--- a/ffmpeg35_buildfix.patch
+++ b/ffmpeg40_buildfix.patch
@@ -1,24 +1,46 @@
+--- a/src/FFmpegReader.cpp
++++ b/src/FFmpegReader.cpp
+@@ -978,7 +978,7 @@ void FFmpegReader::ProcessAudioPacket(int64_t requested_frame, int64_t target_fr
+ int data_size = 0;
+
+ // re-initialize buffer size (it gets changed in the avcodec_decode_audio2 method call)
+- int buf_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE;
++ int buf_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE;
+ #pragma omp critical (ProcessAudioPacket)
+ {
+ #if IS_FFMPEG_3_2
+@@ -1083,7 +1083,7 @@ void FFmpegReader::ProcessAudioPacket(int64_t requested_frame, int64_t target_fr
+
+
+ // Allocate audio buffer
+- int16_t *audio_buf = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
++ int16_t *audio_buf = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
+
+ ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::ProcessAudioPacket (ReSample)", "packet_samples", packet_samples, "info.channels", info.channels, "info.sample_rate", info.sample_rate, "aCodecCtx->sample_fmt", AV_GET_SAMPLE_FORMAT(aStream, aCodecCtx), "AV_SAMPLE_FMT_S16", AV_SAMPLE_FMT_S16, "", -1);
+
+diff --git a/src/FFmpegWriter.cpp b/src/FFmpegWriter.cpp
+index 4416040..82c6a9e 100644
--- a/src/FFmpegWriter.cpp
+++ b/src/FFmpegWriter.cpp
-@@ -543,7 +543,7 @@
+@@ -559,7 +559,7 @@ void FFmpegWriter::flush_encoders()
{
- if (info.has_audio && audio_codec && audio_st->codec->codec_type == AVMEDIA_TYPE_AUDIO && audio_codec->frame_size <= 1)
- return;
-- if (info.has_video && video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (oc->oformat->flags & AVFMT_RAWPICTURE) && video_codec->codec->id == AV_CODEC_ID_RAWVIDEO)
-+ if (info.has_video && video_st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (oc->oformat->flags & AVFMT_NOFILE) && video_codec->codec->id == AV_CODEC_ID_RAWVIDEO)
- return;
+ if (info.has_audio && audio_codec && AV_GET_CODEC_TYPE(audio_st) == AVMEDIA_TYPE_AUDIO && AV_GET_CODEC_ATTRIBUTES(audio_st, audio_codec)->frame_size <= 1)
+ return;
+- if (info.has_video && video_codec && AV_GET_CODEC_TYPE(video_st) == AVMEDIA_TYPE_VIDEO && (oc->oformat->flags & AVFMT_RAWPICTURE) && AV_FIND_DECODER_CODEC_ID(video_st) == AV_CODEC_ID_RAWVIDEO)
++ if (info.has_video && video_codec && AV_GET_CODEC_TYPE(video_st) == AVMEDIA_TYPE_VIDEO && (oc->oformat->flags & AVFMT_NOFILE) && AV_FIND_DECODER_CODEC_ID(video_st) == AV_CODEC_ID_RAWVIDEO)
+ return;
int error_code = 0;
-@@ -858,7 +858,7 @@
+@@ -881,7 +881,7 @@ AVStream* FFmpegWriter::add_audio_stream()
// some formats want stream headers to be separate
if (oc->oformat->flags & AVFMT_GLOBALHEADER)
- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ AV_COPY_PARAMS_FROM_CONTEXT(st, c);
ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::add_audio_stream", "c->codec_id", c->codec_id, "c->bit_rate", c->bit_rate, "c->channels", c->channels, "c->sample_fmt", c->sample_fmt, "c->channel_layout", c->channel_layout, "c->sample_rate", c->sample_rate);
-
-@@ -931,7 +931,7 @@
+@@ -953,7 +953,7 @@ AVStream* FFmpegWriter::add_video_stream()
c->mb_decision = 2;
// some formats want stream headers to be separate
if (oc->oformat->flags & AVFMT_GLOBALHEADER)
@@ -27,7 +49,7 @@
// Find all supported pixel formats for this codec
const PixelFormat* supported_pixel_formats = codec->pix_fmts;
-@@ -951,14 +951,14 @@
+@@ -973,7 +973,7 @@ AVStream* FFmpegWriter::add_video_stream()
if (strcmp(fmt->name, "gif") != 0)
// If not GIF format, skip the encoding process
// Set raw picture flag (so we don't encode this video)
@@ -36,55 +58,33 @@
} else {
// Set the default codec
c->pix_fmt = PIX_FMT_YUV420P;
- }
+@@ -981,7 +981,7 @@ AVStream* FFmpegWriter::add_video_stream()
}
+ AV_COPY_PARAMS_FROM_CONTEXT(st, c);
- ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::add_video_stream (" + (string)fmt->name + " : " + (string)av_get_pix_fmt_name(c->pix_fmt) + ")", "c->codec_id", c->codec_id, "c->bit_rate", c->bit_rate, "c->pix_fmt", c->pix_fmt, "oc->oformat->flags", oc->oformat->flags, "AVFMT_RAWPICTURE", AVFMT_RAWPICTURE, "", -1);
+ ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::add_video_stream (" + (string)fmt->name + " : " + (string)av_get_pix_fmt_name(c->pix_fmt) + ")", "c->codec_id", c->codec_id, "c->bit_rate", c->bit_rate, "c->pix_fmt", c->pix_fmt, "oc->oformat->flags", oc->oformat->flags, "AVFMT_NOFILE", AVFMT_NOFILE, "", -1);
return st;
}
-@@ -1018,7 +1018,7 @@
- audio_encoder_buffer_size = AUDIO_PACKET_ENCODING_SIZE;
- audio_encoder_buffer = new uint8_t[audio_encoder_buffer_size];
+@@ -1056,7 +1056,7 @@ void FFmpegWriter::open_audio(AVFormatContext *oc, AVStream *st)
+ av_dict_set(&st->metadata, iter->first.c_str(), iter->second.c_str(), 0);
+ }
- ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::open_audio", "audio_codec->thread_count", audio_codec->thread_count, "audio_input_frame_size", audio_input_frame_size, "buffer_size", AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE, "", -1, "", -1, "", -1);
+ ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::open_audio", "audio_codec->thread_count", audio_codec->thread_count, "audio_input_frame_size", audio_input_frame_size, "buffer_size", AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE, "", -1, "", -1, "", -1);
}
-@@ -1473,9 +1473,9 @@
+@@ -1560,9 +1560,9 @@ void FFmpegWriter::process_video_packet(std::shared_ptr<Frame> frame)
// write video frame
bool FFmpegWriter::write_video_packet(std::shared_ptr<Frame> frame, AVFrame* frame_final)
{
- ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::write_video_packet", "frame->number", frame->number, "oc->oformat->flags & AVFMT_RAWPICTURE", oc->oformat->flags & AVFMT_RAWPICTURE, "", -1, "", -1, "", -1, "", -1);
--
-- if (oc->oformat->flags & AVFMT_RAWPICTURE) {
+ ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::write_video_packet", "frame->number", frame->number, "oc->oformat->flags & AVFMT_NOFILE", oc->oformat->flags & AVFMT_NOFILE, "", -1, "", -1, "", -1, "", -1);
-+
+
+- if (oc->oformat->flags & AVFMT_RAWPICTURE) {
+ if (oc->oformat->flags & AVFMT_NOFILE) {
// Raw video case.
AVPacket pkt;
av_init_packet(&pkt);
-
---- a/src/FFmpegReader.cpp
-+++ b/src/FFmpegReader.cpp
-@@ -903,7 +903,7 @@
- int data_size = 0;
-
- // re-initialize buffer size (it gets changed in the avcodec_decode_audio2 method call)
-- int buf_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE;
-+ int buf_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE;
- int used = avcodec_decode_audio4(aCodecCtx, audio_frame, &frame_finished, packet);
-
- if (frame_finished) {
-@@ -976,7 +976,7 @@
-
-
- // Allocate audio buffer
-- int16_t *audio_buf = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
-+ int16_t *audio_buf = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
-
- ZmqLogger::Instance()->AppendDebugMethod("FFmpegReader::ProcessAudioPacket (ReSample)", "packet_samples", packet_samples, "info.channels", info.channels, "info.sample_rate", info.sample_rate, "aCodecCtx->sample_fmt", aCodecCtx->sample_fmt, "AV_SAMPLE_FMT_S16", AV_SAMPLE_FMT_S16, "", -1);
-
-
diff --git a/libopenshot.spec b/libopenshot.spec
index ffefede..3d32de6 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,22 +1,26 @@
Name: libopenshot
-Version: 0.1.9
-Release: 7%{?dist}
+Version: 0.2.0
+Release: 1%{?dist}
Summary: Library for creating and editing videos
License: LGPLv3+
URL: http://www.openshot.org/
Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version...
-Patch0: ffmpeg35_buildfix.patch
+Patch0: ffmpeg40_buildfix.patch
-BuildRequires: cmake swig
+BuildRequires: gcc-c++
+BuildRequires: cmake
+BuildRequires: swig
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: ImageMagick-c++-devel
BuildRequires: ffmpeg-devel
-BuildRequires: libopenshot-audio-devel >= 0.1.5
+BuildRequires: libopenshot-audio-devel >= 0.1.6
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: unittest-cpp-devel
-BuildRequires: zeromq-devel cppzmq-devel
+BuildRequires: cppzmq-devel
+BuildRequires: zeromq-devel
+BuildRequires: ruby-devel
%description
@@ -47,6 +51,16 @@ The python-%{name} package contains python bindings for
applications that use %{name}.
+%package -n ruby-%{name}
+Summary: Ruby bindings for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Group: Development/Libraries
+
+%description -n ruby-%{name}
+The ruby-%{name} package contains ruby bindings for
+applications that use %{name}.
+
+
%prep
%autosetup -p1
@@ -78,8 +92,14 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed -Wno-error"
%files -n python%{python3_pkgversion}-libopenshot
%{python3_sitearch}/*
+%files -n ruby-libopenshot
+%{ruby_vendorarchdir}/*
+
%changelog
+* Tue Jul 31 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.0-1
+- New upstream release
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.1.9-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 8e0c5aa..e8c2e7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74012e7260c91c3413b45401c46bfcc0 libopenshot-0.1.9.tar.gz
+09b05e23356d53777bcb2cad1615683b libopenshot-0.2.0.tar.gz
5 years, 9 months