0004-omx-il-fix-building-issue.patch 3.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788
  1. From 14143fcf2c4561905c11cae22314bb5dfdbe171c Mon Sep 17 00:00:00 2001
  2. From: Andy Hu <andy.hu@starfivetech.com>
  3. Date: Wed, 17 Aug 2022 11:14:38 +0800
  4. Subject: [PATCH] omx-il: fix building issue
  5. ---
  6. omx-il/Makefile | 29 ++++++++++++++++++++++-------
  7. 1 file changed, 22 insertions(+), 7 deletions(-)
  8. diff --git a/omx-il/Makefile b/omx-il/Makefile
  9. index 150c4d5..a51de48 100644
  10. --- a/omx-il/Makefile
  11. +++ b/omx-il/Makefile
  12. @@ -10,7 +10,8 @@ BUILD_CONFIGURATION := EmbeddedRiscvLinux
  13. PRODUCT := OMX_IL
  14. ifeq ("$(BUILD_CONFIGURATION)", "EmbeddedRiscvLinux")
  15. - CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
  16. +# CROSS_CC_PREFIX = riscv64-buildroot-linux-gnu-
  17. + CROSS_CC_PREFIX =
  18. PLATFORM = riscvlinux
  19. endif
  20. CC = $(CROSS_CC_PREFIX)gcc
  21. @@ -18,9 +19,13 @@ CXX = $(CROSS_CC_PREFIX)g++
  22. LINKER=$(CC)
  23. AR = $(CROSS_CC_PREFIX)ar
  24. +TARGET_DIR=../target
  25. +STAGING_DIR=$(TARGET_DIR)
  26. +INSTALL=install
  27. +
  28. DEFINES = -DUSE_FEEDING_METHOD_BUFFER
  29. INCLUDES = -I./include/khronos -I./core -I./component/video/wave5/common -I./component/video/wave4 -I./component/helper
  30. -$(warning "the value of LOCAL_PATH is$(STAGING_DIR)")
  31. +$(warning "the value of LOCAL_PATH is $(STAGING_DIR)")
  32. INCLUDES += -I$(STAGING_DIR)/usr/include/
  33. INCLUDES += -I$(STAGING_DIR)/usr/include/wave420l/
  34. INCLUDES += -I$(STAGING_DIR)/usr/include/wave420l/vpuapi/
  35. @@ -29,12 +34,13 @@ INCLUDES += -I$(STAGING_DIR)/usr/include/wave420l/sample/helper/
  36. #mjpeg
  37. INCLUDES += -I./component/image/common
  38. +INCLUDES += -I../out/include
  39. CFLAGS += -g -I. $(INCLUDES) $(DEFINES) $(PLATFORM_FLAGS)
  40. CFLAGS += -fpic
  41. ARFLAGS += cru
  42. -LDFLAGS = -ldl -lpthread -Wl,--fatal-warning
  43. -LDFLAGS_FFMPEG = -lavformat -lavcodec -lavutil -lswresample
  44. +LDFLAGS = -L./ -ldl -lpthread -Wl,--fatal-warning
  45. +LDFLAGS_FFMPEG = -L../out/lib -lavformat -lavcodec -lavutil -lswresample
  46. OBJDIR=obj
  47. ALLOBJS=*.o
  48. @@ -86,18 +92,27 @@ omx-il: CREATE_DIR $(OBJECTPATHS_COMMON)
  49. test: video-dec-test video-enc-test mjpeg-dec-test
  50. video-dec-test: CREATE_DIR $(OBJECTPATHS_DEC_TEST)
  51. - $(CC) -o video_dec_test $(LDFLAGS) $(LDFLAGS_FFMPEG) -lsf-omx-il $(OBJECTPATHS_DEC_TEST) -L./
  52. + $(CC) -o video_dec_test $(OBJECTPATHS_DEC_TEST) $(LDFLAGS) $(LDFLAGS_FFMPEG) -lsf-omx-il
  53. video-enc-test: CREATE_DIR $(OBJECTPATHS_ENC_TEST)
  54. - $(CC) -o video_enc_test $(LDFLAGS) $(LDFLAGS_FFMPEG) -lsf-omx-il $(OBJECTPATHS_ENC_TEST) -L./
  55. + $(CC) -o video_enc_test $(OBJECTPATHS_ENC_TEST) -L../out/lib -L./ -lsf-omx-il $(LDFLAGS_FFMPEG) $(LDFLAGS)
  56. mjpeg-dec-test: CREATE_DIR $(OBJECTPATHS_MJPEG_DEC_TEST)
  57. - $(CC) -g -o mjpeg_dec_test $(LDFLAGS) $(LDFLAGS_FFMPEG) -lsf-omx-il $(OBJECTPATHS_MJPEG_DEC_TEST) -L./
  58. + $(CC) -g -o mjpeg_dec_test $(OBJECTPATHS_MJPEG_DEC_TEST) $(LDFLAGS) $(LDFLAGS_FFMPEG) -lsf-omx-il -L./
  59. clean:
  60. + rm -rf obj/
  61. + rm -rf libsf-omx-il.so video-dec-test video-enc-test mjpeg-dec-test
  62. CREATE_DIR:
  63. -mkdir -p $(OBJDIR)
  64. obj/%.o: %.c $(MAKEFILE)
  65. $(CC) $(CFLAGS) -Wall -Werror -c $< -o $@ -MD -MF $(@:.o=.dep)
  66. +
  67. +install:
  68. + @echo "install omx-il to STAGING_DIR ..."
  69. + $(INSTALL) -m 0644 libsf-omx-il.so $(STAGING_DIR)/usr/lib/libsf-omx-il.so
  70. + ln -sf libsf-omx-il.so $(STAGING_DIR)/usr/lib/libOMX_Core.so
  71. + $(INSTALL) -d include/khronos $(STAGING_DIR)/usr/include/omx-il
  72. + $(INSTALL) -m 0644 include/khronos/* $(STAGING_DIR)/usr/include/omx-il
  73. --
  74. 2.36.0