[lives] Some minor changes
by Antonio
commit 12667f4bf4ecf8b62412aac9fa2908eab20e92a2
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Aug 20 23:12:00 2018 +0200
Some minor changes
lives.spec | 51 +++++++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/lives.spec b/lives.spec
index 2e01116..79cd1d3 100644
--- a/lives.spec
+++ b/lives.spec
@@ -14,7 +14,7 @@
Name: lives
Version: 2.8.9
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -57,7 +57,7 @@ BuildRequires: gtk3-devel
BuildRequires: ffmpeg-devel
BuildRequires: bzip2-devel
BuildRequires: libappstream-glib
-BuildRequires: gcc-c++
+BuildRequires: gcc-c++, pkgconf-pkg-config
BuildRequires: perl-generators
BuildRequires: python2-devel
BuildRequires: python3-devel
@@ -65,24 +65,24 @@ BuildRequires: python3-devel
# Packages for re-configuration
BuildRequires: autoconf, automake, libtool
-Requires: mplayer
-Requires: mpv
-Requires: sox
-Requires: ImageMagick
-Requires: ogmtools
-Requires: oggvideotools
-Requires: perl-interpreter
-Requires: theora-tools
-Requires: youtube-dl
-Requires: dvgrab
-Requires: icedax
-Requires: frei0r-plugins
-Requires: mkvtoolnix
-Requires: vorbis-tools
-Requires: dvgrab
-Requires: projectM-libvisual
-Requires: projectM-pulseaudio
-Requires: projectM-jack
+Requires: mplayer%{?_isa}
+Requires: mpv%{?_isa}
+Requires: sox%{?_isa}
+Requires: ImageMagick%{?_isa}
+Requires: ogmtools%{?_isa}
+Requires: oggvideotools%{?_isa}
+Requires: perl-interpreter%{?_isa}
+Requires: theora-tools%{?_isa}
+Requires: youtube-dl%{?_isa}
+Requires: dvgrab%{?_isa}
+Requires: icedax%{?_isa}
+Requires: frei0r-plugins%{?_isa}
+Requires: mkvtoolnix%{?_isa}
+Requires: vorbis-tools%{?_isa}
+Requires: dvgrab%{?_isa}
+Requires: projectM-libvisual%{?_isa}
+Requires: projectM-pulseaudio%{?_isa}
+Requires: projectM-jack%{?_isa}
Requires: hicolor-icon-theme
%description
@@ -93,7 +93,7 @@ designed to be simple to use, yet powerful.
It is small in size, yet it has many advanced features.
%prep
-%setup -q -n lives-%{version}
+%autosetup -n lives-%{version}
##Remove spurious executable permissions
for i in `find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.txt" \)`; do
@@ -152,10 +152,10 @@ desktop-file-edit \
%{buildroot}%{_datadir}/applications/LiVES.desktop
# Register as an application to be visible in the software center
-install -Dp -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/LiVES.appdata.xml
+install -Dp -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}/LiVES.appdata.xml
%check
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%files -f %{name}.lang
%doc README AUTHORS BUGS ChangeLog FEATURES
@@ -171,9 +171,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.xpm
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/metainfo/LiVES.appdata.xml
+%{_metainfodir}/LiVES.appdata.xml
%changelog
+* Mon Aug 20 2018 Antonio Trande <sagitterATfedoraproject.org> - 2.8.9-5
+- Some minor changes
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.8.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
6 years, 3 months
[xpra-codecs-freeworld] Update to 2.3.3
by Antonio
commit 308837d667ed20082a0d82889f53ea43c2136761
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Aug 20 11:50:03 2018 +0200
Update to 2.3.3
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8499ecd..3334535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ xpra-0.16.3.tar.xz
/xpra-2.3.tar.xz
/xpra-2.3.1.tar.xz
/xpra-2.3.2.tar.xz
+/xpra-2.3.3.tar.xz
diff --git a/sources b/sources
index b38fccb..d2fd322 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67ae262de9c7175c14d2a1fb24dad1a1 xpra-2.3.2.tar.xz
+ab0db7b5be4992cae72ee98e8fb0e9ee xpra-2.3.3.tar.xz
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 1f60c5b..064942d 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -35,8 +35,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 2.3.2
-Release: 3%{?dist}
+Version: 2.3.3
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
@@ -128,6 +128,9 @@ find %{buildroot}%{pythonx_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Sun Aug 19 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 2.3.3-1
+- Update to 2.3.3
+
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.3.2-3
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
6 years, 3 months
[chromium-freeworld] setuid user-session, more python2 hacks
by Leigh Scott
commit d844f5b54bb270b0f7edc5d49c2078db142489d8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Aug 20 00:02:53 2018 +0100
setuid user-session, more python2 hacks
chromium-67.0.3396.99-py2-bootstrap.patch | 21 +++++++++++++++++++++
chromium-freeworld.spec | 5 ++++-
2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/chromium-67.0.3396.99-py2-bootstrap.patch b/chromium-67.0.3396.99-py2-bootstrap.patch
new file mode 100644
index 0000000..a6c2435
--- /dev/null
+++ b/chromium-67.0.3396.99-py2-bootstrap.patch
@@ -0,0 +1,21 @@
+diff -up chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2 chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py
+--- chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2 2018-07-24 16:58:53.372022183 -0400
++++ chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py 2018-07-24 17:00:03.200279816 -0400
+@@ -983,7 +983,7 @@ def build_gn_with_gn(temp_gn, build_dir,
+ gn_gen_args = options.gn_gen_args or ''
+ if not options.debug:
+ gn_gen_args += ' is_debug=false'
+- cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args,
++ cmd = [temp_gn, 'gen', '--script-executable=/usr/bin/python2', build_dir, '--args=%s' % gn_gen_args,
+ "--root="+SRC_ROOT
+ ]
+ check_call(cmd)
+@@ -997,7 +997,7 @@ def build_gn_with_gn(temp_gn, build_dir,
+ # build.ninja currently refers back to gn from the temporary directory.
+ # Regenerate the build files using the gn we just built so that the reference
+ # gets updated to "./gn".
+- cmd = [os.path.join(build_dir, 'gn'), 'gen', build_dir,
++ cmd = [os.path.join(build_dir, 'gn'), 'gen', '--script-executable=/usr/bin/python2', build_dir,
+ '--args=%s' % gn_gen_args]
+ check_call(cmd)
+
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index b0a1c8d..9fe0c6d 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -261,6 +261,7 @@ Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
Patch101: chromium-67.0.3396.87-fedora-user-agent.patch
# Try to fix version.py for Rawhide
Patch102: chromium-67.0.3396.99-py3fix.patch
+Patch103: chromium-67.0.3396.99-py2-bootstrap.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -782,6 +783,7 @@ udev.
%endif
%patch101 -p1 -b .fedora-user-agent
%patch102 -p1 -b .py3fix
+%patch103 -p1 -b .py2
# Change shebang in all relevant files in this directory and all subdirectories
@@ -1249,7 +1251,7 @@ if python2 -c 'import google ; print google.__path__' 2> /dev/null ; then \
fi
tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES"
-%{target}/gn gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}
+%{target}/gn --script-executable=/usr/bin/python2 gen --args="$CHROMIUM_CORE_GN_DEFINES $CHROMIUM_BROWSER_GN_DEFINES" %{target}
%if %{freeworld}
# do not need to do headless gen
@@ -1395,6 +1397,7 @@ cp -a remoting_locales %{buildroot}%{crd_path}/
cp -a remoting_me2me_host %{buildroot}%{crd_path}/chrome-remote-desktop-host
cp -a remoting_start_host %{buildroot}%{crd_path}/start-host
cp -a remoting_user_session %{buildroot}%{crd_path}/user-session
+chmod +s %{buildroot}%{crd_path}/user-session
# chromium
mkdir -p %{buildroot}%{_sysconfdir}/chromium/native-messaging-hosts
6 years, 3 months
[mixxx/f28] Update to upstream release 2.1.2
by Uwe Klotz
commit dc0b5fce6f2a5872bf00ce7f3f73dba312fe5cc0
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Aug 19 15:18:23 2018 +0200
Update to upstream release 2.1.2
.gitignore | 1 +
mixxx.spec | 10 ++++++++--
sources | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b87783..3ea6c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-release-2.1.0-rc1.tar.gz
/mixxx-release-2.1.0.tar.gz
/mixxx-release-2.1.1.tar.gz
+/mixxx-release-2.1.2.0.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 02b52c8..396f357 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -16,8 +16,9 @@
%endif
Name: mixxx
-Version: 2.1.1
-Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+# 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
+Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -150,6 +151,11 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Sun Aug 19 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.2-1
+- Update to upstream release 2.1.2
+- Re-enable FFmpeg
+- Remove obsolete build flag
+
* Thu Jun 14 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.1-2
- Update to upstream release 2.1.1
- Use system library SoundTouch v2.0+ if available
diff --git a/sources b/sources
index a9dfaa3..e2ed966 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6336d6568bbf860c4e03295ae51ee286 mixxx-release-2.1.1.tar.gz
+ce44bc93f1370ad4e64a240ed342e535 mixxx-release-2.1.2.0.tar.gz
6 years, 3 months
[mixxx/f28] Re-enable FFmpeg
by Uwe Klotz
commit 95fe75e4bbff05221cc45bc728a3b2bb804bedf5
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Aug 19 15:18:07 2018 +0200
Re-enable FFmpeg
mixxx.spec | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index c40f784..02b52c8 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -32,10 +32,7 @@ BuildRequires: python2-scons
# Build Requirements
BuildRequires: faad2-devel
-# 2018-04-11 uklotzde: FFmpeg support has been disabled temporarily
-# due to incompatibilities causing build errors in rawhide/f29
-# See below: SCons build option ffmpeg=0/1
-#BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-devel
BuildRequires: fftw-devel
BuildRequires: flac-devel
BuildRequires: hidapi-devel
@@ -103,7 +100,7 @@ scons %{?_smp_mflags} \
optimize=portable \
bulk=1 \
faad=1 \
- ffmpeg=0 \
+ ffmpeg=1 \
hid=1 \
modplug=1 \
opus=1 \
6 years, 3 months
[mixxx/f28] Remove obsolete build flag
by Uwe Klotz
commit b44d42f5dd7ea524dc1897f4100d9eb93fbb1c2b
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Aug 19 15:17:51 2018 +0200
Remove obsolete build flag
mixxx.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index e70ced5..c40f784 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -101,7 +101,6 @@ scons %{?_smp_mflags} \
qtdir=%{_qt4_prefix} \
build=release \
optimize=portable \
- qdebug=1 \
bulk=1 \
faad=1 \
ffmpeg=0 \
6 years, 3 months
[mixxx] Update to upstream release 2.1.2
by Uwe Klotz
commit a61b5aac6971e3e87dd1c32a18474cf25aef29dd
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Aug 19 15:18:23 2018 +0200
Update to upstream release 2.1.2
.gitignore | 1 +
mixxx.spec | 10 ++++++++--
sources | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b87783..3ea6c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ mixxx-1.11.0-src.tar.gz
/mixxx-release-2.1.0-rc1.tar.gz
/mixxx-release-2.1.0.tar.gz
/mixxx-release-2.1.1.tar.gz
+/mixxx-release-2.1.2.0.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 239799f..7d8e420 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -16,8 +16,9 @@
%endif
Name: mixxx
-Version: 2.1.1
-Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+# 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
+Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -150,6 +151,11 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Sun Aug 19 2018 Uwe Klotz <uklotz(a)mixxx.org> - 2.1.2-1
+- Update to upstream release 2.1.2
+- Re-enable FFmpeg
+- Remove obsolete build flag
+
* Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index a9dfaa3..e2ed966 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6336d6568bbf860c4e03295ae51ee286 mixxx-release-2.1.1.tar.gz
+ce44bc93f1370ad4e64a240ed342e535 mixxx-release-2.1.2.0.tar.gz
6 years, 3 months
[mixxx] Re-enable FFmpeg
by Uwe Klotz
commit f5b10b6f87b15dbaae3c89ed11b9075859feac45
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Aug 19 15:18:07 2018 +0200
Re-enable FFmpeg
mixxx.spec | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 872f781..239799f 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -32,10 +32,7 @@ BuildRequires: python2-scons
# Build Requirements
BuildRequires: faad2-devel
-# 2018-04-11 uklotzde: FFmpeg support has been disabled temporarily
-# due to incompatibilities causing build errors in rawhide/f29
-# See below: SCons build option ffmpeg=0/1
-#BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-devel
BuildRequires: fftw-devel
BuildRequires: flac-devel
BuildRequires: hidapi-devel
@@ -103,7 +100,7 @@ scons %{?_smp_mflags} \
optimize=portable \
bulk=1 \
faad=1 \
- ffmpeg=0 \
+ ffmpeg=1 \
hid=1 \
modplug=1 \
opus=1 \
6 years, 3 months
[mixxx] Remove obsolete build flag
by Uwe Klotz
commit f93f6ccb2e9ca961b85588603dc70ee0e369ee5f
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Aug 19 15:17:51 2018 +0200
Remove obsolete build flag
mixxx.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 4850a45..872f781 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -101,7 +101,6 @@ scons %{?_smp_mflags} \
qtdir=%{_qt4_prefix} \
build=release \
optimize=portable \
- qdebug=1 \
bulk=1 \
faad=1 \
ffmpeg=0 \
6 years, 3 months