From: Good Guy <good1.2guy@gmail.com>
Date: Sun, 5 Mar 2023 23:10:04 +0000 (-0700)
Subject: Credit Andrew for noexecstack, and Stefan for shuttle mouse
X-Git-Tag: 2023-03~4
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=0aa1cf868b3686002891a830f5f8e407344b1d9e;hp=6c6367a007ab0f67538ad165e5815e66183a3997;p=goodguy%2Fcinelerra.git

Credit Andrew for noexecstack, and Stefan for shuttle mouse
---

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index d9fc6ce7..1cb58d50 100644
--- a/cinelerra-5.1/cinelerra/Makefile
+++ b/cinelerra-5.1/cinelerra/Makefile
@@ -526,7 +526,7 @@ CFLAGS += -DUSE_ALPHA
 
 else
 
-LDFLAGS1 = -Wl,-export-dynamic -g
+LDFLAGS1 = -Wl,-export-dynamic -g -Wl,-z,noexecstack
 LDFLAGS2 = $(LDFLAGS)
 LINKER = $(CXX) -o $(OUTPUT)
 
diff --git a/cinelerra-5.1/cinelerra/shuttle.C b/cinelerra-5.1/cinelerra/shuttle.C
index 53b6527a..80d2fdff 100644
--- a/cinelerra-5.1/cinelerra/shuttle.C
+++ b/cinelerra-5.1/cinelerra/shuttle.C
@@ -624,10 +624,16 @@ static const struct shuttle_dev {
 } shuttle_devs[] = {
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttleXpress-event-if00",
 		0x0b33, 0x0020 },
+	{ "/dev/input/by-id/usb-Contour_Design_ShuttleXpress-event-mouse",
+		0x0b33, 0x0020 },
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePRO_v2-event-if00",
 		0x0b33, 0x0030 },
+	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePRO_v2-event-mouse",
+		0x0b33, 0x0030 },
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePro-event-if00",
 		0x0b33, 0x0030 },
+	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePro-event-mouse",
+		0x0b33, 0x0030 },
 	{ "/dev/input/by-id/usb-Contour_Design_ShuttlePRO_v2-event-joystick",
 		0x0b33, 0x0030 },
 };