[libopenshot-audio/f28: 4/4] Merge branch 'master' into f28
by Frank R Dana
commit 6466e7de2e95ce35f4b8ba1f08286fbd6f9477ec
Merge: 52a1b31 9d4789e
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 24 07:03:24 2018 -0400
Merge branch 'master' into f28
.gitignore | 1 +
libopenshot-audio-0.0.3-libs.patch | 12 ------------
libopenshot-audio-noXinerama.patch | 26 ++++++++++++++++++++++++++
libopenshot-audio.spec | 13 +++++++++----
sources | 2 +-
5 files changed, 37 insertions(+), 17 deletions(-)
---
6 years
[libopenshot-audio/f29] (3 commits) ...Bump release
by Frank R Dana
Summary of changes:
e4bbc6d... New upstream release 0.1.7 (*)
5960adb... Completely remove Xinerama dependency (*)
9d4789e... Bump release (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[mixxx] Fix RPATH issues
by Uwe Klotz
commit efddb5e20151322b6c8d7b2bd2fe35a6abeb32bc
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Sep 24 12:48:33 2018 +0200
Fix RPATH issues
mixxx.spec | 7 +++++++
1 file changed, 7 insertions(+)
---
diff --git a/mixxx.spec b/mixxx.spec
index 07882ad..f9b567a 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -31,6 +31,7 @@ BuildRequires: protobuf-compiler
BuildRequires: python2-scons
# Build Requirements
+BuildRequires: chrpath
BuildRequires: faad2-devel
BuildRequires: ffmpeg-devel
BuildRequires: fftw-devel
@@ -140,6 +141,12 @@ appstream-util \
--nonet \
$RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+# Workaround: Manually strip RPATH from installed binaries
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/vamp/libmixxxminimal.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsource/libsoundsourcem4a.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsource/libsoundsourcewv.so
+
# Remove docdir
rm -rf $RPM_BUILD_ROOT%{_docdir}
6 years
[mixxx] Fix package build and update snapshot
by Uwe Klotz
commit 46d35c00e8e011f170ebf54bd2d18871cf6df35f
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Sep 24 00:21:25 2018 +0200
Fix package build and update snapshot
.gitignore | 2 +-
mixxx.spec | 20 ++++++++++----------
sources | 2 +-
3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0a24db4..735d94b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-release-2.1.2.0.tar.gz
/mixxx-release-2.1.3.tar.gz
/mixxx-release-2.1.4.tar.gz
-/mixxx-637ed7635a36872393fc9cbe183a98c39ab2fc2a.tar.gz
+/mixxx-33e0cc33ee840d0b6c24ffa8f753b2b3e8ae5c34.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index e224313..07882ad 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -2,9 +2,9 @@
%global extraver beta
# Optional: Only used for untagged snapshot versions
-%global gitcommit 637ed7635a36872393fc9cbe183a98c39ab2fc2a
+%global gitcommit 33e0cc33ee840d0b6c24ffa8f753b2b3e8ae5c34
# Format: <yyyymmdd>
-%global gitcommitdate 20180923
+%global gitcommitdate 20180924
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -126,8 +126,8 @@ scons %{?_smp_mflags} \
install
# Install udev rule
-install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
-install -p -m 0644 res/linux/mixxx.usb.rules ${RPM_BUILD_ROOT}/%{_udevrulesdir}/90-mixxx.usb.rules
+install -d ${RPM_BUILD_ROOT}%{_udevrulesdir}
+install -p -m 0644 res/linux/mixxx.usb.rules ${RPM_BUILD_ROOT}%{_udevrulesdir}/90-mixxx.usb.rules
desktop-file-install \
--vendor "" \
@@ -138,7 +138,7 @@ desktop-file-install \
appstream-util \
validate-relax \
--nonet \
- $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml
+ $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
# Remove docdir
rm -rf $RPM_BUILD_ROOT%{_docdir}
@@ -148,18 +148,18 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%license COPYING LICENSE
%doc Mixxx-Manual.pdf README README.md
%{_bindir}/%{name}
-%{_datadir}/%{name}/
-%{_udevrulesdir}/90-mixxx.usb.rules
%{_libdir}/%{name}/
+%{_datadir}/%{name}/
%{_datadir}/applications/mixxx.desktop
-%{_datadir}/pixmaps/mixxx-icon.png
+%{_datadir}/pixmaps/mixxx_icon.svg
%{_datadir}/appdata/%{name}.appdata.xml
+%{_udevrulesdir}/90-mixxx.usb.rules
%changelog
-* Sun Sep 23 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.1.beta.20180923git637ed76
+* Mon Sep 24 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.0-0.1.beta.20180924git33e0cc3
- 1st upstream beta test release for 2.2.0
-- Update dependencies from Qt 4 to Qt 5
+- Update build and dependencies from Qt 4 to Qt 5
- Add support for QtKeychain to store broadcasting credentials
* Thu Sep 06 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.4-1
diff --git a/sources b/sources
index 9e5d538..e8c95e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1609d7825e6884c6e2915131b6195d77 mixxx-637ed7635a36872393fc9cbe183a98c39ab2fc2a.tar.gz
+90a736116c1e3a44c69f22dac08b1d05 mixxx-33e0cc33ee840d0b6c24ffa8f753b2b3e8ae5c34.tar.gz
6 years
[openshot] New upstream release 2.4.3
by Frank R Dana
commit 7a4cd9eeeee4ba816b895820f09c3e258ffc4977
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Mon Sep 24 05:46:38 2018 -0400
New upstream release 2.4.3
- Update libopenshot dependency version to new 0.2.2 release
- Drop several upstreamed build fixes
- Use upstream appdata file instead of our own
- Patch upstream appdata file for missed release tag
- Add openshot-owner(a)rpmfusion.org as update contact in appdata
- Clean up installed files
- New translations path, update find logic and packaging
.gitignore | 1 +
openshot-2.4.3-appdata.patch | 12 +++++++
openshot-qt.appdata.xml | 78 ----------------------------------------
openshot-rpmfusion-contact.patch | 10 ++++++
openshot.spec | 56 +++++++++++++++++++----------
sources | 2 +-
6 files changed, 61 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecbb19a..0734ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ openshot-1.4.3.tar.gz
/openshot-qt-2.4.0.tar.gz
/openshot-qt-2.4.1.tar.gz
/openshot-qt-2.4.2.tar.gz
+/openshot-qt-2.4.3.tar.gz
diff --git a/openshot-2.4.3-appdata.patch b/openshot-2.4.3-appdata.patch
new file mode 100644
index 0000000..156721c
--- /dev/null
+++ b/openshot-2.4.3-appdata.patch
@@ -0,0 +1,12 @@
+diff --git a/xdg/openshot-qt.appdata.xml b/xdg/openshot-qt.appdata.xml
+index 71765103..69d500fd 100644
+--- a/xdg/openshot-qt.appdata.xml
++++ b/xdg/openshot-qt.appdata.xml
+@@ -69,6 +69,7 @@
+ <content_attribute id="money-gambling">none</content_attribute>
+ </content_rating>
+ <releases>
++ <release version="2.4.3" date="2018-09-22"/>
+ <release version="2.4.2" date="2018-06-30"/>
+ <release version="2.4.1" date="2017-11-12"/>
+ </releases>
diff --git a/openshot-rpmfusion-contact.patch b/openshot-rpmfusion-contact.patch
new file mode 100644
index 0000000..02c162b
--- /dev/null
+++ b/openshot-rpmfusion-contact.patch
@@ -0,0 +1,10 @@
+diff --git a/xdg/openshot-qt.appdata.xml b/xdg/openshot-qt.appdata.xml
+index 69d500fd..133be097 100644
+--- a/xdg/openshot-qt.appdata.xml
++++ b/xdg/openshot-qt.appdata.xml
+@@ -73,4 +73,5 @@
+ <release version="2.4.2" date="2018-06-30"/>
+ <release version="2.4.1" date="2017-11-12"/>
+ </releases>
++ <update_contact>openshot-owner(a)rpmfusion.org</update_contact>
+ </component>
diff --git a/openshot.spec b/openshot.spec
index 667ccc4..d6cda38 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.2
-Release: 2%{?dist}
+Version: 2.4.3
+Release: 1%{?dist}
Summary: Create and edit videos and movies
Group: Applications/Multimedia
@@ -14,7 +14,14 @@ Source0: https://github.com/OpenShot/%{name}-qt/archive/v%{version}/%{nam
# QT translation files are installed to a non-standard location
Source100: openshot-find-lang.sh
-Source101: openshot-qt.appdata.xml
+
+# Upstreamed
+#Source101: openshot-qt.appdata.xml
+
+# Import commit 42ed592b from upstream, to add forgotten 2.4.3 release tag
+Patch0: openshot-2.4.3-appdata.patch
+# Add openshot-owner@rpmfusion to appdata as update_contact
+Patch1: openshot-rpmfusion-contact.patch
BuildArch: noarch
@@ -27,13 +34,13 @@ BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: libopenshot >= 0.2.0
BuildRequires: libopenshot-audio >= 0.1.6
BuildRequires: desktop-file-utils
-# To fix icon
-BuildRequires: ImageMagick
+# To fix icon — fix upstreamed
+# BuildRequires: ImageMagick
Requires: python%{python3_pkgversion}-qt5
Requires: python%{python3_pkgversion}-qt5-webkit
Requires: python%{python3_pkgversion}-httplib2
-Requires: python%{python3_pkgversion}-libopenshot >= 0.2.0
+Requires: python%{python3_pkgversion}-libopenshot >= 0.2.2
Requires: python%{python3_pkgversion}-zmq
Requires: ffmpeg-libs
@@ -74,7 +81,7 @@ Requires: %{name} = %{version}-%{release}
%prep
-%autosetup -n %{name}-qt-%{version}
+%autosetup -p1 -n %{name}-qt-%{version}
%build
@@ -97,19 +104,17 @@ done
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-qt.desktop
-# Install appdata file
-mkdir -p %{buildroot}%{_metainfodir}
-install -pm 0644 %{SOURCE101} %{buildroot}%{_metainfodir}/
+# Validate appdata file
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
-# Move icon files to the preferred location
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ \
- %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
-mv %{buildroot}%{_datadir}/pixmaps/%{name}-qt.svg \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+# Move icon files to the preferred location — fixed upstream
+#mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ \
+# %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
+#mv %{buildroot}%{_datadir}/pixmaps/%{name}-qt.svg \
+# %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
-# Provided icon is not square
-convert xdg/openshot-qt.png -virtual-pixel Transparent -set option:distort:viewport "%[fx:max(w,h)]x%[fx:max(w,h)]-%[fx:max((h-w)/2,0)]-%[fx:max((w-h)/2,0)]" -filter point -distort SRT 0 +repage %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/openshot-qt.png
+# Provided icon was not square — fixed upstream
+#convert xdg/openshot-qt.png -virtual-pixel Transparent -set option:distort:viewport "%[fx:max(w,h)]x%[fx:max(w,h)]-%[fx:max((h-w)/2,0)]-%[fx:max((w-h)/2,0)]" -filter point -distort SRT 0 +repage %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/openshot-qt.png
%find_lang OpenShot --with-qt
@@ -135,18 +140,31 @@ fi
%{_bindir}/*
%{_datadir}/applications/%{name}-qt.desktop
%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/pixmaps/*
%{_datadir}/mime/packages/*
%{_metainfodir}/*.appdata.xml
%{python3_sitelib}/%{name}_qt/
-%exclude %{python3_sitelib}/%{name}_qt/locale/*
+%exclude %{python3_sitelib}/%{name}_qt/language/*
%{python3_sitelib}/*egg-info
%{_prefix}/lib/mime/packages/openshot-qt
%files lang -f OpenShot.lang
-%dir %{python3_sitelib}/%{name}_qt/locale/*
+%dir %{python3_sitelib}/%{name}_qt/language
+%{python3_sitelib}/%{name}_qt/language/%{name}_lang.py
+%{python3_sitelib}/%{name}_qt/language/%{name}_lang.qrc
%changelog
+* Mon Sep 3 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.3-1
+- New upstream release 2.4.3
+- Update libopenshot dependency version to new 0.2.2 release
+- Drop several upstreamed build fixes
+- Use upstream appdata file instead of our own
+- Patch upstream appdata file for missed release tag
+- Add openshot-owner(a)rpmfusion.org as update contact in appdata
+- Clean up installed files
+- New translations path, update find logic and packaging
+
* Sat Sep 1 2018 FeRD (Frank Dana) <ferdnyc AT gmail com> - 2.4.2-2
- Updated package description
- Rebuild for updated libopenshot (with new ImageMagick)
diff --git a/sources b/sources
index ed3f5da..4c40cb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5cdf9a71a4b02d54df18a83596c49f4 openshot-qt-2.4.2.tar.gz
+1d5dab40ee47748d1322bdd18b902171 openshot-qt-2.4.3.tar.gz
6 years
[ppsspp/f28] First rpm rhbz#5015
by Antonio
Summary of changes:
dbf55c2... First rpm rhbz#5015 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[ppsspp/f29] First rpm rhbz#5015
by Antonio
Summary of changes:
dbf55c2... First rpm rhbz#5015 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[lightspark/f27] Disable LLVM
by Xavier Bachelot
Summary of changes:
52a3da8... Disable LLVM (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
[lightspark/f28] Disable LLVM
by Xavier Bachelot
Summary of changes:
52a3da8... Disable LLVM (*)
(*) This commit already existed in another branch; no separate mail sent
6 years
