mirror of
https://github.com/dwhinham/mt32-pi.git
synced 2026-10-27 06:21:59 +00:00
Update to circle-stdlib v15.12/Circle Step 44.4.1
This commit is contained in:
1 parent
63dc284de3
commit
2f188d98f7
4 files changed
+13
-9
No files matched your search
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## Changed
|
||||
|
||||
- Update to circle-stdlib v15.12/Circle Step 44.4.1.
|
||||
|
||||
## [0.11.1] - 2022-03-10
|
||||
|
||||
### Added
|
||||
|
||||
@@ -16,7 +16,7 @@ $(CIRCLE_STDLIB_CONFIG) $(CIRCLE_CONFIG)&:
|
||||
$(CIRCLESTDLIBHOME)/configure --raspberrypi=$(RASPBERRYPI) --prefix=$(PREFIX)
|
||||
|
||||
# Apply patches
|
||||
@patch -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.3-minimal-usb-drivers.patch
|
||||
@patch -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.4-minimal-usb-drivers.patch
|
||||
|
||||
ifeq ($(strip $(GC_SECTIONS)),1)
|
||||
# Enable function/data sections for circle-stdlib
|
||||
@@ -120,7 +120,7 @@ clean:
|
||||
#
|
||||
veryclean: clean
|
||||
# Reverse patches
|
||||
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.3-minimal-usb-drivers.patch
|
||||
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(CIRCLEHOME) < patches/circle-44.4-minimal-usb-drivers.patch
|
||||
@patch -R -N -p1 --no-backup-if-mismatch -r - -d $(FLUIDSYNTHHOME) < patches/fluidsynth-2.2.5-circle.patch
|
||||
|
||||
# Clean circle-stdlib
|
||||
|
||||
Vendored
+1
-1
Submodule external/circle-stdlib updated: 47d9deb580...61cf3a47bf.
+6
-6
@@ -29,7 +29,7 @@ index 59a1fa7..2f4e334 100644
|
||||
usbserialpl2303.o usbserialft231x.o usbserialcdc.o usbtouchscreen.o
|
||||
|
||||
diff --git a/lib/usb/usbdevicefactory.cpp b/lib/usb/usbdevicefactory.cpp
|
||||
index 432a3ec..8cfb35c 100644
|
||||
index 150ade3..8240548 100644
|
||||
--- a/lib/usb/usbdevicefactory.cpp
|
||||
+++ b/lib/usb/usbdevicefactory.cpp
|
||||
@@ -74,6 +74,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
|
||||
@@ -39,8 +39,8 @@ index 432a3ec..8cfb35c 100644
|
||||
+#if 0
|
||||
else if (pName->Compare ("int3-1-1") == 0)
|
||||
{
|
||||
pResult = new CUSBKeyboardDevice (pParent);
|
||||
@@ -116,6 +117,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
|
||||
CString *pVendor = pParent->GetDevice ()->GetName (DeviceNameVendor);
|
||||
@@ -132,6 +133,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
|
||||
{
|
||||
pResult = new CUSBPrinterDevice (pParent);
|
||||
}
|
||||
@@ -48,7 +48,7 @@ index 432a3ec..8cfb35c 100644
|
||||
else if (pName->Compare ("ven424-ec00") == 0)
|
||||
{
|
||||
pResult = new CSMSC951xDevice (pParent);
|
||||
@@ -124,11 +126,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
|
||||
@@ -140,11 +142,13 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
|
||||
{
|
||||
pResult = new CLAN7800Device (pParent);
|
||||
}
|
||||
@@ -62,7 +62,7 @@ index 432a3ec..8cfb35c 100644
|
||||
else if ( pName->Compare ("int1-3-0") == 0
|
||||
|| pName->Compare ("ven582-12a") == 0) // Roland UM-ONE MIDI interface
|
||||
{
|
||||
@@ -171,6 +175,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
|
||||
@@ -187,6 +191,7 @@ CUSBFunction *CUSBDeviceFactory::GetDevice (CUSBFunction *pParent, CString *pNam
|
||||
return pResult;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ index 432a3ec..8cfb35c 100644
|
||||
CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
|
||||
{
|
||||
// Must copy parent function here, because we consume the HID report descriptor,
|
||||
@@ -249,6 +254,7 @@ CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
|
||||
@@ -265,6 +270,7 @@ CUSBFunction *CUSBDeviceFactory::GetGenericHIDDevice (CUSBFunction *pParent)
|
||||
|
||||
return new CUSBGamePadStandardDevice (pParent);
|
||||
}
|
||||
Reference in new issue
Block a user