Credit Andrew for noexecstack, and Stefan for shuttle mouse

diff --git a/cinelerra-5.1/cinelerra/Makefile b/cinelerra-5.1/cinelerra/Makefile
index d9fc6ce7cdf3ba0d7db17e0db351f4aec4ac696f..1cb58d504d29479b24f2de84b35f3e7d8681b8d9 100644 (file)
--- 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 53b6527acd3bef06742d37f229f00730003befd6..80d2fdff01a39bfeea539cebd89e6442ca93a46c 100644 (file)
--- 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 },
 };