[SCM] mustang-plug/master: Drop all patches, they've been applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sun Apr 26 19:55:17 UTC 2015
The following commit has been merged in the master branch:
commit f13fe93bc8239819b98c39bdedad5b381d496aa0
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date: Sun Apr 26 20:49:28 2015 +0100
Drop all patches, they've been applied upstream.
diff --git a/debian/patches/1001-firmware_mustange_III_to_V.patch b/debian/patches/1001-firmware_mustange_III_to_V.patch
deleted file mode 100644
index 8fd13df..0000000
--- a/debian/patches/1001-firmware_mustange_III_to_V.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Fix firmware update for Mustang III, IV and V.
-Origin: upstream, https://bitbucket.org/piorekf/plug/changeset/15dba9c8
----
- plug/mainwindow.cpp | 2 +-
- plug/mustang.cpp | 10 +++++++---
- plug/mustang.h | 3 ++-
- 3 files changed, 10 insertions(+), 5 deletions(-)
-
---- mustang-plug.orig/plug/mainwindow.cpp
-+++ mustang-plug/plug/mainwindow.cpp
-@@ -664,7 +664,7 @@ void MainWindow::update_firmware()
- QString filename;
- int ret = 0;
-
-- QMessageBox::information(this, "Prepare", "Please power off the amplifier, then power it back on while holding \"Save\" button.<br>After pressing \"OK\" choose firmware file and then update will begin.<br>It will take about one minute. You will be notified when it's finished.");
-+ QMessageBox::information(this, "Prepare", "Please power off the amplifier, then power it back on while holding down:<ul><li>The \"Save\" button (Mustang I and II)</li><li>The Data Wheel (Mustang III, IV and IV)</li></ul>After pressing \"OK\" choose firmware file and then update will begin.It will take about one minute. You will be notified when it's finished.");
-
- filename = QFileDialog::getOpenFileName(this, tr("Open..."), QDir::homePath(), tr("Mustang firmware (*.upd)"));
- if(filename.isEmpty())
---- mustang-plug.orig/plug/mustang.cpp
-+++ mustang-plug/plug/mustang.cpp
-@@ -1286,11 +1286,15 @@ int Mustang::update(char *filename)
- return ret;
-
- // get handle for the device
-- amp_hand = libusb_open_device_with_vid_pid(NULL, USB_UPDATE_VID, USB_UPDATE_PID);
-+ amp_hand = libusb_open_device_with_vid_pid(NULL, USB_UPDATE_VID, OLD_USB_UPDATE_PID);
- if(amp_hand == NULL)
- {
-- libusb_exit(NULL);
-- return -100;
-+ amp_hand = libusb_open_device_with_vid_pid(NULL, USB_UPDATE_VID, NEW_USB_UPDATE_PID);
-+ if(amp_hand == NULL)
-+ {
-+ libusb_exit(NULL);
-+ return -100;
-+ }
- }
-
- // detach kernel driver
---- mustang-plug.orig/plug/mustang.h
-+++ mustang-plug/plug/mustang.h
-@@ -17,7 +17,8 @@
-
- // amp's VID and PID while in update mode
- #define USB_UPDATE_VID 0x1ed8
--#define USB_UPDATE_PID 0x0006
-+#define OLD_USB_UPDATE_PID 0x0006 //Mustang I and II
-+#define NEW_USB_UPDATE_PID 0x0007 //Mustang III, IV, V
-
- // for USB communication
- #define TMOUT 500
diff --git a/debian/patches/1002-firmware_mustang_II_v2.patch b/debian/patches/1002-firmware_mustang_II_v2.patch
deleted file mode 100644
index 4e75d8d..0000000
--- a/debian/patches/1002-firmware_mustang_II_v2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Origin: upstream, http://code.piorekf.org/plug/commits/2fb4eca6a29c9
-Description: Add Mustang II V2 VID
----
- plug/mustang.cpp | 9 +++++----
- plug/mustang.h | 1 +
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
---- mustang-plug.orig/plug/mustang.cpp
-+++ mustang-plug/plug/mustang.cpp
-@@ -42,10 +42,11 @@ int Mustang::start_amp(char list[][32],
- // get handle for the device
- if((amp_hand = libusb_open_device_with_vid_pid(NULL, USB_VID, OLD_USB_PID)) == NULL)
- if((amp_hand = libusb_open_device_with_vid_pid(NULL, USB_VID, NEW_USB_PID)) == NULL)
-- {
-- libusb_exit(NULL);
-- return -100;
-- }
-+ if((amp_hand = libusb_open_device_with_vid_pid(NULL, USB_VID, V2_USB_PID)) == NULL)
-+ {
-+ libusb_exit(NULL);
-+ return -100;
-+ }
-
- // detach kernel driver
- ret = libusb_kernel_driver_active(amp_hand, 0);
---- mustang-plug.orig/plug/mustang.h
-+++ mustang-plug/plug/mustang.h
-@@ -14,6 +14,7 @@
- #define USB_VID 0x1ed8
- #define OLD_USB_PID 0x0004 //Mustang I and II
- #define NEW_USB_PID 0x0005 //Mustang III, IV and V
-+#define V2_USB_PID 0x0014 // Mustang II (and I?) V2
-
- // amp's VID and PID while in update mode
- #define USB_UPDATE_VID 0x1ed8
diff --git a/debian/patches/1003-upstream_bug_31.patch b/debian/patches/1003-upstream_bug_31.patch
deleted file mode 100644
index 368aaef..0000000
--- a/debian/patches/1003-upstream_bug_31.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Descriptiption: Moved fopen() in update function so that file is
- opened after all necessary checks - fixes #31
-Origin: upstream, http://code.piorekf.org/plug/commits/1b82b066239
----
- plug/mustang.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- mustang-plug.orig/plug/mustang.cpp
-+++ mustang-plug/plug/mustang.cpp
-@@ -1274,7 +1274,6 @@ int Mustang::update(char *filename)
- int ret, recieved;
- unsigned char array[LENGTH], number = 0;
- FILE *file;
-- file = fopen(filename, "rb");
- // struct timespec sleep;
- // sleep.tv_nsec = NANO_SEC_SLEEP;
- // sleep.tv_sec = 0;
-@@ -1321,6 +1320,7 @@ int Mustang::update(char *filename)
- else
- return -200;
-
-+ file = fopen(filename, "rb");
- // send date when firmware was created
- fseek(file, 0x1a, SEEK_SET);
- memset(array, 0x00, LENGTH);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b9e6f33..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-1001-firmware_mustange_III_to_V.patch
-1002-firmware_mustang_II_v2.patch
-1003-upstream_bug_31.patch
--
mustang-plug packaging
More information about the pkg-multimedia-commits
mailing list