[dvdstyler] Update to 1:3.1-5.beta3.gite4968db
by Martin Gansser
commit 67141cc0f2ab0dabbe4baf695747fa49eee18a79
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri Apr 12 15:52:26 2019 +0200
Update to 1:3.1-5.beta3.gite4968db
.gitignore | 1 +
dvdstyler.spec | 11 ++++++++---
sources | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f84d078..8d93a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ DVDStyler-2.9.6.tar.bz2
/DVDStyler-3.0.3.tar.bz2
/DVDStyler-3.0.4.tar.bz2
/dvdstyler-e4c6466.tar.bz2
+/dvdstyler-e4968db.tar.bz2
diff --git a/dvdstyler.spec b/dvdstyler.spec
index e7b19b9..b52eead 100644
--- a/dvdstyler.spec
+++ b/dvdstyler.spec
@@ -1,7 +1,7 @@
#For git snapshots, set to 0 to use release instead:
%global usesnapshot 1
%if 0%{?usesnapshot}
-%global commit0 e4c6466ec3ca26af550082a97d24c001e2780239
+%global commit0 e4968db20deddc33ada0779853ab19e4d1570b0c
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global snapshottag .git%{shortcommit0}
%endif
@@ -13,16 +13,18 @@
Name: dvdstyler
Epoch: 1
Version: 3.1
-Release: 4.beta3%{?snapshottag}%{?dist}
+Release: 5.beta3%{?snapshottag}%{?dist}
Summary: Cross-platform DVD authoring application
License: GPLv2+
URL: http://www.dvdstyler.de/
# checkout instructions
# git clone git://git.code.sf.net/p/dvdstyler/DVDStyler dvdstyler
+# or
+# git clone https://git.code.sf.net/p/dvdstyler/DVDStyler dvdstyler
# cd dvdstyler
# git rev-parse --short HEAD
-# git archive --format=tar --prefix=dvdstyler/ %%{shortcommit0} \
+# git archive --format=tar --prefix=dvdstyler/ %%{shortcommit0}
# -o dvdstyler-%%{shortcommit0}.tar
# bzip2 dvdstyler-%%{shortcommit0}.tar
@@ -130,6 +132,9 @@ desktop-file-install \
%{_mandir}/*/*.gz
%changelog
+* Fri Apr 12 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 1:3.1-5.beta3.gite4968db
+- Update to 1:3.1-5.beta3.gite4968db
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:3.1-4.beta3.gite4c6466
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 0825193..aa392db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf5e9c7132a739d61840263782b0ddc5 dvdstyler-e4c6466.tar.bz2
+b22ad6da46b59566e941c45df2d1b1ed dvdstyler-e4968db.tar.bz2
5 years, 7 months
[buildsys-build-rpmfusion/f30] Fix version
by Leigh Scott
commit bb0fcd9da9b82af3a8d0baae497d4dc32dff362c
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Apr 12 11:53:18 2019 +0100
Fix version
buildsys-build-rpmfusion-kerneldevpkgs-current | 8 ++++----
buildsys-build-rpmfusion.spec | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/buildsys-build-rpmfusion-kerneldevpkgs-current b/buildsys-build-rpmfusion-kerneldevpkgs-current
index b5c19aa..ac07de3 100644
--- a/buildsys-build-rpmfusion-kerneldevpkgs-current
+++ b/buildsys-build-rpmfusion-kerneldevpkgs-current
@@ -1,4 +1,4 @@
-5.0.7-300.fc30
-5.0.7-300.fc30smp
-5.0.7-300.fc30PAE
-5.0.7-300.fc30lpae
+5.0.6-300.fc30
+5.0.6-300.fc30smp
+5.0.6-300.fc30PAE
+5.0.6-300.fc30lpae
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 80e5bfb..a1efef2 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -78,7 +78,7 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
* Fri Apr 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 10:30-2
-- rebuild for kernel 5.0.7-300.fc30
+- rebuild for kernel 5.0.6-300.fc30
* Wed Apr 10 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 10:30-1
- rebuild for kernel 5.0.5-300.fc30
5 years, 7 months
[buildsys-build-rpmfusion/f30] rebuild for kernel 5.0.7-300.fc30
by Leigh Scott
commit abc812debedb6a587f7fd17c116db250ee2ebddd
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Apr 12 11:49:53 2019 +0100
rebuild for kernel 5.0.7-300.fc30
buildsys-build-rpmfusion-kerneldevpkgs-current | 8 ++++----
buildsys-build-rpmfusion.spec | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/buildsys-build-rpmfusion-kerneldevpkgs-current b/buildsys-build-rpmfusion-kerneldevpkgs-current
index 24cc560..b5c19aa 100644
--- a/buildsys-build-rpmfusion-kerneldevpkgs-current
+++ b/buildsys-build-rpmfusion-kerneldevpkgs-current
@@ -1,4 +1,4 @@
-5.0.5-300.fc30
-5.0.5-300.fc30smp
-5.0.5-300.fc30PAE
-5.0.5-300.fc30lpae
+5.0.7-300.fc30
+5.0.7-300.fc30smp
+5.0.7-300.fc30PAE
+5.0.7-300.fc30lpae
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 2ec622e..80e5bfb 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 30
-Release: 1
+Release: 2
Summary: Tools and files used by the %{repo} buildsys
License: MIT
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Fri Apr 12 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 10:30-2
+- rebuild for kernel 5.0.7-300.fc30
+
* Wed Apr 10 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 10:30-1
- rebuild for kernel 5.0.5-300.fc30
5 years, 7 months
[mixxx/f28] New upstream release 2.1.8
by Uwe Klotz
commit 8a603227d9d8e215bff123c23b9800111794b2bf
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Apr 11 21:42:32 2019 +0200
New upstream release 2.1.8
.gitignore | 1 +
mixxx.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d48c47..ebaad42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mixxx-release-2.1.7.tar.gz
+/mixxx-release-2.1.8.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 2369df2..58452a1 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -16,7 +16,7 @@
%endif
Name: mixxx
-Version: 2.1.7
+Version: 2.1.8
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
@@ -150,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Thu Apr 11 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.8-1
+- New upstream release 2.1.8
+
* Thu Jan 31 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.7-1
- New upstream release 2.1.7
diff --git a/sources b/sources
index 5882dfd..8b1d67a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5777296e110ea0a97118b4cc550e49ed mixxx-release-2.1.7.tar.gz
+de1545fa42bc4e05f3fd6ccd4e70befd mixxx-release-2.1.8.tar.gz
5 years, 7 months
[libopenshot] Build from latest git HEAD
by Frank R Dana
commit b8d139d61a4e9693b1a06cea6886e6127c1a15e1
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Wed Apr 10 15:21:09 2019 -0400
Build from latest git HEAD
Fixes FTBFS under GCC9 (F30/rawhide)
.gitignore | 1 +
libopenshot.spec | 29 ++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da7f28d..a2b4e8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ libopenshot-0.0.6.tar.gz
/libopenshot-0.2.0.tar.gz
/libopenshot-0.2.2.tar.gz
/libopenshot-0.2.3.tar.gz
+/libopenshot-101f25a.tar.gz
diff --git a/libopenshot.spec b/libopenshot.spec
index dd45462..fd3add7 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,21 +1,24 @@
+%global gitrev 101f25a7f5a1623cca2b2514fa2f7aed93799324
+%global shortrev %(c=%{gitrev}; echo ${c:0:7})
+%global gitdate 20190406
+
Name: libopenshot
Version: 0.2.3
-Release: 1%{?dist}
+Release: 2.%{gitdate}git%{shortrev}%{?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...
+Source0: https://github.com/OpenShot/%{name}/archive/%{gitrev}.tar.gz#/%{name}-%{s...
-#
-Patch1: %{name}-fix_swig_variable.patch
+# Fixed upstream
+#Patch1: %{name}-fix_swig_variable.patch
BuildRequires: gcc-c++
%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: cmake3
BuildRequires: ImageMagick-c++-devel
BuildRequires: ffmpeg-devel
-BuildRequires: libopenshot-audio-devel >= 0.1.8
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: unittest-cpp-devel
@@ -23,6 +26,13 @@ BuildRequires: cppzmq-devel
BuildRequires: zeromq-devel
BuildRequires: jsoncpp-devel
+# Dependency on libopenshot-audio 0.1.8 is insufficient, this libopenshot
+# code can only be built and run with a libopenshot-audio release containing
+# the new JUCE 5 APIs, which were introduced in the specific package releases
+# indicated. This restriction will be eliminated with the next official
+# releases of libopenshot and libopenshot-audio.
+BuildRequires: libopenshot-audio-devel >= 0:0.1.8-2
+Requires: libopenshot-audio%{?isa} >= 0:0.1.8-2
%description
OpenShot Library (libopenshot) is an open-source project
@@ -64,12 +74,12 @@ applications that use %{name}.
%prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{gitrev}
sed -e 's|-g -ggdb|-g|g' -i src/CMakeLists.txt tests/CMakeLists.txt
-sed -e 's|-std=c++11|%{optflags} -std=c++11 %{__global_ldflags} -Wl,--as-needed|g' -i CMakeLists.txt
%build
+export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}"
%cmake3 -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_SKIP_RPATH:BOOL=YES -DUSE_SYSTEM_JSONCPP:BOOL=ON .
%make_build
@@ -99,6 +109,11 @@ sed -e 's|-std=c++11|%{optflags} -std=c++11 %{__global_ldflags} -Wl,--as-needed|
%changelog
+* Tue Apr 09 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.3-2
+- Upgrade to latest git revision, to fix FTBFS with GCC9 on Fedora 30
+- Requires libopenshot-audio also built from same or later gitrev
+- Drop upstreamed patches
+
* Fri Mar 22 2019 FeRD (Frank Dana) <ferdnyc AT gmail com> - 0.2.3-1
- New upstream release
- Drop upstreamed patches
diff --git a/sources b/sources
index 71b3780..f56116a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ba70ff88ef52f658ce550aad1f5eaa1 libopenshot-0.2.3.tar.gz
+ccadd77620b6c53f19e916b1ec96556d libopenshot-101f25a.tar.gz
5 years, 7 months