mirror of
				https://github.com/lingble/meta-tegra.git
				synced 2025-10-30 20:07:55 +00:00 
			
		
		
		
	tegra-mmapi-samples: refresh patches for R35.3.1
Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
		 Matt Madison
					Matt Madison
				
			
				
					committed by
					
						 Matt Madison
						Matt Madison
					
				
			
			
				
	
			
			
			 Matt Madison
						Matt Madison
					
				
			
						parent
						
							6306520ad1
						
					
				
				
					commit
					e8f1905020
				
			| @@ -40,10 +40,10 @@ Signed-off-by: Matt Madison <matt@madison.systems> | |||||||
|  .../transform_unit_sample/Makefile            | 10 +- |  .../transform_unit_sample/Makefile            | 10 +- | ||||||
|  28 files changed, 208 insertions(+), 307 deletions(-) |  28 files changed, 208 insertions(+), 307 deletions(-) | ||||||
|  |  | ||||||
| diff --git a/Makefile b/Makefile | Index: jetson_multimedia_api/Makefile | ||||||
| index 26b05cf..18e37d3 100644 | =================================================================== | ||||||
| --- a/Makefile | --- jetson_multimedia_api.orig/Makefile | ||||||
| +++ b/Makefile | +++ jetson_multimedia_api/Makefile | ||||||
| @@ -58,7 +58,7 @@ SUBDIRS = \ | @@ -58,7 +58,7 @@ SUBDIRS = \ | ||||||
|  all: |  all: | ||||||
|  	@list='$(SUBDIRS)'; for subdir in $$list; do \ |  	@list='$(SUBDIRS)'; for subdir in $$list; do \ | ||||||
| @@ -64,10 +64,10 @@ index 26b05cf..18e37d3 100644 | |||||||
| +		echo "Install in $$subdir";\ | +		echo "Install in $$subdir";\ | ||||||
| +		$(MAKE) -C $$subdir install;\ | +		$(MAKE) -C $$subdir install;\ | ||||||
| +	done | +	done | ||||||
| diff --git a/samples/00_video_decode/Makefile b/samples/00_video_decode/Makefile | Index: jetson_multimedia_api/samples/00_video_decode/Makefile | ||||||
| index 06239b1..e65ba7e 100644 | =================================================================== | ||||||
| --- a/samples/00_video_decode/Makefile | --- jetson_multimedia_api.orig/samples/00_video_decode/Makefile | ||||||
| +++ b/samples/00_video_decode/Makefile | +++ jetson_multimedia_api/samples/00_video_decode/Makefile | ||||||
| @@ -34,23 +34,19 @@ APP := video_decode | @@ -34,23 +34,19 @@ APP := video_decode | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -95,10 +95,10 @@ index 06239b1..e65ba7e 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/01_video_encode/Makefile b/samples/01_video_encode/Makefile | Index: jetson_multimedia_api/samples/01_video_encode/Makefile | ||||||
| index 650b888..a14f4b4 100644 | =================================================================== | ||||||
| --- a/samples/01_video_encode/Makefile | --- jetson_multimedia_api.orig/samples/01_video_encode/Makefile | ||||||
| +++ b/samples/01_video_encode/Makefile | +++ jetson_multimedia_api/samples/01_video_encode/Makefile | ||||||
| @@ -34,23 +34,19 @@ APP := video_encode | @@ -34,23 +34,19 @@ APP := video_encode | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -126,10 +126,10 @@ index 650b888..a14f4b4 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/02_video_dec_cuda/Makefile b/samples/02_video_dec_cuda/Makefile | Index: jetson_multimedia_api/samples/02_video_dec_cuda/Makefile | ||||||
| index 31e8de8..97f8a4c 100644 | =================================================================== | ||||||
| --- a/samples/02_video_dec_cuda/Makefile | --- jetson_multimedia_api.orig/samples/02_video_dec_cuda/Makefile | ||||||
| +++ b/samples/02_video_dec_cuda/Makefile | +++ jetson_multimedia_api/samples/02_video_dec_cuda/Makefile | ||||||
| @@ -34,33 +34,19 @@ APP := video_dec_cuda | @@ -34,33 +34,19 @@ APP := video_dec_cuda | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -167,10 +167,10 @@ index 31e8de8..97f8a4c 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/03_video_cuda_enc/Makefile b/samples/03_video_cuda_enc/Makefile | Index: jetson_multimedia_api/samples/03_video_cuda_enc/Makefile | ||||||
| index 7911c20..d0d0cc4 100644 | =================================================================== | ||||||
| --- a/samples/03_video_cuda_enc/Makefile | --- jetson_multimedia_api.orig/samples/03_video_cuda_enc/Makefile | ||||||
| +++ b/samples/03_video_cuda_enc/Makefile | +++ jetson_multimedia_api/samples/03_video_cuda_enc/Makefile | ||||||
| @@ -34,33 +34,20 @@ APP := video_cuda_enc | @@ -34,33 +34,20 @@ APP := video_cuda_enc | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -209,10 +209,10 @@ index 7911c20..d0d0cc4 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/04_video_dec_trt/Makefile b/samples/04_video_dec_trt/Makefile | Index: jetson_multimedia_api/samples/04_video_dec_trt/Makefile | ||||||
| index 2dcd621..1d35817 100644 | =================================================================== | ||||||
| --- a/samples/04_video_dec_trt/Makefile | --- jetson_multimedia_api.orig/samples/04_video_dec_trt/Makefile | ||||||
| +++ b/samples/04_video_dec_trt/Makefile | +++ jetson_multimedia_api/samples/04_video_dec_trt/Makefile | ||||||
| @@ -30,44 +30,36 @@ | @@ -30,44 +30,36 @@ | ||||||
|   |   | ||||||
|  include ../Rules.mk |  include ../Rules.mk | ||||||
| @@ -271,10 +271,10 @@ index 2dcd621..1d35817 100644 | |||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| +endif | +endif | ||||||
| diff --git a/samples/05_jpeg_encode/Makefile b/samples/05_jpeg_encode/Makefile | Index: jetson_multimedia_api/samples/05_jpeg_encode/Makefile | ||||||
| index ebb6626..eebdb63 100644 | =================================================================== | ||||||
| --- a/samples/05_jpeg_encode/Makefile | --- jetson_multimedia_api.orig/samples/05_jpeg_encode/Makefile | ||||||
| +++ b/samples/05_jpeg_encode/Makefile | +++ jetson_multimedia_api/samples/05_jpeg_encode/Makefile | ||||||
| @@ -34,23 +34,20 @@ APP := jpeg_encode | @@ -34,23 +34,20 @@ APP := jpeg_encode | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -303,10 +303,10 @@ index ebb6626..eebdb63 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/06_jpeg_decode/Makefile b/samples/06_jpeg_decode/Makefile | Index: jetson_multimedia_api/samples/06_jpeg_decode/Makefile | ||||||
| index 3f28db9..4d769f0 100644 | =================================================================== | ||||||
| --- a/samples/06_jpeg_decode/Makefile | --- jetson_multimedia_api.orig/samples/06_jpeg_decode/Makefile | ||||||
| +++ b/samples/06_jpeg_decode/Makefile | +++ jetson_multimedia_api/samples/06_jpeg_decode/Makefile | ||||||
| @@ -34,23 +34,19 @@ APP := jpeg_decode | @@ -34,23 +34,19 @@ APP := jpeg_decode | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -334,10 +334,10 @@ index 3f28db9..4d769f0 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/07_video_convert/Makefile b/samples/07_video_convert/Makefile | Index: jetson_multimedia_api/samples/07_video_convert/Makefile | ||||||
| index 7edeb29..8af6299 100644 | =================================================================== | ||||||
| --- a/samples/07_video_convert/Makefile | --- jetson_multimedia_api.orig/samples/07_video_convert/Makefile | ||||||
| +++ b/samples/07_video_convert/Makefile | +++ jetson_multimedia_api/samples/07_video_convert/Makefile | ||||||
| @@ -34,23 +34,19 @@ APP := video_convert | @@ -34,23 +34,19 @@ APP := video_convert | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -365,10 +365,10 @@ index 7edeb29..8af6299 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/08_video_dec_drm/Makefile b/samples/08_video_dec_drm/Makefile | Index: jetson_multimedia_api/samples/08_video_dec_drm/Makefile | ||||||
| index 5cb1be9..f59d7f7 100644 | =================================================================== | ||||||
| --- a/samples/08_video_dec_drm/Makefile | --- jetson_multimedia_api.orig/samples/08_video_dec_drm/Makefile | ||||||
| +++ b/samples/08_video_dec_drm/Makefile | +++ jetson_multimedia_api/samples/08_video_dec_drm/Makefile | ||||||
| @@ -34,12 +34,11 @@ APP := video_dec_drm | @@ -34,12 +34,11 @@ APP := video_dec_drm | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -408,11 +408,11 @@ index 5cb1be9..f59d7f7 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) image_rgba.* |  	$(AT)rm -rf $(APP) $(OBJS) image_rgba.* | ||||||
| diff --git a/samples/09_argus_camera_jpeg/Makefile b/samples/09_argus_camera_jpeg/Makefile | Index: jetson_multimedia_api/samples/09_argus_camera_jpeg/Makefile | ||||||
| index 2fc7720..4372f8d 100644 | =================================================================== | ||||||
| --- a/samples/09_argus_camera_jpeg/Makefile | --- jetson_multimedia_api.orig/samples/09_argus_camera_jpeg/Makefile | ||||||
| +++ b/samples/09_argus_camera_jpeg/Makefile | +++ jetson_multimedia_api/samples/09_argus_camera_jpeg/Makefile | ||||||
| @@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils | @@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samp | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
|  	main.cpp \ |  	main.cpp \ | ||||||
| @@ -447,11 +447,11 @@ index 2fc7720..4372f8d 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/10_argus_camera_recording/Makefile b/samples/10_argus_camera_recording/Makefile | Index: jetson_multimedia_api/samples/10_argus_camera_recording/Makefile | ||||||
| index 8a8eb57..21e2beb 100644 | =================================================================== | ||||||
| --- a/samples/10_argus_camera_recording/Makefile | --- jetson_multimedia_api.orig/samples/10_argus_camera_recording/Makefile | ||||||
| +++ b/samples/10_argus_camera_recording/Makefile | +++ jetson_multimedia_api/samples/10_argus_camera_recording/Makefile | ||||||
| @@ -36,12 +36,11 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils | @@ -36,12 +36,11 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samp | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
|  	main.cpp \ |  	main.cpp \ | ||||||
| @@ -492,10 +492,10 @@ index 8a8eb57..21e2beb 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/12_v4l2_camera_cuda/Makefile b/samples/12_v4l2_camera_cuda/Makefile | Index: jetson_multimedia_api/samples/12_v4l2_camera_cuda/Makefile | ||||||
| index c6d086a..63f4338 100644 | =================================================================== | ||||||
| --- a/samples/12_v4l2_camera_cuda/Makefile | --- jetson_multimedia_api.orig/samples/12_v4l2_camera_cuda/Makefile | ||||||
| +++ b/samples/12_v4l2_camera_cuda/Makefile | +++ jetson_multimedia_api/samples/12_v4l2_camera_cuda/Makefile | ||||||
| @@ -33,33 +33,19 @@ include ../Rules.mk | @@ -33,33 +33,19 @@ include ../Rules.mk | ||||||
|  APP := v4l2_camera_cuda |  APP := v4l2_camera_cuda | ||||||
|   |   | ||||||
| @@ -533,11 +533,11 @@ index c6d086a..63f4338 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/13_argus_multi_camera/Makefile b/samples/13_argus_multi_camera/Makefile | Index: jetson_multimedia_api/samples/13_argus_multi_camera/Makefile | ||||||
| index 6a28095..f556b2a 100644 | =================================================================== | ||||||
| --- a/samples/13_argus_multi_camera/Makefile | --- jetson_multimedia_api.orig/samples/13_argus_multi_camera/Makefile | ||||||
| +++ b/samples/13_argus_multi_camera/Makefile | +++ jetson_multimedia_api/samples/13_argus_multi_camera/Makefile | ||||||
| @@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samples/utils | @@ -36,10 +36,9 @@ ARGUS_UTILS_DIR := $(TOP_DIR)/argus/samp | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
|  	main.cpp \ |  	main.cpp \ | ||||||
| @@ -572,10 +572,10 @@ index 6a28095..f556b2a 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/14_multivideo_decode/Makefile b/samples/14_multivideo_decode/Makefile | Index: jetson_multimedia_api/samples/14_multivideo_decode/Makefile | ||||||
| index 0e13ef9..80d5d6c 100644 | =================================================================== | ||||||
| --- a/samples/14_multivideo_decode/Makefile | --- jetson_multimedia_api.orig/samples/14_multivideo_decode/Makefile | ||||||
| +++ b/samples/14_multivideo_decode/Makefile | +++ jetson_multimedia_api/samples/14_multivideo_decode/Makefile | ||||||
| @@ -34,23 +34,19 @@ APP := multivideo_decode | @@ -34,23 +34,19 @@ APP := multivideo_decode | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -603,10 +603,10 @@ index 0e13ef9..80d5d6c 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/15_multivideo_encode/Makefile b/samples/15_multivideo_encode/Makefile | Index: jetson_multimedia_api/samples/15_multivideo_encode/Makefile | ||||||
| index 2121764..9ac26e8 100644 | =================================================================== | ||||||
| --- a/samples/15_multivideo_encode/Makefile | --- jetson_multimedia_api.orig/samples/15_multivideo_encode/Makefile | ||||||
| +++ b/samples/15_multivideo_encode/Makefile | +++ jetson_multimedia_api/samples/15_multivideo_encode/Makefile | ||||||
| @@ -34,23 +34,19 @@ APP := multivideo_encode | @@ -34,23 +34,19 @@ APP := multivideo_encode | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -634,10 +634,10 @@ index 2121764..9ac26e8 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/16_multivideo_transcode/Makefile b/samples/16_multivideo_transcode/Makefile | Index: jetson_multimedia_api/samples/16_multivideo_transcode/Makefile | ||||||
| index df65641..9b7394e 100644 | =================================================================== | ||||||
| --- a/samples/16_multivideo_transcode/Makefile | --- jetson_multimedia_api.orig/samples/16_multivideo_transcode/Makefile | ||||||
| +++ b/samples/16_multivideo_transcode/Makefile | +++ jetson_multimedia_api/samples/16_multivideo_transcode/Makefile | ||||||
| @@ -34,23 +34,19 @@ APP := multivideo_transcode | @@ -34,23 +34,19 @@ APP := multivideo_transcode | ||||||
|   |   | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
| @@ -665,10 +665,10 @@ index df65641..9b7394e 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/17_frontend/Makefile b/samples/17_frontend/Makefile | Index: jetson_multimedia_api/samples/17_frontend/Makefile | ||||||
| index 35f3f56..8bfafb3 100644 | =================================================================== | ||||||
| --- a/samples/17_frontend/Makefile | --- jetson_multimedia_api.orig/samples/17_frontend/Makefile | ||||||
| +++ b/samples/17_frontend/Makefile | +++ jetson_multimedia_api/samples/17_frontend/Makefile | ||||||
| @@ -30,6 +30,15 @@ | @@ -30,6 +30,15 @@ | ||||||
|   |   | ||||||
|  include ../Rules.mk |  include ../Rules.mk | ||||||
| @@ -750,10 +750,10 @@ index 35f3f56..8bfafb3 100644 | |||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| +endif | +endif | ||||||
| diff --git a/samples/18_v4l2_camera_cuda_rgb/Makefile b/samples/18_v4l2_camera_cuda_rgb/Makefile | Index: jetson_multimedia_api/samples/18_v4l2_camera_cuda_rgb/Makefile | ||||||
| index 1b3ec95..e484a51 100644 | =================================================================== | ||||||
| --- a/samples/18_v4l2_camera_cuda_rgb/Makefile | --- jetson_multimedia_api.orig/samples/18_v4l2_camera_cuda_rgb/Makefile | ||||||
| +++ b/samples/18_v4l2_camera_cuda_rgb/Makefile | +++ jetson_multimedia_api/samples/18_v4l2_camera_cuda_rgb/Makefile | ||||||
| @@ -26,15 +26,8 @@ SRCS := \ | @@ -26,15 +26,8 @@ SRCS := \ | ||||||
|  	capture.cpp \ |  	capture.cpp \ | ||||||
|  	yuv2rgb.cu |  	yuv2rgb.cu | ||||||
| @@ -772,10 +772,10 @@ index 1b3ec95..e484a51 100644 | |||||||
|   |   | ||||||
|  all: $(APP) |  all: $(APP) | ||||||
|   |   | ||||||
| diff --git a/samples/Rules.mk b/samples/Rules.mk | Index: jetson_multimedia_api/samples/Rules.mk | ||||||
| index 190c8e1..a4df626 100644 | =================================================================== | ||||||
| --- a/samples/Rules.mk | --- jetson_multimedia_api.orig/samples/Rules.mk | ||||||
| +++ b/samples/Rules.mk | +++ jetson_multimedia_api/samples/Rules.mk | ||||||
| @@ -28,10 +28,6 @@ | @@ -28,10 +28,6 @@ | ||||||
|  # |  # | ||||||
|  ############################################################################### |  ############################################################################### | ||||||
| @@ -787,7 +787,7 @@ index 190c8e1..a4df626 100644 | |||||||
|  # Verbose flag |  # Verbose flag | ||||||
|  ifeq ($(VERBOSE), 1) |  ifeq ($(VERBOSE), 1) | ||||||
|  AT = |  AT = | ||||||
| @@ -39,71 +35,65 @@ else | @@ -39,73 +35,65 @@ else | ||||||
|  AT = @ |  AT = @ | ||||||
|  endif |  endif | ||||||
|   |   | ||||||
| @@ -841,6 +841,7 @@ index 190c8e1..a4df626 100644 | |||||||
| -LDFLAGS += \ | -LDFLAGS += \ | ||||||
| -	-Wl,-rpath-link=$(TARGET_ROOTFS)/lib/$(TEGRA_ARMABI) \ | -	-Wl,-rpath-link=$(TARGET_ROOTFS)/lib/$(TEGRA_ARMABI) \ | ||||||
| -	-Wl,-rpath-link=$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI) \ | -	-Wl,-rpath-link=$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI) \ | ||||||
|  | -	-Wl,-rpath-link=$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)/nvidia \ | ||||||
| -	-Wl,-rpath-link=$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)/tegra \ | -	-Wl,-rpath-link=$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)/tegra \ | ||||||
| -	-Wl,-rpath-link=$(TARGET_ROOTFS)/$(CUDA_PATH)/lib64 | -	-Wl,-rpath-link=$(TARGET_ROOTFS)/$(CUDA_PATH)/lib64 | ||||||
| -endif | -endif | ||||||
| @@ -864,11 +865,13 @@ index 190c8e1..a4df626 100644 | |||||||
|   |   | ||||||
|  # All common dependent libraries |  # All common dependent libraries | ||||||
|  LDFLAGS += \ |  LDFLAGS += \ | ||||||
|  	-lpthread -lv4l2 -lEGL -lGLESv2 -lX11 \ | -	-lpthread -lnvv4l2 -lEGL -lGLESv2 -lX11 \ | ||||||
|  | +	-lpthread -lv4l2 -lEGL -lGLESv2 -lX11 \ | ||||||
|  	-lnvbufsurface -lnvbufsurftransform -lnvjpeg -lnvosd -ldrm \ |  	-lnvbufsurface -lnvbufsurftransform -lnvjpeg -lnvosd -ldrm \ | ||||||
| -	-lcuda -lcudart \ | -	-lcuda -lcudart \ | ||||||
| -	-L"$(TARGET_ROOTFS)/$(CUDA_PATH)/lib64" \ | -	-L"$(TARGET_ROOTFS)/$(CUDA_PATH)/lib64" \ | ||||||
| -	-L"$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)" \ | -	-L"$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)" \ | ||||||
|  | -	-L"$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)/nvidia" \ | ||||||
| -	-L"$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)/tegra" | -	-L"$(TARGET_ROOTFS)/usr/lib/$(TEGRA_ARMABI)/tegra" | ||||||
| +	-lcuda -lcudart | +	-lcuda -lcudart | ||||||
| + | + | ||||||
| @@ -902,10 +905,10 @@ index 190c8e1..a4df626 100644 | |||||||
| +install: $(APP) | +install: $(APP) | ||||||
| +	[ -z "$(APP)" ] || install -d $(DESTDIR)$(bindir) | +	[ -z "$(APP)" ] || install -d $(DESTDIR)$(bindir) | ||||||
| +	[ -z "$(APP)" ] || install -m 0755 $(APP) $(DESTDIR)$(bindir) | +	[ -z "$(APP)" ] || install -m 0755 $(APP) $(DESTDIR)$(bindir) | ||||||
| diff --git a/samples/backend/Makefile b/samples/backend/Makefile | Index: jetson_multimedia_api/samples/backend/Makefile | ||||||
| index 13389e8..145241d 100644 | =================================================================== | ||||||
| --- a/samples/backend/Makefile | --- jetson_multimedia_api.orig/samples/backend/Makefile | ||||||
| +++ b/samples/backend/Makefile | +++ jetson_multimedia_api/samples/backend/Makefile | ||||||
| @@ -30,28 +30,34 @@ | @@ -30,28 +30,34 @@ | ||||||
|   |   | ||||||
|  include ../Rules.mk |  include ../Rules.mk | ||||||
| @@ -979,10 +982,10 @@ index 13389e8..145241d 100644 | |||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| +endif | +endif | ||||||
| diff --git a/samples/common/algorithm/cuda/Makefile b/samples/common/algorithm/cuda/Makefile | Index: jetson_multimedia_api/samples/common/algorithm/cuda/Makefile | ||||||
| index e218d51..86c5a0d 100644 | =================================================================== | ||||||
| --- a/samples/common/algorithm/cuda/Makefile | --- jetson_multimedia_api.orig/samples/common/algorithm/cuda/Makefile | ||||||
| +++ b/samples/common/algorithm/cuda/Makefile | +++ jetson_multimedia_api/samples/common/algorithm/cuda/Makefile | ||||||
| @@ -28,6 +28,8 @@ | @@ -28,6 +28,8 @@ | ||||||
|  # |  # | ||||||
|  ############################################################################### |  ############################################################################### | ||||||
| @@ -1019,10 +1022,10 @@ index e218d51..86c5a0d 100644 | |||||||
|  clean: |  clean: | ||||||
| -	$(AT)rm -rf *.o | -	$(AT)rm -rf *.o | ||||||
| +	$(AT)rm -rf *.o algo_cuda.built | +	$(AT)rm -rf *.o algo_cuda.built | ||||||
| diff --git a/samples/common/algorithm/trt/Makefile b/samples/common/algorithm/trt/Makefile | Index: jetson_multimedia_api/samples/common/algorithm/trt/Makefile | ||||||
| index f782ae0..e24ae57 100644 | =================================================================== | ||||||
| --- a/samples/common/algorithm/trt/Makefile | --- jetson_multimedia_api.orig/samples/common/algorithm/trt/Makefile | ||||||
| +++ b/samples/common/algorithm/trt/Makefile | +++ jetson_multimedia_api/samples/common/algorithm/trt/Makefile | ||||||
| @@ -28,17 +28,24 @@ | @@ -28,17 +28,24 @@ | ||||||
|  # |  # | ||||||
|  ############################################################################### |  ############################################################################### | ||||||
| @@ -1050,10 +1053,10 @@ index f782ae0..e24ae57 100644 | |||||||
|  clean: |  clean: | ||||||
| -	$(AT)rm -rf $(APP) $(OBJS) | -	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| +	$(AT)rm -rf $(APP) $(OBJS) algo_trt.built | +	$(AT)rm -rf $(APP) $(OBJS) algo_trt.built | ||||||
| diff --git a/samples/common/classes/Makefile b/samples/common/classes/Makefile | Index: jetson_multimedia_api/samples/common/classes/Makefile | ||||||
| index 7336298..82e2bb8 100644 | =================================================================== | ||||||
| --- a/samples/common/classes/Makefile | --- jetson_multimedia_api.orig/samples/common/classes/Makefile | ||||||
| +++ b/samples/common/classes/Makefile | +++ jetson_multimedia_api/samples/common/classes/Makefile | ||||||
| @@ -28,13 +28,21 @@ | @@ -28,13 +28,21 @@ | ||||||
|  # |  # | ||||||
|  ############################################################################### |  ############################################################################### | ||||||
| @@ -1077,10 +1080,10 @@ index 7336298..82e2bb8 100644 | |||||||
|   |   | ||||||
|  %.o: %.cpp |  %.o: %.cpp | ||||||
|  	@echo "Compiling: $<" |  	@echo "Compiling: $<" | ||||||
| diff --git a/samples/unittest_samples/camera_unit_sample/Makefile b/samples/unittest_samples/camera_unit_sample/Makefile | Index: jetson_multimedia_api/samples/unittest_samples/camera_unit_sample/Makefile | ||||||
| index 790a322..ec63a2d 100644 | =================================================================== | ||||||
| --- a/samples/unittest_samples/camera_unit_sample/Makefile | --- jetson_multimedia_api.orig/samples/unittest_samples/camera_unit_sample/Makefile | ||||||
| +++ b/samples/unittest_samples/camera_unit_sample/Makefile | +++ jetson_multimedia_api/samples/unittest_samples/camera_unit_sample/Makefile | ||||||
| @@ -35,23 +35,19 @@ APP := camera_sample | @@ -35,23 +35,19 @@ APP := camera_sample | ||||||
|  SRCS := \ |  SRCS := \ | ||||||
|  	camera_unit_sample.cpp \ |  	camera_unit_sample.cpp \ | ||||||
| @@ -1108,10 +1111,10 @@ index 790a322..ec63a2d 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/unittest_samples/decoder_unit_sample/Makefile b/samples/unittest_samples/decoder_unit_sample/Makefile | Index: jetson_multimedia_api/samples/unittest_samples/decoder_unit_sample/Makefile | ||||||
| index 16b6a0a..e6f813a 100644 | =================================================================== | ||||||
| --- a/samples/unittest_samples/decoder_unit_sample/Makefile | --- jetson_multimedia_api.orig/samples/unittest_samples/decoder_unit_sample/Makefile | ||||||
| +++ b/samples/unittest_samples/decoder_unit_sample/Makefile | +++ jetson_multimedia_api/samples/unittest_samples/decoder_unit_sample/Makefile | ||||||
| @@ -33,23 +33,19 @@ include ../../Rules.mk | @@ -33,23 +33,19 @@ include ../../Rules.mk | ||||||
|  APP := decode_sample |  APP := decode_sample | ||||||
|   |   | ||||||
| @@ -1139,10 +1142,10 @@ index 16b6a0a..e6f813a 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/unittest_samples/encoder_unit_sample/Makefile b/samples/unittest_samples/encoder_unit_sample/Makefile | Index: jetson_multimedia_api/samples/unittest_samples/encoder_unit_sample/Makefile | ||||||
| index d372602..f1d6428 100644 | =================================================================== | ||||||
| --- a/samples/unittest_samples/encoder_unit_sample/Makefile | --- jetson_multimedia_api.orig/samples/unittest_samples/encoder_unit_sample/Makefile | ||||||
| +++ b/samples/unittest_samples/encoder_unit_sample/Makefile | +++ jetson_multimedia_api/samples/unittest_samples/encoder_unit_sample/Makefile | ||||||
| @@ -33,23 +33,19 @@ include ../../Rules.mk | @@ -33,23 +33,19 @@ include ../../Rules.mk | ||||||
|  APP := encode_sample |  APP := encode_sample | ||||||
|   |   | ||||||
| @@ -1170,10 +1173,10 @@ index d372602..f1d6428 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| diff --git a/samples/unittest_samples/transform_unit_sample/Makefile b/samples/unittest_samples/transform_unit_sample/Makefile | Index: jetson_multimedia_api/samples/unittest_samples/transform_unit_sample/Makefile | ||||||
| index 404429b..1ede2ab 100644 | =================================================================== | ||||||
| --- a/samples/unittest_samples/transform_unit_sample/Makefile | --- jetson_multimedia_api.orig/samples/unittest_samples/transform_unit_sample/Makefile | ||||||
| +++ b/samples/unittest_samples/transform_unit_sample/Makefile | +++ jetson_multimedia_api/samples/unittest_samples/transform_unit_sample/Makefile | ||||||
| @@ -33,23 +33,19 @@ include ../../Rules.mk | @@ -33,23 +33,19 @@ include ../../Rules.mk | ||||||
|  APP := transform_sample |  APP := transform_sample | ||||||
|   |   | ||||||
| @@ -1201,6 +1204,3 @@ index 404429b..1ede2ab 100644 | |||||||
|   |   | ||||||
|  clean: |  clean: | ||||||
|  	$(AT)rm -rf $(APP) $(OBJS) |  	$(AT)rm -rf $(APP) $(OBJS) | ||||||
| --  |  | ||||||
| 2.34.1 |  | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user