[chromium-freeworld] Fix rpmlint warnings and errors
by qvint
commit a35f5f4eea7a2a005b4f54f34bb0733e359005ff
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Mar 6 06:53:24 2020 +0300
Fix rpmlint warnings and errors
- Indent tag data
- Remove trailing spaces
- Fix summary-ended-with-dot
- Fix summary-too-long
- Fix name-repeated-in-summary
- Fix description-shorter-than-summary
- Fix mixed-use-of-spaces-and-tabs
chromium-freeworld.spec | 210 ++++++++++++++++++++++++------------------------
1 file changed, 105 insertions(+), 105 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 155d3ba..bacd0c0 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -14,16 +14,16 @@
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
-# Fedora's Python 2 stack is being removed, we use the bundled Python libraries
-# This can be revisited once we upgrade to Python 3
+# Fedora's Python 2 stack is being removed, we use the bundled Python libraries
+# This can be revisited once we upgrade to Python 3
%global bundlepylibs 1
%if 0%{bundlepylibs}
%bcond_with system_ply
%else
%bcond_without system_ply
%endif
-# This package depends on automagic byte compilation
-# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
+# This package depends on automagic byte compilation
+# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
%global _python_bytecompile_extra 1
#Require harfbuzz >= 2.4.0 for hb_subset_input_set_retain_gids
%if 0%{?fedora} >= 31
@@ -57,7 +57,7 @@
%bcond_without system_minizip
%endif
-# Need re2 ver. 2016.07.21 for re2::LazyRE2
+# Need re2 ver. 2016.07.21 for re2::LazyRE2
%bcond_with system_re2
#Turn on verbose mode
@@ -68,14 +68,14 @@
# Enable building with ozone support
%global ozone 0
##############################Package Definitions######################################
-Name: chromium-freeworld
-Version: 80.0.3987.132
-Release: 1%{?dist}
-Summary: Chromium-freeworld is an open-source web browser, powered by WebKit (Blink). It comes with all freeworld codecs and video acceleration enabled.
-License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
-URL: https://www.chromium.org/Home
+Name: chromium-freeworld
+Version: 80.0.3987.132
+Release: 1%{?dist}
+Summary: Chromium web browser built with all freeworld codecs and VA-API support
+License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
+URL: https://www.chromium.org/Home
%if %{freeworld}
-Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
+Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
%else
# Unfortunately, Fedora & Copr forbids uploading sources with patent-encumbered
# ffmpeg code even if they are never compiled and linked to target binaries,
@@ -89,14 +89,14 @@ Source0: https://commondatastorage.googleapis.com/chromium-browser-official/c
# to 1 to use the upstreanm packaged source.
# The repackaged source tarball used here is produced by:
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
-Source0: chromium-%{version}-clean.tar.xz
+Source0: chromium-%{version}-clean.tar.xz
%endif
# The following two source files are copied and modified from the chromium source
-Source10: %{name}.sh
-#Add our own appdata file.
-Source11: %{name}.appdata.xml
+Source10: %{name}.sh
+#Add our own appdata file.
+Source11: %{name}.appdata.xml
#Personal stuff
-Source15: LICENSE
+Source15: LICENSE
######################## Installation Folder #################################################
#Our installation folder
%global chromiumdir %{_libdir}/%{name}
@@ -104,30 +104,30 @@ Source15: LICENSE
#Compiler settings
# Make sure we don't encounter any bug
%if %{clang}
-BuildRequires: clang, llvm, lld
+BuildRequires: clang, llvm, lld
%else
-BuildRequires: gcc-c++
+BuildRequires: gcc-c++
%endif
# Basic tools and libraries needed for building
-BuildRequires: ninja-build, nodejs, bison, gperf, hwdata
-BuildRequires: libgcc, glibc, libatomic
-BuildRequires: libcap-devel, cups-devel, alsa-lib-devel
-BuildRequires: mesa-libGL-devel, mesa-libEGL-devel
+BuildRequires: ninja-build, nodejs, bison, gperf, hwdata
+BuildRequires: libgcc, glibc, libatomic
+BuildRequires: libcap-devel, cups-devel, alsa-lib-devel
+BuildRequires: mesa-libGL-devel, mesa-libEGL-devel
%if %{with system_minizip}
-BuildRequires: minizip-compat-devel
+BuildRequires: minizip-compat-devel
%endif
# Pipewire need this.
%if 0%{?fedora} >= 29
-BuildRequires: pkgconfig(libpipewire-0.2)
-%endif
-BuildRequires: pkgconfig(gtk+-2.0), pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(libexif), pkgconfig(nss)
-BuildRequires: pkgconfig(xtst), pkgconfig(xscrnsaver)
-BuildRequires: pkgconfig(dbus-1), pkgconfig(libudev)
-BuildRequires: pkgconfig(gnome-keyring-1)
-BuildRequires: pkgconfig(libffi)
+BuildRequires: pkgconfig(libpipewire-0.2)
+%endif
+BuildRequires: pkgconfig(gtk+-2.0), pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(libexif), pkgconfig(nss)
+BuildRequires: pkgconfig(xtst), pkgconfig(xscrnsaver)
+BuildRequires: pkgconfig(dbus-1), pkgconfig(libudev)
+BuildRequires: pkgconfig(gnome-keyring-1)
+BuildRequires: pkgconfig(libffi)
#for vaapi
-BuildRequires: pkgconfig(libva)
+BuildRequires: pkgconfig(libva)
%if %{ozone}
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(wayland-client)
@@ -138,115 +138,115 @@ BuildRequires: pkgconfig(wayland-server)
#Python stuffs
%if 0%{?bundlepylibs}
-
+
# Using bundled bits, do nothing.
#This is needed for remove_bundled_libraries.py
-BuildRequires: /usr/bin/python2
-
+BuildRequires: /usr/bin/python2
+
%else
-BuildRequires: python2-rpm-macros
-BuildRequires: python2-beautifulsoup4
-BuildRequires: python2-lxml
-BuildRequires: python2-html5lib
-BuildRequires: python2-markupsafe
-Buildrequires: python2-six
+BuildRequires: python2-rpm-macros
+BuildRequires: python2-beautifulsoup4
+BuildRequires: python2-lxml
+BuildRequires: python2-html5lib
+BuildRequires: python2-markupsafe
+Buildrequires: python2-six
%if %{with system_ply}
-BuildRequires: python2-ply
+BuildRequires: python2-ply
%endif
%endif
%if %{with system_re2}
-BuildRequires: re2-devel
+BuildRequires: re2-devel
%endif
# replace_gn_files.py --system-libraries
-BuildRequires: flac-devel
-BuildRequires: freetype-devel
+BuildRequires: flac-devel
+BuildRequires: freetype-devel
%if %{with system_harfbuzz}
-BuildRequires: harfbuzz-devel
+BuildRequires: harfbuzz-devel
%endif
%if %{with system_libicu}
-BuildRequires: libicu-devel
+BuildRequires: libicu-devel
%endif
-BuildRequires: libdrm-devel
-BuildRequires: libjpeg-turbo-devel
-BuildRequires: libpng-devel
+BuildRequires: libdrm-devel
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libpng-devel
# Chromium requires libvpx 1.5.0 and some non-default options
%if %{with system_libvpx}
-BuildRequires: libvpx-devel
+BuildRequires: libvpx-devel
%endif
%if %{with system_ffmpeg}
-BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-devel
%endif
-BuildRequires: libwebp-devel
+BuildRequires: libwebp-devel
%if %{with system_libxml2}
-BuildRequires: pkgconfig(libxml-2.0)
-%endif
-BuildRequires: pkgconfig(libxslt)
-BuildRequires: opus-devel
-BuildRequires: snappy-devel
-BuildRequires: yasm
-BuildRequires: pciutils-devel
-BuildRequires: speech-dispatcher-devel
-BuildRequires: pulseaudio-libs-devel
+BuildRequires: pkgconfig(libxml-2.0)
+%endif
+BuildRequires: pkgconfig(libxslt)
+BuildRequires: opus-devel
+BuildRequires: snappy-devel
+BuildRequires: yasm
+BuildRequires: pciutils-devel
+BuildRequires: speech-dispatcher-devel
+BuildRequires: pulseaudio-libs-devel
# install desktop files
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils
# install AppData files
-BuildRequires: libappstream-glib
+BuildRequires: libappstream-glib
# Mojojojo need this >:(
-BuildRequires: java-1.8.0-openjdk
+BuildRequires: java-1.8.0-openjdk
# Libstdc++ static needed for linker
BuildRequires: libstdc++-static
#Runtime Requirements
Requires: hicolor-icon-theme
# Make sure chromium-freeworld replaces chromium-vaapi
-Provides: chromium-vaapi = %{version}-%{release}
-Obsoletes: chromium-vaapi < %{version}-%{release}
+Provides: chromium-vaapi = %{version}-%{release}
+Obsoletes: chromium-vaapi < %{version}-%{release}
#Some recommendations
-Recommends: libva-utils
+Recommends: libva-utils
%if !%{debug_pkg}
%global debug_package %{nil}
%endif
# This build should be only available to amd64
-ExclusiveArch: x86_64
+ExclusiveArch: x86_64
# Define Patches here ##
# Enable video acceleration on chromium for Linux
-Patch1: enable-vaapi.patch
+Patch1: enable-vaapi.patch
# Enable support for widevine
-Patch2: widevine.patch
+Patch2: widevine.patch
# Fix vaapi on Intel
-Patch3: fixvaapionintel.patch
+Patch3: fixvaapionintel.patch
#Fix certificare transperancy error introduced by the current stable version of chromium
-Patch5: cert-trans-google.patch
+Patch5: cert-trans-google.patch
# Bootstrap still uses python command
-Patch51: py2-bootstrap.patch
+Patch51: py2-bootstrap.patch
# Fix building with system icu
-Patch52: chromium-system-icu.patch
+Patch52: chromium-system-icu.patch
# Let's brand chromium!
-Patch54: brand.patch
+Patch54: brand.patch
# Fix header
-Patch68: Add-missing-header-to-fix-webrtc-build.patch
-Patch69: chromium-unbundle-zlib.patch
-Patch70: chromium-base-location.patch
+Patch68: Add-missing-header-to-fix-webrtc-build.patch
+Patch69: chromium-unbundle-zlib.patch
+Patch70: chromium-base-location.patch
# Gentoo:
-Patch400: chromium-80-include.patch
-Patch401: chromium-80-gcc-incomplete-type.patch
-Patch402: chromium-80-gcc-quiche.patch
-Patch403: chromium-80-gcc-permissive.patch
-Patch404: chromium-80-gcc-blink.patch
-Patch405: chromium-80-gcc-abstract.patch
+Patch400: chromium-80-include.patch
+Patch401: chromium-80-gcc-incomplete-type.patch
+Patch402: chromium-80-gcc-quiche.patch
+Patch403: chromium-80-gcc-permissive.patch
+Patch404: chromium-80-gcc-blink.patch
+Patch405: chromium-80-gcc-abstract.patch
%if %{with system_libxml2}
-Patch406: chromium-80-unbundle-libxml.patch
+Patch406: chromium-80-unbundle-libxml.patch
%endif
# Fedora:
-Patch500: chromium-80.0.3987.87-missing-string-header.patch
-Patch501: chromium-80.0.3987.106-missing-cstddef-header.patch
-Patch502: chromium-80.0.3987.87-missing-cstdint-header.patch
-Patch503: chromium-77.0.3865.75-gcc-include-memory.patch
-Patch504: chromium-80.0.3987.106-missing-cstring-header.patch
+Patch500: chromium-80.0.3987.87-missing-string-header.patch
+Patch501: chromium-80.0.3987.106-missing-cstddef-header.patch
+Patch502: chromium-80.0.3987.87-missing-cstdint-header.patch
+Patch503: chromium-77.0.3865.75-gcc-include-memory.patch
+Patch504: chromium-80.0.3987.106-missing-cstring-header.patch
%if 0%{?fedora} >= 32
-Patch505: chromium-79.0.3945.130-gcc10-use-c++17-to-work-around-ugly-angle-code.patch
-Patch506: chromium-80.0.3987.87-fix-for-c++17.patch
+Patch505: chromium-79.0.3945.130-gcc10-use-c++17-to-work-around-ugly-angle-code.patch
+Patch506: chromium-80.0.3987.87-fix-for-c++17.patch
%endif
@@ -316,10 +316,10 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/catapult \
third_party/catapult/common/py_vulcanize/third_party/rcssmin \
third_party/catapult/common/py_vulcanize/third_party/rjsmin \
- %if 0%{?bundlepylibs}
+%if 0%{?bundlepylibs}
third_party/catapult/third_party/beautifulsoup4 \
third_party/catapult/third_party/html5lib-python \
- %endif
+%endif
third_party/catapult/third_party/polymer \
third_party/catapult/third_party/six \
third_party/catapult/tracing/third_party/d3 \
@@ -392,8 +392,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt
third_party/libyuv \
third_party/lss \
third_party/lzma_sdk \
-%if 0%{?bundlepylibs}
- third_party/markupsafe \
+%if 0%{?bundlepylibs}
+ third_party/markupsafe \
%endif
third_party/mesa \
third_party/metrics_proto \
@@ -554,8 +554,8 @@ export AR=ar NM=nm AS=as
export CC=gcc CXX=g++
-# GN needs gold to bootstrap
-export LDFLAGS="$LDFLAGS -fuse-ld=gold"
+# GN needs gold to bootstrap
+export LDFLAGS="$LDFLAGS -fuse-ld=gold"
export CXXFLAGS="$CXXFLAGS -fpermissive"
%if !%{debug_logs}
@@ -571,7 +571,7 @@ export CXXFLAGS="$CXXFLAGS -g0"
export CXXFLAGS="$CXXFLAGS -fno-ipa-cp-clone"
%endif
#end compiler part
-%endif
+%endif
gn_args=(
is_debug=false
@@ -628,9 +628,9 @@ gn_args+=(
'clang_base_path="/usr"'
clang_use_chrome_plugins=false
use_lld=true
-%else
+%else
is_clang=false
-%endif
+%endif
)
#Pipewire
@@ -645,7 +645,7 @@ gn_args+=(
gn_args+=(
%if %{ozone}
use_ozone=true
- use_system_minigbm=true
+ use_system_minigbm=true
use_xkbcommon=true
%endif
)
@@ -721,7 +721,7 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
######################################files################################################
%files
%license LICENSE
-%doc AUTHORS
+%doc AUTHORS
%{_bindir}/%{name}
%{_metainfodir}/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
4 years, 8 months
[mixxx] Disable ctest
by Uwe Klotz
commit ba0990a59d91477e1723381494ca4b6116867f37
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 20:30:24 2020 +0100
Disable ctest
mixxx.spec | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 8b3593e..6ea5b27 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -151,15 +151,18 @@ install -Dpm 0644 \
%check
-pushd .
-cd cmake_build
+# Tests can only be executed locally. Running them on
+# http://koji.rpmfusion.org always ends with the error
+# message "# Child aborted***Exception:"
+#pushd .
+#cd cmake_build
# TODO: Renable ControllerEngineTest after fixing the failures
# See also: https://github.com/mixxxdj/mixxx/projects/2#card-34576534
-ctest \
- --exclude-regex ControllerEngineTest \
- %{?_smp_mflags} \
- --verbose
-popd
+#ctest \
+# --exclude-regex ControllerEngineTest \
+# %{?_smp_mflags} \
+# --verbose
+#popd
appstream-util \
validate-relax \
4 years, 8 months
[mixxx] Use %cmake macro and add %check section with ctest
by Uwe Klotz
commit e905eb4da81de393c1c282c08e4b2eae94115bba
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 12:04:47 2020 +0100
Use %cmake macro and add %check section with ctest
.gitignore | 3 +-
mixxx.spec | 106 ++++++++++++++++++++-----------------------
sources | 2 +-
usb_hidapi_udev_rules0.patch | 30 ++++++------
usb_hidapi_udev_rules1.patch | 13 +++---
5 files changed, 72 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 50f047c..91c9a9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/mixxx-release-2.2.3.tar.gz
-/mixxx-e16b6a63b28eab4d3c3ce919ed661a91d7fc664d.tar.gz
+/mixxx-9c15f9eb257f4a65419d1e582f7907897bd28ed4.tar.gz
diff --git a/mixxx.spec b/mixxx.spec
index 578025b..8b3593e 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -2,22 +2,22 @@
%global extraver alpha
# Optional: Only used for untagged snapshot versions
-%global gitcommit e16b6a63b28eab4d3c3ce919ed661a91d7fc664d
+%global gitcommit 9c15f9eb257f4a65419d1e582f7907897bd28ed4
# Format: <yyyymmdd>
-%global gitcommitdate 20200316
+%global gitcommitdate 20200318
%if "%{?gitcommit}" == ""
-# (Pre-)Releases
-%global sources release-%{version}%{?extraver:-%{extraver}}
+ # (Pre-)Releases
+ %global sources release-%{version}%{?extraver:-%{extraver}}
%else
-# Snapshots
-%global sources %{gitcommit}
-%global snapinfo %{?gitcommit:%{?gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}}
+ # Snapshots
+ %global sources %{gitcommit}
+ %global snapinfo %{?gitcommit:%{?gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}}
%endif
Name: mixxx
Version: 2.3.0
-Release: 0.1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 0.2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -83,28 +83,21 @@ through the GUI or with external controllers including
MIDI and HID devices.
-%global debug_package %{nil}
-
-
%prep
%autosetup -p1 -n %{name}-%{sources}
echo "#pragma once" > src/build.h
-%if 0%{?extraver:1}
+%if "%{?extraver}" != ""
echo "#define BUILD_BRANCH \"%{extraver}\"" >> src/build.h
%endif
-%if 0%{?snapinfo:1}
+%if "%{?snapinfo}" != ""
echo "#define BUILD_REV \"%{snapinfo}\"" >> src/build.h
%endif
%build
-ccache -s
mkdir -p cmake_build
cd cmake_build
-cmake \
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
- -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=%{_includedir} \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+%cmake \
-DCMAKE_BUILD_TYPE=Release \
-DOPTIMIZE=portable \
-DINSTALL_GTEST=OFF \
@@ -124,47 +117,25 @@ cmake \
-DVINYLCONTROL=ON \
-DWAVPACK=ON \
..
-cmake \
- --build . \
- --target mixxx \
- %{?_smp_mflags}
+%make_build
%install
-
-# Executable
-install -Dpsm 0755 \
- -t %{buildroot}%{_bindir} \
- cmake_build/%{name}
-
-# Icon
-install -Dpm 0644 \
- -t %{buildroot}%{_datadir}/pixmaps \
- res/images/%{name}_icon.svg \
-
-# Resources
-for subdir in controllers fonts keyboard skins translations
-do
- pushd .
- cd res/$subdir
- find . \
- -type f \
- -exec install -Dpm 0644 "{}" "%{buildroot}%{_datadir}/%{name}/$subdir/{}" \;
- popd
-done
-
-# Docs
-install -Dpm 0644 \
- -t %{buildroot}%{_docdir}/%{name} \
- README \
- README.md \
- Mixxx-Manual.pdf
+pushd .
+cd cmake_build
+%make_install
+popd
# USB HID permissions
-# Order custom rules before 70-uaccess.rules
-install -Dpm 0644 \
- res/linux/%{name}-usb-uaccess.rules \
+# - Relocate .rules file
+# - Order custom rules before 70-uaccess.rules
+install -d \
+ %{buildroot}%{_udevrulesdir}
+mv \
+ %{buildroot}%{_prefix}%{_sysconfdir}/udev/rules.d/%{name}-usb-uaccess.rules \
%{buildroot}%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
+rm -rf \
+ %{buildroot}%{_prefix}%{_sysconfdir}
# Desktop launcher
desktop-file-install \
@@ -174,18 +145,31 @@ desktop-file-install \
res/linux/%{name}.desktop
# AppStream metadata
-appstream-util \
- validate-relax \
- --nonet \
- res/linux/%{name}.appdata.xml
install -Dpm 0644 \
-t %{buildroot}%{_datadir}/appdata \
res/linux/%{name}.appdata.xml
+%check
+pushd .
+cd cmake_build
+# TODO: Renable ControllerEngineTest after fixing the failures
+# See also: https://github.com/mixxxdj/mixxx/projects/2#card-34576534
+ctest \
+ --exclude-regex ControllerEngineTest \
+ %{?_smp_mflags} \
+ --verbose
+popd
+
+appstream-util \
+ validate-relax \
+ --nonet \
+ %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
+
%files
%license COPYING LICENSE
-%doc Mixxx-Manual.pdf README README.md
+%doc Mixxx-Manual.pdf README
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
@@ -195,6 +179,12 @@ install -Dpm 0644 \
%changelog
+* Wed Mar 18 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.0-0.2.alpha.20200318gitdf88442
+- New upstream snapshot 2.3.0-pre-alpha
+- Build debuginfo packages
+- Use cmake macros for the build
+- Verify the build results by executing ctest
+
* Tue Mar 17 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.0-0.1.alpha.20200316gite16b6a6
- New upstream snapshot 2.3.0-pre-alpha
- Replaced build system SCons with CMake
diff --git a/sources b/sources
index 70f64e6..817d8ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mixxx-e16b6a63b28eab4d3c3ce919ed661a91d7fc664d.tar.gz) = 3c6454bbea7977272159ff9ef81b03627d9a29be7319fb5ae491b1661d71f12ce078e18a60dd0783599c0f7cdca1c83ef48ba1df1190b98cb8a924b21e42e6ab
+SHA512 (mixxx-9c15f9eb257f4a65419d1e582f7907897bd28ed4.tar.gz) = f949f94d09dc5fb51b4aff03a9fa4d61e264c7cb97bb3716bc5b6ed33d0c55ca0a902b3d34f2c105b8e241a827c1f803b417b5df8a59de8578720f0faf761649
diff --git a/usb_hidapi_udev_rules0.patch b/usb_hidapi_udev_rules0.patch
index 1fc400c..fab9276 100644
--- a/usb_hidapi_udev_rules0.patch
+++ b/usb_hidapi_udev_rules0.patch
@@ -1,4 +1,4 @@
-From 5d1a915b655cf9060238275d8078f00c910f4f5a Mon Sep 17 00:00:00 2001
+From c9bb987664fbcb12b522cbb0827c30f2b71fa13b Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu, 12 Mar 2020 11:44:29 +0100
Subject: [PATCH 1/2] Change USB HID udev rules from GROUP/MODE to TAG uaccess
@@ -11,29 +11,29 @@ Subject: [PATCH 1/2] Change USB HID udev rules from GROUP/MODE to TAG uaccess
rename res/linux/{mixxx.usb.rules => mixxx-usb-uaccess.rules} (56%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aa5fba2edf..e95b430532 100644
+index bbcd0a8628..c9c6acd325 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -879,7 +879,7 @@ install(
-
+@@ -922,7 +922,7 @@ install(
# udev rule file for USB HID and Bulk controllers
install(
-- FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/linux/mixxx.usb.rules
-+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/linux/mixxx-usb-uaccess.rules
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
+ FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/res/linux/mixxx.usb.rules
++ ${CMAKE_CURRENT_SOURCE_DIR}/res/linux/mixxx-usb-uaccess.rules
+ DESTINATION
+ ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
)
-
diff --git a/SConscript b/SConscript
index 4a8d90d1fc..0eb8785093 100644
--- a/SConscript
+++ b/SConscript
@@ -287,7 +287,7 @@ dotdesktop_files = Glob('#res/linux/mixxx.desktop')
dotappstream_files = Glob('#res/linux/mixxx.appdata.xml')
-
+
#udev rule file for USB HID and Bulk controllers
-hidudev_files = Glob('#res/linux/mixxx.usb.rules')
+hidudev_files = Glob('#res/linux/mixxx-usb-uaccess.rules')
-
+
#Icon file for menu entry
icon_files = Glob('#res/images/mixxx_icon.svg')
@@ -1009,7 +1009,7 @@ def BuildUbuntuPackage(target, source, env):
@@ -42,7 +42,7 @@ index 4a8d90d1fc..0eb8785093 100644
os.system('cp -r build/debian .')
- os.system('cp res/linux/mixxx.usb.rules ./debian/mixxx.mixxx-usb.udev')
+ os.system('cp res/linux/mixxx-usb-uaccess.rules ./debian/mixxx.mixxx-usb.udev')
-
+
scons_flags = ' '.join([
'optimize=portable',
diff --git a/res/linux/mixxx.usb.rules b/res/linux/mixxx-usb-uaccess.rules
@@ -54,7 +54,7 @@ index 7187e8a0b0..1e1a9a842a 100644
+++ b/res/linux/mixxx-usb-uaccess.rules
@@ -1,25 +1,26 @@
# This udev rule allows Mixxx to access HID and USB Bulk controllers when running as a normal user
-
+
-# Allow write access for all users in the "users" group for USB devices from known vendors
-# that make HID or USB bulk controllers. Note that the udev rule must match on the USB device level;
-# matching the USB interface descriptor with bInterfaceClass does not work.
@@ -62,7 +62,7 @@ index 7187e8a0b0..1e1a9a842a 100644
+# descriptor with bInterfaceClass does not work.
+
+# Install and execute before 70-uaccess.rules, e.g. .../udev/rules.d/69-mixxx-usb-uaccess.rules
-
+
# Native Instruments
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="17cc", GROUP="users", MODE="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="17cc", TAG+="uaccess"
@@ -87,9 +87,9 @@ index 7187e8a0b0..1e1a9a842a 100644
# Gemini
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="23c7", GROUP="users", MODE="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="23c7", TAG+="uaccess"
-
+
# Only some distribuions require the below
-KERNEL=="hiddev*", NAME="usb/%k", GROUP="users"
+KERNEL=="hiddev*", NAME="usb/%k", GROUP="uaccess"
---
+--
2.25.1
diff --git a/usb_hidapi_udev_rules1.patch b/usb_hidapi_udev_rules1.patch
index e9c49ea..86f286c 100644
--- a/usb_hidapi_udev_rules1.patch
+++ b/usb_hidapi_udev_rules1.patch
@@ -1,4 +1,4 @@
-From 9f01191fa5d61e993301f9e1d56bddee20460dd9 Mon Sep 17 00:00:00 2001
+From df88442557004d2afea0e8d6263f7e91057a471d Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu, 12 Mar 2020 12:00:12 +0100
Subject: [PATCH 2/2] Extend, update, and sort list of USB vendor ids
@@ -13,7 +13,7 @@ index 1e1a9a842a..0f8a67809b 100644
+++ b/res/linux/mixxx-usb-uaccess.rules
@@ -1,26 +1,50 @@
# This udev rule allows Mixxx to access HID and USB Bulk controllers when running as a normal user
-
+
+# Sources:
+# http://www.linux-usb.org/usb.ids
+# https://www.the-sz.com/products/usbid/
@@ -21,9 +21,9 @@ index 1e1a9a842a..0f8a67809b 100644
+
# Note that the udev rule must match on the USB device level; matching the USB interface
# descriptor with bInterfaceClass does not work.
-
+
# Install and execute before 70-uaccess.rules, e.g. .../udev/rules.d/69-mixxx-usb-uaccess.rules
-
+
-# Native Instruments
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="17cc", TAG+="uaccess"
-# Hercules
@@ -71,8 +71,9 @@ index 1e1a9a842a..0f8a67809b 100644
+
+# Missing:
+# - American Musical Supply (AMS/Mixars)
-
+
# Only some distribuions require the below
KERNEL=="hiddev*", NAME="usb/%k", GROUP="uaccess"
---
+--
2.25.1
+
4 years, 8 months
[mixxx/f30] Exclude README.md
by Uwe Klotz
commit 8d2c34c6cc2779365080bb9f3735b1a1786520e0
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 18:39:27 2020 +0100
Exclude README.md
mixxx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 9503d5f..5beae39 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -171,7 +171,7 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsounds
%files
%license COPYING LICENSE
-%doc Mixxx-Manual.pdf README README.md
+%doc Mixxx-Manual.pdf README
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/
4 years, 8 months
[mixxx/f31] Exclude README.md
by Uwe Klotz
commit be4efca22a616d957e55875ff9ecc44e30e2d2cb
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 18:39:27 2020 +0100
Exclude README.md
mixxx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 1104ccf..22875b3 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -171,7 +171,7 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsounds
%files
%license COPYING LICENSE
-%doc Mixxx-Manual.pdf README README.md
+%doc Mixxx-Manual.pdf README
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/
4 years, 8 months
[mixxx/f32] Exclude README.md
by Uwe Klotz
commit 8f6bf74292bbfa7e5d6ef4325426df5886b61d82
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 18:39:27 2020 +0100
Exclude README.md
mixxx.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index ab9a388..ff7a214 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -171,7 +171,7 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsounds
%files
%license COPYING LICENSE
-%doc Mixxx-Manual.pdf README README.md
+%doc Mixxx-Manual.pdf README
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/
4 years, 8 months
[mixxx/f32] Fix packaging errors
by Uwe Klotz
commit f16155e7432d61000af2871aa5a25e7d7c48fa95
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 16:38:30 2020 +0100
Fix packaging errors
Includes some backports of .spec changes/improvements from rawhide
mixxx.spec | 98 ++++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 60 insertions(+), 38 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index f7bf678..ab9a388 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -7,17 +7,17 @@
#global gitcommitdate 20181224
%if "%{?gitcommit}" == ""
-# (Pre-)Releases
-%global sources release-%{version}%{?extraver:-%{extraver}}
+ # (Pre-)Releases
+ %global sources release-%{version}%{?extraver:-%{extraver}}
%else
-# Snapshots
-%global sources %{gitcommit}
-%global snapinfo %{?gitcommit:%{?gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}}
+ # Snapshots
+ %global sources %{gitcommit}
+ %global snapinfo %{?gitcommit:%{?gitcommitdate}git%{?gitcommit:%(c=%{gitcommit}; echo ${c:0:7})}}
%endif
Name: mixxx
Version: 2.2.3
-Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -28,8 +28,8 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: protobuf-compiler
-# TODO: Update to python3-scons for 2.3.0
-# TODO: Update to cmake for 2.4.0
+BuildRequires: gcc-g++
+# TODO: Update to CMake/CCache for 2.3.0
BuildRequires: python2-scons
# Build Requirements
@@ -82,23 +82,22 @@ MIDI and HID devices.
%prep
%autosetup -p1 -n %{name}-%{sources}
-
-# TODO: Remove bundled libs before build?
-#rm -rf \
-# lib/gmock* \
-# lib/gtest* \
-# lib/libebur128* \
-# lib/soundtouch* \
-# lib/vamp \
-# lib/xwax \
+echo "#pragma once" > src/build.h
+%if 0%{?extraver:1}
+ echo "#define BUILD_BRANCH \"%{extraver}\"" >> src/build.h
+%endif
+%if 0%{?snapinfo:1}
+ echo "#define BUILD_REV \"%{snapinfo}\"" >> src/build.h
+%endif
%build
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-# TODO: Switch from scons-2 to scons(-3) for 2.3.0
-scons-2 %{?_smp_mflags} \
+# TODO: Switch from scons-2 to CMake for 2.3.0
+scons-2 \
+ %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
build=release \
@@ -115,39 +114,59 @@ scons-2 %{?_smp_mflags} \
%install
+# TODO: Switch from scons-2 to CMake for 2.3.0
+# All environment variables and arguments for this invocation
+# must match the SCons build invocation!!!
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-# TODO: Switch from scons-2 to scons(-3) for 2.3.0
-scons-2 %{?_smp_mflags} \
+scons-2 \
+ %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
- install_root=$RPM_BUILD_ROOT%{_prefix} \
+ build=release \
+ optimize=portable \
+ bulk=1 \
+ faad=1 \
+ ffmpeg=1 \
+ hid=1 \
+ modplug=1 \
+ opus=1 \
+ qtkeychain=1 \
+ shoutcast=1 \
+ wv=1 \
+ install_root=%{buildroot}%{_prefix} \
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
+# Remove redundant/unpackaged LICENSE file
+rm %{buildroot}%{_docdir}/%{name}/LICENSE
+
+# Install udev rules
+install -Dpm 0644 \
+ res/linux/%{name}.usb.rules \
+ %{buildroot}%{_udevrulesdir}/90-%{name}.usb.rules
+# Desktop launcher
desktop-file-install \
--vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--add-category=X-Synthesis \
- res/linux/mixxx.desktop
+ res/linux/%{name}.desktop
+# AppStream metadata
appstream-util \
validate-relax \
--nonet \
- $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+ res/linux/%{name}.appdata.xml
+install -Dpm 0644 \
+ -t %{buildroot}%{_datadir}/appdata \
+ res/linux/%{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/vampqt5/libmixxxminimal.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcem4a.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcewv.so
-
-# Remove docdir
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+chrpath --delete %{buildroot}%{_bindir}/%{name}
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/vampqt5/libmixxxminimal.so
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcem4a.so
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcewv.so
%files
@@ -156,13 +175,16 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/
-%{_datadir}/applications/mixxx.desktop
-%{_datadir}/pixmaps/mixxx_icon.svg
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}_icon.svg
%{_datadir}/appdata/%{name}.appdata.xml
-%{_udevrulesdir}/90-mixxx.usb.rules
+%{_udevrulesdir}/90-%{name}.usb.rules
%changelog
+* Wed Mar 18 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.3-4
+- Fix packaging errors
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 8 months
[mixxx/f30] Fix packaging errors
by Uwe Klotz
commit a7f46abc0df7e7386b01aac7872d0331b9666ce2
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 10:14:47 2020 +0100
Fix packaging errors
Includes some backports of .spec changes/improvements from rawhide
mixxx.spec | 88 +++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 55 insertions(+), 33 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 14b3a93..9503d5f 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,7 +17,7 @@
Name: mixxx
Version: 2.2.3
-Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -28,8 +28,8 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: protobuf-compiler
-# TODO: Update to python3-scons for 2.3.0
-# TODO: Update to cmake for 2.4.0
+BuildRequires: gcc-g++
+# TODO: Update to CMake/CCache for 2.3.0
BuildRequires: python2-scons
# Build Requirements
@@ -82,23 +82,22 @@ MIDI and HID devices.
%prep
%autosetup -p1 -n %{name}-%{sources}
-
-# TODO: Remove bundled libs before build?
-#rm -rf \
-# lib/gmock* \
-# lib/gtest* \
-# lib/libebur128* \
-# lib/soundtouch* \
-# lib/vamp \
-# lib/xwax \
+echo "#pragma once" > src/build.h
+%if 0%{?extraver:1}
+ echo "#define BUILD_BRANCH \"%{extraver}\"" >> src/build.h
+%endif
+%if 0%{?snapinfo:1}
+ echo "#define BUILD_REV \"%{snapinfo}\"" >> src/build.h
+%endif
%build
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-# TODO: Switch from scons-2 to scons(-3) for 2.3.0
-scons-2 %{?_smp_mflags} \
+# TODO: Switch from scons-2 to CMake for 2.3.0
+scons-2 \
+ %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
build=release \
@@ -115,39 +114,59 @@ scons-2 %{?_smp_mflags} \
%install
+# TODO: Switch from scons-2 to CMake for 2.3.0
+# All environment variables and arguments for this invocation
+# must match the SCons build invocation!!!
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-# TODO: Switch from scons-2 to scons(-3) for 2.3.0
-scons-2 %{?_smp_mflags} \
+scons-2 \
+ %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
- install_root=$RPM_BUILD_ROOT%{_prefix} \
+ build=release \
+ optimize=portable \
+ bulk=1 \
+ faad=1 \
+ ffmpeg=1 \
+ hid=1 \
+ modplug=1 \
+ opus=1 \
+ qtkeychain=1 \
+ shoutcast=1 \
+ wv=1 \
+ install_root=%{buildroot}%{_prefix} \
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
+# Remove redundant/unpackaged LICENSE file
+rm %{buildroot}%{_docdir}/%{name}/LICENSE
+
+# Install udev rules
+install -Dpm 0644 \
+ res/linux/%{name}.usb.rules \
+ %{buildroot}%{_udevrulesdir}/90-%{name}.usb.rules
+# Desktop launcher
desktop-file-install \
--vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--add-category=X-Synthesis \
- res/linux/mixxx.desktop
+ res/linux/%{name}.desktop
+# AppStream metadata
appstream-util \
validate-relax \
--nonet \
- $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+ res/linux/%{name}.appdata.xml
+install -Dpm 0644 \
+ -t %{buildroot}%{_datadir}/appdata \
+ res/linux/%{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/vampqt5/libmixxxminimal.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcem4a.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcewv.so
-
-# Remove docdir
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+chrpath --delete %{buildroot}%{_bindir}/%{name}
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/vampqt5/libmixxxminimal.so
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcem4a.so
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcewv.so
%files
@@ -156,13 +175,16 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/
-%{_datadir}/applications/mixxx.desktop
-%{_datadir}/pixmaps/mixxx_icon.svg
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}_icon.svg
%{_datadir}/appdata/%{name}.appdata.xml
-%{_udevrulesdir}/90-mixxx.usb.rules
+%{_udevrulesdir}/90-%{name}.usb.rules
%changelog
+* Wed Mar 18 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.3-2
+- Fix packaging errors
+
* Mon Dec 09 2019 Uwe Klotz <uwe.klotz(a)gmail.com> - 2.2.3-1
- New upstream release 2.2.3
4 years, 8 months
[mixxx/f31] Fix packaging errors
by Uwe Klotz
commit e1bad8f9610eabc98af6e31844306ab4ed4d0f9a
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Mar 18 10:14:47 2020 +0100
Fix packaging errors
Includes some backports of .spec changes/improvements from rawhide
mixxx.spec | 88 +++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 55 insertions(+), 33 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index ab9b4ac..1104ccf 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,7 +17,7 @@
Name: mixxx
Version: 2.2.3
-Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
@@ -28,8 +28,8 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: protobuf-compiler
-# TODO: Update to python3-scons for 2.3.0
-# TODO: Update to cmake for 2.4.0
+BuildRequires: gcc-g++
+# TODO: Update to CMake/CCache for 2.3.0
BuildRequires: python2-scons
# Build Requirements
@@ -82,23 +82,22 @@ MIDI and HID devices.
%prep
%autosetup -p1 -n %{name}-%{sources}
-
-# TODO: Remove bundled libs before build?
-#rm -rf \
-# lib/gmock* \
-# lib/gtest* \
-# lib/libebur128* \
-# lib/soundtouch* \
-# lib/vamp \
-# lib/xwax \
+echo "#pragma once" > src/build.h
+%if 0%{?extraver:1}
+ echo "#define BUILD_BRANCH \"%{extraver}\"" >> src/build.h
+%endif
+%if 0%{?snapinfo:1}
+ echo "#define BUILD_REV \"%{snapinfo}\"" >> src/build.h
+%endif
%build
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-# TODO: Switch from scons-2 to scons(-3) for 2.3.0
-scons-2 %{?_smp_mflags} \
+# TODO: Switch from scons-2 to CMake for 2.3.0
+scons-2 \
+ %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
build=release \
@@ -115,39 +114,59 @@ scons-2 %{?_smp_mflags} \
%install
+# TODO: Switch from scons-2 to CMake for 2.3.0
+# All environment variables and arguments for this invocation
+# must match the SCons build invocation!!!
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-# TODO: Switch from scons-2 to scons(-3) for 2.3.0
-scons-2 %{?_smp_mflags} \
+scons-2 \
+ %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
- install_root=$RPM_BUILD_ROOT%{_prefix} \
+ build=release \
+ optimize=portable \
+ bulk=1 \
+ faad=1 \
+ ffmpeg=1 \
+ hid=1 \
+ modplug=1 \
+ opus=1 \
+ qtkeychain=1 \
+ shoutcast=1 \
+ wv=1 \
+ install_root=%{buildroot}%{_prefix} \
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
+# Remove redundant/unpackaged LICENSE file
+rm %{buildroot}%{_docdir}/%{name}/LICENSE
+
+# Install udev rules
+install -Dpm 0644 \
+ res/linux/%{name}.usb.rules \
+ %{buildroot}%{_udevrulesdir}/90-%{name}.usb.rules
+# Desktop launcher
desktop-file-install \
--vendor "" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir %{buildroot}%{_datadir}/applications \
--add-category=X-Synthesis \
- res/linux/mixxx.desktop
+ res/linux/%{name}.desktop
+# AppStream metadata
appstream-util \
validate-relax \
--nonet \
- $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+ res/linux/%{name}.appdata.xml
+install -Dpm 0644 \
+ -t %{buildroot}%{_datadir}/appdata \
+ res/linux/%{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/vampqt5/libmixxxminimal.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcem4a.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcewv.so
-
-# Remove docdir
-rm -rf $RPM_BUILD_ROOT%{_docdir}
+chrpath --delete %{buildroot}%{_bindir}/%{name}
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/vampqt5/libmixxxminimal.so
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcem4a.so
+chrpath --delete %{buildroot}%{_libdir}/%{name}/plugins/soundsourceqt5/libsoundsourcewv.so
%files
@@ -156,13 +175,16 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%{_bindir}/%{name}
%{_libdir}/%{name}/
%{_datadir}/%{name}/
-%{_datadir}/applications/mixxx.desktop
-%{_datadir}/pixmaps/mixxx_icon.svg
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}_icon.svg
%{_datadir}/appdata/%{name}.appdata.xml
-%{_udevrulesdir}/90-mixxx.usb.rules
+%{_udevrulesdir}/90-%{name}.usb.rules
%changelog
+* Wed Mar 18 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.3-2
+- Fix packaging errors
+
* Mon Dec 09 2019 Uwe Klotz <uwe.klotz(a)gmail.com> - 2.2.3-1
- New upstream release 2.2.3
4 years, 8 months
[mixxx] Add missing build dependency lame-devel
by Uwe Klotz
commit c0575207903d09673bf8108c3fb055145e1c931f
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Tue Mar 17 23:57:57 2020 +0100
Add missing build dependency lame-devel
mixxx.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/mixxx.spec b/mixxx.spec
index 6a4e065..578025b 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -41,6 +41,7 @@ BuildRequires: ffmpeg-devel
BuildRequires: fftw-devel
BuildRequires: flac-devel
BuildRequires: hidapi-devel
+BuildRequires: lame-devel
BuildRequires: libebur128-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
4 years, 8 months