Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add uvcvideo version update patch #12905

Merged
merged 2 commits into from
May 12, 2024
Merged

Add uvcvideo version update patch #12905

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d854d8a
add uvcvideo version update patch
Nir-Az May 7, 2024
aa671d1
add uvcvideo version update patch
Nir-Az May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/patch-realsense-ubuntu-lts-hwe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ then
# Patching kernel for RealSense devices
echo -e "\e[32mApplying patches for \e[36m${ubuntu_codename}-${kernel_branch}\e[32m line\e[0m"
echo -e "\e[32mApplying realsense-uvc patch\e[0m"
patch -p1 < ../scripts/realsense-uvc-driver-version.patch
patch -p1 < ../scripts/realsense-camera-formats-${ubuntu_codename}-${kernel_branch}.patch || patch -p1 < ../scripts/realsense-camera-formats-${ubuntu_codename}-master.patch
if [ ${skip_md_patch} -eq 0 ]; then
echo -e "\e[32mApplying realsense-metadata patch\e[0m"
Expand Down
27 changes: 27 additions & 0 deletions scripts/realsense-uvc-driver-version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 327de73504d2d5ac897d86fe15c3aceaeb051da8 Mon Sep 17 00:00:00 2001
From: Nir <nir.azkiel@intel.com>
Date: Tue, 7 May 2024 23:02:47 +0300
Subject: [PATCH] make realsense uvcvideo driver version unique

---
drivers/media/usb/uvc/uvcvideo.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 6fb0a78b1..b35431ae1 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -44,8 +44,8 @@
/* ------------------------------------------------------------------------
* Driver specific constants.
*/
-
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should leave this new line here

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

-#define DRIVER_VERSION "1.1.1"
+#define DRIVER_VERSION_SUFFIX "realsense-patch"
+#define DRIVER_VERSION "1.1.1-" DRIVER_VERSION_SUFFIX

/* Number of isochronous URBs. */
#define UVC_URBS 5
--
2.34.1