From 56ae9a31530c625ac1736d414b691a1ee7f36678 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 09 2017 16:44:02 +0000 Subject: fix build autoconf + tests --- diff --git a/0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch b/0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch new file mode 100644 index 0000000..3238bd5 --- /dev/null +++ b/0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch @@ -0,0 +1,25 @@ +From 4e6d9e321400cbb660b4373db6b50bea71707641 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Fri, 4 Aug 2017 16:43:02 +0300 +Subject: [PATCH 10/48] build-sys: add iec958-stereo-input.conf to + dist_alsapaths_DATA + +--- + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 3ff1139f..1d974037 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1343,6 +1343,7 @@ dist_alsapaths_DATA = \ + modules/alsa/mixer/paths/analog-output-headphones-2.conf \ + modules/alsa/mixer/paths/analog-output-lineout.conf \ + modules/alsa/mixer/paths/analog-output-mono.conf \ ++ modules/alsa/mixer/paths/iec958-stereo-input.conf \ + modules/alsa/mixer/paths/iec958-stereo-output.conf \ + modules/alsa/mixer/paths/hdmi-output-0.conf \ + modules/alsa/mixer/paths/hdmi-output-1.conf \ +-- +2.13.6 + diff --git a/0018-build-sys-add-the-Arctis-configuration.patch b/0018-build-sys-add-the-Arctis-configuration.patch new file mode 100644 index 0000000..948aa38 --- /dev/null +++ b/0018-build-sys-add-the-Arctis-configuration.patch @@ -0,0 +1,38 @@ +From c7fe78c9f73ded2c3428666722ec9c1af4b82812 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen +Date: Sat, 2 Sep 2017 18:23:12 +0300 +Subject: [PATCH 18/48] build-sys: add the Arctis configuration + +--- + src/Makefile.am | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 1d974037..ba2ea97e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1310,7 +1310,8 @@ dist_alsaprofilesets_DATA = \ + modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \ + modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \ + modules/alsa/mixer/profile-sets/kinect-audio.conf \ +- modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf ++ modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf \ ++ modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf + + if HAVE_UDEV + dist_udevrules_DATA = \ +@@ -1352,7 +1353,10 @@ dist_alsapaths_DATA = \ + modules/alsa/mixer/paths/hdmi-output-4.conf \ + modules/alsa/mixer/paths/hdmi-output-5.conf \ + modules/alsa/mixer/paths/hdmi-output-6.conf \ +- modules/alsa/mixer/paths/hdmi-output-7.conf ++ modules/alsa/mixer/paths/hdmi-output-7.conf \ ++ modules/alsa/mixer/paths/steelseries-arctis-input.conf \ ++ modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf \ ++ modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf + + endif + +-- +2.13.6 + diff --git a/pulseaudio.spec b/pulseaudio.spec index db54c66..aaf7eb4 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -56,8 +56,10 @@ Patch3: pulseaudio-8.99.2-getaffinity.patch ## upstream patches Patch4: 0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch Patch9: 0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch +Patch10: 0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch Patch15: 0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch Patch16: 0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch +Patch18: 0018-build-sys-add-the-Arctis-configuration.patch Patch35: 0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch ## upstreamable patches @@ -240,11 +242,13 @@ This package contains GDM integration hooks for the PulseAudio sound server. %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}} ## upstream patches -%patch4 -p1 -b .0004 -%patch9 -p1 -b .0009 -%patch15 -p1 -b .0015 -%patch16 -p1 -b .0016 -%patch35 -p1 -b .0035 +%patch4 -p1 +%patch9 -p1 +%patch10 -p1 +%patch15 -p1 +%patch16 -p1 +%patch18 -p1 +%patch35 -p1 %patch1 -p1 -b .autostart %patch2 -p1 -b .disable_flat_volumes @@ -259,9 +263,12 @@ sed -i.no_consolekit -e \ sed -i.PACKAGE_VERSION -e "s|^PACKAGE_VERSION=.*|PACKAGE_VERSION=\'%{version}\'|" configure %else ## kill rpaths -%if "%{_libdir}" != "/usr/lib" -sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure -%endif +# needed for (at least) patch18 +NOCONFIGURE=1 ./bootstrap.sh + +#if "%{_libdir}" != "/usr/lib" +#sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure +#endif %endif