[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-6-5-g98eae1c

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Wed May 5 12:41:22 UTC 2010


The following commit has been merged in the master branch:
commit ab3fd14b2a82fcf98d3ceef7b25b805a03b81003
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue May 4 12:11:48 2010 +0200

    Remove obsolete patches (included upstream as of r4003)

diff --git a/debian/patches/armel-varargs b/debian/patches/armel-varargs
deleted file mode 100644
index 613a32b..0000000
--- a/debian/patches/armel-varargs
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jack-audio-connection-kit/common/JackAPI.cpp
-===================================================================
---- jack-audio-connection-kit.orig/common/JackAPI.cpp	2010-05-03 19:03:21.000000000 +0200
-+++ jack-audio-connection-kit/common/JackAPI.cpp	2010-05-03 19:03:37.000000000 +0200
-@@ -300,7 +300,7 @@
-         int options = JackUseExactName;
-         if (getenv("JACK_START_SERVER") == NULL)
-             options |= JackNoStartServer;
--        jack_client_t* res = jack_client_open_aux(client_name, (jack_options_t)options, NULL, NULL);
-+        jack_client_t* res = jack_client_open(client_name, (jack_options_t)options, NULL, NULL);
-         JackGlobals::fOpenMutex->Unlock();
-         return res;
-     } catch (std::bad_alloc& e) {
diff --git a/debian/patches/atomic b/debian/patches/atomic
deleted file mode 100644
index 5863134..0000000
--- a/debian/patches/atomic
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/linux/JackAtomic_os.h
-+++ b/linux/JackAtomic_os.h
-@@ -67,16 +67,17 @@
-     return ret;
- }
- 
--#else
-+#endif
- 
-+#if !defined(__i386__) && !defined(__x86_64__)  && !defined(__PPC__)
- #warning using builtin gcc (version > 4.1) atomic
- 
--static inline char CAS(volatile uint32_t value, uint32_t newvalue, volatile int32_t* addr)
-+static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
- {
--    return __sync_bool_compare_and_swap (addr, value, newvalue);
-+    return __sync_bool_compare_and_swap (&addr, value, newvalue);
- }
--
- #endif
- 
-+
- #endif
- 
diff --git a/debian/patches/get_cycles b/debian/patches/get_cycles
deleted file mode 100644
index 6be5933..0000000
--- a/debian/patches/get_cycles
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/linux/cycles.h
-+++ b/linux/cycles.h
-@@ -103,6 +103,20 @@
- 
- #endif
- 
-+/* everything else but x86, amd64 or ppc */
-+#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
-+
-+#warning No suitable get_cycles() implementation. Returning 0 instead
-+
-+typedef unsigned long long cycles_t;
-+
-+static inline cycles_t get_cycles(void)
-+{
-+    return 0;
-+}
-+
-+#endif
-+
- #endif
- 
- #endif /* __jack_cycles_h__ */
diff --git a/debian/patches/more-varargs b/debian/patches/more-varargs
deleted file mode 100644
index 7a01451..0000000
--- a/debian/patches/more-varargs
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: jack-audio-connection-kit/common/JackServerAPI.cpp
-===================================================================
---- jack-audio-connection-kit.orig/common/JackServerAPI.cpp	2010-05-03 22:26:49.000000000 +0200
-+++ jack-audio-connection-kit/common/JackServerAPI.cpp	2010-05-03 22:28:13.000000000 +0200
-@@ -73,11 +73,7 @@
-     }
- 
-     /* parse variable arguments */
--    if (ap) {
--        jack_varargs_parse(options, ap, &va);
--    } else {
--        jack_varargs_init(&va);
--    }
-+    jack_varargs_parse(options, ap, &va);
- 
-     if (!JackServerGlobals::Init()) { // jack server initialisation
-         int my_status1 = (JackFailure | JackServerError);
-Index: jack-audio-connection-kit/common/JackLibAPI.cpp
-===================================================================
---- jack-audio-connection-kit.orig/common/JackLibAPI.cpp	2010-05-03 22:26:49.000000000 +0200
-+++ jack-audio-connection-kit/common/JackLibAPI.cpp	2010-05-03 22:29:04.000000000 +0200
-@@ -77,11 +77,7 @@
-     }
- 
-     /* parse variable arguments */
--    if (ap) {
--        jack_varargs_parse(options, ap, &va);
--    } else {
--        jack_varargs_init(&va);
--    }
-+    jack_varargs_parse(options, ap, &va);
-         
-     JackLibGlobals::Init(); // jack library initialisation
- 
diff --git a/debian/patches/pointersize b/debian/patches/pointersize
deleted file mode 100644
index 3194340..0000000
--- a/debian/patches/pointersize
+++ /dev/null
@@ -1,392 +0,0 @@
-diff --git a/common/JackAPI.cpp b/common/JackAPI.cpp
-index 0640883..6acb364 100644
---- a/common/JackAPI.cpp
-+++ b/common/JackAPI.cpp
-@@ -317,11 +317,7 @@ EXPORT void* jack_port_get_buffer(jack_port_t* port, jack_nframes_t frames)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_get_buffer");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_get_buffer called with an incorrect port %ld", myport);
-@@ -337,11 +333,7 @@ EXPORT const char* jack_port_name(const jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_name");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_name called with an incorrect port %ld", myport);
-@@ -357,11 +349,7 @@ EXPORT const char* jack_port_short_name(const jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_short_name");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_short_name called with an incorrect port %ld", myport);
-@@ -377,11 +365,7 @@ EXPORT int jack_port_flags(const jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_flags");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_flags called with an incorrect port %ld", myport);
-@@ -397,11 +381,7 @@ EXPORT const char* jack_port_type(const jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_type");
- #endif
-- #if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-    if (!CheckPort(myport)) {
-         jack_error("jack_port_flags called an incorrect port %ld", myport);
-@@ -417,11 +397,7 @@ EXPORT jack_port_type_id_t jack_port_type_id(const jack_port_t *port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_type_id");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_type_id called an incorrect port %ld", myport);
-@@ -437,11 +413,7 @@ EXPORT int jack_port_connected(const jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_connected");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_connected called with an incorrect port %ld", myport);
-@@ -458,11 +430,7 @@ EXPORT int jack_port_connected_to(const jack_port_t* port, const char* port_name
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_connected_to");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t src = (jack_port_id_t)port_aux;
-     if (!CheckPort(src)) {
-         jack_error("jack_port_connected_to called with an incorrect port %ld", src);
-@@ -488,21 +456,13 @@ EXPORT int jack_port_tie(jack_port_t* src, jack_port_t* dst)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_tie");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t src_aux = (uint64_t)src;
--#else
--    uint32_t src_aux = (uint32_t)src;
--#endif
-+    uintptr_t src_aux = (uintptr_t)src;
-     jack_port_id_t mysrc = (jack_port_id_t)src_aux;
-     if (!CheckPort(mysrc)) {
-         jack_error("jack_port_tie called with a NULL src port");
-         return -1;
-     }
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t dst_aux = (uint64_t)dst;
--#else
--    uint32_t dst_aux = (uint32_t)dst;
--#endif
-+    uintptr_t dst_aux = (uintptr_t)dst;
-     jack_port_id_t mydst = (jack_port_id_t)dst_aux;
-     if (!CheckPort(mydst)) {
-         jack_error("jack_port_tie called with a NULL dst port");
-@@ -522,11 +482,7 @@ EXPORT int jack_port_untie(jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_untie");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_untie called with an incorrect port %ld", myport);
-@@ -542,11 +498,7 @@ EXPORT jack_nframes_t jack_port_get_latency(jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_get_latency");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_get_latency called with an incorrect port %ld", myport);
-@@ -563,11 +515,7 @@ EXPORT void jack_port_set_latency(jack_port_t* port, jack_nframes_t frames)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_set_latency");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_set_latency called with an incorrect port %ld", myport);
-@@ -585,11 +533,7 @@ EXPORT int jack_recompute_total_latency(jack_client_t* ext_client, jack_port_t*
- #endif
- 
-     JackClient* client = (JackClient*)ext_client;
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (client == NULL) {
-         jack_error("jack_recompute_total_latencies called with a NULL client");
-@@ -630,11 +574,7 @@ EXPORT int jack_port_set_name(jack_port_t* port, const char* name)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_set_name");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_set_name called with an incorrect port %ld", myport);
-@@ -660,11 +600,7 @@ EXPORT int jack_port_set_alias(jack_port_t* port, const char* name)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_set_alias");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_set_alias called with an incorrect port %ld", myport);
-@@ -683,11 +619,7 @@ EXPORT int jack_port_unset_alias(jack_port_t* port, const char* name)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_unset_alias");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_unset_alias called with an incorrect port %ld", myport);
-@@ -706,11 +638,7 @@ EXPORT int jack_port_get_aliases(const jack_port_t* port, char* const aliases[2]
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_get_aliases");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_get_aliases called with an incorrect port %ld", myport);
-@@ -726,11 +654,7 @@ EXPORT int jack_port_request_monitor(jack_port_t* port, int onoff)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_request_monitor");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_request_monitor called with an incorrect port %ld", myport);
-@@ -769,11 +693,7 @@ EXPORT int jack_port_ensure_monitor(jack_port_t* port, int onoff)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_ensure_monitor");
- #endif
-- #if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_ensure_monitor called with an incorrect port %ld", myport);
-@@ -789,11 +709,7 @@ EXPORT int jack_port_monitoring_input(jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_monitoring_input");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_monitoring_input called with an incorrect port %ld", myport);
-@@ -1128,11 +1044,7 @@ EXPORT jack_port_t* jack_port_register(jack_client_t* ext_client, const char* po
-         jack_error("jack_port_register called with a NULL port name or a NULL port_type");
-         return NULL;
-     } else {
--#if defined(__x86_64__) || defined(__ppc64__)
--        return (jack_port_t *)((uint64_t)client->PortRegister(port_name, port_type, flags, buffer_size));
--#else
--        return (jack_port_t *)client->PortRegister(port_name, port_type, flags, buffer_size);
--#endif
-+        return (jack_port_t *)((uintptr_t)client->PortRegister(port_name, port_type, flags, buffer_size));
-     }
- }
- 
-@@ -1146,11 +1058,7 @@ EXPORT int jack_port_unregister(jack_client_t* ext_client, jack_port_t* port)
-         jack_error("jack_port_unregister called with a NULL client");
-         return -1;
-     }
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_unregister called with an incorrect port %ld", myport);
-@@ -1169,11 +1077,7 @@ EXPORT int jack_port_is_mine(const jack_client_t* ext_client, const jack_port_t*
-         jack_error("jack_port_is_mine called with a NULL client");
-         return -1;
-     }
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_is_mine called with an incorrect port %ld", myport);
-@@ -1187,11 +1091,7 @@ EXPORT const char** jack_port_get_connections(const jack_port_t* port)
- #ifdef __CLIENTDEBUG__
-     JackGlobals::CheckContext("jack_port_get_connections");
- #endif
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_get_connections called with an incorrect port %ld", myport);
-@@ -1215,11 +1115,7 @@ EXPORT const char** jack_port_get_all_connections(const jack_client_t* ext_clien
-         return NULL;
-     }
- 
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_get_all_connections called with an incorrect port %ld", myport);
-@@ -1242,11 +1138,7 @@ EXPORT jack_nframes_t jack_port_get_total_latency(jack_client_t* ext_client, jac
-         return 0;
-     }
- 
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)port;
--#else
--    uint32_t port_aux = (uint32_t)port;
--#endif
-+    uintptr_t port_aux = (uintptr_t)port;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_get_total_latency called with an incorrect port %ld", myport);
-@@ -1307,11 +1199,7 @@ EXPORT int jack_port_disconnect(jack_client_t* ext_client, jack_port_t* src)
-         jack_error("jack_port_disconnect called with a NULL client");
-         return -1;
-     }
--#if defined(__x86_64__) || defined(__ppc64__)
--    uint64_t port_aux = (uint64_t)src;
--#else
--    uint32_t port_aux = (uint32_t)src;
--#endif
-+    uintptr_t port_aux = (uintptr_t)src;
-     jack_port_id_t myport = (jack_port_id_t)port_aux;
-     if (!CheckPort(myport)) {
-         jack_error("jack_port_disconnect called with an incorrect port %ld", myport);
-@@ -1383,11 +1271,7 @@ EXPORT jack_port_t* jack_port_by_name(jack_client_t* ext_client, const char* por
-         if (!manager)
-             return NULL;
-         int res = manager->GetPort(portname); // returns a port index at least > 1
--#if defined(__x86_64__) || defined(__ppc64__)
--        return (res == NO_PORT) ? NULL : (jack_port_t*)((uint64_t)res);
--#else
--        return (res == NO_PORT) ? NULL : (jack_port_t*)res;
--#endif
-+        return (res == NO_PORT) ? NULL : (jack_port_t*)((uintptr_t)res);
-     }
- }
- 
-@@ -1397,11 +1281,7 @@ EXPORT jack_port_t* jack_port_by_id(jack_client_t* ext_client, jack_port_id_t id
-     JackGlobals::CheckContext("jack_port_by_id");
- #endif
-     /* jack_port_t* type is actually the port index */
--#if defined(__x86_64__) || defined(__ppc64__)
--    return (jack_port_t*)((uint64_t)id);
--#else
--    return (jack_port_t*)id;
--#endif
-+    return (jack_port_t*)((uintptr_t)id);
- }
- 
- EXPORT int jack_engine_takeover_timebase(jack_client_t* ext_client)
diff --git a/debian/patches/series b/debian/patches/series
index aa69691..79377fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,4 @@
 0000_sync_upstream_VCS.patch
-atomic
-armel-varargs
-more-varargs
-get_cycles
-pointersize
 0001_jackrec-rename.patch
 0002_manpages.patch
 1001_connect.patch

-- 
Debian packaging for jack-audio-connection-kit



More information about the pkg-multimedia-commits mailing list