[SCM] jack-audio-connection-kit/master: Drop obsolete patches.
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Tue Nov 23 15:03:26 UTC 2010
The following commit has been merged in the master branch:
commit f7461f92afecec5e1f76020945ead8da02d7b1cf
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Tue Nov 23 15:22:18 2010 +0100
Drop obsolete patches.
They have all been included upstream.
diff --git a/debian/patches/1001_big_endian_alsa.patch b/debian/patches/1001_big_endian_alsa.patch
deleted file mode 100644
index ad23bf7..0000000
--- a/debian/patches/1001_big_endian_alsa.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix endian problem w/ 24bit (LE) interface and BE CPU
-Author: Roland Stigge <stigge at antcom.de>
-Bug: http://trac.jackaudio.org/ticket/135
-Bug-Debian: http://bugs.debian.org/486308
-Last-Update: 2010-03-10
-Index: jack-audio-connection-kit/drivers/alsa/memops.c
-===================================================================
---- jack-audio-connection-kit.orig/drivers/alsa/memops.c
-+++ jack-audio-connection-kit/drivers/alsa/memops.c
-@@ -347,7 +347,7 @@
- x <<= 8;
- x |= (unsigned char)(src[0]);
- /* correct sign bit and the rest of the top byte */
-- if (src[0] & 0x80) {
-+ if (src[2] & 0x80) {
- x |= 0xff << 24;
- }
- #endif
diff --git a/debian/patches/1002_warn_deprecated.patch b/debian/patches/1002_warn_deprecated.patch
deleted file mode 100644
index 3cd15c1..0000000
--- a/debian/patches/1002_warn_deprecated.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-Description: Add compiler warnings for deprecated functions and types
- GCC will issue a warning on deprecated API parts, so programmers will
- be told early instead of fixing it later.
-Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
-Bug: http://trac.jackaudio.org/ticket/138
-Bug-Debian: http://bugs.debian.org/548537
-Last-Update: 2010-03-10
-Index: jack-audio-connection-kit/jack/jack.h
-===================================================================
---- jack-audio-connection-kit.orig/jack/jack.h
-+++ jack-audio-connection-kit/jack/jack.h
-@@ -102,7 +102,7 @@
- * NEW JACK CLIENTS</b>
- *
- */
--jack_client_t *jack_client_new (const char *client_name);
-+jack_client_t *jack_client_new (const char *client_name) JACK_DEPRECATED;
-
- /**
- * Disconnects an external client from a JACK server.
-@@ -148,14 +148,14 @@
- */
- int jack_internal_client_new (const char *client_name,
- const char *load_name,
-- const char *load_init);
-+ const char *load_init) JACK_DEPRECATED;
-
- /**
- * Remove an internal client from a JACK server.
- *
- * @deprecated Please use jack_internal_client_load().
- */
--void jack_internal_client_close (const char *client_name);
-+void jack_internal_client_close (const char *client_name) JACK_DEPRECATED;
-
- /**
- * Tell the Jack server that the program is ready to start processing
-@@ -203,7 +203,7 @@
- * It should be replace by use of @ jack_cycle_wait and @ jack_cycle_signal functions.
- *
- */
--jack_nframes_t jack_thread_wait (jack_client_t*, int status);
-+jack_nframes_t jack_thread_wait (jack_client_t*, int status) JACK_DEPRECATED;
-
- /**
- * Wait until this JACK client should process data.
-@@ -490,7 +490,7 @@
- *
- * @return ENOSYS, function not implemented.
- */
--int jack_engine_takeover_timebase (jack_client_t *);
-+int jack_engine_takeover_timebase (jack_client_t *) JACK_DEPRECATED;
-
- /**
- * @return the current CPU load estimated by JACK. This is a running
-@@ -651,7 +651,7 @@
- * turned out to serve essentially no purpose in real-life
- * JACK clients.
- */
--int jack_port_tie (jack_port_t *src, jack_port_t *dst);
-+int jack_port_tie (jack_port_t *src, jack_port_t *dst) JACK_DEPRECATED;
-
- /**
- *
-@@ -660,7 +660,7 @@
- * turned out to serve essentially no purpose in real-life
- * JACK clients.
- */
--int jack_port_untie (jack_port_t *port);
-+int jack_port_untie (jack_port_t *port) JACK_DEPRECATED;
-
- /**
- * @return the time (in frames) between data being available or
-Index: jack-audio-connection-kit/jack/transport.h
-===================================================================
---- jack-audio-connection-kit.orig/jack/transport.h
-+++ jack-audio-connection-kit/jack/transport.h
-@@ -410,7 +410,7 @@
- JackTransportSMPTE = 0x8, /**< SMPTE (ignored) */
- JackTransportBBT = 0x10 /**< Bar, Beat, Tick */
-
--} jack_transport_bits_t;
-+} jack_transport_bits_t JACK_DEPRECATED;
-
- /**
- * Deprecated struct for transport position information.
-@@ -444,7 +444,7 @@
- double ticks_per_beat;
- double beats_per_minute;
-
--} jack_transport_info_t;
-+} jack_transport_info_t JACK_DEPRECATED;
-
- /**
- * Gets the current transport info structure (deprecated).
-@@ -459,7 +459,7 @@
- * @pre Must be called from the process thread.
- */
- void jack_get_transport_info (jack_client_t *client,
-- jack_transport_info_t *tinfo);
-+ jack_transport_info_t *tinfo) JACK_DEPRECATED;
-
- /**
- * Set the transport info structure (deprecated).
-@@ -469,7 +469,7 @@
- * a ::JackTimebaseCallback.
- */
- void jack_set_transport_info (jack_client_t *client,
-- jack_transport_info_t *tinfo);
-+ jack_transport_info_t *tinfo) JACK_DEPRECATED;
-
- #ifdef __cplusplus
- }
-Index: jack-audio-connection-kit/jack/types.h
-===================================================================
---- jack-audio-connection-kit.orig/jack/types.h
-+++ jack-audio-connection-kit/jack/types.h
-@@ -437,4 +437,10 @@
- };
-
-
-+#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3 )
-+# define JACK_DEPRECATED __attribute__((__deprecated__))
-+#else
-+# define JACK_DEPRECATED
-+#endif
-+
- #endif /* __jack_types_h__ */
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list