[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/0.116.1-4-21-g1a16aea
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Fri May 8 10:50:30 UTC 2009
The following commit has been merged in the master branch:
commit 1a16aea8195ee6a6fcc8523f2c7e3a0f486f9ca2
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Fri May 8 12:47:08 2009 +0200
Remove old patches. The first is obsolete, the second is
included in the 0.116.2 release.
diff --git a/debian/patches/06_iec61883_headers.patch b/debian/patches/06_iec61883_headers.patch
deleted file mode 100644
index 042823c..0000000
--- a/debian/patches/06_iec61883_headers.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -N -a -u -r drivers/iec61883/iec61883_common.h drivers/iec61883/iec61883_common.h
---- drivers/iec61883/iec61883_common.h 1970-01-01 01:00:00.000000000 +0100
-+++ drivers/iec61883/iec61883_common.h 2003-12-15 20:54:37.000000000 +0100
-@@ -0,0 +1,45 @@
-+/*
-+ * JACK IEC61883 (FireWire audio) driver
-+ *
-+ * Copyright (C) Robert Ham 2003 <rah at bash.sh>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifndef __JACK_IEC61883_COMMON_H__
-+#define __JACK_IEC61883_COMMON_H__
-+
-+#include <jack/types.h>
-+#include <jack/jslist.h>
-+
-+typedef jack_default_audio_sample_t sample_t;
-+typedef struct _iec61883_channel_info iec61883_channel_info_t;
-+
-+struct _iec61883_channel_info
-+{
-+ unsigned char iso_ch;
-+ int naud_chs;
-+};
-+
-+/** convert a channel spec into an ordered JSList of
-+ * iec61883_channel_info_t's */
-+JSList * iec61883_get_channel_spec (const char * channel_spec);
-+
-+void iec61883_client_print_iso_ch_info (JSList * infos, FILE * file);
-+
-+
-+#endif /* __JACK_IEC61883_COMMON_H__ */
-+
-+
-diff -N -a -u -r drivers/iec61883/iec61883_driver.h drivers/iec61883/iec61883_driver.h
---- drivers/iec61883/iec61883_driver.h 1970-01-01 01:00:00.000000000 +0100
-+++ drivers/iec61883/iec61883_driver.h 2003-12-15 20:54:46.000000000 +0100
-@@ -0,0 +1,46 @@
-+/*
-+ * JACK IEC16883 (FireWire audio) driver
-+ *
-+ * Copyright (C) Robert Ham 2003 (rah at bash.sh)
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifndef __JACK_IEC61883_DRIVER_H__
-+#define __JACK_IEC61883_DRIVER_H__
-+
-+#include <jack/driver.h>
-+#include <jack/engine.h>
-+#include <jack/types.h>
-+
-+#include "iec61883_client.h"
-+
-+typedef struct _iec61883_driver iec61883_driver_t;
-+
-+struct _iec61883_driver
-+{
-+ JACK_DRIVER_NT_DECL
-+
-+ jack_client_t * jack_client;
-+
-+ jack_nframes_t buffer_size;
-+ iec61883_client_t * iec61883_client;
-+};
-+
-+
-+
-+#endif /* __JACK_IEC61883_DRIVER_H__ */
-+
-+
-diff -N -a -u -r drivers/iec61883/iec61883_ip_client.h drivers/iec61883/iec61883_ip_client.h
---- drivers/iec61883/iec61883_ip_client.h 1970-01-01 01:00:00.000000000 +0100
-+++ drivers/iec61883/iec61883_ip_client.h 2003-12-15 20:55:08.000000000 +0100
-@@ -0,0 +1,36 @@
-+/* -*- mode: c; c-file-style: "linux"; -*- */
-+/*
-+ * JACK IEC16883 (FireWire audio) driver
-+ *
-+ * Copyright (C) 2003 Robert Ham <rah at bash.sh>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ *
-+ * This has stuff that is common to both the driver and the in-process
-+ * client.
-+ */
-+
-+#ifndef __JACK_IEC61883_IP_CLIENT_H__
-+#define __JACK_IEC61883_IP_CLIENT_H__
-+
-+#include <jack/types.h>
-+
-+#include "iec61883_common.h"
-+#include "iec61883_client.h"
-+
-+#endif /* __JACK_IEC61883_IP_CLIENT_H__ */
-+
-+
diff --git a/debian/patches/11_fix_varargs_to_fix_ftbfs_on_alpha.patch b/debian/patches/11_fix_varargs_to_fix_ftbfs_on_alpha.patch
deleted file mode 100644
index ff8f3c9..0000000
--- a/debian/patches/11_fix_varargs_to_fix_ftbfs_on_alpha.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_fix_varargs_to_fix_ftbfs_on_alpha.patch.dpatch by <asheesh at asheesh.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad jack-audio-connection-kit-0.115.6~/libjack/client.c jack-audio-connection-kit-0.115.6/libjack/client.c
---- jack-audio-connection-kit-0.115.6~/libjack/client.c 2008-11-23 06:27:20.000000000 -0800
-+++ jack-audio-connection-kit-0.115.6/libjack/client.c 2008-12-14 18:47:32.000000000 -0800
-@@ -969,7 +969,7 @@
- }
-
- /* parse variable arguments */
-- if (ap)
-+ if (options & (JackServerName | JackLoadName | JackLoadInit))
- jack_varargs_parse(options, ap, &va);
- else
- jack_varargs_init(&va);
-@@ -1117,7 +1117,7 @@
- jack_options_t options = JackUseExactName;
- if (getenv("JACK_START_SERVER") == NULL)
- options |= JackNoStartServer;
-- return jack_client_open_aux (client_name, options, NULL, NULL);
-+ return jack_client_open (client_name, options, NULL);
- }
-
- char *
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list