diff --git a/.dockerignore b/.dockerignore index b1e0e60..1f76c28 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,3 +4,4 @@ !/subprojects/freetype.wrap !/subprojects/libcamera.wrap !/subprojects/x264.wrap +!/subprojects/libpisp.wrap diff --git a/.gitignore b/.gitignore index b1e0e60..1f76c28 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ !/subprojects/freetype.wrap !/subprojects/libcamera.wrap !/subprojects/x264.wrap +!/subprojects/libpisp.wrap diff --git a/post_install.sh b/post_install.sh index b38a247..56ad0a7 100755 --- a/post_install.sh +++ b/post_install.sh @@ -15,6 +15,7 @@ if [ -f ${DESTDIR}/${MESON_INSTALL_PREFIX}/lib/libcamera.so.9.9 ]; then cp -r ${DESTDIR}/${MESON_INSTALL_PREFIX}/lib/libcamera $OUT_DIR/ipa_module cp ${DESTDIR}/${MESON_INSTALL_PREFIX}/lib/libcamera-base.so.9.9 $OUT_DIR/ cp ${DESTDIR}/${MESON_INSTALL_PREFIX}/lib/libcamera.so.9.9 $OUT_DIR/ + cp -r ${DESTDIR}/${MESON_INSTALL_PREFIX}/share/libpisp $OUT_DIR/libpisp fi cp ${DESTDIR}/${MESON_INSTALL_PREFIX}/bin/mtxrpicam $OUT_DIR/ diff --git a/subprojects/freetype.wrap b/subprojects/freetype.wrap index 4e22e14..51761db 100644 --- a/subprojects/freetype.wrap +++ b/subprojects/freetype.wrap @@ -1,4 +1,3 @@ [wrap-git] url = https://github.com/freetype/freetype -# VER-2-11-1 -revision = 3f83daeecb1a78d851b660eed025eeba362c0e4a +revision = VER-2-11-1 diff --git a/subprojects/libcamera.wrap b/subprojects/libcamera.wrap index 68a5020..b94538b 100644 --- a/subprojects/libcamera.wrap +++ b/subprojects/libcamera.wrap @@ -1,5 +1,4 @@ [wrap-git] url = https://github.com/raspberrypi/libcamera -# v0.3.0+rpt20240617 -revision = 6ddd79b5bdbedc1f61007aed35391f1559f9e29a +revision = v0.3.0+rpt20240617 diff_files = libcamera.patch diff --git a/subprojects/libpisp.wrap b/subprojects/libpisp.wrap new file mode 100644 index 0000000..333cd98 --- /dev/null +++ b/subprojects/libpisp.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url = https://github.com/raspberrypi/libpisp.git +# this must be aligned with version inside libcamera +revision = v1.0.6 +diff_files = libpisp.patch diff --git a/subprojects/packagefiles/libpisp.patch b/subprojects/packagefiles/libpisp.patch new file mode 100644 index 0000000..48b6c69 --- /dev/null +++ b/subprojects/packagefiles/libpisp.patch @@ -0,0 +1,13 @@ +diff --git a/src/libpisp/backend/meson.build b/src/libpisp/backend/meson.build +index e29e1a3..10ce7ac 100644 +--- a/src/libpisp/backend/meson.build ++++ b/src/libpisp/backend/meson.build +@@ -4,7 +4,7 @@ + config_install_dir = get_option('prefix') / get_option('datadir') / 'libpisp' + + conf_data = configuration_data() +-conf_data.set('PISP_BE_CONFIG_DIR', '"' + config_install_dir + '"') ++conf_data.set('PISP_BE_CONFIG_DIR', '"./libpisp"') + pisp_build_config = configure_file(output : 'pisp_build_config.h', configuration : conf_data) + + backend_sources = files([