From 0aa1cf868b3686002891a830f5f8e407344b1d9e Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 5 Mar 2023 16:10:04 -0700 Subject: [PATCH] Credit Andrew for noexecstack, and Stefan for shuttle mouse --- cinelerra-5.1/cinelerra/Makefile | 2 +- cinelerra-5.1/cinelerra/shuttle.C | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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 }, }; -- 2.26.2