[obs-studio/f27: 5/5] Merge branch 'master' into f27
by Momcilo Medic
commit 9cd83be89d744c017f5d1e752c80c7f385f02dd6
Merge: 329dd27 c1934f4
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Wed Aug 22 02:02:51 2018 +0200
Merge branch 'master' into f27
obs-ffmpeg-mux.patch | 10 +++++-----
obs-studio.spec | 11 ++++++++++-
sources | 2 +-
3 files changed, 16 insertions(+), 7 deletions(-)
---
6 years, 3 months
[obs-studio] Updated to 22.0.1
by Momcilo Medic
commit c1934f47f6d61cdd48faf9140ae0f4001fe126c2
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Wed Aug 22 01:53:35 2018 +0200
Updated to 22.0.1
obs-ffmpeg-mux.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/obs-ffmpeg-mux.patch b/obs-ffmpeg-mux.patch
index d7be21b..e74f128 100644
--- a/obs-ffmpeg-mux.patch
+++ b/obs-ffmpeg-mux.patch
@@ -13,13 +13,13 @@
dstr_insert_ch(cmd, 0, '\"');
dstr_cat(cmd, "\" \"");
---- CMakeLists.txt 2017-01-18 19:55:31.000000000 +0100
-+++ CMakeLists.txt 2017-01-30 20:46:26.382264509 +0100
-@@ -24,6 +24,7 @@
+--- CMakeLists.txt 2018-08-20 18:13:28.000000000 +0200
++++ CMakeLists.txt 2018-08-22 01:50:26.191160839 +0200
+@@ -31,6 +31,7 @@
include(ObsHelpers)
include(ObsCpack)
include(GNUInstallDirs)
+add_definitions(-DFFMPEG_MUX_FIXED=\"/usr/libexec/obs-plugins/obs-ffmpeg/ffmpeg-mux\")
- if(MSVC AND NOT EXISTS "${CMAKE_BINARY_DIR}/ALL_BUILD.vcxproj.user")
- file(GENERATE
+ # Must be a string in the format of "x.x.x-rcx"
+ if(DEFINED RELEASE_CANDIDATE)
6 years, 3 months
[obs-studio] Updated to 22.0.1
by Momcilo Medic
commit c28f584e0bc5ee503af89d9bdd4ad361e95eb52d
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Wed Aug 22 01:31:20 2018 +0200
Updated to 22.0.1
obs-studio.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index ade35fa..43dd33e 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -2,8 +2,8 @@
%global __python %{__python3}
Name: obs-studio
-Version: 21.1.2
-Release: 3%{?dist}
+Version: 22.0.1
+Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -123,6 +123,9 @@ mv -f %{buildroot}/%{_datadir}/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux \
%doc docs/html
%changelog
+* Wed Aug 22 2018 Momcilo Medic <fedorauser(a)fedoraproject.org> - 22.0.1-1
+- Updated to 22.0.1
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 21.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 55fce16..8ae3c3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc36a9e8d8c8018955c64197f18f839a obs-studio-21.1.2.tar.gz
+7d9ad616caaa3bd0f93a2af26407edfe obs-studio-22.0.1.tar.gz
6 years, 3 months
[shotcut/f28] Update to 18.08.14
by Martin Gansser
Summary of changes:
1f56a92... Update to 18.08.14 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 3 months
[shotcut] Update to 18.08.14
by Martin Gansser
commit 1f56a92450f75ea3dc51895b9a06d95e96d4b5c1
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Aug 21 16:11:12 2018 +0200
Update to 18.08.14
.gitignore | 1 +
shotcut.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index feca143..fe30d18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/shotcut-18.07.tar.gz
/shotcut-18.08.tar.gz
/shotcut-18.08.11.tar.gz
+/shotcut-18.08.14.tar.gz
diff --git a/shotcut.spec b/shotcut.spec
index 2bc7f65..b441058 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,7 +3,7 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 18.08.11
+Version: 18.08.14
Release: 1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
@@ -181,6 +181,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.%{na
%doc doc
%changelog
+* Tue Aug 21 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.08.14-1
+- Update to 18.08.14
+
* Tue Aug 14 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.08.11-1
- Update to 18.08.11
diff --git a/sources b/sources
index d131cba..ca3b561 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2aa6d5b4b646608fb4471b7c601c5e0e shotcut-18.08.11.tar.gz
+980d8f7e8db2b1495c9e1322ba49a3f4 shotcut-18.08.14.tar.gz
6 years, 3 months
[mixxx] New upstream release 2.1.3
by Uwe Klotz
commit 5335d809a1b818b16e3f1d4513388d4af2066e3f
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Tue Aug 21 00:35:02 2018 +0200
New upstream release 2.1.3
.gitignore | 1 +
mixxx.spec | 6 ++++--
sources | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ea6c09..a4e9a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-release-2.1.0.tar.gz
/mixxx-release-2.1.1.tar.gz
/mixxx-release-2.1.2.0.tar.gz
+/mixxx-release-2.1.3.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 7d8e420..dedda4b 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -16,8 +16,7 @@
%endif
Name: mixxx
-# NOTE (uklotzde, 2018-08-19): Special 2.1.2.0 version tag (instead of 2.1.2) due to a release accident
-Version: 2.1.2.0
+Version: 2.1.3
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -151,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Mon Aug 20 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.3-1
+- New upstream release 2.1.3
+
* Sun Aug 19 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.2-1
- Update to upstream release 2.1.2
- Re-enable FFmpeg
diff --git a/sources b/sources
index e2ed966..6fe8c91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce44bc93f1370ad4e64a240ed342e535 mixxx-release-2.1.2.0.tar.gz
+237ffa407bfec0cb36c2ed88564fd550 mixxx-release-2.1.3.tar.gz
6 years, 3 months
[mixxx/f27] New upstream release 2.1.3
by Uwe Klotz
commit 2cae08ec8529e6ef1c601d8b79b49a71dc7dede1
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Tue Aug 21 00:35:02 2018 +0200
New upstream release 2.1.3
.gitignore | 1 +
mixxx.spec | 6 ++++--
sources | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ea6c09..a4e9a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-release-2.1.0.tar.gz
/mixxx-release-2.1.1.tar.gz
/mixxx-release-2.1.2.0.tar.gz
+/mixxx-release-2.1.3.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 396f357..c3ed8c0 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -16,8 +16,7 @@
%endif
Name: mixxx
-# NOTE (uklotzde, 2018-08-19): Special 2.1.2.0 version tag (instead of 2.1.2) due to a release accident
-Version: 2.1.2.0
+Version: 2.1.3
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -151,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Mon Aug 20 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.3-1
+- New upstream release 2.1.3
+
* Sun Aug 19 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.2-1
- Update to upstream release 2.1.2
- Re-enable FFmpeg
diff --git a/sources b/sources
index e2ed966..6fe8c91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce44bc93f1370ad4e64a240ed342e535 mixxx-release-2.1.2.0.tar.gz
+237ffa407bfec0cb36c2ed88564fd550 mixxx-release-2.1.3.tar.gz
6 years, 3 months