remove obsolete ppc64-long/mpd, gcc* patches

epel8
Nils Philippsen 7 years ago
parent 40a605cb6a
commit 77959806c0

@ -28,14 +28,6 @@ Patch1: jack2-1.9.12-outdir.patch
Patch2: jack2-1.9.12-nointernalapi.patch
# Adjust default priority. RHBZ#795094
Patch3: jack-realtime-compat.patch
# Fix ppc64 mpd startup issue RHBZ#799552
Patch5: jack-ppc64-long.patch
# Fix building with gcc5
Patch6: jack-gcc5.patch
# Fix building with gcc6
Patch7: jack-gcc6.patch
# Fix building with gcc7
Patch8: jack-gcc7.patch
BuildRequires: alsa-lib-devel
@ -102,10 +94,6 @@ Small example clients that use the Jack Audio Connection Kit.
%patch1 -p1 -b .outdir
%patch2 -p1 -b .nointernalapi
%patch3 -p1 -b .priority
%patch5 -p1 -b .mpd
%patch6 -p1 -b .gcc5
%patch7 -p1 -b .gcc6
%patch8 -p1 -b .gcc7
# Fix encoding issues
for file in ChangeLog README TODO; do
@ -267,6 +255,7 @@ exit 0
- update source URL
- update nodate, outdir, nointernalapi patches
- remove broken (undocumented, non-upstreamed) portnames patch
- remove obsolete ppc64-long/mpd, gcc* patches
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.10-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

@ -1,26 +0,0 @@
From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Date: Thu, 18 Sep 2014 18:29:23 +0200
Subject: [PATCH] Fix FTBFS with clang++
Forwarded from http://bugs.debian.org/757820
---
common/memops.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/memops.c b/common/memops.c
index 27f6194..2d416b6 100644
--- a/common/memops.c
+++ b/common/memops.c
@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
*/
static unsigned int seed = 22222;
-inline unsigned int fast_rand() {
+static inline unsigned int fast_rand() {
seed = (seed * 96314165) + 907633515;
return seed;
}
--
2.4.0

@ -1,21 +0,0 @@
diff -rupN jack-1.9.10.org/tests/iodelay.cpp jack-1.9.10/tests/iodelay.cpp
--- jack-1.9.10.org/tests/iodelay.cpp 2014-07-18 08:28:13.000000000 -0400
+++ jack-1.9.10/tests/iodelay.cpp 2016-02-13 18:38:33.280737975 -0500
@@ -167,8 +167,8 @@ static jack_client_t *jack_handle;
static jack_port_t *jack_capt;
static jack_port_t *jack_play;
-jack_latency_range_t capture_latency = {-1, -1};
-jack_latency_range_t playback_latency = {-1, -1};
+jack_latency_range_t capture_latency = {(jack_nframes_t)-1, (jack_nframes_t)-1};
+jack_latency_range_t playback_latency = {(jack_nframes_t)-1, (jack_nframes_t)-1};
void
latency_cb (jack_latency_callback_mode_t mode, void *arg)
@@ -266,4 +266,4 @@ int main (int ac, char *av [])
return 0;
}
-// --------------------------------------------------------------------------------
\ No newline at end of file
+// --------------------------------------------------------------------------------

@ -1,12 +0,0 @@
diff -rupN jack-1.9.10.org/tests/test.cpp jack-1.9.10/tests/test.cpp
--- jack-1.9.10.org/tests/test.cpp 2014-07-18 08:28:13.000000000 -0400
+++ jack-1.9.10/tests/test.cpp 2017-02-13 20:24:13.691773753 -0500
@@ -480,7 +480,7 @@ int process4(jack_nframes_t nframes, voi
jack_nframes_t delta_time = cur_time - last_time;
Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
+ if (delta_time > 0 && (jack_nframes_t)abs((int64_t)delta_time - cur_buffer_size) > tolerance) {
printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
}

@ -1,32 +0,0 @@
diff -up jack-1.9.8/linux/cycles.h\~ jack-1.9.8/linux/cycles.h
--- jack-1.9.8/linux/cycles.h~ 2011-12-19 12:54:27.000000000 +0100
+++ jack-1.9.8/linux/cycles.h 2012-03-02 23:57:29.200812059 +0100
@@ -77,16 +77,24 @@ static inline cycles_t get_cycles(void)
{
cycles_t ret = 0;
+#ifdef __powerpc64__
+# define LONGT ".llong"
+#else
+# define LONGT ".long"
+#endif
+
__asm__ __volatile__(
"98: mftb %0\n"
"99:\n"
".section __ftr_fixup,\"a\"\n"
" .long %1\n"
" .long 0\n"
- " .long 98b\n"
- " .long 99b\n"
+ " " LONGT " 98b\n"
+ " " LONGT " 99b\n"
".previous"
: "=r" (ret) : "i" (CPU_FTR_601));
+
+#undef LONGT
return ret;
}
Diff finished. Fri Mar 2 23:57:31 2012
Loading…
Cancel
Save