[frobtads/f32] Fix FTBFS
by jwrdegoede
Summary of changes:
f6d8b1c... Fix FTBFS (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
[frobtads] Fix FTBFS
by jwrdegoede
commit f6d8b1c3b5deec824e17e8b57a952a29712fe15d
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 17 23:17:01 2020 +0100
Fix FTBFS
frobtads-1.2.3-gcc10-fix.patch | 15 +++++++++++++++
frobtads.spec | 8 ++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/frobtads-1.2.3-gcc10-fix.patch b/frobtads-1.2.3-gcc10-fix.patch
new file mode 100644
index 0000000..ba01499
--- /dev/null
+++ b/frobtads-1.2.3-gcc10-fix.patch
@@ -0,0 +1,15 @@
+diff -up frobtads-1.2.3/tads3/unix/osnetunix.h~ frobtads-1.2.3/tads3/unix/osnetunix.h
+--- frobtads-1.2.3/tads3/unix/osnetunix.h~ 2013-05-17 21:52:27.000000000 +0200
++++ frobtads-1.2.3/tads3/unix/osnetunix.h 2020-03-17 23:00:59.775324251 +0100
+@@ -218,11 +218,6 @@ private:
+ # undef ATOMIC_INC_FETCH
+ # undef ATOMIC_DEC_FETCH
+ #endif
+-#ifndef __clang__
+-# if __has_builtin == 0
+-# undef __has_builtin
+-# endif
+-#endif
+
+ /* ------------------------------------------------------------------------ */
+ /*
diff --git a/frobtads.spec b/frobtads.spec
index 6748e20..d2450da 100644
--- a/frobtads.spec
+++ b/frobtads.spec
@@ -1,11 +1,12 @@
Name: frobtads
Version: 1.2.3
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Text interpreter for Tads games
License: non-commercial
URL: http://www.tads.org/frobtads.htm
Source0: http://www.tads.org/%{name}/%{name}-%{version}.tar.gz
+Patch1: frobtads-1.2.3-gcc10-fix.patch
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
@@ -40,7 +41,7 @@ This package contains Tads 2 and Tads 3 compilers.
%prep
-%setup -q
+%autosetup -p1
%build
@@ -73,6 +74,9 @@ rm -rf %{buildroot}%{_datadir}/frobtads/tads3/doc
%changelog
+* Tue Mar 17 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.3-11
+- Fix FTBFS
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 8 months
[mixxx] Add new sources
by Uwe Klotz
commit 4903e00593a0c0ad5b05eac9e6f3591d3fefe471
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Tue Mar 17 22:51:02 2020 +0100
Add new sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index c9fd37e..50f047c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mixxx-release-2.2.3.tar.gz
+/mixxx-e16b6a63b28eab4d3c3ce919ed661a91d7fc664d.tar.gz
diff --git a/sources b/sources
index 5af72f0..70f64e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mixxx-release-2.2.3.tar.gz) = dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
+SHA512 (mixxx-e16b6a63b28eab4d3c3ce919ed661a91d7fc664d.tar.gz) = 3c6454bbea7977272159ff9ef81b03627d9a29be7319fb5ae491b1661d71f12ce078e18a60dd0783599c0f7cdca1c83ef48ba1df1190b98cb8a924b21e42e6ab
4 years, 8 months
[mixxx] New upstream snapshot 2.3.0-pre-alpha built with CMake
by Uwe Klotz
commit 8466e1f1c1fcd919528a3511b31c1759ac8750bc
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Tue Mar 17 14:44:32 2020 +0100
New upstream snapshot 2.3.0-pre-alpha built with CMake
mixxx.spec | 163 ++++++++++++++++++++++++++-----------------
usb_hidapi_udev_rules0.patch | 95 +++++++++++++++++++++++++
usb_hidapi_udev_rules1.patch | 78 +++++++++++++++++++++
3 files changed, 272 insertions(+), 64 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index f7bf678..6a4e065 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -1,10 +1,10 @@
# Optional: Package version suffix for pre-releases, e.g. "beta" or "rc"
-#global extraver rc
+%global extraver alpha
# Optional: Only used for untagged snapshot versions
-#global gitcommit d9d7ea6404de71c86beacfc86f9087dc8db0fc58
+%global gitcommit e16b6a63b28eab4d3c3ce919ed661a91d7fc664d
# Format: <yyyymmdd>
-#global gitcommitdate 20181224
+%global gitcommitdate 20200316
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -16,21 +16,23 @@
%endif
Name: mixxx
-Version: 2.2.3
-Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Version: 2.3.0
+Release: 0.1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s...
+Patch0: usb_hidapi_udev_rules0.patch
+Patch1: usb_hidapi_udev_rules1.patch
# Build Tools
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: python2-scons
+BuildRequires: cmake
+BuildRequires: ccache
+BuildRequires: gcc-c++
# Build Requirements
BuildRequires: chrpath
@@ -80,89 +82,122 @@ through the GUI or with external controllers including
MIDI and HID devices.
+%global debug_package %{nil}
+
+
%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} \
- prefix=%{_prefix} \
- qtdir=%{_qt5_prefix} \
- build=release \
- optimize=portable \
- bulk=1 \
- faad=1 \
- ffmpeg=1 \
- hid=1 \
- modplug=1 \
- opus=1 \
- qtkeychain=1 \
- shoutcast=1 \
- wv=1 \
+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} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DOPTIMIZE=portable \
+ -DINSTALL_GTEST=OFF \
+ -DWITH_STATIC_PIC=ON \
+ -DBATTERY=ON \
+ -DBROADCAST=ON \
+ -DBULK=ON \
+ -DFAAD=ON \
+ -DFFMPEG=ON \
+ -DHID=ON \
+ -DLOCALECOMPARE=ON \
+ -DLILV=ON \
+ -DMAD=ON \
+ -DMODPLUG=ON \
+ -DOPUS=ON \
+ -DQTKEYCHAIN=ON \
+ -DVINYLCONTROL=ON \
+ -DWAVPACK=ON \
+ ..
+cmake \
+ --build . \
+ --target mixxx \
+ %{?_smp_mflags}
%install
-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} \
- prefix=%{_prefix} \
- qtdir=%{_qt5_prefix} \
- install_root=$RPM_BUILD_ROOT%{_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
+# 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
+
+# USB HID permissions
+# Order custom rules before 70-uaccess.rules
+install -Dpm 0644 \
+ res/linux/%{name}-usb-uaccess.rules \
+ %{buildroot}%{_udevrulesdir}/69-%{name}-usb-uaccess.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
-
-# 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}
+ res/linux/%{name}.appdata.xml
+install -Dpm 0644 \
+ -t %{buildroot}%{_datadir}/appdata \
+ res/linux/%{name}.appdata.xml
%files
%license COPYING LICENSE
%doc Mixxx-Manual.pdf README README.md
%{_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}/69-%{name}-usb-uaccess.rules
%changelog
+* 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
+
* 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
diff --git a/usb_hidapi_udev_rules0.patch b/usb_hidapi_udev_rules0.patch
new file mode 100644
index 0000000..1fc400c
--- /dev/null
+++ b/usb_hidapi_udev_rules0.patch
@@ -0,0 +1,95 @@
+From 5d1a915b655cf9060238275d8078f00c910f4f5a 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
+
+---
+ CMakeLists.txt | 2 +-
+ SConscript | 4 +--
+ ...ixxx.usb.rules => mixxx-usb-uaccess.rules} | 25 ++++++++++---------
+ 3 files changed, 16 insertions(+), 15 deletions(-)
+ rename res/linux/{mixxx.usb.rules => mixxx-usb-uaccess.rules} (56%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aa5fba2edf..e95b430532 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -879,7 +879,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
+ )
+
+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):
+ print("* Copying Debian build directory from build/debian to debian (cwd: %s)" % os.getcwd())
+ print()
+ 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
+similarity index 56%
+rename from res/linux/mixxx.usb.rules
+rename to res/linux/mixxx-usb-uaccess.rules
+index 7187e8a0b0..1e1a9a842a 100644
+--- a/res/linux/mixxx.usb.rules
++++ 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.
++# 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", GROUP="users", MODE="0660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="17cc", TAG+="uaccess"
+ # Hercules
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="06f8", GROUP="users", MODE="0660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="06f8", TAG+="uaccess"
+ # Pioneer
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="08e4", GROUP="users", MODE="0660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="08e4", TAG+="uaccess"
+ # Numark (may be needed for NS7 & V7)
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="15e4", GROUP="users", MODE="0660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="15e4", TAG+="uaccess"
+ # Eks
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1157", GROUP="users", MODE="0660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1157", TAG+="uaccess"
+ # Nintendo
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="057e", GROUP="users", MODE="0660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="057e", TAG+="uaccess"
+ # Sony
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="054c", GROUP="users", MODE="0660"
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="054c", TAG+="uaccess"
+ # 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
new file mode 100644
index 0000000..e9c49ea
--- /dev/null
+++ b/usb_hidapi_udev_rules1.patch
@@ -0,0 +1,78 @@
+From 9f01191fa5d61e993301f9e1d56bddee20460dd9 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
+
+---
+ res/linux/mixxx-usb-uaccess.rules | 48 +++++++++++++++++++++++--------
+ 1 file changed, 36 insertions(+), 12 deletions(-)
+
+diff --git a/res/linux/mixxx-usb-uaccess.rules b/res/linux/mixxx-usb-uaccess.rules
+index 1e1a9a842a..0f8a67809b 100644
+--- a/res/linux/mixxx-usb-uaccess.rules
++++ 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/
++# https://devicehunt.com/all-usb-vendors
++
+ # 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
++# Allen + Heath Ltd.
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="22f0", TAG+="uaccess"
++# Arturia
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1c75", TAG+="uaccess"
++# BEHRINGER International GmbH
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1397", TAG+="uaccess"
++# D&M Holdings, Inc. (Denon/Marantz)
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="154e", TAG+="uaccess"
++# EKS (Otus)
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1157", TAG+="uaccess"
++# Gemini
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="23c7", TAG+="uaccess"
++# Guillemot Corp. (Hercules)
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="06f8", TAG+="uaccess"
+-# Pioneer
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="08e4", TAG+="uaccess"
+-# Numark (may be needed for NS7 & V7)
++# inMusic (Numark, Denon)
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="15e4", TAG+="uaccess"
+-# Eks
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1157", TAG+="uaccess"
+-# Nintendo
++# KORG, Inc.
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0944", TAG+="uaccess"
++# Native Instruments
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="17cc", TAG+="uaccess"
++# Nintendo Co., Ltd
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="057e", TAG+="uaccess"
+-# Sony
++# Pioneer Corp.
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="08e4", TAG+="uaccess"
++# Rane
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="13e5", TAG+="uaccess"
++# Reloop
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="200c", TAG+="uaccess"
++# Roland Corp.
++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0582", TAG+="uaccess"
++# Sony Corp.
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="054c", TAG+="uaccess"
+-# Gemini
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="23c7", TAG+="uaccess"
++
++# 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
[xroar/f32] Fix FTBFS
by jwrdegoede
Summary of changes:
c05f7c5... Fix FTBFS (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 8 months
[xroar] Fix FTBFS
by jwrdegoede
commit c05f7c5516c628887ba4f94d710635f5b61b89e8
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Tue Mar 17 20:01:08 2020 +0100
Fix FTBFS
xroar-0.35.4-fcommon-fix.patch | 24 ++++++++++++++++++++++++
xroar.spec | 8 ++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/xroar-0.35.4-fcommon-fix.patch b/xroar-0.35.4-fcommon-fix.patch
new file mode 100644
index 0000000..f2acb7c
--- /dev/null
+++ b/xroar-0.35.4-fcommon-fix.patch
@@ -0,0 +1,24 @@
+diff -up xroar-0.35.4/src/vdisk.h~ xroar-0.35.4/src/vdisk.h
+--- xroar-0.35.4/src/vdisk.h~ 2019-03-29 07:51:23.000000000 +0100
++++ xroar-0.35.4/src/vdisk.h 2020-03-17 19:26:09.442092064 +0100
+@@ -40,7 +40,7 @@ enum vdisk_err {
+ vdisk_err_idam_crc,
+ vdisk_err_data_crc,
+ vdisk_err_max
+-} vdisk_errno;
++};
+
+ /*
+ * If write_back is not set, the image file will not be updated when the disk
+diff -up xroar-0.35.4/src/vdisk.c~ xroar-0.35.4/src/vdisk.c
+--- xroar-0.35.4/src/vdisk.c~ 2019-05-13 21:43:11.000000000 +0200
++++ xroar-0.35.4/src/vdisk.c 2020-03-17 19:38:01.041359792 +0100
+@@ -100,6 +100,8 @@ static const uint8_t vdk_header[12] = {
+ 0x00, // name length & compression flag, populated later
+ };
+
++static enum vdisk_err vdisk_errno;
++
+ const char *vdisk_strerror(int errnum) {
+ if (errnum < 0 || errnum > vdisk_err_max)
+ errnum = vdisk_err_max;
diff --git a/xroar.spec b/xroar.spec
index 26cf715..6ff17de 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,6 +1,6 @@
Name: xroar
Version: 0.35.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv2+
URL: http://www.6809.org.uk/xroar/
@@ -9,6 +9,7 @@ Source1: http://www.6809.org.uk/dragon/dragon.rom
Source2: %{name}.desktop
Source3: %{name}-minifirm.desktop
Source4: %{name}.appdata.xml
+Patch1: xroar-0.35.4-fcommon-fix.patch
BuildRequires: gcc
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -34,7 +35,7 @@ minimal firmware is included.
%prep
-%setup -q
+%autosetup -p1
%build
@@ -96,6 +97,9 @@ rm -f %{buildroot}%{_infodir}/dir
%changelog
+* Tue Mar 17 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.35.4-4
+- Fix FTBFS
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.35.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 8 months
[telegram-desktop/f31: 2/2] Updated to version 1.9.21.
by Vitaly Zaitsev
commit 8c0f233744830dbd43cb2c2c6664baecf170b099
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Mar 17 11:04:49 2020 +0100
Updated to version 1.9.21.
.gitignore | 1 +
sources | 2 +-
telegram-desktop.spec | 14 +++++---------
3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9285af9..a24b2c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,4 @@
/tdesktop-1.9.12-full.tar.gz
/tdesktop-1.9.13-full.tar.gz
/tdesktop-1.9.14-full.tar.gz
+/tdesktop-1.9.21-full.tar.gz
diff --git a/sources b/sources
index 3e6e829..6407555 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-1.9.14-full.tar.gz) = 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056
+SHA512 (tdesktop-1.9.21-full.tar.gz) = ea02fc69e88ed6244ed420516bb7a93827cb85efaa0a7e9af7562aa1bc29184c5a2102caca8693c976b25d374832e0deb2ccbf00144d5340b5ffacbdc9dcebf1
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index aaccb2a..0fef120 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -27,8 +27,8 @@
%endif
Name: telegram-desktop
-Version: 1.9.14
-Release: 2%{?dist}
+Version: 1.9.21
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * Telegram Desktop - GPLv3+ with OpenSSL exception -- main tarball;
@@ -98,9 +98,8 @@ Requires: gtk3%{?_isa}
%endif
%if %{with spellcheck}
-BuildRequires: enchant2-devel
+BuildRequires: hunspell-devel
BuildRequires: glib2-devel
-Requires: enchant2%{?_isa}
Requires: hunspell%{?_isa}
%endif
@@ -207,14 +206,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
-* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.9.14-2
-- Rebuild for ffmpeg-4.3 git
+* Tue Mar 17 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.9.21-1
+- Updated to version 1.9.21.
* Tue Feb 18 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.9.14-1
- Updated to version 1.9.14.
* Thu Feb 13 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.9.13-1
- Updated to version 1.9.13.
-
-* Tue Feb 11 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.9.12-1
-- Updated to version 1.9.12.
4 years, 8 months
